fix: double focus on terminal

bus-stop · Oct 7, 2020 · 3b8f018 · 3b8f018
1 parent 62fb0f0
commit 3b8f018
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/element.js b/src/element.js
@@ -704,10 +704,14 @@ class XTerminalElementImpl extends HTMLElement {
 		}
 	}
 
-	focusOnTerminal () {
+	focusOnTerminal (double) {
 		if (this.terminal) {
 			this.model.setActive()
 			this.terminal.focus()
+			if (double) {
+				// second focus will send command to pty
+				this.terminal.focus()
+			}
 		}
 	}
 

diff --git a/src/model.js b/src/model.js
@@ -202,11 +202,10 @@ class XTerminalModel {
 		}
 	}
 
-	focusOnTerminal () {
-		this.element.focusOnTerminal()
-		const oldIsModified = this.modified
-		this.modified = false
-		if (oldIsModified !== this.modified) {
+	focusOnTerminal (double) {
+		this.element.focusOnTerminal(double)
+		if (this.modified) {
+			this.modified = false
 			this.emitter.emit('did-change-modified', this.modified)
 		}
 	}

diff --git a/src/x-terminal.js b/src/x-terminal.js
@@ -521,7 +521,7 @@ class XTerminalSingleton {
 			this.openTerminal()
 		} else {
 			const activeTerminal = [...this.terminals_set].find(t => t.activeIndex === 0)
-			activeTerminal.focusOnTerminal()
+			activeTerminal.focusOnTerminal(true)
 		}
 	}