@raydiant/playlist-window-manager 0.28.2-rc4 → 0.28.2-rc5

package/build/BrowserWindowRenderer.js

@@ -128,7 +128,6 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                     },
                                 })
                                 : this.createOrGetPooledBrowserWindow(windowId, {
-                                    paintWhenInitiallyHidden: false,
                                     show: false,
                                     /**
                                      * This option fixes window not being able to take fullscreen leaving

package/build/PlaylistWindowManager.js

@@ -946,14 +946,20 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
                         // Don't await here because this will cause a slight delay when playing the next window.
                         // Instead we want to wait for window close at the end of this method.
                         closeWindowPromise = new Promise(function (resolve) {
+                            // Capture the current window reference to close because this.currentWindow will be
+                            // set to the next window before the timeout fires.
+                            var windowToClose = _this.currentWindow;
                             setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            if (!this.currentWindow) return [3 /*break*/, 2];
-                                            this.currentWindow.hide();
-                                            return [4 /*yield*/, this.removeCurrentWindow()];
+                                            if (!windowToClose) return [3 /*break*/, 2];
+                                            // TODO: Do we need to check if the window is already removed/destroyed?
+                                            // TODO: Add a guard in BrowserWindowRenderer.removeWindow to check if the window is destroyed?
+                                            return [4 /*yield*/, windowToClose.remove()];
                                         case 1:
+                                            // TODO: Do we need to check if the window is already removed/destroyed?
+                                            // TODO: Add a guard in BrowserWindowRenderer.removeWindow to check if the window is destroyed?
                                             _a.sent();
                                             _a.label = 2;
                                         case 2:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.28.2-rc4",
+  "version": "0.28.2-rc5",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "@types/jschannel": "^1.0.1",
     "@types/jest": "^24.0.15",
     "@types/uuid": "8.3.0",
-    "electron": "28.1.2",
+    "electron": "38.0.0",
     "jest": "^24.8.0",
     "ts-jest": "^24.0.2",
     "typescript": "^4.1.2"

package/src/BrowserWindowRenderer.ts

@@ -114,7 +114,6 @@ export default class BrowserWindowRenderer
               },
             })
           : this.createOrGetPooledBrowserWindow(windowId, {
-              paintWhenInitiallyHidden: false,
               show: false,
               /**
                * This option fixes window not being able to take fullscreen leaving

package/src/PlaylistWindowManager.ts

@@ -749,22 +749,27 @@ export default class PlaylistWindowManager extends EventEmitter {
       this.nextWindow.show(this.isFocused);
     }
 
+    // If current window isn't defined we don't need to hide it but we still
+    // want to make the next window the new current window.
     // If current window isn't defined we don't need to hide it but we still
     // want to make the next window the new current window.
     let closeWindowPromise;
     if (this.currentWindow) {
-      // TODO: Kind of a hack, could use win.on('show') event to trigger hide?
-      // Would only work in electron environment so need to do in BrowserWindowRenderer.
-      // Should show be async then?
-      // Or try paintWhenInitiallyHidden: false?
       if (this.options.closeWindowDelayMs !== undefined) {
         // Don't await here because this will cause a slight delay when playing the next window.
         // Instead we want to wait for window close at the end of this method.
         closeWindowPromise = new Promise((resolve) => {
+          // Capture the current window reference to close because this.currentWindow will be
+          // set to the next window before the timeout fires.
+          const windowToClose = this.currentWindow;
           setTimeout(async () => {
-            if (this.currentWindow) {
-              this.currentWindow.hide();
-              await this.removeCurrentWindow();
+            if (windowToClose) {
+              // TODO: Do we need to check if the window is already removed/destroyed?
+              // TODO: Add a guard in BrowserWindowRenderer.removeWindow to check if the window is destroyed?
+              await windowToClose.remove();
+              // TODO: We can't use this.removeCurrentWindow because the currentWindow reference has already
+              // changed by the time the timeout fires. Is there a better way to handle this?
+              // await this.removeCurrentWindow();
             }
             resolve(undefined);
           }, this.options.closeWindowDelayMs);