Merge branch 'main' into prettier-and-eslint-fixes

Author: simonhamp

.github/workflows/fix-php-code-style-issues.yml

@@ -23,6 +23,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           ref: ${{ github.head_ref || github.sha }}
+          fetch-depth: 0
 
       - name: Check PHP code style issues
         if: github.event_name == 'push'

resources/electron/electron-plugin/dist/index.js

@@ -95,6 +95,9 @@ class NativePHP {
                 details.requestHeaders['X-NativePHP-Secret'] = state.randomSecret;
                 callback({ requestHeaders: details.requestHeaders });
             });
+            if (process.env.NATIVEPHP_NO_FOCUS) {
+                state.noFocusOnRestart = true;
+            }
             yield notifyLaravel("booted");
         });
     }

resources/electron/electron-plugin/dist/libs/positioner/index.js

@@ -74,6 +74,10 @@ class Positioner {
                 x: Math.floor(screenSize.x + (screenSize.width / 2 - windowSize[0] / 2)),
                 y: Math.floor((screenSize.height + screenSize.y) / 2 - windowSize[1] / 2),
             },
+            upperCenter: {
+                x: Math.floor(screenSize.x + (screenSize.width / 2 - windowSize[0] / 2)),
+                y: Math.floor(screenSize.y + (screenSize.height - windowSize[1]) / 3),
+            },
         };
         if (position.substr(0, 4) === "tray") {
             if (positions[position].x + windowSize[0] >

resources/electron/electron-plugin/dist/server/api/window.js

@@ -274,6 +274,9 @@ router.post('/open', (req, res) => {
         });
     }
     window.webContents.on('did-finish-load', () => {
+        if (state.noFocusOnRestart && window.isVisible()) {
+            return;
+        }
         window.show();
     });
     window.webContents.on('did-fail-load', (event) => {

resources/electron/electron-plugin/dist/server/state.js

@@ -36,6 +36,7 @@ export default {
     randomSecret: generateRandomString(32),
     processes: {},
     windows: {},
+    noFocusOnRestart: false,
     findWindow(id) {
         return this.windows[id] || null;
     },

resources/electron/electron-plugin/src/index.ts

@@ -124,6 +124,10 @@ class NativePHP {
             callback({ requestHeaders: details.requestHeaders });
         });
 
+        if (process.env.NATIVEPHP_NO_FOCUS) {
+            state.noFocusOnRestart = true;
+        }
+
         await notifyLaravel('booted');
     }
 

resources/electron/electron-plugin/src/libs/positioner/index.ts

@@ -79,6 +79,14 @@ class Positioner {
                 x: Math.floor(screenSize.x + (screenSize.width / 2 - windowSize[0] / 2)),
                 y: Math.floor((screenSize.height + screenSize.y) / 2 - windowSize[1] / 2),
             },
+            upperCenter: {
+                x: Math.floor(
+                    screenSize.x + (screenSize.width / 2 - windowSize[0] / 2),
+                ),
+                y: Math.floor(
+                    screenSize.y + (screenSize.height - windowSize[1]) / 3,
+                ),
+            },
         };
 
         // Default to right if the window is bigger than the space left.

resources/electron/electron-plugin/src/server/api/window.ts

@@ -409,6 +409,10 @@ router.post('/open', (req, res) => {
     }
 
     window.webContents.on('did-finish-load', () => {
+        if (state.noFocusOnRestart && window.isVisible()) {
+            return;
+        }
+        
         window.show();
     });
 

resources/electron/electron-plugin/src/server/state.ts

@@ -34,6 +34,7 @@ interface State {
     randomSecret: string;
     store: Store;
     findWindow: (id: string) => BrowserWindow | null;
+    noFocusOnRestart: boolean;
     dockBounce: number;
 }
 
@@ -63,6 +64,7 @@ export default {
     randomSecret: generateRandomString(32),
     processes: {},
     windows: {},
+    noFocusOnRestart: false,
     findWindow(id: string) {
         return this.windows[id] || null;
     },

resources/electron/package.json

@@ -80,7 +80,7 @@
         "@vue/eslint-config-prettier": "^10.1.0",
         "cross-env": "^10.0.0",
         "electron": "^38.0.0",
-        "electron-builder": "^25.1.8",
+        "electron-builder": "^26.0.0",
         "electron-chromedriver": "^38.0.0",
         "electron-vite": "^4.0.0",
         "eslint": "^9.17.0",