@lvce-editor/renderer-process 30.64.11 → 30.64.13

package/dist/rendererProcessMain.js

@@ -4641,6 +4641,9 @@ const addCssStyleSheet = (id, text) => {
   if (existing) {
     existing.replaceSync(text);
     setText$1(id, text);
+    if (id === 'ContributedColorTheme') {
+      window.dispatchEvent(new Event('color-theme-changed'));
+    }
     return;
   }
   const sheet = new CSSStyleSheet({});
@@ -4648,6 +4651,9 @@ const addCssStyleSheet = (id, text) => {
   setText$1(id, text);
   sheet.replaceSync(text);
   document.adoptedStyleSheets.push(sheet);
+  if (id === 'ContributedColorTheme') {
+    window.dispatchEvent(new Event('color-theme-changed'));
+  }
 };
 const patchCssStyleSheet = (id, start, deleteCount, replacement) => {
   const sheet = get$5(id);
@@ -8372,9 +8378,13 @@ const handleMouseEnter = event => {
   send$1(/* Menu.handleMouseEnter */'Menu.handleMouseEnter', /* level */level, /* index */index, /* x */clientX, /* y */clientY, /* timeStamp */timeStamp);
 };
 const handleMouseLeave = event => {
+  const $Menu = event.currentTarget;
   const $RelatedTarget = event.relatedTarget;
-  if ($RelatedTarget && $RelatedTarget.classList.contains('MenuItem')) ;
-  // RendererWorker.send(/* Menu.handleMouseLeave */ 'Menu.handleMouseLeave')
+  if ($RelatedTarget && ($Menu.contains($RelatedTarget) || $RelatedTarget.closest?.('.MenuItem'))) {
+    return;
+  }
+  const level = getLevel($Menu);
+  send$1(/* Menu.handleMouseLeave */'Menu.handleMouseLeave', /* level */level);
 };
 
 // const handleBlur = (event) => {}
@@ -12329,6 +12339,24 @@ const ready = main();
 
 const defaultColumns = 80;
 const defaultRows = 24;
+const terminalAnsiColors = [['black', 'Black'], ['red', 'Red'], ['green', 'Green'], ['yellow', 'Yellow'], ['blue', 'Blue'], ['magenta', 'Magenta'], ['cyan', 'Cyan'], ['white', 'White'], ['brightBlack', 'BrightBlack'], ['brightRed', 'BrightRed'], ['brightGreen', 'BrightGreen'], ['brightYellow', 'BrightYellow'], ['brightBlue', 'BrightBlue'], ['brightMagenta', 'BrightMagenta'], ['brightCyan', 'BrightCyan'], ['brightWhite', 'BrightWhite']];
+const getTerminalTheme = () => {
+  const getColor = key => getComputedStyle(document.documentElement).getPropertyValue(`--${key}`).trim();
+  const theme = {
+    background: 'rgba(0, 0, 0, 0)'
+  };
+  const foreground = getColor('TerminalForeground') || getColor('WorkbenchForeground');
+  if (foreground) {
+    theme.foreground = foreground;
+  }
+  for (const [xtermColor, themeColor] of terminalAnsiColors) {
+    const color = getColor(`TerminalAnsi${themeColor}`);
+    if (color) {
+      theme[xtermColor] = color;
+    }
+  }
+  return theme;
+};
 const createTerminal = async uid => {
   const [{
     FitAddon
@@ -12344,9 +12372,7 @@ const createTerminal = async uid => {
     convertEol: true,
     cursorBlink: true,
     rows: defaultRows,
-    theme: {
-      background: 'rgba(0, 0, 0, 0)'
-    }
+    theme: getTerminalTheme()
   });
   const fitAddon = new FitAddon();
   terminal.loadAddon(fitAddon);
@@ -12403,6 +12429,11 @@ const mountTerminal = async (state, uid) => {
       rows
     });
   });
+  const updateTheme = () => {
+    terminal.options.theme = getTerminalTheme();
+  };
+  window.addEventListener('color-theme-changed', updateTheme);
+  updateTheme();
   terminal.open(state.$Viewlet);
   const resizeObserver = new ResizeObserver(() => {
     if (state.restoring) return;
@@ -12413,7 +12444,9 @@ const mountTerminal = async (state, uid) => {
   state.fitAddon = fitAddon;
   state.resizeObserver = resizeObserver;
   state.terminal = terminal;
-  state.disposables = [inputDisposable, resizeDisposable];
+  state.disposables = [inputDisposable, resizeDisposable, {
+    dispose: () => window.removeEventListener('color-theme-changed', updateTheme)
+  }];
   fitAddon.fit();
   flushPendingData(state);
   focusIfConnected(state);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.64.11",
+  "version": "30.64.13",
   "keywords": [
     "lvce-editor",
     "renderer-process"