@@ -506,6 +506,7 @@ const makeFaviconWebContents = (options?: {
506506 send : webviewSend ,
507507 session : { fetch } ,
508508 navigationHistory : { canGoBack : ( ) => false , canGoForward : ( ) => false } ,
509+ isFocused : vi . fn ( ( ) => true ) ,
509510 setIgnoreMenuShortcuts : vi . fn ( ) ,
510511 setWindowOpenHandler : vi . fn ( ) ,
511512 executeJavaScriptInIsolatedWorld,
@@ -643,7 +644,6 @@ describe("PreviewManager", () => {
643644 const hostWebContents = { sendInputEvent, isDestroyed : ( ) => false } ;
644645 Object . assign ( preview . webContents , { hostWebContents } ) ;
645646 fromId . mockReturnValue ( preview . webContents ) ;
646- getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
647647 yield * manager . setMainWindow ( {
648648 isDestroyed : ( ) => false ,
649649 once : vi . fn ( ) ,
@@ -708,7 +708,6 @@ describe("PreviewManager", () => {
708708 hostWebContents : { isDestroyed : ( ) => false , send } ,
709709 } ) ;
710710 fromId . mockReturnValue ( preview . webContents ) ;
711- getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
712711 yield * manager . createTab ( "tab_reopen" ) ;
713712 yield * manager . registerWebview ( "tab_reopen" , 42 ) ;
714713 const shortcut = parseKeybindingShortcut ( chord ) ! ;
@@ -737,12 +736,12 @@ describe("PreviewManager", () => {
737736 expect ( preventDefault ) . toHaveBeenCalledTimes ( "isAutoRepeat" in overrides ? 1 : 0 ) ;
738737 expect ( send ) . toHaveBeenCalledOnce ( ) ;
739738 }
740- getFocusedWebContents . mockReturnValue ( null ) ;
739+ vi . mocked ( ( preview . webContents as Electron . WebContents ) . isFocused ) . mockReturnValue ( false ) ;
741740 preventDefault . mockClear ( ) ;
742741 beforeInput ( { preventDefault } as never , input as never ) ;
743742 expect ( preventDefault ) . not . toHaveBeenCalled ( ) ;
744743 expect ( send ) . toHaveBeenCalledOnce ( ) ;
745- getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
744+ vi . mocked ( ( preview . webContents as Electron . WebContents ) . isFocused ) . mockReturnValue ( true ) ;
746745 yield * manager . setForwardedShortcuts ( [ ] ) ;
747746 beforeInput ( { preventDefault } as never , input as never ) ;
748747 expect ( preventDefault ) . not . toHaveBeenCalled ( ) ;
@@ -770,7 +769,6 @@ describe("PreviewManager", () => {
770769 hostWebContents : { isDestroyed : ( ) => false , send } ,
771770 } ) ;
772771 fromId . mockReturnValue ( preview . webContents ) ;
773- getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
774772 yield * manager . createTab ( "tab_alt_graph" ) ;
775773 yield * manager . registerWebview ( "tab_alt_graph" , 42 ) ;
776774 yield * manager . setForwardedShortcuts ( [
@@ -812,7 +810,6 @@ describe("PreviewManager", () => {
812810
813811 for ( const browser of [ preview , popup ] ) {
814812 const contents = browser . webContents as Electron . WebContents ;
815- getFocusedWebContents . mockReturnValue ( browser . webContents as never ) ;
816813 const beforeInput = browser . listeners . get ( "before-input-event" ) ! ;
817814 const preventDefault = vi . fn ( ) ;
818815 const input = {
@@ -834,7 +831,7 @@ describe("PreviewManager", () => {
834831 beforeInput ( { preventDefault } as never , { ...input , key : "w" } as never ) ;
835832 expect ( contents . setIgnoreMenuShortcuts ) . toHaveBeenLastCalledWith ( true ) ;
836833
837- getFocusedWebContents . mockReturnValue ( null ) ;
834+ vi . mocked ( contents . isFocused ) . mockReturnValue ( false ) ;
838835 beforeInput ( { preventDefault } as never , input as never ) ;
839836 expect ( contents . setIgnoreMenuShortcuts ) . toHaveBeenLastCalledWith ( true ) ;
840837 expect ( preventDefault ) . not . toHaveBeenCalled ( ) ;
@@ -843,6 +840,43 @@ describe("PreviewManager", () => {
843840 ) ,
844841 ) ;
845842
843+ effectIt . effect ( "keeps editing and forwarded shortcuts in every tab of a focused window" , ( ) =>
844+ withManager ( ( manager ) =>
845+ Effect . gen ( function * ( ) {
846+ const send = vi . fn ( ) ;
847+ const host = { isDestroyed : ( ) => false , send } ;
848+ const older = makeFaviconWebContents ( { id : 42 } ) ;
849+ const newer = makeFaviconWebContents ( { id : 43 } ) ;
850+ for ( const tab of [ older , newer ] ) Object . assign ( tab . webContents , { hostWebContents : host } ) ;
851+ // Electron names one arbitrary guest here when several share a focused window.
852+ getFocusedWebContents . mockReturnValue ( newer . webContents as never ) ;
853+ fromId . mockReturnValue ( older . webContents ) ;
854+ yield * manager . createTab ( "tab_older" ) ;
855+ yield * manager . registerWebview ( "tab_older" , 42 ) ;
856+ fromId . mockReturnValue ( newer . webContents ) ;
857+ yield * manager . createTab ( "tab_newer" ) ;
858+ yield * manager . registerWebview ( "tab_newer" , 43 ) ;
859+ const shortcut = parseKeybindingShortcut ( "mod+shift+t" ) ! ;
860+ yield * manager . setForwardedShortcuts ( [ { command : "view.reopenClosed" , shortcut } ] ) ;
861+
862+ const beforeInput = older . listeners . get ( "before-input-event" ) ! ;
863+ const key = { type : "keyDown" , meta : true , control : false , alt : false } ;
864+ beforeInput (
865+ { preventDefault : vi . fn ( ) } as never ,
866+ { ...key , key : "v" , shift : false } as never ,
867+ ) ;
868+ expect (
869+ ( older . webContents as Electron . WebContents ) . setIgnoreMenuShortcuts ,
870+ ) . toHaveBeenLastCalledWith ( false ) ;
871+
872+ const preventDefault = vi . fn ( ) ;
873+ beforeInput ( { preventDefault } as never , { ...key , key : "T" , shift : true } as never ) ;
874+ expect ( preventDefault ) . toHaveBeenCalledOnce ( ) ;
875+ expect ( send ) . toHaveBeenCalledExactlyOnceWith ( "desktop:menu-action" , "view.reopenClosed" ) ;
876+ } ) ,
877+ ) ,
878+ ) ;
879+
846880 effectIt . effect ( "rejects a destroyed webview during registration" , ( ) =>
847881 withManager ( ( manager ) =>
848882 Effect . gen ( function * ( ) {
0 commit comments