Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-04-03 18:17:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix 'giveFocus' issue

Browse Source
This commit is contained in:
sawka 2023-03-19 23:36:04 -07:00
parent 651146cab1
commit 31d79b8829
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/linecomps.tsx
View File

@ -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();
}

12
src/model.ts
View File

@ -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();
}