focus chat box on chat button click in line

wavetermdev · May 16, 2024 · 5472ca3 · 5472ca3
1 parent 0b3bb11
commit 5472ca3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/src/app/line/linecomps.tsx b/src/app/line/linecomps.tsx
@@ -115,7 +115,8 @@ class LineActions extends React.Component<{ screen: LineContainerType; line: Lin
  }
 
  @boundMethod
- clickChat() {
+ clickChat(e: any) {
+ e.stopPropagation();
  const { line, screen } = this.props;
  const termWrap = screen.getTermWrap(line.lineid);
  const cmd = screen.getCmd(line);
@@ -125,6 +126,7 @@ class LineActions extends React.Component<{ screen: LineContainerType; line: Lin
  termWrap?.getOutput(false),
  cmdShouldMarkError(cmd)
  );
+ GlobalModel.sidebarchatModel.setFocus("input", true);
  }
  }
 

diff --git a/src/app/sidebar/aichat.tsx b/src/app/sidebar/aichat.tsx
@@ -172,6 +172,12 @@ class ChatSidebar extends React.Component<{}, {}> {
  mobx.makeObservable(this);
  }
 
+ componentDidUpdate() {
+ if (GlobalModel.sidebarchatModel.getFocus("input")) {
+ this.textAreaRef.current.focus();
+ }
+ }
+
  componentDidMount() {
  GlobalModel.sidebarchatModel.setFocus("input", true);
  if (this.sidebarRef.current) {
@@ -391,7 +397,6 @@ class ChatSidebar extends React.Component<{}, {}> {
  const renderAIChatKeybindings = GlobalModel.sidebarchatModel.getFocus();
  const cmdAndOutput = GlobalModel.sidebarchatModel.getCmdAndOutput();
  const value = this.formChatMessage(cmdAndOutput);
- console.log("cmdAndOutput", cmdAndOutput);
  return (
  <div ref={this.sidebarRef} className="sidebarchat">
  <If condition={renderAIChatKeybindings}>

diff --git a/src/models/input.ts b/src/models/input.ts
@@ -162,8 +162,6 @@ class InputModel {
  // nothing to do here
  break;
  }
-
- GlobalModel.sidebarchatModel.resetFocus();
  }
 
  @mobx.action

diff --git a/src/models/sidebarchat.ts b/src/models/sidebarchat.ts
@@ -38,11 +38,16 @@ class SidebarChatModel {
  this.sidebarChatFocus[section] = focus;
  }
 
- getFocus(section?: "input" | "block"): boolean {
+ getFocus(section?: "input" | "block"): string | null {
  if (section == null) {
- return this.sidebarChatFocus.input || this.sidebarChatFocus.block;
+ if (this.sidebarChatFocus.input) {
+ return "input";
+ } else if (this.sidebarChatFocus.block) {
+ return "block";
+ }
+ return null;
  }
- return this.sidebarChatFocus[section];
+ return this.sidebarChatFocus[section] ? section : null;
  }
 
  resetFocus(): void {