Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:wavetermdev/waveterm into red/aichat-sidebar

Browse Source
This commit is contained in:
Red Adaya 2024-05-02 08:23:16 +08:00
commit 4f06cd8095
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/models/input.ts
View File

@ -460,22 +460,18 @@ class InputModel {
} }
shouldRenderAuxViewKeybindings(view: InputAuxViewType): boolean { shouldRenderAuxViewKeybindings(view: InputAuxViewType): boolean {
if (view != null && this.getActiveAuxView() != view) { if (GlobalModel.activeMainView.get() != "session") {
return false; return false;
} }
if (view != null && !this.getAuxViewFocus()) { if (GlobalModel.getActiveScreen()?.getFocusType() != "input") {
return false; return false;
} }
if (view == null && this.hasFocus() && !this.getAuxViewFocus()) { // (view == null) means standard cmdinput keybindings
return true; if (view == null) {
return !this.getAuxViewFocus();
} else {
return this.getAuxViewFocus() && view == this.getActiveAuxView();
} }
if (view != null && this.getAuxViewFocus()) {
return true;
}
if (GlobalModel.getActiveScreen().getFocusType() == "input" && GlobalModel.activeMainView.get() == "session") {
return true;
}
return false;
} }
@mobx.action @mobx.action