From 1cee9f7dfbd1c09e1717328ddc1d36a105b2b0e5 Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Tue, 30 Jul 2019 16:18:42 -0700 Subject: [PATCH] fixes #71580 --- src/vs/editor/contrib/codeAction/lightBulbWidget.ts | 2 +- src/vs/platform/contextview/browser/contextMenuHandler.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts index 455798e4a9d..8575f354d5c 100644 --- a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts +++ b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts @@ -74,7 +74,7 @@ export class LightBulbWidget extends Disposable implements IContentWidget { // Make sure that focus / cursor location is not lost when clicking widget icon this._editor.focus(); - dom.EventHelper.stop(e, true); + e.preventDefault(); // a bit of extra work to make sure the menu // doesn't cover the line-text const { top, height } = dom.getDomNodePagePosition(this._domNode); diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts index 4d3479aae8b..8ab9ccc2d82 100644 --- a/src/vs/platform/contextview/browser/contextMenuHandler.ts +++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts @@ -85,6 +85,10 @@ export class ContextMenuHandler { menu.onDidBlur(() => this.contextViewService.hideContextView(true), null, menuDisposables); domEvent(window, EventType.BLUR)(() => { this.contextViewService.hideContextView(true); }, null, menuDisposables); domEvent(window, EventType.MOUSE_DOWN)((e: MouseEvent) => { + if (e.defaultPrevented) { + return; + } + let event = new StandardMouseEvent(e); let element: HTMLElement | null = event.target;