@lvce-editor/renderer-process 30.46.2 → 30.46.4

package/dist/editorOnlyRendererProcessMain.js

@@ -2480,7 +2480,9 @@ const getInputMap = $Viewlet => {
   const $$Inputs = queryInputs($Viewlet);
   const inputMap = Object.create(null);
   for (const $Input of $$Inputs) {
-    inputMap[$Input.name] = $Input.value;
+    if (!$Input.readOnly) {
+      inputMap[$Input.name] = $Input.value;
+    }
   }
   return inputMap;
 };
@@ -2509,6 +2511,9 @@ const restoreFocusedElement = ($Hidden, $New, focused) => {
   if (!$NewFocused) {
     return;
   }
+  if ($NewFocused.readOnly) {
+    return;
+  }
   const $Previous = $Hidden.firstChild;
   if (!$Previous) {
     return;
@@ -2526,7 +2531,9 @@ const renderWithUid = ($Viewlet, dom, eventMap, uid, inputMap, focused, activeEl
   setComponentUid($New, uid);
   const $$NewInputs = queryInputs($New);
   for (const $Input of $$NewInputs) {
-    $Input.value = inputMap[$Input.name] || $Input.value || '';
+    if (!$Input.readOnly) {
+      $Input.value = inputMap[$Input.name] || $Input.value || '';
+    }
   }
   $Viewlet.replaceWith($New);
   if (focused) {

package/dist/rendererProcessMain.js

@@ -1916,7 +1916,9 @@ const getInputMap = $Viewlet => {
   const $$Inputs = queryInputs($Viewlet);
   const inputMap = Object.create(null);
   for (const $Input of $$Inputs) {
-    inputMap[$Input.name] = $Input.value;
+    if (!$Input.readOnly) {
+      inputMap[$Input.name] = $Input.value;
+    }
   }
   return inputMap;
 };
@@ -1945,6 +1947,9 @@ const restoreFocusedElement = ($Hidden, $New, focused) => {
   if (!$NewFocused) {
     return;
   }
+  if ($NewFocused.readOnly) {
+    return;
+  }
   const $Previous = $Hidden.firstChild;
   if (!$Previous) {
     return;
@@ -1962,7 +1967,9 @@ const renderWithUid = ($Viewlet, dom, eventMap, uid, inputMap, focused, activeEl
   setComponentUid($New, uid);
   const $$NewInputs = queryInputs($New);
   for (const $Input of $$NewInputs) {
-    $Input.value = inputMap[$Input.name] || $Input.value || '';
+    if (!$Input.readOnly) {
+      $Input.value = inputMap[$Input.name] || $Input.value || '';
+    }
   }
   $Viewlet.replaceWith($New);
   if (focused) {
@@ -3662,15 +3669,18 @@ const addFileHandle = fileHandle => {
   return addFileHandle$1(fileHandle);
 };
 
+const getWindowControlsOverlay = () => {
+  const navigatorWithWindowControls = globalThis.navigator;
+  return navigatorWithWindowControls.windowControlsOverlay;
+};
+const getTitleBarRect = () => {
+  return getWindowControlsOverlay()?.getTitlebarAreaRect();
+};
 const getTitleBarHeight = () => {
-  if (
-  // @ts-expect-error
-  globalThis.navigator.windowControlsOverlay?.getTitlebarAreaRect) {
-    // @ts-expect-error
-    const titleBarRect = globalThis.navigator.windowControlsOverlay.getTitlebarAreaRect();
-    return titleBarRect.height;
-  }
-  return 0;
+  return getTitleBarRect()?.height ?? 0;
+};
+const getTitleBarLeftInset = () => {
+  return getTitleBarRect()?.x ?? 0;
 };
 const getBounds = () => {
   return {
@@ -8806,6 +8816,9 @@ const ViewletTitleBarMenuBarEvents = {
 };
 
 const activeId = 'TitleBarEntryActive';
+const getMenuX = x => {
+  return x + getTitleBarLeftInset();
+};
 const removeDocumentClickListener = state => {
   const {
     documentClickListener
@@ -8934,7 +8947,7 @@ const openMenu = (state, unFocusIndex, index, level, menuItems, menuFocusedIndex
     items: menuItems,
     level,
     width,
-    x,
+    x: getMenuX(x),
     y
   });
   if (menuFocusedIndex !== -1) {
@@ -9001,7 +9014,7 @@ const addMenu = ($$Menus, change, uid) => {
     x,
     y
   } = menu;
-  setBounds$a($Menu, x, y, width, height);
+  setBounds$a($Menu, getMenuX(x), y, width, height);
   renderInto($Menu, dom);
   $Menu.id = `Menu-${level}`;
   append$1($Menu);
@@ -9033,7 +9046,7 @@ const updateMenu = ($$Menus, change) => {
     y
   } = menu;
   const $Menu = $$Menus[level];
-  setBounds$a($Menu, x, y, width, height);
+  setBounds$a($Menu, getMenuX(x), y, width, height);
   renderInto($Menu, dom);
   const isOpeningSubMenu = $$Menus.length < newLength;
   if (level === newLength - 1 || isOpeningSubMenu) {

package/package.json

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