Move off in Webview

src/vs/workbench/api/browser/mainThreadCodeInsets.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { getWindow } from 'vs/base/browser/dom';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { isEqual } from 'vs/base/common/resources';
 import { URI, UriComponents } from 'vs/base/common/uri';
@@ -88,14 +89,16 @@ export class MainThreadEditorInsets implements MainThreadEditorInsetsShape {
 		}
 
 		const disposables = new DisposableStore();
+		const codeWindow = getWindow(editor.getDomNode());
 
 		const webview = this._webviewService.createWebviewElement({
 			title: undefined,
 			options: {
 				enableFindWidget: false,
 			},
 			contentOptions: reviveWebviewContentOptions(options),
-			extension: { id: extensionId, location: URI.revive(extensionLocation) }
+			extension: { id: extensionId, location: URI.revive(extensionLocation) },
+			codeWindow: codeWindow
 		});
 
 		const webviewZone = new EditorWebviewZone(editor, line, height, webview);

src/vs/workbench/api/browser/mainThreadWebviewPanels.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { getActiveWindow } from 'vs/base/browser/dom';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event } from 'vs/base/common/event';
 import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
@@ -170,7 +171,8 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 			title: initData.title,
 			options: reviveWebviewOptions(initData.panelOptions),
 			contentOptions: reviveWebviewContentOptions(initData.webviewOptions),
-			extension
+			extension,
+			codeWindow: getActiveWindow()
 		}, this.webviewPanelViewType.fromExternal(viewType), initData.title, mainThreadShowOptions);
 
 		this.addWebviewInput(handle, webview, { serializeBuffersForPostMessage: initData.serializeBuffersForPostMessage });

src/vs/workbench/browser/parts/editor/editorPane.ts

@@ -24,6 +24,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { ITextResourceConfigurationChangeEvent, ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash';
+import { getWindowById } from 'vs/base/browser/dom';
 
 /**
  * The base class of editors in the workbench. Editors register themselves for specific editor inputs.
@@ -163,6 +164,16 @@ export abstract class EditorPane extends Composite implements IEditorPane {
 		this._group = group;
 	}
 
+	getContainingWindow() {
+		let codeWindow;
+		if (this.group?.windowId) {
+			const windowById = getWindowById(this.group.windowId);
+			codeWindow = windowById?.window;
+		}
+
+		return codeWindow;
+	}
+
 	setBoundarySashes(_sashes: IBoundarySashes) {
 		// Subclasses can implement
 	}

src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { getWindowById } from 'vs/base/browser/dom';
+import { mainWindow } from 'vs/base/browser/window';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { IReference } from 'vs/base/common/lifecycle';
@@ -22,6 +24,7 @@ import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { ICustomEditorModel, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
 import { IOverlayWebview, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
 import { IWebviewWorkbenchService, LazilyResolvedWebviewEditorInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
+import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
 
@@ -43,12 +46,16 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
 			// If it's an untitled file we must populate the untitledDocumentData
 			const untitledString = accessor.get(IUntitledTextEditorService).getValue(resource);
 			const untitledDocumentData = untitledString ? VSBuffer.fromString(untitledString) : undefined;
+			const editorGroupService = accessor.get(IEditorGroupsService);
+			const windowId = group ? editorGroupService.getGroup(group)?.windowId : undefined;
+			const codeWindow = windowId ? (getWindowById(windowId)?.window ?? mainWindow) : mainWindow;
 			const webview = accessor.get(IWebviewService).createWebviewOverlay({
 				providedViewType: viewType,
 				title: undefined,
 				options: { customClasses: options?.customClasses },
 				contentOptions: {},
 				extension: undefined,
+				codeWindow
 			});
 			const input = instantiationService.createInstance(CustomEditorInput, { resource, viewType }, webview, { untitledDocumentData: untitledDocumentData, oldResource: options?.oldResource });
 			if (typeof group !== 'undefined') {

src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { getActiveWindow } from 'vs/base/browser/dom';
+import { CodeWindow } from 'vs/base/browser/window';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
@@ -100,7 +102,7 @@ export class CustomEditorInputSerializer extends WebviewEditorInputSerializer {
 	}
 }
 
-function reviveWebview(webviewService: IWebviewService, data: { origin: string | undefined; viewType: string; state: any; webviewOptions: WebviewOptions; contentOptions: WebviewContentOptions; extension?: WebviewExtensionDescription }) {
+function reviveWebview(webviewService: IWebviewService, data: { origin: string | undefined; viewType: string; state: any; webviewOptions: WebviewOptions; contentOptions: WebviewContentOptions; extension?: WebviewExtensionDescription; codeWindow: CodeWindow }) {
 	const webview = webviewService.createWebviewOverlay({
 		providedViewType: data.viewType,
 		origin: data.origin,
@@ -112,6 +114,7 @@ function reviveWebview(webviewService: IWebviewService, data: { origin: string |
 		},
 		contentOptions: data.contentOptions,
 		extension: data.extension,
+		codeWindow: data.codeWindow
 	});
 	webview.state = data.state;
 	return webview;
@@ -185,6 +188,7 @@ export class ComplexCustomWorkingCopyEditorHandler extends Disposable implements
 			contentOptions: restoreWebviewContentOptions(backupData.webview.options),
 			state: backupData.webview.state,
 			extension,
+			codeWindow: getActiveWindow()
 		});
 
 		const editor = this._instantiationService.createInstance(CustomEditorInput, { resource: URI.revive(backupData.editorResource), viewType: backupData.viewType }, webview, { backupId: backupData.backupId });

src/vs/workbench/contrib/extensions/browser/extensionEditor.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, Dimension, addDisposableListener, append, setParentFlowTo } from 'vs/base/browser/dom';
+import { $, Dimension, addDisposableListener, append, getWindow, setParentFlowTo } from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { setupCustomHover } from 'vs/base/browser/ui/hover/updatableHoverWidget';
@@ -661,6 +661,8 @@ export class ExtensionEditor extends EditorPane {
 				return Promise.resolve(null);
 			}
 
+			const codeWindow = this.getContainingWindow() ?? getWindow(container);
+
 			const webview = this.contentDisposables.add(this.webviewService.createWebviewOverlay({
 				title,
 				options: {
@@ -670,16 +672,17 @@ export class ExtensionEditor extends EditorPane {
 				},
 				contentOptions: {},
 				extension: undefined,
+				codeWindow: codeWindow
 			}));
 
 			webview.initialScrollProgress = this.initialScrollProgress.get(webviewIndex) || 0;
 
-			webview.claim(this, this.scopedContextKeyService);
+			webview.claim(this, codeWindow, this.scopedContextKeyService);
 			setParentFlowTo(webview.container, container);
 			webview.layoutWebviewOverElement(container);
 
 			webview.setHtml(body);
-			webview.claim(this, undefined);
+			webview.claim(this, codeWindow, undefined);
 
 			this.contentDisposables.add(webview.onDidFocus(() => this.fireOnDidFocus()));
 

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

@@ -47,7 +47,6 @@ import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { cellIndexesToRanges, cellRangesToIndexes } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { NotebookDiffOverviewRuler } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler';
 import { registerZIndex, ZIndex } from 'vs/platform/layout/browser/zIndexRegistry';
-import { mainWindow } from 'vs/base/browser/window';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 
 const $ = DOM.$;
@@ -154,7 +153,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		@ICodeEditorService codeEditorService: ICodeEditorService
 	) {
 		super(NotebookTextDiffEditor.ID, telemetryService, themeService, storageService);
-		this._notebookOptions = new NotebookOptions(DOM.getWindowById(this.group?.windowId, true).window ?? mainWindow, this.configurationService, notebookExecutionStateService, codeEditorService, false);
+		this._notebookOptions = new NotebookOptions(DOM.getWindowById(this.group?.windowId, true).window, this.configurationService, notebookExecutionStateService, codeEditorService, false);
 		this._register(this._notebookOptions);
 		this._revealFirst = true;
 	}

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

@@ -560,7 +560,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 		this.webview.mountTo(this.element);
 		this._register(this.webview);
 
-		this._register(new WebviewWindowDragMonitor(() => this.webview));
+		this._register(new WebviewWindowDragMonitor(codeWindow, () => this.webview));
 
 		const initializePromise = new DeferredPromise<void>();
 

src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts

@@ -34,6 +34,7 @@ import { SimpleSettingRenderer } from 'vs/workbench/contrib/markdown/browser/mar
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Schemas } from 'vs/base/common/network';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { getActiveWindow } from 'vs/base/browser/dom';
 
 export class ReleaseNotesManager {
 	private readonly _simpleSettingRenderer: SimpleSettingRenderer;
@@ -104,7 +105,8 @@ export class ReleaseNotesManager {
 						localResourceRoots: [],
 						allowScripts: true
 					},
-					extension: undefined
+					extension: undefined,
+					codeWindow: getActiveWindow()
 				},
 				'releaseNotes',
 				title,

src/vs/workbench/contrib/webview/browser/overlayWebview.ts

@@ -6,6 +6,7 @@
 import { Dimension } from 'vs/base/browser/dom';
 import { FastDomNode } from 'vs/base/browser/fastDomNode';
 import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+import { CodeWindow } from 'vs/base/browser/window';
 import { Emitter } from 'vs/base/common/event';
 import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
@@ -35,6 +36,7 @@ export class OverlayWebview extends Disposable implements IOverlayWebview {
 	private _options: WebviewOptions;
 
 	private _owner: any = undefined;
+	public _codeWindow: CodeWindow | undefined = undefined;
 
 	private readonly _scopedContextKeyService = this._register(new MutableDisposable<IScopedContextKeyService>());
 	private _findWidgetVisible: IContextKey<boolean> | undefined;
@@ -109,15 +111,16 @@ export class OverlayWebview extends Disposable implements IOverlayWebview {
 		return this._container.domNode;
 	}
 
-	public claim(owner: any, scopedContextKeyService: IContextKeyService | undefined) {
+	public claim(owner: any, codeWindow: CodeWindow, scopedContextKeyService: IContextKeyService | undefined) {
 		if (this._isDisposed) {
 			return;
 		}
 
 		const oldOwner = this._owner;
 
 		this._owner = owner;
-		this._show();
+		this._codeWindow = codeWindow;
+		this._show(codeWindow);
 
 		if (oldOwner !== owner) {
 			const contextKeyService = (scopedContextKeyService || this._baseContextKeyService);
@@ -184,7 +187,7 @@ export class OverlayWebview extends Disposable implements IOverlayWebview {
 		}
 	}
 
-	private _show() {
+	private _show(codeWindow: CodeWindow) {
 		if (this._isDisposed) {
 			throw new Error('OverlayWebview is disposed');
 		}
@@ -197,6 +200,7 @@ export class OverlayWebview extends Disposable implements IOverlayWebview {
 				options: this._options,
 				contentOptions: this._contentOptions,
 				extension: this.extension,
+				codeWindow: codeWindow
 			});
 			this._webview.value = webview;
 			webview.state = this._state;

src/vs/workbench/contrib/webview/browser/webview.ts

@@ -78,7 +78,7 @@ export interface WebviewInitInfo {
 	readonly contentOptions: WebviewContentOptions;
 
 	readonly extension: WebviewExtensionDescription | undefined;
-	readonly codeWindow?: CodeWindow;
+	readonly codeWindow: CodeWindow;
 }
 
 export const enum WebviewContentPurpose {
@@ -308,7 +308,7 @@ export interface IOverlayWebview extends IWebview {
 	 * @param claimant Identifier for the object claiming the webview.
 	 *   This must match the `claimant` passed to {@link IOverlayWebview.release}.
 	 */
-	claim(claimant: any, scopedContextKeyService: IContextKeyService | undefined): void;
+	claim(claimant: any, codeWindow: CodeWindow, scopedContextKeyService: IContextKeyService | undefined): void;
 
 	/**
 	 * Release ownership of the webview.

src/vs/workbench/contrib/webview/browser/webviewElement.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { isFirefox } from 'vs/base/browser/browser';
-import { addDisposableListener, EventType, getActiveWindow } from 'vs/base/browser/dom';
+import { addDisposableListener, EventType } from 'vs/base/browser/dom';
 import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 import { promiseWithResolvers, ThrottledDelayer } from 'vs/base/common/async';
 import { streamToBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
@@ -37,7 +37,7 @@ import { WebviewFindDelegate, WebviewFindWidget } from 'vs/workbench/contrib/web
 import { FromWebviewMessage, KeyEvent, ToWebviewMessage } from 'vs/workbench/contrib/webview/browser/webviewMessages';
 import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from 'vs/workbench/contrib/webview/common/webview';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { $window } from 'vs/base/browser/window';
+import { CodeWindow } from 'vs/base/browser/window';
 
 interface WebviewContent {
 	readonly html: string;
@@ -88,6 +88,14 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 	 */
 	public readonly origin: string;
 
+	private readonly _codeWindow: CodeWindow;
+
+	/**
+	 * The code window the webview is contained within.
+	 */
+	public get codeWindow(): CodeWindow { return this._codeWindow; }
+
+
 	private readonly _encodedWebviewOriginPromise: Promise<string>;
 	private _encodedWebviewOrigin: string | undefined;
 
@@ -103,7 +111,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 		if (!this._focused) {
 			return false;
 		}
-		if ($window.document.activeElement && $window.document.activeElement !== this.element) {
+		if (this._codeWindow.document.activeElement && this._codeWindow.document.activeElement !== this.element) {
 			// looks like https://github.com/microsoft/vscode/issues/132641
 			// where the focus is actually not in the `<iframe>`
 			return false;
@@ -159,8 +167,9 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 
 		this.providedViewType = initInfo.providedViewType;
 		this.origin = initInfo.origin ?? this.id;
+		this._codeWindow = initInfo.codeWindow;
 
-		this._encodedWebviewOriginPromise = parentOriginHash($window.origin, this.origin).then(id => this._encodedWebviewOrigin = id);
+		this._encodedWebviewOriginPromise = parentOriginHash(this._codeWindow.origin, this.origin).then(id => this._encodedWebviewOrigin = id);
 
 		this._options = initInfo.options;
 		this.extension = initInfo.extension;
@@ -180,7 +189,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 
 		this._element = this._createElement(initInfo.options, initInfo.contentOptions);
 
-		const subscription = this._register(addDisposableListener(initInfo.codeWindow ?? getActiveWindow(), 'message', (e: MessageEvent) => {
+		const subscription = this._register(addDisposableListener(this._codeWindow, 'message', (e: MessageEvent) => {
 			if (!this._encodedWebviewOrigin || e?.data?.target !== this.id) {
 				return;
 			}
@@ -460,7 +469,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 			extensionId: extension?.id.value ?? '',
 			platform: this.platform,
 			'vscode-resource-base-authority': webviewRootResourceAuthority,
-			parentOrigin: $window.origin,
+			parentOrigin: this._codeWindow.origin,
 		};
 
 		if (this._options.disableServiceWorker) {
@@ -500,7 +509,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 			}));
 		}
 
-		for (const node of [element, $window]) {
+		for (const node of [element, this._codeWindow]) {
 			this._register(addDisposableListener(node, EventType.DRAG_END, () => {
 				this._stopBlockingIframeDragEvents();
 			}));
@@ -683,7 +692,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 			get: () => this.element,
 		});
 		// And re-dispatch
-		$window.dispatchEvent(emulatedKeyboardEvent);
+		this._codeWindow.dispatchEvent(emulatedKeyboardEvent);
 	}
 
 	windowDidDragStart(): void {
@@ -825,7 +834,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 				return;
 			}
 
-			if ($window.document.activeElement && $window.document.activeElement !== this.element && $window.document.activeElement?.tagName !== 'BODY') {
+			if (this._codeWindow.document.activeElement && this._codeWindow.document.activeElement !== this.element && this._codeWindow.document.activeElement?.tagName !== 'BODY') {
 				return;
 			}