@@ -4376,6 +4376,8 @@ describe("PreviewManager", () => {
43764376 let routeToIframe = false ;
43774377 let interruptFrameKeyDown = false ;
43784378 let holdKeyUp = false ;
4379+ let waitForTarget : ( ( ) => Promise < void > ) | undefined ;
4380+ let waitForReceipt : ( ( ) => Promise < void > ) | undefined ;
43794381 let releaseKeyUp : ( ( ) => void ) | undefined ;
43804382 let notifyKeyUpQueued : ( ( ) => void ) | undefined ;
43814383 const keyUpQueued = new Promise < void > ( ( resolve ) => {
@@ -4405,15 +4407,17 @@ describe("PreviewManager", () => {
44054407 } ,
44064408 } ) ;
44074409 const frame = {
4408- executeJavaScript : vi . fn ( async ( expression : string ) =>
4409- NodeVM . runInContext ( expression , frameContext ) ,
4410- ) ,
4410+ executeJavaScript : vi . fn ( async ( expression : string ) => {
4411+ if ( expression . endsWith ( "?.promise" ) ) await waitForReceipt ?.( ) ;
4412+ return NodeVM . runInContext ( expression , frameContext ) ;
4413+ } ) ,
44114414 } ;
44124415 let humanInput : ( ( _event : unknown , signal : unknown ) => void ) | undefined ;
44134416 const sendCommand = vi . fn (
44144417 async ( method : string , params ?: Record < string , unknown > , sessionId ?: string ) => {
44154418 if ( method === "Runtime.evaluate" ) {
44164419 if ( params ?. [ "returnByValue" ] === true ) return { result : { value : { ok : true } } } ;
4420+ await waitForTarget ?.( ) ;
44174421 return {
44184422 result :
44194423 routeToIframe && ! sessionId
@@ -4684,6 +4688,46 @@ describe("PreviewManager", () => {
46844688 "view.reopenClosed" ,
46854689 ) ;
46864690 }
4691+ failKeyDown = false ;
4692+ for ( const stage of [ "target" , "receipt" ] ) {
4693+ const paused = yield * Deferred . make < void > ( ) ;
4694+ let resume : ( ( ) => void ) | undefined ;
4695+ const wait = ( ) =>
4696+ new Promise < void > ( ( resolve ) => {
4697+ resume = resolve ;
4698+ Deferred . doneUnsafe ( paused , Effect . void ) ;
4699+ } ) ;
4700+ if ( stage === "target" ) waitForTarget = wait ;
4701+ else waitForReceipt = wait ;
4702+ sendToHost . mockClear ( ) ;
4703+ preventReopen . mockClear ( ) ;
4704+ const running = yield * manager
4705+ . automationPress ( "tab_input" , { key : "x" } )
4706+ . pipe ( Effect . forkChild ( { startImmediately : true } ) ) ;
4707+ yield * Deferred . await ( paused ) ;
4708+ expect ( sendToHost ) . not . toHaveBeenCalled ( ) ;
4709+ beforeInput ?.(
4710+ { preventDefault : preventReopen } as unknown as Electron . Event ,
4711+ {
4712+ type : "keyDown" ,
4713+ key : "x" ,
4714+ meta : false ,
4715+ control : false ,
4716+ shift : false ,
4717+ alt : false ,
4718+ } as Electron . Input ,
4719+ ) ;
4720+ expect ( preventReopen ) . toHaveBeenCalledOnce ( ) ;
4721+ expect ( sendToHost ) . toHaveBeenCalledExactlyOnceWith (
4722+ "desktop:menu-action" ,
4723+ "view.reopenClosed" ,
4724+ ) ;
4725+ waitForTarget = undefined ;
4726+ waitForReceipt = undefined ;
4727+ resume ?.( ) ;
4728+ yield * Fiber . join ( running ) ;
4729+ expect ( sendToHost ) . toHaveBeenCalledOnce ( ) ;
4730+ }
46874731 } ) ,
46884732 ) ,
46894733 ) ;
0 commit comments