@raydiant/playlist-window-manager 0.28.2-rc2 → 0.28.2-rc3

package/build/PlaylistWindowManager.js

@@ -905,7 +905,7 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
     };
     PlaylistWindowManager.prototype.swapWindows = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var nextPreviewPresentationId, preview, result, nextPresentation, shouldPreload;
+            var nextPreviewPresentationId, preview, result, nextPresentation, shouldPreload, closeWindowPromise;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -941,19 +941,22 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
                         if (this.nextWindow) {
                             this.nextWindow.show(this.isFocused);
                         }
-                        if (!this.currentWindow) return [3 /*break*/, 4];
-                        if (!(this.options.closeWindowDelayMs !== undefined)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, delay(this.options.closeWindowDelayMs)];
+                        if (!this.currentWindow) return [3 /*break*/, 2];
+                        // 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 = delay(this.options.closeWindowDelayMs);
+                        }
+                        this.currentWindow.hide();
+                        return [4 /*yield*/, this.removeCurrentWindow()];
                     case 1:
                         _a.sent();
                         _a.label = 2;
                     case 2:
-                        this.currentWindow.hide();
-                        return [4 /*yield*/, this.removeCurrentWindow()];
-                    case 3:
-                        _a.sent();
-                        _a.label = 4;
-                    case 4:
                         // Swap windows.
                         this.currentWindow = this.nextWindow;
                         if (this.currentWindow) {
@@ -981,7 +984,12 @@ var PlaylistWindowManager = /** @class */ (function (_super) {
                             this.nextWindow = null;
                             this.nextPresentation = null;
                         }
-                        return [2 /*return*/];
+                        if (!closeWindowPromise) return [3 /*break*/, 4];
+                        return [4 /*yield*/, closeWindowPromise];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.28.2-rc2",
+  "version": "0.28.2-rc3",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {

package/src/PlaylistWindowManager.ts

@@ -753,13 +753,16 @@ export default class PlaylistWindowManager extends EventEmitter {
 
     // 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) {
-        await delay(this.options.closeWindowDelayMs);
+        // 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 = delay(this.options.closeWindowDelayMs);
       }
       this.currentWindow.hide();
       await this.removeCurrentWindow();
@@ -795,6 +798,10 @@ export default class PlaylistWindowManager extends EventEmitter {
       this.nextWindow = null;
       this.nextPresentation = null;
     }
+
+    if (closeWindowPromise) {
+      await closeWindowPromise;
+    }
   }
 
   private evalRuleEngine(warnIfPreloadMismatch = true): EvalRuleEngineResult {