@adecore/shell 0.21.1 → 0.22.0

package/dist/theme.js

@@ -12,12 +12,12 @@ export const createTheme = (options) => {
         apply: (theme) => {
             current = theme;
             options.nativeTheme.themeSource = theme.followsSystem ? 'system' : theme.resolved;
+            const overlay = platform === 'darwin' ? undefined : overlayOf(theme.resolved);
             for (const window of options.windows()) {
                 if (window.isDestroyed()) {
                     continue;
                 }
-                const overlay = overlayOf(theme.resolved);
-                if (platform !== 'darwin' && overlay) {
+                if (overlay) {
                     window.setTitleBarOverlay(overlay);
                 }
                 window.setBackgroundColor(theme.background);

package/dist/window-state.js

@@ -145,7 +145,6 @@ export const createWindowState = (options) => {
                 flush();
             });
         },
-        /* Whether a key has bounds saved. */
         has: (key) => windows.has(key),
         /* Writes what is pending at once, for the moment the app quits. */
         flush: () => {

package/dist/windows.js

@@ -57,6 +57,7 @@ export const createWindows = (options) => {
         return null;
     };
     const holderOf = (key) => alive().find((entry) => entry.key === key) ?? null;
+    const pageWindow = (contents) => alive().find((entry) => entry.window.webContents === contents)?.window ?? null;
     const raise = (window) => {
         if (window.isMinimized()) {
             window.restore();
@@ -66,10 +67,10 @@ export const createWindows = (options) => {
     };
     const boundsFor = (key) => {
         const stateKey = key ?? UNKEYED_STATE;
-        const front = focused();
         if (options.state.has(stateKey)) {
             return options.state.bounds(stateKey);
         }
+        const front = focused();
         if (!front) {
             return options.state.bounds(options.formerKey !== undefined && options.state.has(options.formerKey) ? options.formerKey : stateKey);
         }
@@ -159,7 +160,7 @@ export const createWindows = (options) => {
          * The window whose own page this is, and null for anything else, a `<webview>` inside it included.
          * This is the check for an IPC message that may speak for the app.
          */
-        fromPage: (contents) => alive().find((entry) => entry.window.webContents === contents)?.window ?? null,
+        fromPage: pageWindow,
         /*
          * Moves what a window shows into a new window, which comes to the front, and leaves the old one
          * without a key. The key is never without a window in between. Null for a window that shows nothing.
@@ -179,7 +180,7 @@ export const createWindows = (options) => {
             if (guestOwner !== undefined) {
                 return entries.get(guestOwner)?.window ?? null;
             }
-            return alive().find((entry) => entry.window.webContents === contents)?.window ?? null;
+            return pageWindow(contents);
         },
         /* The window last in front, for what has no sender: a second instance, a notification, a menu command. */
         focused,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/shell",
-  "version": "0.21.1",
+  "version": "0.22.0",
   "description": "The main process of an Electron app: its menu, its updater and the guards around its page.",
   "license": "FSL-1.1-MIT",
   "author": "Bas Milius",

package/src/theme.ts

@@ -36,12 +36,12 @@ export const createTheme = (options: ThemeOptions) => {
         apply: (theme: ThemeState): void => {
             current = theme;
             options.nativeTheme.themeSource = theme.followsSystem ? 'system' : theme.resolved;
+            const overlay = platform === 'darwin' ? undefined : overlayOf(theme.resolved);
             for (const window of options.windows()) {
                 if (window.isDestroyed()) {
                     continue;
                 }
-                const overlay = overlayOf(theme.resolved);
-                if (platform !== 'darwin' && overlay) {
+                if (overlay) {
                     window.setTitleBarOverlay(overlay);
                 }
                 window.setBackgroundColor(theme.background);

package/src/window-state.ts

@@ -199,7 +199,6 @@ export const createWindowState = (options: WindowStateOptions) => {
             });
         },
 
-        /* Whether a key has bounds saved. */
         has: (key: string): boolean => windows.has(key),
 
         /* Writes what is pending at once, for the moment the app quits. */

package/src/windows.ts

@@ -90,6 +90,8 @@ export const createWindows = (options: WindowsOptions) => {
 
     const holderOf = (key: string): Entry | null => alive().find((entry) => entry.key === key) ?? null;
 
+    const pageWindow = (contents: WebContents): BrowserWindow | null => alive().find((entry) => entry.window.webContents === contents)?.window ?? null;
+
     const raise = (window: BrowserWindow): void => {
         if (window.isMinimized()) {
             window.restore();
@@ -100,10 +102,10 @@ export const createWindows = (options: WindowsOptions) => {
 
     const boundsFor = (key: string | null): Partial<Rectangle> & WindowSize => {
         const stateKey = key ?? UNKEYED_STATE;
-        const front = focused();
         if (options.state.has(stateKey)) {
             return options.state.bounds(stateKey);
         }
+        const front = focused();
         if (!front) {
             return options.state.bounds(options.formerKey !== undefined && options.state.has(options.formerKey) ? options.formerKey : stateKey);
         }
@@ -200,7 +202,7 @@ export const createWindows = (options: WindowsOptions) => {
          * The window whose own page this is, and null for anything else, a `<webview>` inside it included.
          * This is the check for an IPC message that may speak for the app.
          */
-        fromPage: (contents: WebContents): BrowserWindow | null => alive().find((entry) => entry.window.webContents === contents)?.window ?? null,
+        fromPage: pageWindow,
 
         /*
          * Moves what a window shows into a new window, which comes to the front, and leaves the old one
@@ -222,7 +224,7 @@ export const createWindows = (options: WindowsOptions) => {
             if (guestOwner !== undefined) {
                 return entries.get(guestOwner)?.window ?? null;
             }
-            return alive().find((entry) => entry.window.webContents === contents)?.window ?? null;
+            return pageWindow(contents);
         },
 
         /* The window last in front, for what has no sender: a second instance, a notification, a menu command. */