@lvce-editor/renderer-process 30.64.10 → 30.64.12

package/dist/rendererProcessMain.js

@@ -3487,18 +3487,20 @@ const render$2 = (element, eventMap, newEventMap) => {
 
 const renderInternal = ($Parent, elements, eventMap, newEventMap, renderElement = render$2) => {
   const max = elements.length - 1;
-  let stack = [];
+  const stack = [];
   for (let i = max; i >= 0; i--) {
     const element = elements[i];
     const $Element = renderElement(element, eventMap, newEventMap);
     if (element.childCount > 0) {
-      // @ts-expect-error
-      $Element.append(...stack.slice(0, element.childCount));
-      stack = stack.slice(element.childCount);
+      for (let child = 0; child < element.childCount; child++) {
+        $Element.append(stack.pop());
+      }
     }
-    stack.unshift($Element);
+    stack.push($Element);
+  }
+  while (stack.length > 0) {
+    $Parent.append(stack.pop());
   }
-  $Parent.append(...stack);
 };
 
 const renderInto$1 = ($Parent, dom, eventMap = {}) => {
@@ -4639,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({});
@@ -4646,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);
@@ -12327,6 +12335,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
@@ -12342,9 +12368,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);
@@ -12401,6 +12425,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;
@@ -12411,7 +12440,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.10",
+  "version": "30.64.12",
   "keywords": [
     "lvce-editor",
     "renderer-process"