fix(focusable): disable focusable on prompt creation

johnlindquist · May 19, 2024 · bfc61de · bfc61de
1 parent c259b6f
commit bfc61de
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
     "super-silly": "cross-env ELECTRON_ENABLE_STACK_DUMPING=true ELECTRON_ENABLE_LOGGING=true LOG_LEVEL=silly yarn start",
     "start": "cross-env NODE_ENV=development yarn start-$(node -e \"console.log(process.platform === 'darwin' ? 'mac' : process.platform === 'win32' ? 'windows' : 'linux')\")",
     "start-mac": "./vite-dev.sh",
-    "start-windows": "eletron-vite dev",
-    "start-linux": "electron-vite dev",
+    "start-windows": "eletron-vite preview",
+    "start-linux": "electron-vite preview",
     "sponsor": "KIT_SPONSOR=development yarn start",
     "tiktok": "KIT_SPONSOR=development KIT_TIKTOK=development yarn start",
     "splash": "KIT_SPLASH=true yarn start",

diff --git a/src/main/prompt.options.ts b/src/main/prompt.options.ts
@@ -1,3 +1,4 @@
+import log from 'electron-log';
 import { fileURLToPath } from 'url';
 import { getAssetPath } from '../shared/assets';
 import { getCurrentScreen } from './screen';
@@ -35,6 +36,11 @@ export const getPromptOptions = () => {
     transparent = true;
   }
 
+  let focusable = false;
+  if (kitState?.kenvEnv?.KIT_FORCE_FOCUSABLE === 'true') {
+    focusable = true;
+  }
+
   let x = Math.round(screenWidth / 2 - width / 2 + workX);
   if (kitState.isWindows) {
     x = -10000;
@@ -62,7 +68,31 @@ export const getPromptOptions = () => {
     show = true;
   }
 
+  let backgroundColor = '#00000000';
+  if (kitState?.kenvEnv?.KIT_BACKGROUND_COLOR) {
+    backgroundColor = kitState.kenvEnv.KIT_BACKGROUND_COLOR;
+  }
+
+  let backgroundMaterial = 'mica';
+  if (kitState?.kenvEnv?.KIT_BACKGROUND_MATERIAL) {
+    backgroundMaterial = kitState.kenvEnv.KIT_BACKGROUND_MATERIAL;
+  }
+
+  // Log all of the conditional options:
+  log.info('Prompt Options:', {
+    backgroundThrottling,
+    hasShadow,
+    frame,
+    transparent,
+    x,
+    y,
+    show,
+    backgroundColor,
+    backgroundMaterial,
+  });
+
   const options = {
+    focusable,
     useContentSize: true,
     frame,
     hasShadow,
@@ -90,6 +120,8 @@ export const getPromptOptions = () => {
     transparent,
     x,
     y,
+    backgroundColor,
+    backgroundMaterial,
   } as BrowserWindowConstructorOptions;
 
   if (kitState.isMac) {

diff --git a/src/main/prompt.ts b/src/main/prompt.ts
@@ -641,14 +641,18 @@ export class KitPrompt {
     const options = getPromptOptions();
     this.window = new BrowserWindow(options);
 
+    let timeout = 2000;
+    if (kitState?.kenvEnv?.KIT_PROMPT_INITIAL_HIDE_TIMEOUT) {
+      timeout = parseInt(kitState?.kenvEnv?.KIT_PROMPT_INITIAL_HIDE_TIMEOUT);
+    }
     if (kitState.isWindows) {
       setInterval(() => {
         this.window?.hide();
         log.info(
           'Hiding prompt window. Current position',
           this.window?.getPosition(),
         );
-      }, 2000);
+      }, timeout);
     }
 
     this.sendToPrompt = (channel: Channel | AppChannel, data) => {
@@ -2146,6 +2150,7 @@ export class KitPrompt {
       !this.window.isDestroyed() &&
       !this.window?.isFocused()
     ) {
+      this?.window?.setFocusable(true);
       try {
         if (kitState.isMac) {
           // REMOVE-MAC

diff --git a/src/main/tray.ts b/src/main/tray.ts
@@ -58,6 +58,21 @@ const buildRunningScriptsSubmenu = async (): Promise<
   const runningScripts: MenuItemConstructorOptions[] = [];
 
   if (processes.find((p) => p?.scriptPath)) {
+    // Terminate all running scripts
+
+    runningScripts.push({
+      type: 'separator',
+    });
+
+    runningScripts.push({
+      label: 'Terminate All Running Scripts',
+      click: () => {
+        for (const { pid } of processes) {
+          processes.removeByPid(pid);
+        }
+      },
+    });
+
     runningScripts.push({
       type: 'separator',
     });