@codingame/monaco-vscode-theme-service-override 34.0.2 → 34.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-theme-service-override",
-  "version": "34.0.2",
+  "version": "34.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - theme service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "34.0.2",
-    "@codingame/monaco-vscode-files-service-override": "34.0.2"
+    "@codingame/monaco-vscode-api": "34.1.0",
+    "@codingame/monaco-vscode-files-service-override": "34.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/themes/browser/workbenchThemeService.js

@@ -18,7 +18,7 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { registerFileIconThemeSchemas } from '../common/fileIconThemeSchema.js';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
-import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
+import { createStyleSheet, shadowRootContainer } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { FileChangeType } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -799,8 +799,26 @@ class ThemeFileWatcher {
         this.watchedLocation = undefined;
     }
 }
+const injectedFontFaces = ( new Set());
+function injectFontFacesInHead(styleSheetContent) {
+    const sheet = new mainWindow.CSSStyleSheet();
+    sheet.replaceSync(styleSheetContent);
+    const fontFaces = ( Array.from(sheet.cssRules).filter(rule => rule instanceof mainWindow.CSSFontFaceRule).map(r => r.cssText));
+    const missingFontFaces = fontFaces.filter(fontFace => !( injectedFontFaces.has(fontFace)));
+    if (missingFontFaces.length > 0) {
+        const fontFaceStyleSheet = new mainWindow.CSSStyleSheet();
+        for (const fontFace of missingFontFaces) {
+            fontFaceStyleSheet.insertRule(fontFace);
+        }
+        mainWindow.document.adoptedStyleSheets = [...mainWindow.document.adoptedStyleSheets, fontFaceStyleSheet];
+    }
+}
 function _applyRules(styleSheetContent, rulesClassName) {
-    const themeStyles = mainWindow.document.head.querySelectorAll(`.${rulesClassName}`);
+    if (shadowRootContainer) {
+        injectFontFacesInHead(styleSheetContent);
+    }
+    const container = shadowRootContainer ?? mainWindow.document.head;
+    const themeStyles = container.querySelectorAll(`.${rulesClassName}`);
     if (themeStyles.length === 0) {
         const elStyle = createStyleSheet();
         elStyle.className = rulesClassName;