redo fixes

Author: amunger

src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts

@@ -183,7 +183,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		// throw new Error('Method not implemented.');
 	}
 
-	didFocusOutputInputChange(focus: boolean): void {
+	didFocusOutputInputChange(inputFocused: boolean): void {
 		// noop
 	}
 

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

@@ -94,7 +94,7 @@ export interface INotebookDelegateForWebview {
 	setScrollTop(scrollTop: number): void;
 	triggerScroll(event: IMouseWheelEvent): void;
 	updatePerformanceMetadata(cellId: string, executionId: string, duration: number, rendererId: string): void;
-	didFocusOutputInputChange(focus: boolean): void;
+	didFocusOutputInputChange(inputFocused: boolean): void;
 }
 
 interface BacklayerWebviewOptions {
@@ -879,7 +879,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 					break;
 				}
 				case 'outputInputFocus': {
-					this.notebookEditor.didFocusOutputInputChange(data.hasFocus);
+					this.notebookEditor.didFocusOutputInputChange(data.inputFocused);
 				}
 			}
 		}));

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

@@ -49,7 +49,7 @@ export interface IOutputBlurMessage extends BaseToWebviewMessage {
 
 export interface IOutputInputFocusMessage extends BaseToWebviewMessage {
 	readonly type: 'outputInputFocus';
-	readonly hasFocus: boolean;
+	readonly inputFocused: boolean;
 }
 
 export interface IScrollToRevealMessage extends BaseToWebviewMessage {

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

@@ -146,10 +146,10 @@ async function webviewPreloads(ctx: PreloadContext) {
 		}
 
 		if (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA') {
-			postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { hasFocus: true });
+			postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { inputFocused: true });
 
-			activeElement.addEventListener('onblur', () => {
-				postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { hasFocus: false });
+			activeElement.addEventListener('blur', () => {
+				postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { inputFocused: false });
 			}, { once: true });
 		}
 	};
@@ -159,8 +159,6 @@ async function webviewPreloads(ctx: PreloadContext) {
 			return;
 		}
 
-		checkOutputInputFocus();
-
 		for (const node of event.composedPath()) {
 			if (node instanceof HTMLElement && node.classList.contains('output')) {
 				// output
@@ -241,6 +239,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 	};
 
 	document.body.addEventListener('click', handleInnerClick);
+	document.body.addEventListener('focusin', checkOutputInputFocus);
 
 	interface RendererContext extends rendererApi.RendererContext<unknown> {
 		readonly onDidChangeSettings: Event<RenderOptions>;