use focusin event

Author: amunger

src/vs/workbench/contrib/notebook/browser/controller/editActions.ts

@@ -126,61 +126,6 @@ registerAction2(class QuitEditCellAction extends NotebookCellAction {
 	}
 });
 
-registerAction2(class UnfocusCellOutput extends NotebookCellAction {
-	constructor() {
-		super(
-			{
-				id: 'notebook.cell.unfocusOutput',
-				title: localize('notebookActions.unfocusOutput', "Stop Editing Cell"),
-				menu: {
-					id: MenuId.NotebookCellTitle,
-					when: ContextKeyExpr.and(
-						NOTEBOOK_CELL_TYPE.isEqualTo('markup'),
-						NOTEBOOK_CELL_MARKDOWN_EDIT_MODE,
-						NOTEBOOK_CELL_EDITABLE),
-					order: CellToolbarOrder.SaveCell,
-					group: CELL_TITLE_CELL_GROUP_ID
-				},
-				icon: icons.stopEditIcon,
-				keybinding: [
-					{
-						when: ContextKeyExpr.and(quitEditCondition,
-							EditorContextKeys.hoverVisible.toNegated(),
-							EditorContextKeys.hasNonEmptySelection.toNegated(),
-							EditorContextKeys.hasMultipleSelections.toNegated()),
-						primary: KeyCode.Escape,
-						weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT - 5
-					},
-					{
-						when: ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,
-							NOTEBOOK_OUTPUT_FOCUSED,
-							NOTEBOOK_OUPTUT_INPUT_FOCUSED.toNegated()),
-						primary: KeyCode.Escape,
-						weight: KeybindingWeight.WorkbenchContrib + 1
-					},
-					{
-						when: ContextKeyExpr.and(
-							quitEditCondition,
-							NOTEBOOK_CELL_TYPE.isEqualTo('markup')),
-						primary: KeyMod.WinCtrl | KeyCode.Enter,
-						win: {
-							primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter
-						},
-						weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT - 5
-					},
-				]
-			});
-	}
-
-	async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext) {
-		if (context.cell.cellKind === CellKind.Markup) {
-			context.cell.updateEditState(CellEditState.Preview, QUIT_EDIT_CELL_COMMAND_ID);
-		}
-
-		await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
-	}
-});
-
 registerAction2(class DeleteCellAction extends NotebookCellAction {
 	constructor() {
 		super(

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts

@@ -94,8 +94,6 @@ async function webviewPreloads(ctx: PreloadContext) {
 	let currentRenderOptions = ctx.renderOptions;
 	const settingChange: EmitterLike<RenderOptions> = createEmitter<RenderOptions>();
 
-	let isInputElementFocused: boolean | undefined = undefined;
-
 	const acquireVsCodeApi = globalThis.acquireVsCodeApi;
 	const vscode = acquireVsCodeApi();
 	delete (globalThis as any).acquireVsCodeApi;
@@ -140,19 +138,16 @@ async function webviewPreloads(ctx: PreloadContext) {
 		};
 
 	// check if an input element is focused within the output element
-	const checkOutputInputFocus = () => {
-
+	const handleOutputFocus = () => {
 		const activeElement = document.activeElement;
 		if (!activeElement) {
 			return;
 		}
 
-		isInputElementFocused = !!activeElement && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA');
-
-		if (isInputElementFocused) {
+		if (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA') {
 			postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { hasFocus: true });
 
-			activeElement.addEventListener('onblur', () => {
+			activeElement.addEventListener('blur', () => {
 				postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { hasFocus: false });
 			}, { once: true });
 		}
@@ -163,7 +158,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 			return;
 		}
 
-		checkOutputInputFocus();
+		handleOutputFocus();
 
 		for (const node of event.composedPath()) {
 			if (node instanceof HTMLElement && node.classList.contains('output')) {
@@ -245,6 +240,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 	};
 
 	document.body.addEventListener('click', handleInnerClick);
+	document.body.addEventListener('focusin', handleOutputFocus);
 
 	interface RendererContext extends rendererApi.RendererContext<unknown> {
 		readonly onDidChangeSettings: Event<RenderOptions>;