Skip to content

Commit

Permalink
aux window - avoid more global window (microsoft#195869)
Browse files Browse the repository at this point in the history 
* aux window - avoid more global `window`

* aux window - avoid more global `document`
  • Loading branch information
@bpasero
bpasero authored Oct 18, 2023
1 parent d18bce4 commit 198bbdf
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 46 deletions.
9 changes: 1 addition & 8 deletions src/vs/base/browser/dom.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,14 +602,7 @@ export function getLargestChildWidth(parent: HTMLElement, children: HTMLElement[
// ----------------------------------------------------------------------------------------

export function isAncestor(testChild: Node | null, testAncestor: Node | null): boolean {
while (testChild) {
if (testChild === testAncestor) {
return true;
}
testChild = testChild.parentNode;
}

return false;
return Boolean(testAncestor?.contains(testChild));
}

const parentFlowToDataKey = 'parentFlowToElementId';
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/browser/layout.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { Event, Emitter } from 'vs/base/common/event';
import { EventType, addDisposableListener, getClientArea, Dimension, position, size, IDimension, isAncestorUsingFlowTo, computeScreenAwareSize, getActiveDocument, getWindows } from 'vs/base/browser/dom';
import { EventType, addDisposableListener, getClientArea, Dimension, position, size, IDimension, isAncestorUsingFlowTo, computeScreenAwareSize, getActiveDocument, getWindows, getActiveWindow } from 'vs/base/browser/dom';
import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from 'vs/base/browser/browser';
import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
import { isWindows, isLinux, isMacintosh, isWeb, isNative, isIOS } from 'vs/base/common/platform';
Expand Down Expand Up @@ -1463,8 +1463,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
}

resizePart(part: Parts, sizeChangeWidth: number, sizeChangeHeight: number): void {
const sizeChangePxWidth = Math.sign(sizeChangeWidth) * computeScreenAwareSize(window, Math.abs(sizeChangeWidth));
const sizeChangePxHeight = Math.sign(sizeChangeHeight) * computeScreenAwareSize(window, Math.abs(sizeChangeHeight));
const sizeChangePxWidth = Math.sign(sizeChangeWidth) * computeScreenAwareSize(getActiveWindow(), Math.abs(sizeChangeWidth));
const sizeChangePxHeight = Math.sign(sizeChangeHeight) * computeScreenAwareSize(getActiveWindow(), Math.abs(sizeChangeHeight));

let viewSize: IViewSize;

Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { INotificationsCenterController, NotificationActionRunner } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { isAncestor, Dimension } from 'vs/base/browser/dom';
import { Dimension, isAncestorOfActiveElement } from 'vs/base/browser/dom';
import { widgetShadow } from 'vs/platform/theme/common/colorRegistry';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { localize } from 'vs/nls';
Expand Down Expand Up @@ -222,7 +222,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
notificationsList.updateNotificationsList(e.index, 1, [e.item]);
break;
case NotificationChangeType.REMOVE:
focusEditor = isAncestor(document.activeElement, notificationsCenterContainer);
focusEditor = isAncestorOfActiveElement(notificationsCenterContainer);
notificationsList.updateNotificationsList(e.index, 1);
e.item.updateVisibility(false);
break;
Expand All @@ -247,7 +247,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
return; // already hidden
}

const focusEditor = isAncestor(document.activeElement, this.notificationsCenterContainer);
const focusEditor = isAncestorOfActiveElement(this.notificationsCenterContainer);

// Hide
this._isVisible = false;
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/browser/parts/notifications/notificationsList.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import 'vs/css!./media/notificationsList';
import { localize } from 'vs/nls';
import { isAncestor, trackFocus } from 'vs/base/browser/dom';
import { isAncestorOfActiveElement, trackFocus } from 'vs/base/browser/dom';
import { WorkbenchList } from 'vs/platform/list/browser/listService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IListAccessibilityProvider, IListOptions } from 'vs/base/browser/ui/list/listWidget';
Expand Down Expand Up @@ -133,7 +133,7 @@ export class NotificationsList extends Disposable {

updateNotificationsList(start: number, deleteCount: number, items: INotificationViewItem[] = []) {
const [list, listContainer] = assertAllDefined(this.list, this.listContainer);
const listHasDOMFocus = isAncestor(document.activeElement, listContainer);
const listHasDOMFocus = isAncestorOfActiveElement(listContainer);

// Remember focus and relative top of that item
const focusedIndex = list.getFocus()[0];
Expand Down Expand Up @@ -223,7 +223,7 @@ export class NotificationsList extends Disposable {
return false; // not created yet
}

return isAncestor(document.activeElement, this.listContainer);
return isAncestorOfActiveElement(this.listContainer);
}

layout(width: number, maxHeight?: number): void {
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'vs/css!./media/notificationsToasts';
import { localize } from 'vs/nls';
import { INotificationsModel, NotificationChangeType, INotificationChangeEvent, INotificationViewItem, NotificationViewItemContentChangeKind } from 'vs/workbench/common/notifications';
import { IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
import { isAncestor, addDisposableListener, EventType, Dimension, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
import { addDisposableListener, EventType, Dimension, scheduleAtNextAnimationFrame, isAncestorOfActiveElement } from 'vs/base/browser/dom';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
import { Event, Emitter } from 'vs/base/common/event';
Expand Down Expand Up @@ -322,7 +322,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
// UI
const notificationToast = this.mapNotificationToToast.get(item);
if (notificationToast) {
const toastHasDOMFocus = isAncestor(document.activeElement, notificationToast.container);
const toastHasDOMFocus = isAncestorOfActiveElement(notificationToast.container);
if (toastHasDOMFocus) {
focusEditor = !(this.focusNext() || this.focusPrevious()); // focus next if any, otherwise focus editor
}
Expand Down Expand Up @@ -380,7 +380,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
}

hide(): void {
const focusEditor = this.notificationsToastsContainer ? isAncestor(document.activeElement, this.notificationsToastsContainer) : false;
const focusEditor = this.notificationsToastsContainer ? isAncestorOfActiveElement(this.notificationsToastsContainer) : false;

this.removeToasts();

Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { EventType, addDisposableListener, isActiveElement } from 'vs/base/browser/dom';
import { EventType, addDisposableListener, getActiveWindow, isActiveElement } from 'vs/base/browser/dom';
import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
import { alert } from 'vs/base/browser/ui/aria/aria';
Expand Down Expand Up @@ -264,7 +264,7 @@ export class AccessibleView extends Disposable {
return;
}
const delegate: IContextViewDelegate = {
getAnchor: () => { return { x: (window.innerWidth / 2) - ((Math.min(this._layoutService.dimension.width * 0.62 /* golden cut */, DIMENSIONS.MAX_WIDTH)) / 2), y: this._layoutService.offset.quickPickTop }; },
getAnchor: () => { return { x: (getActiveWindow().innerWidth / 2) - ((Math.min(this._layoutService.dimension.width * 0.62 /* golden cut */, DIMENSIONS.MAX_WIDTH)) / 2), y: this._layoutService.offset.quickPickTop }; },
render: (container) => {
container.classList.add('accessible-view-container');
return this._render(provider!, container, showAccessibleViewHelp);
Expand Down
11 changes: 8 additions & 3 deletions src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { Event } from 'vs/base/common/event';
import { addDisposableListener, onDidRegisterWindow } from 'vs/base/browser/dom';

const transientWordWrapState = 'transientWordWrapState';
const isWordWrapMinifiedKey = 'isWordWrapMinified';
Expand Down Expand Up @@ -255,7 +257,7 @@ function canToggleWordWrap(codeEditorService: ICodeEditorService, editor: ICodeE
return true;
}

class EditorWordWrapContextKeyTracker implements IWorkbenchContribution {
class EditorWordWrapContextKeyTracker extends Disposable implements IWorkbenchContribution {

private readonly _canToggleWordWrap: IContextKey<boolean>;
private readonly _editorWordWrap: IContextKey<boolean>;
Expand All @@ -267,8 +269,11 @@ class EditorWordWrapContextKeyTracker implements IWorkbenchContribution {
@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
@IContextKeyService private readonly _contextService: IContextKeyService,
) {
window.addEventListener('focus', () => this._update(), true);
window.addEventListener('blur', () => this._update(), true);
super();
this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposableStore }) => {
disposableStore.add(addDisposableListener(window, 'focus', () => this._update(), true));
disposableStore.add(addDisposableListener(window, 'blur', () => this._update(), true));
}, { window, disposableStore: this._store }));
this._editorService.onDidActiveEditorChange(() => this._update());
this._canToggleWordWrap = CAN_TOGGLE_WORD_WRAP.bindTo(this._contextService);
this._editorWordWrap = EDITOR_WORD_WRAP.bindTo(this._contextService);
Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/debug/browser/linkDetector.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import { localize } from 'vs/nls';
import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { getWindow } from 'vs/base/browser/dom';

const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
const WEB_LINK_REGEX = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|data:|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]', 'ug');
Expand Down Expand Up @@ -201,7 +202,7 @@ export class LinkDetector {
link.onmousemove = (event) => { link.classList.toggle('pointer', platform.isMacintosh ? event.metaKey : event.ctrlKey); };
link.onmouseleave = () => link.classList.remove('pointer');
link.onclick = (event) => {
const selection = window.getSelection();
const selection = getWindow(link).getSelection();
if (!selection || selection.type === 'Range') {
return; // do not navigate when user is selecting
}
Expand Down
10 changes: 6 additions & 4 deletions src/vs/workbench/contrib/debug/browser/repl.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,16 +570,18 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
this._register(registerNavigableContainer({
focusNotifiers: [this, this.filterWidget],
focusNextWidget: () => {
const element = this.tree?.getHTMLElement();
if (this.filterWidget.hasFocus()) {
this.tree?.domFocus();
} else if (this.tree?.getHTMLElement() === document.activeElement) {
} else if (element && dom.isActiveElement(element)) {
this.focus();
}
},
focusPreviousWidget: () => {
const element = this.tree?.getHTMLElement();
if (this.replInput.hasTextFocus()) {
this.tree?.domFocus();
} else if (this.tree?.getHTMLElement() === document.activeElement) {
} else if (element && dom.isActiveElement(element)) {
this.focusFilter();
}
}
Expand Down Expand Up @@ -648,7 +650,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
this._register(tree.onContextMenu(e => this.onContextMenu(e)));
let lastSelectedString: string;
this._register(tree.onMouseClick(() => {
const selection = window.getSelection();
const selection = dom.getWindow(this.treeContainer).getSelection();
if (!selection || selection.type !== 'Range' || lastSelectedString === selection.toString()) {
// only focus the input if the user is not currently selecting.
this.replInput.focus();
Expand Down Expand Up @@ -1070,7 +1072,7 @@ registerAction2(class extends Action2 {
async run(accessor: ServicesAccessor, element: IReplElement): Promise<void> {
const clipboardService = accessor.get(IClipboardService);
const debugService = accessor.get(IDebugService);
const nativeSelection = window.getSelection();
const nativeSelection = dom.getActiveWindow().getSelection();
const selectedText = nativeSelection?.toString();
if (selectedText && selectedText.length > 0) {
return clipboardService.writeText(selectedText);
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/files/browser/views/explorerView.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export class ExplorerView extends ViewPane implements IExplorerView {
}

hasFocus(): boolean {
return DOM.isAncestor(document.activeElement, this.container);
return DOM.isAncestorOfActiveElement(this.container);
}

getContext(respectMultiSelection: boolean): ExplorerItem[] {
Expand Down
7 changes: 4 additions & 3 deletions src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,11 +621,12 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
while (true) {
await timeout(0);

if (!document.hasFocus()) {
const ownerDocument = inputBox.inputElement.ownerDocument;
if (!ownerDocument.hasFocus()) {
break;
} if (document.activeElement === inputBox.inputElement) {
} if (DOM.isActiveElement(inputBox.inputElement)) {
return;
} else if (document.activeElement instanceof HTMLElement && DOM.hasParentWithClass(document.activeElement, 'context-view')) {
} else if (ownerDocument.activeElement instanceof HTMLElement && DOM.hasParentWithClass(ownerDocument.activeElement, 'context-view')) {
await Event.toPromise(this.contextMenuService.onDidHideContextMenu);
} else {
break;
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/markers/browser/markersView.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class MarkersView extends FilterViewPane implements IMarkersView {
}

public override focus(): void {
if (this.widget.getHTMLElement() === document.activeElement) {
if (dom.isActiveElement(this.widget.getHTMLElement())) {
return;
}

Expand Down Expand Up @@ -772,7 +772,7 @@ export class MarkersView extends FilterViewPane implements IMarkersView {

private updateRangeHighlights() {
this.rangeHighlightDecorations.removeHighlightRange();
if (this.widget.getHTMLElement() === document.activeElement) {
if (dom.isActiveElement(this.widget.getHTMLElement())) {
this.highlightCurrentSelectedMarkerRange();
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { Categories } from 'vs/platform/action/common/actionCommonCategories';
import { ILogService } from 'vs/platform/log/common/log';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { showWindowLogActionId } from 'vs/workbench/services/log/common/logConstants';
import { getActiveElement } from 'vs/base/browser/dom';
import { getActiveElement, getWindow } from 'vs/base/browser/dom';

let _logging: boolean = false;
function toggleLogging() {
Expand Down Expand Up @@ -309,7 +309,7 @@ export class NotebookClipboardContribution extends Disposable {
}

private _focusInsideEmebedMonaco(editor: INotebookEditor) {
const windowSelection = window.getSelection();
const windowSelection = getWindow(editor.getDomNode()).getSelection();

if (windowSelection?.rangeCount !== 1) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
return false;
}

const windowSelection = window.getSelection();
const windowSelection = DOM.getWindow(this.getDomNode()).getSelection();
if (windowSelection?.rangeCount !== 1) {
return false;
}
Expand Down
7 changes: 4 additions & 3 deletions src/vs/workbench/contrib/scm/browser/scm.contribution.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vs/workbench/con
import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff';
import { QuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiffService';
import { SCMSyncViewPane } from 'vs/workbench/contrib/scm/browser/scmSyncViewPane';
import { getActiveElement } from 'vs/base/browser/dom';

ModesRegistry.registerLanguage({
id: 'scminput',
Expand Down Expand Up @@ -308,7 +309,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
primary: KeyMod.CtrlCmd | KeyCode.Enter,
handler: accessor => {
const contextKeyService = accessor.get(IContextKeyService);
const context = contextKeyService.getContext(document.activeElement);
const context = contextKeyService.getContext(getActiveElement());
const repositoryId = context.getValue<string | undefined>('scmRepository');

if (!repositoryId) {
Expand Down Expand Up @@ -336,7 +337,7 @@ const viewNextCommitCommand = {
handler: (accessor: ServicesAccessor) => {
const contextKeyService = accessor.get(IContextKeyService);
const scmService = accessor.get(ISCMService);
const context = contextKeyService.getContext(document.activeElement);
const context = contextKeyService.getContext(getActiveElement());
const repositoryId = context.getValue<string | undefined>('scmRepository');
const repository = repositoryId ? scmService.getRepository(repositoryId) : undefined;
repository?.input.showNextHistoryValue();
Expand All @@ -349,7 +350,7 @@ const viewPreviousCommitCommand = {
handler: (accessor: ServicesAccessor) => {
const contextKeyService = accessor.get(IContextKeyService);
const scmService = accessor.get(ISCMService);
const context = contextKeyService.getContext(document.activeElement);
const context = contextKeyService.getContext(getActiveElement());
const repositoryId = context.getValue<string | undefined>('scmRepository');
const repository = repositoryId ? scmService.getRepository(repositoryId) : undefined;
repository?.input.showPreviousHistoryValue();
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/search/browser/searchView.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@ export class SearchView extends ViewPane {
}

private updateTextFromFindWidget(controller: CommonFindController, { allowSearchOnType = true }): boolean {
if (!this.searchConfig.seedWithNearestWord && (window.getSelection()?.toString() ?? '') === '') {
if (!this.searchConfig.seedWithNearestWord && (dom.getActiveWindow().getSelection()?.toString() ?? '') === '') {
return false;
}

Expand Down Expand Up @@ -1275,7 +1275,7 @@ export class SearchView extends ViewPane {
}

private getSearchTextFromEditor(allowUnselectedWord: boolean, editor?: IEditor): string | null {
if (dom.isAncestor(document.activeElement, this.getContainer())) {
if (dom.isAncestorOfActiveElement(this.getContainer())) {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { UILabelProvider } from 'vs/base/common/keybindingLabels';
import { OS, OperatingSystem } from 'vs/base/common/platform';
import { deepClone } from 'vs/base/common/objects';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { addDisposableListener, Dimension, safeInnerHtml, size } from 'vs/base/browser/dom';
import { addDisposableListener, Dimension, getWindow, safeInnerHtml, size } from 'vs/base/browser/dom';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
Expand Down Expand Up @@ -156,7 +156,7 @@ export class WalkThroughPart extends EditorPane {
this.content.addEventListener('click', event => {
for (let node = event.target as HTMLElement; node; node = node.parentNode as HTMLElement) {
if (node instanceof HTMLAnchorElement && node.href) {
const baseElement = window.document.getElementsByTagName('base')[0] || window.location;
const baseElement = node.ownerDocument.getElementsByTagName('base')[0] || getWindow(node).location;
if (baseElement && node.href.indexOf(baseElement.href) >= 0 && node.hash) {
const scrollTarget = this.content.querySelector(node.hash);
const innerContent = this.content.firstElementChild;
Expand Down

0 comments on commit 198bbdf

Please sign in to comment.