Add --no-focus flag to native:run command (#93)

* Add --no-focus flag to native:run command

* Fix test

* Attempt to fix workflow for PRs

---------

Co-authored-by: Simon Hamp <simon.hamp@me.com>

Author: mattstauffer

.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/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

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

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

@@ -415,6 +415,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

@@ -33,6 +33,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;
   },

src/Drivers/Electron/Commands/RunCommand.php

@@ -25,7 +25,7 @@ class RunCommand extends Command
     use InstallsAppIcon;
     use PatchesPackagesJson;
 
-    protected $signature = 'native:run {--no-queue} {--D|no-dependencies} {--installer=npm}';
+    protected $signature = 'native:run {--no-queue} {--no-focus} {--D|no-dependencies} {--installer=npm}';
 
     public function __construct(
         protected Builder $builder
@@ -62,6 +62,7 @@ public function handle(): void
         $this->runDeveloper(
             installer: $this->option('installer'),
             skip_queue: $this->option('no-queue'),
+            no_focus: $this->option('no-focus'),
             withoutInteraction: $this->option('no-interaction')
         );
     }

src/Drivers/Electron/Commands/ServeCommand.php

@@ -12,7 +12,7 @@
 )]
 class ServeCommand extends RunCommand
 {
-    protected $signature = 'native:serve {--no-queue} {--D|no-dependencies} {--installer=npm}';
+    protected $signature = 'native:serve {--no-queue} {--no-focus} {--D|no-dependencies} {--installer=npm}';
 
     public function handle(): void
     {

src/Drivers/Electron/Traits/Developer.php

@@ -8,7 +8,7 @@ trait Developer
 {
     use ExecuteCommand;
 
-    protected function runDeveloper(string $installer, bool $skip_queue, bool $withoutInteraction = false): void
+    protected function runDeveloper(string $installer, bool $skip_queue, bool $no_focus = false, bool $withoutInteraction = false): void
     {
         [$installer, $command] = $this->getInstallerAndCommand(installer: $installer, type: 'dev');
 
@@ -18,6 +18,7 @@ protected function runDeveloper(string $installer, bool $skip_queue, bool $witho
             command: $command,
             skip_queue: $skip_queue,
             type: 'serve',
+            no_focus: $no_focus,
             withoutInteraction: $withoutInteraction
         );
     }