From 31d79b88297feec24d70815f4536ba3d77b3e111 Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Sun, 19 Mar 2023 23:36:04 -0700
Subject: [PATCH] fix 'giveFocus' issue

---
 src/linecomps.tsx | 12 +-----------
 src/model.ts      | 12 ++++++++++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/linecomps.tsx b/src/linecomps.tsx
index ccaa405b..ef4bd8f4 100644
--- a/src/linecomps.tsx
+++ b/src/linecomps.tsx
@@ -211,16 +211,6 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
         lineElem.scrollIntoView({block: "end"});
     }
 
-    @boundMethod
-    doRefresh() {
-        let {screen, line} = this.props;
-        let model = GlobalModel;
-        let termWrap = screen.getRenderer(line.cmdid);
-        if (termWrap != null) {
-            termWrap.reload(500);
-        }
-    }
-
     @boundMethod
     handleExpandCmd() : void {
         mobx.action(() => {
@@ -768,7 +758,7 @@ class TerminalRenderer extends React.Component<{screen : LineContainerModel, lin
     clickTermBlock(e : any) {
         let {screen, line} = this.props;
         let model = GlobalModel;
-        let termWrap = screen.getRenderer(line.cmdid);
+        let termWrap = screen.getTermWrap(line.cmdid);
         if (termWrap != null) {
             termWrap.giveFocus();
         }
diff --git a/src/model.ts b/src/model.ts
index 98cde26a..aa6e090b 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -419,7 +419,11 @@ class Screen {
             (document.activeElement as HTMLElement).blur();
         }
         if (sline != null && sline.cmdid != null) {
-            let termWrap = this.getRenderer(sline.cmdid);
+            let renderer = this.getRenderer(sline.cmdid);
+            if (renderer != null) {
+                renderer.giveFocus();
+            }
+            let termWrap = this.getTermWrap(sline.cmdid);
             if (termWrap != null) {
                 termWrap.giveFocus();
             }
@@ -760,7 +764,11 @@ class Screen {
                 sline = this.getLineByNum(this.selectedLine.get());
             }
             if (sline != null) {
-                let termWrap = this.getRenderer(sline.cmdid);
+                let renderer = this.getRenderer(sline.cmdid);
+                if (renderer != null) {
+                    renderer.giveFocus();
+                }
+                let termWrap = this.getTermWrap(sline.cmdid);
                 if (termWrap != null) {
                     termWrap.giveFocus();
                 }