fix: activate pane item on focus (#292)

bus-stop · May 3, 2021 · dcb0fc5 · dcb0fc5
1 parent b40d333
commit dcb0fc5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/spec/model-spec.js b/spec/model-spec.js
@@ -55,7 +55,7 @@ describe('XTerminalModel', () => {
 		spyOn(XTerminalProfilesSingleton.instance, 'generateNewUri').and.returnValue(uri)
 		model = await createNewModel()
 		pane = jasmine.createSpyObj('pane',
-			['destroyItem', 'getActiveItem'])
+			['destroyItem', 'getActiveItem', 'activateItem'])
 		element = jasmine.createSpyObj('element',
 			['destroy', 'refitTerminal', 'focusOnTerminal', 'clickOnCurrentAnchor', 'getCurrentAnchorHref', 'restartPtyProcess', 'clear'])
 		element.terminal = jasmine.createSpyObj('terminal',
@@ -373,6 +373,13 @@ describe('XTerminalModel', () => {
 		expect(model.emitter.emit).toHaveBeenCalled()
 	})
 
+	it('focusOnTerminal() activate pane', () => {
+		model.element = element
+		model.pane = pane
+		model.focusOnTerminal()
+		expect(model.pane.activateItem).toHaveBeenCalled()
+	})
+
 	it('exit()', () => {
 		model.pane = pane
 		model.exit()

diff --git a/src/model.js b/src/model.js
@@ -213,6 +213,9 @@ class XTerminalModel {
 	}
 
 	focusOnTerminal (double) {
+		if (this.pane) {
+			this.pane.activateItem(this)
+		}
 		this.element.focusOnTerminal(double)
 		if (this.modified) {
 			this.modified = false