From a1ed35eaaf9eb4934fa9b10e9101219cb613170e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 12 Feb 2019 15:14:48 -0800 Subject: [PATCH] Fix clicking on webviews does not dismiss custom title bar menu Fixes #68313 When clicking into a webview, the `relatedTarget` property of the corresponding blur event fired is `undefined`. This fix makes it so that an empty `relatedTarget` also dismisses menus --- src/vs/base/browser/ui/menu/menubar.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts index 0369a9baa6e..7a5cd31d621 100644 --- a/src/vs/base/browser/ui/menu/menubar.ts +++ b/src/vs/base/browser/ui/menu/menubar.ts @@ -150,11 +150,9 @@ export class MenuBar extends Disposable { this._register(DOM.addDisposableListener(this.container, DOM.EventType.FOCUS_OUT, (e) => { let event = e as FocusEvent; - if (event.relatedTarget) { - if (!this.container.contains(event.relatedTarget as HTMLElement)) { - this.focusToReturn = undefined; - this.setUnfocusedState(); - } + if (!event.relatedTarget || !this.container.contains(event.relatedTarget as HTMLElement)) { + this.focusToReturn = undefined; + this.setUnfocusedState(); } }));