Fix microsoft#83599. Refresh code widget focus state when hide

rebornix · rebornix · commit ca4242550354 · 2019-12-05T16:17:09.000-08:00
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
@@ -972,6 +972,7 @@ export const EventHelper = {
 export interface IFocusTracker extends Disposable {
 	onDidFocus: Event<void>;
 	onDidBlur: Event<void>;
+	refreshState?(): void;
 }
 
 export function saveParentsScrollTop(node: Element): number[] {
@@ -1000,6 +1001,8 @@ class FocusTracker extends Disposable implements IFocusTracker {
 	private readonly _onDidBlur = this._register(new Emitter<void>());
 	public readonly onDidBlur: Event<void> = this._onDidBlur.event;
 
+	private _refreshStateHandler: () => void;
+
 	constructor(element: HTMLElement | Window) {
 		super();
 		let hasFocus = isAncestor(document.activeElement, <HTMLElement>element);
@@ -1026,9 +1029,24 @@ class FocusTracker extends Disposable implements IFocusTracker {
 			}
 		};
 
+		this._refreshStateHandler = () => {
+			let currentNodeHasFocus = isAncestor(document.activeElement, <HTMLElement>element);
+			if (currentNodeHasFocus !== hasFocus) {
+				if (hasFocus) {
+					onBlur();
+				} else {
+					onFocus();
+				}
+			}
+		};
+
 		this._register(domEvent(element, EventType.FOCUS, true)(onFocus));
 		this._register(domEvent(element, EventType.BLUR, true)(onBlur));
 	}
+
+	refreshState() {
+		this._refreshStateHandler();
+	}
 }
 
 export function trackFocus(element: HTMLElement | Window): IFocusTracker {
diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -874,6 +874,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 	public onHide(): void {
 		this._modelData?.view.refreshFocusState();
+		this._focusTracker.refreshState();
 	}
 
 	public getContribution<T extends editorCommon.IEditorContribution>(id: string): T {
@@ -1806,6 +1807,12 @@ class CodeEditorWidgetFocusTracker extends Disposable {
 	public hasFocus(): boolean {
 		return this._hasFocus;
 	}
+
+	public refreshState(): void {
+		if (this._domFocusTracker.refreshState) {
+			this._domFocusTracker.refreshState();
+		}
+	}
 }
 
 const squigglyStart = encodeURIComponent(`<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 6 3' enable-background='new 0 0 6 3' height='3' width='6'><g fill='`);

Original file line number	Diff line number	Diff line change
`@@ -874,6 +874,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE`
`874`	`874`
`875`	`875`	`public onHide(): void {`
`876`	`876`	`this._modelData?.view.refreshFocusState();`
	`877`	`+ this._focusTracker.refreshState();`
`877`	`878`	`}`
`878`	`879`
`879`	`880`	`public getContribution<T extends editorCommon.IEditorContribution>(id: string): T {`
`@@ -1806,6 +1807,12 @@ class CodeEditorWidgetFocusTracker extends Disposable {`
`1806`	`1807`	`public hasFocus(): boolean {`
`1807`	`1808`	`return this._hasFocus;`
`1808`	`1809`	`}`
	`1810`	`+`
	`1811`	`+ public refreshState(): void {`
	`1812`	`+ if (this._domFocusTracker.refreshState) {`
	`1813`	`+ this._domFocusTracker.refreshState();`
	`1814`	`+ }`
	`1815`	`+ }`
`1809`	`1816`	`}`
`1810`	`1817`
`1811`	`1818`	const squigglyStart = encodeURIComponent(`<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 6 3' enable-background='new 0 0 6 3' height='3' width='6'><g fill='`);