diff --git a/src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts b/src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts index 9878befc18..e6b19bd00e 100644 --- a/src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts +++ b/src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts @@ -243,6 +243,6 @@ const expectWindowsToBeOpenFor = (di: DiContainer) => (windowIds: string[]) => { const windows = di.injectMany(lensWindowInjectionToken); expect( - windows.filter((window) => window.visible).map((window) => window.id), + windows.filter((window) => window.isVisible).map((window) => window.id), ).toEqual(windowIds); }; diff --git a/src/behaviours/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts b/src/behaviours/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts index 8341e40349..5cdba30a8e 100644 --- a/src/behaviours/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts +++ b/src/behaviours/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts @@ -41,7 +41,7 @@ describe("quitting the app using application menu", () => { ); expect( - windows.map((window) => ({ id: window.id, visible: window.visible })), + windows.map((window) => ({ id: window.id, visible: window.isVisible })), ).toEqual([ { id: "only-application-window", visible: true }, { id: "splash", visible: false }, @@ -59,7 +59,7 @@ describe("quitting the app using application menu", () => { ); expect( - windows.map((window) => ({ id: window.id, visible: window.visible })), + windows.map((window) => ({ id: window.id, visible: window.isVisible })), ).toEqual([ { id: "only-application-window", visible: false }, { id: "splash", visible: false }, diff --git a/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts b/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts index de4b2b357d..4b1a3405b3 100644 --- a/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts +++ b/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts @@ -20,7 +20,7 @@ const hideDockForLastClosedWindowInjectable = getInjectable({ run: () => { const visibleWindows = pipeline( getLensWindows(), - filter(window => !!window.visible), + filter(window => !!window.isVisible), ); if (isEmpty(visibleWindows)) { diff --git a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts index 1f50e2312f..fe43f2e41e 100644 --- a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts +++ b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts @@ -42,7 +42,7 @@ const createLensWindowInjectable = getInjectable({ let browserWindow: ElectronWindow | undefined; let windowIsShown = false; - let windowIsOpening = false; + let windowIsStarting = false; const showWindow = () => { assert(browserWindow); @@ -54,17 +54,17 @@ const createLensWindowInjectable = getInjectable({ return { id: configuration.id, - get visible() { + get isVisible() { return windowIsShown; }, - get opening() { - return windowIsOpening; + get isStarting() { + return windowIsStarting; }, - open: async () => { + start: async () => { if (!browserWindow) { - windowIsOpening = true; + windowIsStarting = true; browserWindow = createElectronWindow({ ...configuration, @@ -88,7 +88,7 @@ const createLensWindowInjectable = getInjectable({ showWindow(); - windowIsOpening = false; + windowIsStarting = false; }, show: showWindow, diff --git a/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts b/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts index 4f8c3bb73a..04c0939a6a 100644 --- a/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts +++ b/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts @@ -13,12 +13,12 @@ export interface SendToViewArgs { export interface LensWindow { id: string; - open: () => Promise; + start: () => Promise; close: () => void; show: () => void; send: (args: SendToViewArgs) => void; - visible: boolean; - opening: boolean; + isVisible: boolean; + isStarting: boolean; } export const lensWindowInjectionToken = getInjectionToken({ diff --git a/src/main/start-main-application/lens-window/show-application-window.injectable.ts b/src/main/start-main-application/lens-window/show-application-window.injectable.ts index e1f9438ecf..6fa6fca62c 100644 --- a/src/main/start-main-application/lens-window/show-application-window.injectable.ts +++ b/src/main/start-main-application/lens-window/show-application-window.injectable.ts @@ -16,7 +16,7 @@ const showApplicationWindowInjectable = getInjectable({ const splashWindow = di.inject(splashWindowInjectable); return async () => { - if (applicationWindow.opening) { + if (applicationWindow.isStarting) { applicationWindow.show(); splashWindow.close(); @@ -24,17 +24,17 @@ const showApplicationWindowInjectable = getInjectable({ } const windowIsAlreadyBeingShown = someIsTruthy([ - applicationWindow.visible, - splashWindow.opening, + applicationWindow.isVisible, + splashWindow.isStarting, ]); if (windowIsAlreadyBeingShown) { return; } - await splashWindow.open(); + await splashWindow.start(); - await applicationWindow.open(); + await applicationWindow.start(); splashWindow.close(); }; diff --git a/src/main/start-main-application/start-main-application.injectable.ts b/src/main/start-main-application/start-main-application.injectable.ts index 30e1da33f9..fa85d9f029 100644 --- a/src/main/start-main-application/start-main-application.injectable.ts +++ b/src/main/start-main-application/start-main-application.injectable.ts @@ -49,7 +49,7 @@ const startMainApplicationInjectable = getInjectable({ await beforeApplicationIsLoading(); if (!shouldStartHidden) { - await splashWindow.open(); + await splashWindow.start(); } await onLoadOfApplication(); @@ -60,7 +60,7 @@ const startMainApplicationInjectable = getInjectable({ if (deepLinkUrl) { await openDeepLink(deepLinkUrl); } else { - await applicationWindow.open(); + await applicationWindow.start(); } splashWindow.close(); diff --git a/src/main/utils/channel/message-to-channel.injectable.ts b/src/main/utils/channel/message-to-channel.injectable.ts index 00e588a16a..be535965af 100644 --- a/src/main/utils/channel/message-to-channel.injectable.ts +++ b/src/main/utils/channel/message-to-channel.injectable.ts @@ -21,10 +21,9 @@ const messageToChannelInjectable = getInjectable({ return (channel: MessageChannel, message?: unknown) => { const stringifiedMessage = tentativeStringifyJson(message); - const visibleWindows = pipeline( getAllLensWindows(), - filter((lensWindow) => !!lensWindow.visible), + filter((lensWindow) => !!lensWindow.isVisible), ); visibleWindows.forEach((lensWindow) => diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 56927b4c3a..f22aecc476 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -408,7 +408,7 @@ export const getApplicationBuilder = () => { const applicationWindow = mainDi.inject(applicationWindowInjectable); - await applicationWindow.open(); + await applicationWindow.start(); const startFrame = rendererDi.inject(startFrameInjectable);