fix(clone): clone examples/sponsors with invoke. Fix choice truncate.…

… Detach dev tools
script-kit · Dec 18, 2024 · 8d880ba · 8d880ba
1 parent 1316c5f
commit 8d880ba
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 19 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -725,7 +725,7 @@ const isNewVersion = async () => {
 
 const setupScript = (...args: string[]) => {
   if (process.env.MAIN_SKIP_SETUP) {
-    log.info('⏭️ Skipping setupScript', args);
+    log.info(`⏭️ 'process.env.MAIN_SKIP_SETUP' Skipping setupScript`, args);
     return;
   }
   return new Promise((resolve, reject) => {
@@ -1026,8 +1026,21 @@ const checkKit = async () => {
   if (!isKenvInstalled) {
     log.info('Cloning examples...');
     optionalSetupScript(kitPath('setup', 'clone-examples.js'));
+    invoke('git clone git://github.com/johnlindquist/kit-examples-ts.git examples', kenvPath('kenvs'))
+      .then((result) => {
+        log.info('👍 Examples Cloned', result);
+      })
+      .catch((error) => {
+        log.warn('👎 Examples Cloning Failed', error);
+      });
     log.info('Cloning sponsors...');
-    optionalSetupScript(kitPath('setup', 'clone-sponsors.js'));
+    invoke('git clone git://github.com/johnlindquist/kit-sponsors.git sponsors', kenvPath('kenvs'))
+      .then((result) => {
+        log.info('👍 Sponsors Cloned', result);
+      })
+      .catch((error) => {
+        log.warn('👎 Sponsors Cloning Failed', error);
+      });
   }
 
   // await installLoaderTools();

diff --git a/src/main/install.ts b/src/main/install.ts
@@ -743,7 +743,7 @@ export const requiredSpawnSetup = (command: string, args: string[], options: Spa
 
 export const optionalSpawnSetup = (...args: string[]) => {
   if (process.env.MAIN_SKIP_SETUP) {
-    log.info(`⏭️ Skipping setup script: ${args.join(' ')}`);
+    log.info(`⏭️ 'process.env.MAIN_SKIP_SETUP' Skipping setup script: ${args.join(' ')}`);
     return Promise.resolve('done');
   }
   return new Promise((resolve, reject) => {

diff --git a/src/main/logs.ts b/src/main/logs.ts
@@ -19,10 +19,6 @@ log.info(`
 
 ���🟢 🟢  !!!SCRIPT KIT TIME!!! 🟢 🟢 🟢 `);
 
-log.info('Skipping Setup?', {
-  MAIN_SKIP_SETUP: process.env.MAIN_SKIP_SETUP,
-});
-
 export interface Logger {
   info: (...args: string[]) => void;
   warn: (...args: string[]) => void;

diff --git a/src/main/messages.ts b/src/main/messages.ts
@@ -2170,7 +2170,9 @@ export const createMessageMap = (processInfo: ProcessAndPrompt) => {
     }),
     OPEN_DEV_TOOLS: onChildChannel(({ child }, { channel, value }) => {
       if (prompt.window) {
-        prompt.window.webContents.openDevTools();
+        prompt.window.webContents.openDevTools({
+          mode: 'detach',
+        });
       }
     }),
     START_DRAG: onChildChannel(({ child }, { channel, value }) => {

diff --git a/src/main/prompt.ts b/src/main/prompt.ts
@@ -74,6 +74,21 @@ contextMenu({
   showSearchWithGoogle: false,
   showLookUpSelection: false,
   append: (defaultActions, params, browserWindow) => [
+    {
+      label: 'Detach Dev Tools',
+      click: async () => {
+        if ((browserWindow as BrowserWindow)?.id) {
+          log.info(`Inspect prompt: ${browserWindow?.id}`, {
+            browserWindow,
+          });
+          prompts
+            .find((prompt) => prompt?.window?.id === browserWindow?.id)
+            ?.window?.webContents?.openDevTools({
+              mode: 'detach',
+            });
+        }
+      },
+    },
     {
       label: 'Close',
       click: async () => {
@@ -1885,7 +1900,7 @@ export class KitPrompt {
         env: promptData.env || {},
       };
 
-      log.info(`termConfig`, termConfig);
+      // log.info(`termConfig`, termConfig);
       this.sendToPrompt(AppChannel.SET_TERM_CONFIG, termConfig);
       createPty(this);
     }

diff --git a/src/main/show.ts b/src/main/show.ts
@@ -330,11 +330,11 @@ export const showWidget = async (
     center: options?.center,
     options: JSON.stringify(options),
   });
-  
+
   const position = options?.center
     ? getCenterOnCurrentScreen(options as BrowserWindowConstructorOptions)
     : getTopRightCurrentScreen(options as BrowserWindowConstructorOptions);
-  
+
   log.info(`📍 Calculated position`, { position });
 
   const bwOptions: BrowserWindowConstructorOptions = {
@@ -479,7 +479,9 @@ export const showWidget = async (
           log.info(`🛠️ Opening DevTools`, {
             windowId: widgetWindow.id,
           });
-          widgetWindow?.webContents.openDevTools();
+          widgetWindow?.webContents.openDevTools({
+            mode: 'detach',
+          });
         }
 
         resolve(widgetWindow);
@@ -511,7 +513,9 @@ export const showWidget = async (
             log.info(`🛠️ Opening DevTools from context menu`, {
               windowId: widgetWindow.id,
             });
-            widgetWindow.webContents.openDevTools();
+            widgetWindow.webContents.openDevTools({
+              mode: 'detach',
+            });
           },
         },
         {

diff --git a/src/renderer/src/components/button.tsx b/src/renderer/src/components/button.tsx
@@ -1,5 +1,6 @@
 import { PROMPT } from '@johnlindquist/kit/core/enum';
-import type { Script } from '@johnlindquist/kit/types/core';
+import type { Choice, Script } from '@johnlindquist/kit/types/core';
+import type { ScoredChoice } from '../../../shared/types';
 import log from 'electron-log';
 import parse from 'html-react-parser';
 import { useAtom, useAtomValue } from 'jotai';
@@ -50,7 +51,14 @@ const isValidUrl = (url) => {
   }
 };
 
-const ChoiceName = React.memo(({ scoredChoice, input, base, buttonNameFontSize, choice }) => {
+type ChoiceNameProps = {
+  scoredChoice: ScoredChoice;
+  input: string;
+  base: string;
+  buttonNameFontSize: string;
+  choice: Choice;
+};
+const ChoiceName = React.memo(({ scoredChoice, input, base, buttonNameFontSize, choice }: ChoiceNameProps) => {
   const memoizedChoiceName = useMemo(() => {
     if (!choice?.name) {
       return '';
@@ -65,6 +73,15 @@ const ChoiceName = React.memo(({ scoredChoice, input, base, buttonNameFontSize,
   );
 });
 
+type ChoiceDescriptionProps = {
+  scoredChoice: ScoredChoice;
+  index: number;
+  buttonIndex: number;
+  buttonDescriptionFontSize: string;
+  choice: Choice;
+  modifierDescription: string;
+  shouldHighlightDescription: boolean;
+};
 const ChoiceDescription = React.memo(
   ({
     scoredChoice,
@@ -74,7 +91,7 @@ const ChoiceDescription = React.memo(
     choice,
     modifierDescription,
     shouldHighlightDescription,
-  }) => {
+  }: ChoiceDescriptionProps) => {
     return (
       <>
         {(choice?.focused || choice?.description || modifierDescription) && (
@@ -99,6 +116,23 @@ const ChoiceDescription = React.memo(
   },
 );
 
+type ChoiceButtonContentProps = {
+  choice: Choice;
+  index: number;
+  buttonIndex: number;
+  promptData: Script;
+  selectedChoices: Choice[];
+  scale: string;
+  scoredChoice: ScoredChoice;
+  imageFail: boolean;
+  input: string;
+  base: string;
+  buttonNameFontSize: string;
+  buttonDescriptionFontSize: string;
+  modifierDescription: string;
+  shouldHighlightDescription: boolean;
+  setImageFail: (imageFail: boolean) => void;
+};
 const ChoiceButtonContent = React.memo(
   ({
     choice,
@@ -116,9 +150,9 @@ const ChoiceButtonContent = React.memo(
     modifierDescription,
     shouldHighlightDescription,
     setImageFail,
-  }) => {
+  }: ChoiceButtonContentProps) => {
     return (
-      <div className="flex h-full w-full flex-row items-center justify-between">
+      <div className="flex h-full w-full flex-row items-center justify-between overflow-x-hidden">
         <div className="flex h-full flex-row items-center overflow-x-hidden">
           {/* Checkbox */}
           {promptData?.multiple && (
@@ -165,7 +199,7 @@ const ChoiceButtonContent = React.memo(
                         `}
             />
           )}
-          <div className="flex max-h-full max-w-full flex-col overflow-x-hidden">
+          <div className="flex max-h-full max-w-full flex-col overflow-x-hidden min-w-0">
             <ChoiceName
               scoredChoice={scoredChoice}
               input={input}
@@ -351,6 +385,7 @@ function ChoiceButton({ index: buttonIndex, style, data: { choices } }: ChoiceBu
             flex
             h-16
             w-full
+            max-w-full
             flex-shrink-0
             flex-row
             items-center