refs microsoft/monaco-editor#1357

sbatten · sbatten · commit 627e7e97e157 · 2019-03-12T14:21:18.000-07:00
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -665,5 +665,9 @@ export class SimpleLayoutService implements ILayoutService {
 		return this._container;
 	}
 
+	get hasWorkbench(): boolean {
+		return false;
+	}
+
 	constructor(private _container: HTMLElement) { }
 }
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -16,9 +16,10 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
-import { addDisposableListener, EventType, $ } from 'vs/base/browser/dom';
+import { addDisposableListener, EventType, $, removeNode } from 'vs/base/browser/dom';
 import { attachMenuStyler } from 'vs/platform/theme/common/styler';
 import { domEvent } from 'vs/base/browser/event';
+import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 
 export class ContextMenuHandler {
 	private element: HTMLElement | null;
@@ -28,14 +29,14 @@ export class ContextMenuHandler {
 	private block: HTMLElement | null;
 
 	constructor(
-		element: HTMLElement | null,
+		private layoutService: ILayoutService,
 		private contextViewService: IContextViewService,
 		private telemetryService: ITelemetryService,
 		private notificationService: INotificationService,
 		private keybindingService: IKeybindingService,
 		private themeService: IThemeService
 	) {
-		this.setContainer(element);
+		this.setContainer(this.layoutService.container);
 	}
 
 	setContainer(container: HTMLElement | null): void {
@@ -75,7 +76,9 @@ export class ContextMenuHandler {
 				}
 
 				// Render invisible div to block mouse interaction in the rest of the UI
-				this.block = container.appendChild($('.context-view-block'));
+				if (this.layoutService.hasWorkbench) {
+					this.block = container.appendChild($('.context-view-block'));
+				}
 
 				const menuDisposables: IDisposable[] = [];
 
@@ -110,7 +113,7 @@ export class ContextMenuHandler {
 				}
 
 				if (this.block) {
-					this.block.remove();
+					removeNode(this.block);
 					this.block = null;
 				}
 
diff --git a/src/vs/platform/contextview/browser/contextMenuService.ts b/src/vs/platform/contextview/browser/contextMenuService.ts
@@ -32,7 +32,7 @@ export class ContextMenuService extends Disposable implements IContextMenuServic
 	) {
 		super();
 
-		this.contextMenuHandler = this._register(new ContextMenuHandler(layoutService.container, contextViewService, telemetryService, notificationService, keybindingService, themeService));
+		this.contextMenuHandler = this._register(new ContextMenuHandler(layoutService, contextViewService, telemetryService, notificationService, keybindingService, themeService));
 	}
 
 	dispose(): void {
diff --git a/src/vs/platform/layout/browser/layoutService.ts b/src/vs/platform/layout/browser/layoutService.ts
@@ -32,4 +32,10 @@ export interface ILayoutService {
 	 * event carries the dimensions of the container as part of it.
 	 */
 	readonly onLayout: Event<IDimension>;
+
+
+	/**
+	 * Indicates if the layout has a workbench surrounding the editor
+	 */
+	readonly hasWorkbench: boolean;
 }
diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
@@ -483,6 +483,8 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
 
 	get container(): HTMLElement { return this.workbench; }
 
+	get hasWorkbench(): boolean { return true; }
+
 	private parts: Map<string, Part> = new Map<string, Part>();
 
 	private workbenchGrid: Grid<View> | WorkbenchLegacyLayout;
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
@@ -505,6 +505,10 @@ export class TestLayoutService implements IWorkbenchLayoutService {
 		return false;
 	}
 
+	public get hasWorkbench(): boolean {
+		return true;
+	}
+
 	public setEditorHidden(_hidden: boolean): Promise<void> { return Promise.resolve(); }
 
 	public setSideBarHidden(_hidden: boolean): Promise<void> { return Promise.resolve(); }

Original file line number	Diff line number	Diff line change
`@@ -665,5 +665,9 @@ export class SimpleLayoutService implements ILayoutService {`
`665`	`665`	`return this._container;`
`666`	`666`	`}`
`667`	`667`
	`668`	`+ get hasWorkbench(): boolean {`
	`669`	`+ return false;`
	`670`	`+ }`
	`671`	`+`
`668`	`672`	`constructor(private _container: HTMLElement) { }`
`669`	`673`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export class ContextMenuService extends Disposable implements IContextMenuServic`
`32`	`32`	`) {`
`33`	`33`	`super();`
`34`	`34`
`35`		`- this.contextMenuHandler = this._register(new ContextMenuHandler(layoutService.container, contextViewService, telemetryService, notificationService, keybindingService, themeService));`
	`35`	`+ this.contextMenuHandler = this._register(new ContextMenuHandler(layoutService, contextViewService, telemetryService, notificationService, keybindingService, themeService));`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`dispose(): void {`
Original file line number	Diff line number	Diff line change
`@@ -505,6 +505,10 @@ export class TestLayoutService implements IWorkbenchLayoutService {`
`505`	`505`	`return false;`
`506`	`506`	`}`
`507`	`507`
	`508`	`+ public get hasWorkbench(): boolean {`
	`509`	`+ return true;`
	`510`	`+ }`
	`511`	`+`
`508`	`512`	`public setEditorHidden(_hidden: boolean): Promise<void> { return Promise.resolve(); }`
`509`	`513`
`510`	`514`	`public setSideBarHidden(_hidden: boolean): Promise<void> { return Promise.resolve(); }`