@@ -32,11 +32,13 @@ function makeHarness(options?: {
3232 getMode ?: ( ) => Promise < QuitConfirmationMode > ;
3333} ) {
3434 const notifications : Array < QuitShortcutHintEvent > = [ ] ;
35+ const concealWindow = vi . fn ( ) ;
3536 const quit = vi . fn ( ) ;
3637 const handler = makeQuitShortcutHandler ( {
3738 platform : options ?. platform ?? "darwin" ,
3839 getMode : options ?. getMode ?? ( ( ) => Promise . resolve ( options ?. mode ?? "hold" ) ) ,
3940 notify : ( event ) => notifications . push ( event ) ,
41+ concealWindow,
4042 quit,
4143 } ) ;
4244 const preventDefault = vi . fn ( ) ;
@@ -57,7 +59,7 @@ function makeHarness(options?: {
5759 await send ( makeInput ( { isAutoRepeat : true , ...repeatOverrides } ) ) ;
5860 }
5961 } ;
60- return { notifications, quit, preventDefault, send, holdFor } ;
62+ return { notifications, concealWindow , quit, preventDefault, send, holdFor } ;
6163}
6264
6365describe ( "makeQuitShortcutHandler" , ( ) => {
@@ -82,10 +84,11 @@ describe("makeQuitShortcutHandler", () => {
8284 expect ( harness . notifications ) . toEqual ( [ HOLD_DOWN , UP ] ) ;
8385 } ) ;
8486
85- it ( "quits after a completed hold is released " , async ( ) => {
87+ it ( "conceals a completed hold, then quits after release " , async ( ) => {
8688 const harness = makeHarness ( ) ;
8789 await harness . send ( makeInput ( { } ) ) ;
8890 await harness . holdFor ( QUIT_HOLD_DURATION_MS + 200 ) ;
91+ expect ( harness . concealWindow ) . toHaveBeenCalledTimes ( 1 ) ;
8992 expect ( harness . quit ) . not . toHaveBeenCalled ( ) ;
9093 await harness . send ( makeInput ( { type : "keyUp" , key : "Meta" , meta : false } ) ) ;
9194 expect ( harness . quit ) . not . toHaveBeenCalled ( ) ;
@@ -94,6 +97,32 @@ describe("makeQuitShortcutHandler", () => {
9497 expect ( harness . notifications ) . toEqual ( [ HOLD_DOWN , UP ] ) ;
9598 } ) ;
9699
100+ it ( "keeps a concealed hold committed when another key is pressed" , async ( ) => {
101+ const harness = makeHarness ( ) ;
102+ await harness . send ( makeInput ( { } ) ) ;
103+ await harness . holdFor ( QUIT_HOLD_DURATION_MS ) ;
104+
105+ await harness . send ( makeInput ( { key : "Shift" , shift : true } ) ) ;
106+ expect ( harness . concealWindow ) . toHaveBeenCalledTimes ( 1 ) ;
107+ expect ( harness . quit ) . not . toHaveBeenCalled ( ) ;
108+
109+ vi . advanceTimersByTime ( QUIT_HOLD_RELEASE_GRACE_MS ) ;
110+ expect ( harness . quit ) . toHaveBeenCalledTimes ( 1 ) ;
111+ } ) ;
112+
113+ it ( "keeps a concealed hold committed through a fresh Cmd+Q press" , async ( ) => {
114+ const harness = makeHarness ( ) ;
115+ await harness . send ( makeInput ( { } ) ) ;
116+ await harness . holdFor ( QUIT_HOLD_DURATION_MS ) ;
117+
118+ await harness . send ( makeInput ( { } ) ) ;
119+ expect ( harness . concealWindow ) . toHaveBeenCalledTimes ( 1 ) ;
120+ expect ( harness . quit ) . not . toHaveBeenCalled ( ) ;
121+
122+ await harness . send ( makeInput ( { type : "keyUp" } ) ) ;
123+ expect ( harness . quit ) . toHaveBeenCalledTimes ( 1 ) ;
124+ } ) ;
125+
97126 it ( "quits when a completed hold goes quiet without release events" , async ( ) => {
98127 const harness = makeHarness ( ) ;
99128 await harness . send ( makeInput ( { } ) ) ;
@@ -164,6 +193,7 @@ describe("makeQuitShortcutHandler", () => {
164193 await harness . send ( makeInput ( { type : "keyUp" } ) ) ;
165194 expect ( harness . notifications ) . toEqual ( [ HOLD_DOWN , UP ] ) ;
166195 vi . advanceTimersByTime ( ( QUIT_HOLD_DURATION_MS + QUIT_HOLD_RELEASE_GRACE_MS ) * 2 ) ;
196+ expect ( harness . concealWindow ) . not . toHaveBeenCalled ( ) ;
167197 expect ( harness . quit ) . not . toHaveBeenCalled ( ) ;
168198 } ) ;
169199
@@ -179,6 +209,7 @@ describe("makeQuitShortcutHandler", () => {
179209 it ( "quits without showing a hint in direct mode" , async ( ) => {
180210 const harness = makeHarness ( { mode : "direct" } ) ;
181211 await harness . send ( makeInput ( { } ) ) ;
212+ expect ( harness . concealWindow ) . not . toHaveBeenCalled ( ) ;
182213 expect ( harness . quit ) . toHaveBeenCalledTimes ( 1 ) ;
183214 expect ( harness . notifications ) . toEqual ( [ ] ) ;
184215 } ) ;
@@ -272,6 +303,7 @@ describe("makeQuitShortcutHandler", () => {
272303 await harness . send ( makeInput ( { } ) ) ;
273304 vi . advanceTimersByTime ( QUIT_DOUBLE_PRESS_MS - 100 ) ;
274305 await harness . send ( makeInput ( { } ) ) ;
306+ expect ( harness . concealWindow ) . not . toHaveBeenCalled ( ) ;
275307 expect ( harness . quit ) . toHaveBeenCalledTimes ( 1 ) ;
276308 expect ( harness . notifications ) . toEqual ( [ DOUBLE_CLICK_DOWN , UP ] ) ;
277309 } ) ;
0 commit comments