From c44d76e07e7d46b42e679d0be6c1ea13681fb488 Mon Sep 17 00:00:00 2001 From: Nicholas Romero Date: Thu, 19 Nov 2026 13:41:43 -0600 Subject: [PATCH] Support opening multiple desktop windows from the File menu --- apps/desktop/src/app/DesktopLifecycle.test.ts | 1 + .../src/electron/ElectronWindow.test.ts | 23 +++++++++ apps/desktop/src/electron/ElectronWindow.ts | 47 ++++++++++--------- apps/desktop/src/ipc/DesktopIpc.test.ts | 7 +-- apps/desktop/src/ipc/DesktopIpc.ts | 2 +- apps/desktop/src/ipc/methods/snapShot.test.ts | 8 ++-- apps/desktop/src/ipc/methods/snapShot.ts | 2 +- apps/desktop/src/ipc/methods/window.test.ts | 18 +++---- apps/desktop/src/ipc/methods/window.ts | 8 ++-- .../src/ssh/DesktopSshPasswordPrompts.test.ts | 1 + .../desktop/src/updates/updatesTestHarness.ts | 1 + .../src/window/DesktopApplicationMenu.ts | 11 +++++ apps/desktop/src/window/DesktopWindow.test.ts | 2 + 13 files changed, 88 insertions(+), 43 deletions(-) diff --git a/apps/desktop/src/app/DesktopLifecycle.test.ts b/apps/desktop/src/app/DesktopLifecycle.test.ts index e11e946dd41ba..54433a8be3257 100644 --- a/apps/desktop/src/app/DesktopLifecycle.test.ts +++ b/apps/desktop/src/app/DesktopLifecycle.test.ts @@ -74,6 +74,7 @@ function layerElectronWindow(destroyAll: Effect.Effect = Effect.void) { main: Effect.die("unexpected main window read"), currentMainOrFirst: Effect.die("unexpected current window read"), focusedMainOrFirst: Effect.die("unexpected focused window read"), + mainForSender: () => Effect.succeedNone, setMain: () => Effect.void, clearMain: () => Effect.void, prepareReveal: () => Effect.succeed(false), diff --git a/apps/desktop/src/electron/ElectronWindow.test.ts b/apps/desktop/src/electron/ElectronWindow.test.ts index eac944722e73b..0cadb4c88d385 100644 --- a/apps/desktop/src/electron/ElectronWindow.test.ts +++ b/apps/desktop/src/electron/ElectronWindow.test.ts @@ -4,6 +4,7 @@ import * as Cause from "effect/Cause"; import * as Effect from "effect/Effect"; import * as Fiber from "effect/Fiber"; import * as Layer from "effect/Layer"; +import * as Option from "effect/Option"; import type * as Electron from "electron"; import { beforeEach, vi } from "vite-plus/test"; @@ -207,6 +208,28 @@ describe("ElectronWindow", () => { }).pipe(Effect.provide(layerTest)), ); + it.effect("keeps both application windows registered until each closes", () => + Effect.gen(function* () { + const service = yield* ElectronWindow.ElectronWindow; + const makeWindow = (id: number) => + ({ + webContents: { id }, + isDestroyed: () => false, + isFocused: () => id === 1, + }) as unknown as Electron.BrowserWindow; + const first = makeWindow(1); + const second = makeWindow(2); + yield* service.setMain(first); + yield* service.setMain(second); + assert.deepEqual(yield* service.main, Option.some(first)); + assert.deepEqual(yield* service.mainForSender(2), Option.some(second)); + assert.deepEqual(yield* service.mainForSender(3), Option.none()); + yield* service.clearMain(Option.some(first)); + assert.deepEqual(yield* service.mainForSender(1), Option.none()); + assert.deepEqual(yield* service.main, Option.some(second)); + }).pipe(Effect.provide(layerTest)), + ); + it.effect("never falls back to an auxiliary window as the main window", () => Effect.gen(function* () { const electronWindow = yield* ElectronWindow.ElectronWindow; diff --git a/apps/desktop/src/electron/ElectronWindow.ts b/apps/desktop/src/electron/ElectronWindow.ts index b5f89969e66c7..93eeb194df10e 100644 --- a/apps/desktop/src/electron/ElectronWindow.ts +++ b/apps/desktop/src/electron/ElectronWindow.ts @@ -9,7 +9,6 @@ import * as Effect from "effect/Effect"; import * as Exit from "effect/Exit"; import * as Layer from "effect/Layer"; import * as Option from "effect/Option"; -import * as Ref from "effect/Ref"; import * as Schema from "effect/Schema"; import * as Electron from "electron"; @@ -118,6 +117,9 @@ export class ElectronWindow extends Context.Service< readonly main: Effect.Effect>; readonly currentMainOrFirst: Effect.Effect>; readonly focusedMainOrFirst: Effect.Effect>; + readonly mainForSender: ( + id: number | undefined, + ) => Effect.Effect>; readonly setMain: (window: Electron.BrowserWindow) => Effect.Effect; readonly clearMain: (window: Option.Option) => Effect.Effect; readonly prepareReveal: (window: Electron.BrowserWindow) => Effect.Effect; @@ -146,7 +148,7 @@ export const make = Effect.gen(function* () { }; const captureRevealWindows = new Set(); yield* Effect.addFinalizer(() => Effect.sync(() => windowsForegroundFocus?.close())); - const mainWindowRef = yield* Ref.make>(Option.none()); + const mainWindows = new Set(); const auxiliaryWindows = new WeakSet(); const titleBarOverlayWindows = new WeakSet(); @@ -175,12 +177,9 @@ export const make = Effect.gen(function* () { }), }).pipe(Effect.orDie); - const liveMain = Effect.gen(function* () { - const main = yield* Ref.get(mainWindowRef); - if (Option.isNone(main) || (yield* isWindowDestroyed(main.value))) { - return Option.none(); - } - return main; + const liveMain = Effect.sync(() => { + const windows = [...mainWindows].filter((window) => !window.isDestroyed()); + return Option.fromNullishOr(windows.find((window) => window.isFocused()) ?? windows.at(-1)); }); const currentMainOrFirst = Effect.gen(function* () { @@ -256,20 +255,24 @@ export const make = Effect.gen(function* () { main: liveMain, currentMainOrFirst, focusedMainOrFirst, - setMain: Effect.fn("ElectronWindow.setMain")(function (window) { - return Ref.set(mainWindowRef, Option.some(window)); - }), - clearMain: Effect.fn("ElectronWindow.clearMain")(function (window) { - return Ref.update(mainWindowRef, (current) => { - if (Option.isNone(current)) { - return current; - } - if (Option.isSome(window) && current.value !== window.value) { - return current; - } - return Option.none(); - }); - }), + mainForSender: Effect.fn("ElectronWindow.mainForSender")((id) => + Effect.sync(() => + Option.fromNullishOr( + [...mainWindows].find((window) => !window.isDestroyed() && window.webContents.id === id), + ), + ), + ), + setMain: Effect.fn("ElectronWindow.setMain")((window) => + Effect.sync(() => { + mainWindows.add(window); + }), + ), + clearMain: Effect.fn("ElectronWindow.clearMain")((window) => + Effect.sync(() => { + if (Option.isSome(window)) mainWindows.delete(window.value); + else mainWindows.clear(); + }), + ), prepareReveal: Effect.fn("ElectronWindow.prepareReveal")(function (window) { return Effect.promise(async () => { if (platform !== "win32" || window.isDestroyed()) { diff --git a/apps/desktop/src/ipc/DesktopIpc.test.ts b/apps/desktop/src/ipc/DesktopIpc.test.ts index 1973ab49cefeb..10efb09c710e6 100644 --- a/apps/desktop/src/ipc/DesktopIpc.test.ts +++ b/apps/desktop/src/ipc/DesktopIpc.test.ts @@ -24,9 +24,10 @@ it.effect("answers only the main window's top frame", () => }).pipe( Layer.provide( Layer.mock(ElectronWindow.ElectronWindow, { - main: Effect.succeedSome({ - webContents: { id: 1, mainFrame }, - } as unknown as Electron.BrowserWindow), + mainForSender: () => + Effect.succeedSome({ + webContents: { id: 1, mainFrame }, + } as unknown as Electron.BrowserWindow), }), ), ), diff --git a/apps/desktop/src/ipc/DesktopIpc.ts b/apps/desktop/src/ipc/DesktopIpc.ts index 69d4f70c15a0e..398fbe60f0749 100644 --- a/apps/desktop/src/ipc/DesktopIpc.ts +++ b/apps/desktop/src/ipc/DesktopIpc.ts @@ -186,7 +186,7 @@ export const layer = (ipcMain: DesktopIpcMain) => const electronWindow = yield* ElectronWindow.ElectronWindow; return make(ipcMain, (event) => Effect.map( - electronWindow.main, + electronWindow.mainForSender(event.sender.id), (main) => Option.isSome(main) && main.value.webContents.id === event.sender.id && diff --git a/apps/desktop/src/ipc/methods/snapShot.test.ts b/apps/desktop/src/ipc/methods/snapShot.test.ts index 7e1ae602f979d..7d4f7f385660c 100644 --- a/apps/desktop/src/ipc/methods/snapShot.test.ts +++ b/apps/desktop/src/ipc/methods/snapShot.test.ts @@ -44,8 +44,8 @@ describe("window capture IPC", () => { Effect.provide( Layer.mergeAll( Layer.succeed(ElectronWindow.ElectronWindow, { - main: Effect.succeedSome({ webContents: { id: 7 } }), - } as ElectronWindow.ElectronWindow["Service"]), + mainForSender: () => Effect.succeedSome({ webContents: { id: 7 } }), + } as unknown as ElectronWindow.ElectronWindow["Service"]), Layer.succeed(DesktopSnapShot.DesktopSnapShot, { previewConfig: () => Effect.sync(() => { @@ -81,8 +81,8 @@ describe("window capture IPC", () => { Effect.provide( Layer.mergeAll( Layer.succeed(ElectronWindow.ElectronWindow, { - main: Effect.succeedSome({ webContents: { id: 7 } }), - } as ElectronWindow.ElectronWindow["Service"]), + mainForSender: () => Effect.succeedSome({ webContents: { id: 7 } }), + } as unknown as ElectronWindow.ElectronWindow["Service"]), Layer.succeed(DesktopSnapShot.DesktopSnapShot, { setup: (action: string) => Effect.sync(() => { diff --git a/apps/desktop/src/ipc/methods/snapShot.ts b/apps/desktop/src/ipc/methods/snapShot.ts index 1a37882f4871e..e3778570d6033 100644 --- a/apps/desktop/src/ipc/methods/snapShot.ts +++ b/apps/desktop/src/ipc/methods/snapShot.ts @@ -35,7 +35,7 @@ class SnapShotIpcUnauthorizedSenderError extends Schema.TaggedError { webContents: { id: 1, session: { fetch } }, } as unknown as Electron.BrowserWindow; const read = (url: string, senderId: number) => - readMedia - .handler(url, { sender: { id: senderId } }) - .pipe( - Effect.provide( - Layer.mock(ElectronWindow.ElectronWindow)({ main: Effect.succeedSome(main) }), - ), - ); + readMedia.handler(url, { sender: { id: senderId } }).pipe( + Effect.provide( + Layer.mock(ElectronWindow.ElectronWindow)({ + mainForSender: () => Effect.succeedSome(main), + }), + ), + ); assert.strictEqual(yield* read("https://example.com/a.png", 2), null); assert.strictEqual(yield* read("file:///etc/passwd", 1), null); @@ -463,7 +463,9 @@ describe("syncHtmlFullscreen", () => { if (event === "leave-full-screen") leaveListeners.push(listener); }, } as unknown as Electron.BrowserWindow; - const layer = Layer.mock(ElectronWindow.ElectronWindow)({ main: Effect.succeedSome(window) }); + const layer = Layer.mock(ElectronWindow.ElectronWindow)({ + mainForSender: () => Effect.succeedSome(window), + }); return { window, setFullScreen, finishExit, layer }; }; const fromMainRenderer = { sender: { id: 1 } }; diff --git a/apps/desktop/src/ipc/methods/window.ts b/apps/desktop/src/ipc/methods/window.ts index abf4ec929a7b7..435bb8c9e6802 100644 --- a/apps/desktop/src/ipc/methods/window.ts +++ b/apps/desktop/src/ipc/methods/window.ts @@ -383,7 +383,7 @@ export const readMedia = DesktopIpc.makeIpcMethod({ payload: Schema.String, result: Schema.NullOr(DesktopMediaReadSchema), handler: Effect.fn("desktop.ipc.window.readMedia")(function* (url, event) { - const window = yield* (yield* ElectronWindow.ElectronWindow).main; + const window = yield* (yield* ElectronWindow.ElectronWindow).mainForSender(event?.sender.id); if ( event === undefined || Option.isNone(window) || @@ -467,7 +467,7 @@ export const pasteAsText = DesktopIpc.makeIpcMethod({ result: Schema.Void, handler: Effect.fn("desktop.ipc.window.pasteAsText")(function* (_input, event) { const electronWindow = yield* ElectronWindow.ElectronWindow; - const window = yield* electronWindow.main; + const window = yield* electronWindow.mainForSender(event?.sender.id); if ( event === undefined || Option.isNone(window) || @@ -493,7 +493,7 @@ export const revealWindow = DesktopIpc.makeIpcMethod({ result: Schema.Void, handler: Effect.fn("desktop.ipc.window.revealWindow")(function* (_input, event) { const electronWindow = yield* ElectronWindow.ElectronWindow; - const window = yield* electronWindow.main; + const window = yield* electronWindow.mainForSender(event?.sender.id); if ( event === undefined || Option.isNone(window) || @@ -531,7 +531,7 @@ export const syncHtmlFullscreen = DesktopIpc.makeIpcMethod({ result: Schema.Void, handler: Effect.fn("desktop.ipc.window.syncHtmlFullscreen")(function* (fullscreen, event) { const electronWindow = yield* ElectronWindow.ElectronWindow; - const main = yield* electronWindow.main; + const main = yield* electronWindow.mainForSender(event?.sender.id); if ( event === undefined || Option.isNone(main) || diff --git a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts index 15977b34f398b..38bde6ebc3d18 100644 --- a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts +++ b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts @@ -97,6 +97,7 @@ function layerElectronWindow(window: ReturnType["window"] main: Effect.succeedSome(window as Electron.BrowserWindow), currentMainOrFirst: Effect.succeedSome(window as Electron.BrowserWindow), focusedMainOrFirst: Effect.succeedSome(window as Electron.BrowserWindow), + mainForSender: () => Effect.succeedNone, setMain: () => Effect.void, clearMain: () => Effect.void, prepareReveal: () => Effect.succeed(false), diff --git a/apps/desktop/src/updates/updatesTestHarness.ts b/apps/desktop/src/updates/updatesTestHarness.ts index b118d15ced674..ce4a5d41bb43a 100644 --- a/apps/desktop/src/updates/updatesTestHarness.ts +++ b/apps/desktop/src/updates/updatesTestHarness.ts @@ -123,6 +123,7 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) { main: Effect.succeedNone, currentMainOrFirst: Effect.succeedNone, focusedMainOrFirst: Effect.succeedNone, + mainForSender: () => Effect.succeedNone, setMain: () => Effect.void, clearMain: () => Effect.void, prepareReveal: () => Effect.succeed(false), diff --git a/apps/desktop/src/window/DesktopApplicationMenu.ts b/apps/desktop/src/window/DesktopApplicationMenu.ts index 392208d5b54c9..07cd5add46271 100644 --- a/apps/desktop/src/window/DesktopApplicationMenu.ts +++ b/apps/desktop/src/window/DesktopApplicationMenu.ts @@ -248,6 +248,17 @@ export const make = Effect.gen(function* () { { label: m(msg("File", { $context: "menu bar title" })), submenu: [ + { + label: m(msg("New Window")), + click: () => + runMenuEffect( + "new-window", + Effect.gen(function* () { + const desktopWindow = yield* DesktopWindow.DesktopWindow; + yield* desktopWindow.createMain; + }), + ), + }, ...(environment.platform === "darwin" ? [] : [ diff --git a/apps/desktop/src/window/DesktopWindow.test.ts b/apps/desktop/src/window/DesktopWindow.test.ts index 46311dbba8122..59c0e47088252 100644 --- a/apps/desktop/src/window/DesktopWindow.test.ts +++ b/apps/desktop/src/window/DesktopWindow.test.ts @@ -307,6 +307,7 @@ function layerTest(input: { input.focusedWindow === undefined ? Ref.get(input.mainWindow) : Effect.succeedSome(input.focusedWindow), + mainForSender: () => Effect.succeedNone, setMain: (window) => Ref.set(input.mainWindow, Option.some(window)), clearMain: () => Ref.set(input.mainWindow, Option.none()), prepareReveal: () => Effect.succeed(false), @@ -437,6 +438,7 @@ const makeSplashScenario = (createOutcomes: readonly (Electron.BrowserWindow | n main: Ref.get(mainWindow), currentMainOrFirst, focusedMainOrFirst: currentMainOrFirst, + mainForSender: () => Effect.succeedNone, setMain: (window) => Ref.set(mainWindow, Option.some(window)), clearMain: () => Ref.set(mainWindow, Option.none()), prepareReveal: () => Effect.succeed(false),