aichat improvements (#667)

wavetermdev · Jun 7, 2024 · d7173c9 · d7173c9
1 parent 1234919
commit d7173c9
Show file tree

Hide file tree

Showing 11 changed files with 303 additions and 222 deletions.
diff --git a/assets/default-keybindings.json b/assets/default-keybindings.json
@@ -313,6 +313,10 @@
       "command": "aichat:clearHistory",
       "keys": ["Ctrl:l"]
     },
+    {
+      "command": "aichat:setCmdInputValue",
+      "keys": ["Ctrl:Shift:e"]
+    },
     {
       "command": "terminal:copy",
       "keys": ["Ctrl:Shift:c"]

diff --git a/src/app/app.tsx b/src/app/app.tsx
@@ -31,12 +31,20 @@ class App extends React.Component<{}, {}> {
     dcWait: OV<boolean> = mobx.observable.box(false, { name: "dcWait" });
     mainContentRef: React.RefObject<HTMLDivElement> = React.createRef();
     termThemesLoaded: OV<boolean> = mobx.observable.box(false, { name: "termThemesLoaded" });
+    chatFocusTimeoutId: NodeJS.Timeout = null;
 
     constructor(props: {}) {
         super(props);
         if (GlobalModel.isDev) document.body.classList.add("is-dev");
     }
 
+    componentWillUnmount() {
+        if (this.chatFocusTimeoutId) {
+            clearTimeout(this.chatFocusTimeoutId);
+            this.chatFocusTimeoutId = null;
+        }
+    }
+
     @boundMethod
     handleContextMenu(e: any) {
         let isInNonTermInput = false;
@@ -68,16 +76,15 @@ class App extends React.Component<{}, {}> {
 
     @boundMethod
     openMainSidebar() {
-        const mainSidebarModel = GlobalModel.mainSidebarModel;
-        const width = mainSidebarModel.getWidth(true);
-        mainSidebarModel.saveState(width, false);
+        GlobalModel.mainSidebarModel.setCollapsed(false);
     }
 
     @boundMethod
     openRightSidebar() {
-        const rightSidebarModel = GlobalModel.rightSidebarModel;
-        const width = rightSidebarModel.getWidth(true);
-        rightSidebarModel.saveState(width, false);
+        GlobalModel.rightSidebarModel.setCollapsed(false);
+        this.chatFocusTimeoutId = setTimeout(() => {
+            GlobalModel.inputModel.setChatSidebarFocus();
+        }, 100);
     }
 
     @boundMethod

diff --git a/src/app/line/linecomps.tsx b/src/app/line/linecomps.tsx
@@ -128,7 +128,8 @@ class LineActions extends React.Component<{ screen: LineContainerType; line: Lin
                 screen.getUsedRows(lineutil.getRendererContext(line), line, cmd, 300) * 2,
                 cmdShouldMarkError(cmd)
             );
-            GlobalModel.sidebarchatModel.setFocus("input", true);
+            GlobalModel.inputModel.setChatSidebarFocus();
+            GlobalModel.sidebarchatModel.resetSelectedCodeBlockIndex();
         }
     }
 

diff --git a/src/app/sidebar/aichat.less b/src/app/sidebar/aichat.less
@@ -20,6 +20,11 @@
             .filler {
                 flex: 1 1 auto;
             }
+
+            > * {
+                cursor: default;
+                user-select: none;
+            }
         }
 
         .chat-msg {
@@ -78,6 +83,7 @@
             font-family: var(--termfontfamily);
             font-weight: normal;
             line-height: var(--termlineheight);
+            height: 21px;
         }
     }
 }