@@ -1023,11 +1023,75 @@ describe("DesktopWindow", () => {
10231023 assert . deepEqual ( mainWindowBoundsUpdates , [ { x : 220 , y : 140 , width : 1380 , height : 920 } ] ) ;
10241024 assert . deepEqual ( mainWindowMaximizedUpdates , [ true ] ) ;
10251025 assert . equal ( fakeWindow . getNormalBounds . mock . calls . length , 1 ) ;
1026- assert . equal ( fakeWindow . getBounds . mock . calls . length , 0 ) ;
10271026 } ) . pipe ( Effect . provide ( layer ) ) ;
10281027 } ) ,
10291028 ) ;
10301029
1030+ it . effect . each ( [
1031+ { normal : "on display 1" , width : 1920 , height : 1080 , x : 220 } ,
1032+ { normal : "on display 1" , width : 1280 , height : 720 , x : 220 } ,
1033+ { normal : "straddling both displays" , width : 1920 , height : 1080 , x : 1800 } ,
1034+ ] ) (
1035+ "persists bounds on the display a maximized window was moved to ($width x $height, normal $normal)" ,
1036+ ( { width, height, x } ) =>
1037+ Effect . gen ( function * ( ) {
1038+ const displayOne = { x : 0 , y : 0 , width : 1920 , height : 1080 } ;
1039+ const displayTwo = { x : 1920 , y : 0 , width, height } ;
1040+ const getAllDisplays = vi . mocked ( Electron . screen . getAllDisplays ) ;
1041+ getAllDisplays . mockReturnValue ( [
1042+ { bounds : displayOne , workArea : displayOne } ,
1043+ { bounds : displayTwo , workArea : displayTwo } ,
1044+ ] as unknown as Electron . Display [ ] ) ;
1045+ const fakeWindow = makeFakeBrowserWindow ( ) ;
1046+ fakeWindow . isMaximized . mockReturnValue ( true ) ;
1047+ fakeWindow . getBounds . mockReturnValue ( displayTwo ) ;
1048+ fakeWindow . getNormalBounds . mockReturnValue ( { x, y : 140 , width : 1380 , height : 920 } ) ;
1049+ const createCount = yield * Ref . make ( 0 ) ;
1050+ const mainWindow = yield * Ref . make < Option . Option < Electron . BrowserWindow > > ( Option . none ( ) ) ;
1051+ const mainWindowBoundsUpdates : DesktopAppSettings . DesktopWindowBounds [ ] = [ ] ;
1052+ const mainWindowMaximizedUpdates : boolean [ ] = [ ] ;
1053+ const layer = layerTest ( {
1054+ window : fakeWindow . window ,
1055+ createCount,
1056+ mainWindow,
1057+ mainWindowBoundsUpdates,
1058+ mainWindowMaximizedUpdates,
1059+ } ) ;
1060+
1061+ yield * Effect . gen ( function * ( ) {
1062+ const desktopWindow = yield * DesktopWindow . DesktopWindow ;
1063+ yield * desktopWindow . handleBackendReady ( new URL ( "http://127.0.0.1:3773" ) ) ;
1064+
1065+ const move = fakeWindow . windowListeners . get ( "move" ) ;
1066+ if ( ! move ) {
1067+ return yield * Effect . die ( "window move listener was not registered" ) ;
1068+ }
1069+ move ( ) ;
1070+ yield * TestClock . adjust ( 500 ) ;
1071+ yield * Effect . promise ( ( ) => Promise . resolve ( ) ) ;
1072+
1073+ const persisted = mainWindowBoundsUpdates . at ( - 1 ) ;
1074+ assert . isDefined ( persisted , "maximized window bounds were not persisted" ) ;
1075+ const persistedDisplay = [ displayOne , displayTwo ] . findIndex (
1076+ ( display ) =>
1077+ persisted . x >= display . x &&
1078+ persisted . y >= display . y &&
1079+ persisted . x + persisted . width <= display . x + display . width &&
1080+ persisted . y + persisted . height <= display . y + display . height ,
1081+ ) ;
1082+ assert . equal (
1083+ persistedDisplay ,
1084+ 1 ,
1085+ `window maximized on display 2 persisted bounds ${ JSON . stringify ( persisted ) } , which restore on display ${ persistedDisplay + 1 } ` ,
1086+ ) ;
1087+ assert . deepEqual ( mainWindowMaximizedUpdates , [ true ] ) ;
1088+ } ) . pipe (
1089+ Effect . provide ( layer ) ,
1090+ Effect . ensuring ( Effect . sync ( ( ) => getAllDisplays . mockReset ( ) ) ) ,
1091+ ) ;
1092+ } ) ,
1093+ ) ;
1094+
10311095 it . effect ( "preserves unrestorable bounds until the user changes the window" , ( ) =>
10321096 Effect . gen ( function * ( ) {
10331097 const fakeWindow = makeFakeBrowserWindow ( ) ;
@@ -1071,8 +1135,7 @@ describe("DesktopWindow", () => {
10711135 it . effect ( "flushes normal bounds when minimized before the debounce completes" , ( ) =>
10721136 Effect . gen ( function * ( ) {
10731137 const fakeWindow = makeFakeBrowserWindow ( ) ;
1074- fakeWindow . getBounds . mockReturnValue ( { x : - 32_000 , y : - 32_000 , width : 160 , height : 28 } ) ;
1075- fakeWindow . getNormalBounds . mockReturnValue ( { x : 180 , y : 120 , width : 1440 , height : 960 } ) ;
1138+ fakeWindow . getBounds . mockReturnValue ( { x : 180 , y : 120 , width : 1440 , height : 960 } ) ;
10761139 const createCount = yield * Ref . make ( 0 ) ;
10771140 const mainWindow = yield * Ref . make < Option . Option < Electron . BrowserWindow > > ( Option . none ( ) ) ;
10781141 const mainWindowBoundsUpdates : DesktopAppSettings . DesktopWindowBounds [ ] = [ ] ;
@@ -1093,17 +1156,87 @@ describe("DesktopWindow", () => {
10931156 }
10941157 resize ( ) ;
10951158 yield * TestClock . adjust ( 250 ) ;
1159+ // Windows reports a minimized window at -32000.
10961160 fakeWindow . isMinimized . mockReturnValue ( true ) ;
1161+ fakeWindow . getBounds . mockReturnValue ( { x : - 32_000 , y : - 32_000 , width : 160 , height : 28 } ) ;
10971162
10981163 yield * desktopWindow . flushMainWindowBounds ;
1164+ resize ( ) ;
1165+ yield * TestClock . adjust ( 500 ) ;
1166+ yield * Effect . promise ( ( ) => Promise . resolve ( ) ) ;
10991167
11001168 assert . deepEqual ( mainWindowBoundsUpdates , [ { x : 180 , y : 120 , width : 1440 , height : 960 } ] ) ;
1101- assert . equal ( fakeWindow . getBounds . mock . calls . length , 0 ) ;
1102- assert . equal ( fakeWindow . getNormalBounds . mock . calls . length , 1 ) ;
11031169 } ) . pipe ( Effect . provide ( layer ) ) ;
11041170 } ) ,
11051171 ) ;
11061172
1173+ it . effect . each ( [
1174+ { window : "normal" , write : "flush" } ,
1175+ { window : "normal" , write : "debounce" } ,
1176+ { window : "maximized" , write : "flush" } ,
1177+ { window : "maximized" , write : "debounce" } ,
1178+ ] as const ) ( "persists a $window window change minimized before its $write" , ( input ) =>
1179+ Effect . gen ( function * ( ) {
1180+ const displayOne = { x : 0 , y : 0 , width : 1920 , height : 1080 } ;
1181+ const displayTwo = { x : 1920 , y : 0 , width : 1920 , height : 1080 } ;
1182+ const getAllDisplays = vi . mocked ( Electron . screen . getAllDisplays ) ;
1183+ getAllDisplays . mockReturnValue ( [
1184+ { bounds : displayOne , workArea : displayOne } ,
1185+ { bounds : displayTwo , workArea : displayTwo } ,
1186+ ] as unknown as Electron . Display [ ] ) ;
1187+ const maximized = input . window === "maximized" ;
1188+ const fakeWindow = makeFakeBrowserWindow ( ) ;
1189+ fakeWindow . isMaximized . mockReturnValue ( maximized ) ;
1190+ fakeWindow . getBounds . mockReturnValue (
1191+ maximized ? displayTwo : { x : 220 , y : 140 , width : 1380 , height : 920 } ,
1192+ ) ;
1193+ fakeWindow . getNormalBounds . mockReturnValue ( { x : 220 , y : 140 , width : 1380 , height : 920 } ) ;
1194+ const createCount = yield * Ref . make ( 0 ) ;
1195+ const mainWindow = yield * Ref . make < Option . Option < Electron . BrowserWindow > > ( Option . none ( ) ) ;
1196+ const mainWindowBoundsUpdates : DesktopAppSettings . DesktopWindowBounds [ ] = [ ] ;
1197+ const mainWindowMaximizedUpdates : boolean [ ] = [ ] ;
1198+ const layer = layerTest ( {
1199+ window : fakeWindow . window ,
1200+ createCount,
1201+ mainWindow,
1202+ mainWindowBoundsUpdates,
1203+ mainWindowMaximizedUpdates,
1204+ } ) ;
1205+
1206+ yield * Effect . gen ( function * ( ) {
1207+ const desktopWindow = yield * DesktopWindow . DesktopWindow ;
1208+ yield * desktopWindow . handleBackendReady ( new URL ( "http://127.0.0.1:3773" ) ) ;
1209+
1210+ const move = fakeWindow . windowListeners . get ( "move" ) ;
1211+ if ( ! move ) {
1212+ return yield * Effect . die ( "window move listener was not registered" ) ;
1213+ }
1214+ move ( ) ;
1215+ yield * TestClock . adjust ( 250 ) ;
1216+ // Minimized windows report stale state: macOS unmaximized at the pre-move frame.
1217+ fakeWindow . isMinimized . mockReturnValue ( true ) ;
1218+ fakeWindow . isMaximized . mockReturnValue ( false ) ;
1219+ fakeWindow . getBounds . mockReturnValue ( { x : 100 , y : 100 , width : 1100 , height : 780 } ) ;
1220+ fakeWindow . getNormalBounds . mockReturnValue ( { x : 100 , y : 100 , width : 1100 , height : 780 } ) ;
1221+ if ( input . write === "debounce" ) {
1222+ yield * TestClock . adjust ( 250 ) ;
1223+ yield * Effect . promise ( ( ) => Promise . resolve ( ) ) ;
1224+ }
1225+ yield * desktopWindow . flushMainWindowBounds ;
1226+
1227+ assert . deepEqual ( mainWindowBoundsUpdates , [
1228+ maximized
1229+ ? { x : 2140 , y : 140 , width : 1380 , height : 920 }
1230+ : { x : 220 , y : 140 , width : 1380 , height : 920 } ,
1231+ ] ) ;
1232+ assert . deepEqual ( mainWindowMaximizedUpdates , [ maximized ] ) ;
1233+ } ) . pipe (
1234+ Effect . provide ( layer ) ,
1235+ Effect . ensuring ( Effect . sync ( ( ) => getAllDisplays . mockReset ( ) ) ) ,
1236+ ) ;
1237+ } ) ,
1238+ ) ;
1239+
11071240 it . effect ( "maps macOS horizontal swipes to available history navigation" , ( ) =>
11081241 Effect . gen ( function * ( ) {
11091242 const fakeWindow = makeFakeBrowserWindow ( ) ;
0 commit comments