Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 17:19:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

aux window - fix focus issues

Browse Source
This commit is contained in:
Benjamin Pasero
2023-10-28 06:45:26 +02:00
committed by Benjamin Pasero
parent a6b37b4439
commit 94b453b4f4
7 changed files with 84 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vs/base/browser/dom.ts
View File

@@ -749,9 +749,14 @@ export function isActiveDocument(element: Element): boolean {
/**
* Returns the active document across all child windows.
* Use this instead of `document` when reacting to dom events to handle multiple windows.
* Use this instead of `document` when reacting to dom
* events to handle multiple windows.
*/
export function getActiveDocument(): Document {
if (getWindowsCount() <= 1) {
return document;
}
const documents = Array.from(getWindows()).map(window => window.document);
return documents.find(doc => doc.hasFocus()) ?? document;
}
@@ -797,9 +802,6 @@ export function createStyleSheet(container: HTMLElement = document.head, beforeA
// With <head> as container, the stylesheet becomes global and is tracked
// to support auxiliary windows to clone the stylesheet.
if (container === document.head) {
const clonedGlobalStylesheets = new Set<HTMLStyleElement>();
globalStylesheets.set(style, clonedGlobalStylesheets);
for (const targetWindow of getWindows()) {
if (targetWindow === window) {
continue; // main window is already tracked
@@ -845,13 +847,18 @@ function cloneGlobalStyleSheet(globalStylesheet: HTMLStyleElement, targetWindow:
});
observer.observe(globalStylesheet, { childList: true });
globalStylesheets.get(globalStylesheet)?.add(clone);
let clonedGlobalStylesheets = globalStylesheets.get(globalStylesheet);
if (!clonedGlobalStylesheets) {
clonedGlobalStylesheets = new Set<HTMLStyleElement>();
globalStylesheets.set(globalStylesheet, clonedGlobalStylesheets);
}
clonedGlobalStylesheets.add(clone);
return toDisposable(() => {
observer.disconnect();
targetWindow.document.head.removeChild(clone);
globalStylesheets.get(globalStylesheet)?.delete(clone);
clonedGlobalStylesheets?.delete(clone);
});
}