@@ -6,6 +6,7 @@ import type {
66 DesktopPreviewRecordingInputEvent ,
77} from "@t3tools/contracts" ;
88import { HostProcessPlatform } from "@t3tools/shared/hostProcess" ;
9+ import { parseKeybindingShortcut } from "@t3tools/shared/keybindings" ;
910import * as Cause from "effect/Cause" ;
1011import * as Deferred from "effect/Deferred" ;
1112import * as Effect from "effect/Effect" ;
@@ -269,32 +270,34 @@ const layerFileSystem = FileSystem.layerNoop({
269270 } ) ,
270271} ) ;
271272
272- const layer = PreviewManager . layer . pipe (
273- Layer . provideMerge (
274- Layer . succeed ( DesktopRendererHistory . DesktopRendererHistory , {
275- register : ( ) => Effect . void ,
276- recordMetrics : ( ) => Effect . void ,
277- shutdown : Effect . void ,
278- } ) ,
279- ) ,
280- Layer . provideMerge ( DesktopBrowserHost . layer ) ,
281- Layer . provideMerge ( layerBrowserSession ) ,
282- Layer . provideMerge ( layerEnvironment ) ,
283- Layer . provideMerge ( layerFileSystem ) ,
284- Layer . provideMerge ( Path . layer ) ,
285- Layer . provideMerge ( NodeCrypto . layer ) ,
286- Layer . provideMerge ( Layer . succeed ( HostProcessPlatform , "darwin" ) ) ,
287- ) ;
273+ const managerLayer = ( platform : NodeJS . Platform = "darwin" ) =>
274+ PreviewManager . layer . pipe (
275+ Layer . provideMerge (
276+ Layer . succeed ( DesktopRendererHistory . DesktopRendererHistory , {
277+ register : ( ) => Effect . void ,
278+ recordMetrics : ( ) => Effect . void ,
279+ shutdown : Effect . void ,
280+ } ) ,
281+ ) ,
282+ Layer . provideMerge ( DesktopBrowserHost . layer ) ,
283+ Layer . provideMerge ( layerBrowserSession ) ,
284+ Layer . provideMerge ( layerEnvironment ) ,
285+ Layer . provideMerge ( layerFileSystem ) ,
286+ Layer . provideMerge ( Path . layer ) ,
287+ Layer . provideMerge ( NodeCrypto . layer ) ,
288+ Layer . provideMerge ( Layer . succeed ( HostProcessPlatform , platform ) ) ,
289+ ) ;
288290
289291const withManager = < A > (
290292 use : (
291293 manager : PreviewManager . PreviewManager [ "Service" ] ,
292294 ) => Effect . Effect < A , PreviewManager . PreviewManagerError , Scope . Scope > ,
295+ platform : NodeJS . Platform = "darwin" ,
293296) =>
294297 Effect . gen ( function * ( ) {
295298 const manager = yield * PreviewManager . PreviewManager ;
296299 return yield * use ( manager ) ;
297- } ) . pipe ( Effect . provide ( layer ) , Effect . scoped ) ;
300+ } ) . pipe ( Effect . provide ( managerLayer ( platform ) ) , Effect . scoped ) ;
298301
299302interface TestCapturedPreviewImage {
300303 readonly toJPEG : ( ) => Buffer ;
@@ -574,7 +577,7 @@ describe("PreviewManager", () => {
574577 Effect . gen ( function * ( ) {
575578 const preview = makeFaviconWebContents ( ) ;
576579 const sendInputEvent = vi . fn ( ) ;
577- const hostWebContents = { sendInputEvent } ;
580+ const hostWebContents = { sendInputEvent, isDestroyed : ( ) => false } ;
578581 Object . assign ( preview . webContents , { hostWebContents } ) ;
579582 fromId . mockReturnValue ( preview . webContents ) ;
580583 getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
@@ -628,6 +631,108 @@ describe("PreviewManager", () => {
628631 ) ,
629632 ) ;
630633
634+ effectIt . effect . each ( [
635+ [ "mod+shift+t" , "view.reopenClosed" ] ,
636+ [ "ctrl+alt+u" , "sidebar.toggle" ] ,
637+ ] as const ) (
638+ "forwards only the configured command from the focused guest: %s" ,
639+ ( [ chord , command ] ) =>
640+ withManager ( ( manager ) =>
641+ Effect . gen ( function * ( ) {
642+ const preview = makeFaviconWebContents ( ) ;
643+ const send = vi . fn ( ) ;
644+ Object . assign ( preview . webContents , {
645+ hostWebContents : { isDestroyed : ( ) => false , send } ,
646+ } ) ;
647+ fromId . mockReturnValue ( preview . webContents ) ;
648+ getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
649+ yield * manager . createTab ( "tab_reopen" ) ;
650+ yield * manager . registerWebview ( "tab_reopen" , 42 ) ;
651+ const shortcut = parseKeybindingShortcut ( chord ) ! ;
652+ yield * manager . setForwardedShortcuts ( [ { command, shortcut } ] ) ;
653+ const beforeInput = preview . listeners . get ( "before-input-event" ) ! ;
654+ const input = {
655+ type : "keyDown" ,
656+ key : shortcut . key . toUpperCase ( ) ,
657+ meta : shortcut . metaKey || shortcut . modKey ,
658+ control : shortcut . ctrlKey ,
659+ shift : shortcut . shiftKey ,
660+ alt : shortcut . altKey ,
661+ } ;
662+ const preventDefault = vi . fn ( ) ;
663+ beforeInput ( { preventDefault } as never , input as never ) ;
664+ expect ( preventDefault ) . toHaveBeenCalledOnce ( ) ;
665+ expect ( send ) . toHaveBeenCalledExactlyOnceWith ( "desktop:menu-action" , command ) ;
666+ for ( const overrides of [
667+ { isAutoRepeat : true } ,
668+ { type : "keyUp" } ,
669+ { shift : ! input . shift } ,
670+ { key : "x" } ,
671+ ] ) {
672+ preventDefault . mockClear ( ) ;
673+ beforeInput ( { preventDefault } as never , { ...input , ...overrides } as never ) ;
674+ expect ( preventDefault ) . toHaveBeenCalledTimes ( "isAutoRepeat" in overrides ? 1 : 0 ) ;
675+ expect ( send ) . toHaveBeenCalledOnce ( ) ;
676+ }
677+ getFocusedWebContents . mockReturnValue ( null ) ;
678+ preventDefault . mockClear ( ) ;
679+ beforeInput ( { preventDefault } as never , input as never ) ;
680+ expect ( preventDefault ) . not . toHaveBeenCalled ( ) ;
681+ expect ( send ) . toHaveBeenCalledOnce ( ) ;
682+ getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
683+ yield * manager . setForwardedShortcuts ( [ ] ) ;
684+ beforeInput ( { preventDefault } as never , input as never ) ;
685+ expect ( preventDefault ) . not . toHaveBeenCalled ( ) ;
686+ expect ( send ) . toHaveBeenCalledOnce ( ) ;
687+ } ) ,
688+ ) ,
689+ ) ;
690+
691+ effectIt . effect . each ( [
692+ [ "linux" , "ctrl+alt+[" , "[" , "BracketLeft" , false ] ,
693+ [ "win32" , "ctrl+alt+8" , "[" , "Digit8" , false ] ,
694+ [ "win32" , "ctrl+alt+k" , "K" , "KeyK" , false ] ,
695+ [ "linux" , "ctrl+alt+`" , "Dead" , "Backquote" , false ] ,
696+ [ "darwin" , "ctrl+alt+[" , "[" , "BracketLeft" , true ] ,
697+ [ "linux" , "ctrl+alt+f7" , "F7" , "F7" , true ] ,
698+ ] as const ) (
699+ "handles ambiguous preview chords on %s: %s" ,
700+ ( [ platform , chord , key , code , expected ] ) =>
701+ withManager (
702+ ( manager ) =>
703+ Effect . gen ( function * ( ) {
704+ const preview = makeFaviconWebContents ( ) ;
705+ const send = vi . fn ( ) ;
706+ Object . assign ( preview . webContents , {
707+ hostWebContents : { isDestroyed : ( ) => false , send } ,
708+ } ) ;
709+ fromId . mockReturnValue ( preview . webContents ) ;
710+ getFocusedWebContents . mockReturnValue ( preview . webContents as never ) ;
711+ yield * manager . createTab ( "tab_alt_graph" ) ;
712+ yield * manager . registerWebview ( "tab_alt_graph" , 42 ) ;
713+ yield * manager . setForwardedShortcuts ( [
714+ { command : "view.reopenClosed" , shortcut : parseKeybindingShortcut ( chord ) ! } ,
715+ ] ) ;
716+ const preventDefault = vi . fn ( ) ;
717+ preview . listeners . get ( "before-input-event" ) ! (
718+ { preventDefault } as never ,
719+ {
720+ type : "keyDown" ,
721+ key,
722+ code,
723+ meta : false ,
724+ control : true ,
725+ shift : false ,
726+ alt : true ,
727+ } as never ,
728+ ) ;
729+ expect ( preventDefault ) . toHaveBeenCalledTimes ( expected ? 1 : 0 ) ;
730+ expect ( send ) . toHaveBeenCalledTimes ( expected ? 1 : 0 ) ;
731+ } ) ,
732+ platform ,
733+ ) ,
734+ ) ;
735+
631736 effectIt . effect ( "preserves focused browser editing in tabs and sign-in popups" , ( ) =>
632737 withManager ( ( manager ) =>
633738 Effect . gen ( function * ( ) {
@@ -2716,7 +2821,7 @@ describe("PreviewManager", () => {
27162821 expect ( yield * nextType ) . toBe ( "attached" ) ;
27172822 yield * manager . closeTab ( "tab_1" ) ;
27182823 expect ( yield * nextType ) . toBe ( "detached" ) ;
2719- } ) . pipe ( Effect . provide ( layer ) , Effect . scoped ) ,
2824+ } ) . pipe ( Effect . provide ( managerLayer ( ) ) , Effect . scoped ) ,
27202825 ) ;
27212826
27222827 effectIt . effect ( "stops capture retries when the tab swaps during the retry delay" , ( ) =>
0 commit comments