webview hijacks the focus for undo/redo

rebornix · rebornix · commit e64364ffaa94 · 2020-08-04T10:56:15.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -198,6 +198,7 @@ export interface INotebookEditor extends IEditor {
 	focus(): void;
 
 	hasFocus(): boolean;
+	hasWebviewFocus(): boolean;
 
 	hasOutputTextSelection(): boolean;
 
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -273,6 +273,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._editorFocus?.get() || false;
 	}
 
+	hasWebviewFocus() {
+		return this._webiewFocused;
+	}
+
 	hasOutputTextSelection() {
 		if (!this.hasFocus()) {
 			return false;
diff --git a/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts
@@ -18,6 +18,10 @@ function getFocusedElectronBasedWebviewDelegate(accessor: ServicesAccessor): Ele
 		return;
 	}
 
+	if (!editor?.hasWebviewFocus()) {
+		return;
+	}
+
 	const webview = editor?.getInnerWebview();
 	if (webview && webview instanceof ElectronWebviewBasedWebview) {
 		return webview;
diff --git a/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts b/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
@@ -82,6 +82,10 @@ export class TestNotebookEditor implements INotebookEditor {
 		return true;
 	}
 
+	hasWebviewFocus() {
+		return false;
+	}
+
 	hasOutputTextSelection() {
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,10 @@ export class TestNotebookEditor implements INotebookEditor {`
`82`	`82`	`return true;`
`83`	`83`	`}`
`84`	`84`
	`85`	`+ hasWebviewFocus() {`
	`86`	`+ return false;`
	`87`	`+ }`
	`88`	`+`
`85`	`89`	`hasOutputTextSelection() {`
`86`	`90`	`return false;`
`87`	`91`	`}`