@raydiant/playlist-window-manager 0.0.0-test32 → 0.0.0-test34

package/build/BrowserWindowRenderer.d.ts

@@ -10,7 +10,6 @@ interface BrowserWindowRendererOptions {
     renderChildWindowsAsBrowserViews: boolean;
     useWindowPool: boolean;
     logger: Logger;
-    fullscreen?: boolean;
     proxySettings?: ProxySettings;
     windowCrashHandler?: () => void;
 }

package/build/BrowserWindowRenderer.js

@@ -69,17 +69,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -98,7 +87,6 @@ var BrowserWindowRenderer = /** @class */ (function () {
         this.offscreenWindow = new electron_1.BrowserWindow({
             show: false,
             frame: this.opts.frame,
-            fullscreen: this.opts.fullscreen,
             hasShadow: this.opts.hasShadow,
             webPreferences: {
                 preload: path.join(__dirname, 'preload.js'),
@@ -106,15 +94,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
             },
         });
         this.proxySettings = null;
-        opts.logger.info("offscreenWindow = new BrowserWindow(".concat(JSON.stringify({
-            show: false,
-            frame: this.opts.frame,
-            fullscreen: this.opts.fullscreen,
-            hasShadow: this.opts.hasShadow,
-        }), ")"));
-        if (!opts.fullscreen) {
-            this.offscreenWindow.setBounds(opts.bounds);
-        }
+        this.offscreenWindow.setBounds(opts.bounds);
         if (opts.proxySettings) {
             this.proxySettings = opts.proxySettings;
         }
@@ -131,13 +111,6 @@ var BrowserWindowRenderer = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        this.logger.info("BrowserWindowRenderer.createWindow(".concat(JSON.stringify({
-                            windowId: windowId,
-                            parentWindowId: parentWindowId,
-                            bounds: bounds,
-                        }), ")"));
-                        this.logger.info("BrowserWindowRenderer.createWindow adjust bounds: ".concat(parentWindowId && !this.opts.renderChildWindowsAsBrowserViews, ". New Bounds ").concat(JSON.stringify(parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
-                            ? __assign(__assign({}, bounds), { x: bounds.x + this.opts.bounds.x, y: bounds.y + this.opts.bounds.y }) : bounds), "\n    "));
                         window = {
                             parentWindowId: parentWindowId,
                             // If we are creating a child window and renderChildWindowsAsBrowserViews is true,
@@ -149,17 +122,21 @@ var BrowserWindowRenderer = /** @class */ (function () {
                                         contextIsolation: false,
                                     },
                                 })
-                                : this.createOrGetPooledBrowserWindow(windowId, __assign({ show: false, frame: this.opts.frame, fullscreen: this.opts.fullscreen, 
+                                : this.createOrGetPooledBrowserWindow(windowId, {
+                                    show: false,
+                                    frame: this.opts.frame,
                                     // NOTE: useWindowPool: true does not work with renderChildWindowsAsBrowserViews: false
                                     // because the parent can't be changed after creating the BrowserWindow.
                                     parent: parentWindowId
                                         ? this.getParentBrowserView(parentWindowId)
-                                        : undefined, transparent: backgroundColor === 'transparent', hasShadow: this.opts.hasShadow, webPreferences: {
+                                        : undefined,
+                                    transparent: backgroundColor === 'transparent',
+                                    hasShadow: this.opts.hasShadow,
+                                    webPreferences: {
                                         preload: path.join(__dirname, 'preload.js'),
                                         contextIsolation: false,
-                                    } }, (this.opts.fullscreen
-                                    ? { width: bounds.width, height: bounds.height }
-                                    : {}))),
+                                    },
+                                }),
                             // If we are creating a child window and renderChildWindowsAsBrowserViews is false that means
                             // we are rendering child windows with BrowserWindow. BrowserWindows are positioned absolutely so
                             // to place them in the correct spot relative to their parent we need to add the main window's x / y.
@@ -198,9 +175,7 @@ var BrowserWindowRenderer = /** @class */ (function () {
                             // Electron issue: https://github.com/electron/electron/issues/20357
                             window.view.setBackgroundColor(backgroundColor === 'transparent' ? '#00000000' : backgroundColor);
                         }
-                        if (!this.opts.fullscreen) {
-                            window.view.setBounds(window.bounds);
-                        }
+                        window.view.setBounds(window.bounds);
                         if (!this.proxySettings) return [3 /*break*/, 2];
                         return [4 /*yield*/, window.view.webContents.session.setProxy(this.proxySettings)];
                     case 1:
@@ -420,10 +395,6 @@ var BrowserWindowRenderer = /** @class */ (function () {
             }
         }
         if (!browserWindow) {
-            // TODO remove
-            var parent_1 = options.parent, webPreferences = options.webPreferences, rest = __rest(options, ["parent", "webPreferences"]);
-            var newOptions = __assign(__assign({}, rest), { parentId: parent_1 === null || parent_1 === void 0 ? void 0 : parent_1.id });
-            this.logger.info("BrowserWindowRenderer.createOrGetPooledBrowserWindow, new BrowserWindow(".concat(JSON.stringify(newOptions), ")"));
             browserWindow = new electron_1.BrowserWindow(options);
             if (this.opts.useWindowPool) {
                 this.browserWindowPool.add(browserWindow);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.0.0-test32",
+  "version": "0.0.0-test34",
   "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": "28.3.0",
     "jest": "^24.8.0",
     "ts-jest": "^24.0.2",
     "typescript": "^4.1.2"

package/src/BrowserWindowRenderer.ts

@@ -45,7 +45,6 @@ interface BrowserWindowRendererOptions {
   renderChildWindowsAsBrowserViews: boolean;
   useWindowPool: boolean;
   logger: Logger;
-  fullscreen?: boolean;
   proxySettings?: ProxySettings;
   windowCrashHandler?: () => void;
 }
@@ -65,7 +64,6 @@ export default class BrowserWindowRenderer
   private offscreenWindow = new BrowserWindow({
     show: false,
     frame: this.opts.frame,
-    fullscreen: this.opts.fullscreen,
     hasShadow: this.opts.hasShadow,
     webPreferences: {
       preload: path.join(__dirname, 'preload.js'),
@@ -78,17 +76,7 @@ export default class BrowserWindowRenderer
   private logger: Logger;
 
   constructor(private opts: BrowserWindowRendererOptions) {
-    opts.logger.info(
-      `offscreenWindow = new BrowserWindow(${JSON.stringify({
-        show: false,
-        frame: this.opts.frame,
-        fullscreen: this.opts.fullscreen,
-        hasShadow: this.opts.hasShadow,
-      })})`
-    );
-    if (!opts.fullscreen) {
-      this.offscreenWindow.setBounds(opts.bounds);
-    }
+    this.offscreenWindow.setBounds(opts.bounds);
     if (opts.proxySettings) {
       this.proxySettings = opts.proxySettings;
     }
@@ -108,28 +96,6 @@ export default class BrowserWindowRenderer
     receiveMessageCallback,
     errorCallback,
   }: CreateWindowOptions) {
-    this.logger.info(
-      `BrowserWindowRenderer.createWindow(${JSON.stringify({
-        windowId,
-        parentWindowId,
-        bounds,
-      })})`
-    );
-    this.logger.info(
-      `BrowserWindowRenderer.createWindow adjust bounds: ${
-        parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
-      }. New Bounds ${JSON.stringify(
-        parentWindowId && !this.opts.renderChildWindowsAsBrowserViews
-          ? {
-              ...bounds,
-              x: bounds.x + this.opts.bounds.x,
-              y: bounds.y + this.opts.bounds.y,
-            }
-          : bounds
-      )}
-    `
-    );
-
     const window: BrowserWindowRendererWindow = {
       parentWindowId,
       // If we are creating a child window and renderChildWindowsAsBrowserViews is true,
@@ -145,7 +111,6 @@ export default class BrowserWindowRenderer
           : this.createOrGetPooledBrowserWindow(windowId, {
               show: false,
               frame: this.opts.frame,
-              fullscreen: this.opts.fullscreen,
               // NOTE: useWindowPool: true does not work with renderChildWindowsAsBrowserViews: false
               // because the parent can't be changed after creating the BrowserWindow.
               parent: parentWindowId
@@ -157,9 +122,6 @@ export default class BrowserWindowRenderer
                 preload: path.join(__dirname, 'preload.js'),
                 contextIsolation: false,
               },
-              ...(this.opts.fullscreen
-                ? { width: bounds.width, height: bounds.height }
-                : {}),
             }),
       // If we are creating a child window and renderChildWindowsAsBrowserViews is false that means
       // we are rendering child windows with BrowserWindow. BrowserWindows are positioned absolutely so
@@ -238,9 +200,7 @@ export default class BrowserWindowRenderer
       );
     }
 
-    if (!this.opts.fullscreen) {
-      window.view.setBounds(window.bounds);
-    }
+    window.view.setBounds(window.bounds);
 
     if (this.proxySettings) {
       await window.view.webContents.session.setProxy(this.proxySettings);
@@ -503,15 +463,6 @@ export default class BrowserWindowRenderer
     }
 
     if (!browserWindow) {
-      // TODO remove
-      const { parent, webPreferences, ...rest } = options;
-      const newOptions = { ...rest, parentId: parent?.id };
-      this.logger.info(
-        `BrowserWindowRenderer.createOrGetPooledBrowserWindow, new BrowserWindow(${JSON.stringify(
-          newOptions
-        )})`
-      );
-
       browserWindow = new BrowserWindow(options);
       if (this.opts.useWindowPool) {
         this.browserWindowPool.add(browserWindow);