@@ -81,6 +81,8 @@ const makeDesktopWindowLayer = (selectedAction: Deferred.Deferred<string>) =>
8181 handleBackendNotReady : Effect . void ,
8282 flushMainWindowBounds : Effect . void ,
8383 dispatchMenuAction : ( action ) => Deferred . succeed ( selectedAction , action ) . pipe ( Effect . asVoid ) ,
84+ zoomMain : ( direction ) =>
85+ Deferred . succeed ( selectedAction , `zoom-${ direction } ` ) . pipe ( Effect . asVoid ) ,
8486 syncAppearance : Effect . void ,
8587 } satisfies DesktopWindow . DesktopWindow [ "Service" ] ) ;
8688
@@ -94,32 +96,38 @@ const makeElectronMenuLayer = (
9496 showContextMenu : ( ) => Effect . succeed ( Option . none ( ) ) ,
9597 } satisfies ElectronMenu . ElectronMenu [ "Service" ] ) ;
9698
99+ const configureMenu = (
100+ selectedAction : Deferred . Deferred < string > ,
101+ applicationMenuTemplate : Deferred . Deferred < readonly Electron . MenuItemConstructorOptions [ ] > ,
102+ ) =>
103+ Effect . gen ( function * ( ) {
104+ const menu = yield * DesktopApplicationMenu . DesktopApplicationMenu ;
105+ yield * menu . configure ;
106+ } ) . pipe (
107+ Effect . provide (
108+ DesktopApplicationMenu . layer . pipe (
109+ Layer . provideMerge ( makeElectronMenuLayer ( applicationMenuTemplate ) ) ,
110+ Layer . provideMerge ( makeDesktopWindowLayer ( selectedAction ) ) ,
111+ Layer . provideMerge ( desktopUpdatesLayer ) ,
112+ Layer . provideMerge ( electronDialogLayer ) ,
113+ Layer . provideMerge ( electronAppLayer ) ,
114+ Layer . provideMerge (
115+ DesktopEnvironment . layer ( environmentInput ) . pipe (
116+ Layer . provide ( Layer . mergeAll ( NodeServices . layer , DesktopConfig . layerTest ( { } ) ) ) ,
117+ ) ,
118+ ) ,
119+ ) ,
120+ ) ,
121+ ) ;
122+
97123describe ( "DesktopApplicationMenu" , ( ) => {
98124 it . effect ( "installs the native menu and routes Settings through DesktopWindow" , ( ) =>
99125 Effect . gen ( function * ( ) {
100126 const selectedAction = yield * Deferred . make < string > ( ) ;
101127 const applicationMenuTemplate =
102128 yield * Deferred . make < readonly Electron . MenuItemConstructorOptions [ ] > ( ) ;
103129
104- yield * Effect . gen ( function * ( ) {
105- const menu = yield * DesktopApplicationMenu . DesktopApplicationMenu ;
106- yield * menu . configure ;
107- } ) . pipe (
108- Effect . provide (
109- DesktopApplicationMenu . layer . pipe (
110- Layer . provideMerge ( makeElectronMenuLayer ( applicationMenuTemplate ) ) ,
111- Layer . provideMerge ( makeDesktopWindowLayer ( selectedAction ) ) ,
112- Layer . provideMerge ( desktopUpdatesLayer ) ,
113- Layer . provideMerge ( electronDialogLayer ) ,
114- Layer . provideMerge ( electronAppLayer ) ,
115- Layer . provideMerge (
116- DesktopEnvironment . layer ( environmentInput ) . pipe (
117- Layer . provide ( Layer . mergeAll ( NodeServices . layer , DesktopConfig . layerTest ( { } ) ) ) ,
118- ) ,
119- ) ,
120- ) ,
121- ) ,
122- ) ;
130+ yield * configureMenu ( selectedAction , applicationMenuTemplate ) ;
123131
124132 const template = yield * Deferred . await ( applicationMenuTemplate ) ;
125133 const fileMenu = template . find ( ( item ) => item . label === "File" ) ;
@@ -138,4 +146,38 @@ describe("DesktopApplicationMenu", () => {
138146 assert . equal ( yield * Deferred . await ( selectedAction ) , "open-settings" ) ;
139147 } ) ,
140148 ) ;
149+
150+ // Zoom must route through DesktopWindow.zoomMain instead of the Electron
151+ // zoom roles: the roles zoom whichever webContents has focus, which breaks
152+ // app zoom while an embedded preview WebContentsView holds focus.
153+ it . effect ( "routes View menu zoom to the main window instead of zoom roles" , ( ) =>
154+ Effect . gen ( function * ( ) {
155+ const selectedAction = yield * Deferred . make < string > ( ) ;
156+ const applicationMenuTemplate =
157+ yield * Deferred . make < readonly Electron . MenuItemConstructorOptions [ ] > ( ) ;
158+
159+ yield * configureMenu ( selectedAction , applicationMenuTemplate ) ;
160+
161+ const template = yield * Deferred . await ( applicationMenuTemplate ) ;
162+ const viewMenu = template . find ( ( item ) => item . label === "View" ) ;
163+ assert . isDefined ( viewMenu ) ;
164+ if ( ! Array . isArray ( viewMenu . submenu ) ) {
165+ throw new Error ( "Expected View menu submenu to be an array." ) ;
166+ }
167+
168+ assert . isUndefined (
169+ viewMenu . submenu . find ( ( item ) => item . role ?. toLowerCase ( ) . includes ( "zoom" ) ) ,
170+ ) ;
171+
172+ const zoomIn = viewMenu . submenu . find ( ( item ) => item . label === "Zoom In" ) ;
173+ assert . isDefined ( zoomIn ) ;
174+ assert . equal ( zoomIn . accelerator , "CmdOrCtrl+=" ) ;
175+ if ( typeof zoomIn . click !== "function" ) {
176+ throw new Error ( "Expected Zoom In menu item to have a click handler." ) ;
177+ }
178+
179+ zoomIn . click ( { } as Electron . MenuItem , { } as Electron . BrowserWindow , { } as KeyboardEvent ) ;
180+ assert . equal ( yield * Deferred . await ( selectedAction ) , "zoom-in" ) ;
181+ } ) ,
182+ ) ;
141183} ) ;
0 commit comments