@lvce-editor/renderer-process 30.22.2 → 30.23.0

package/dist/editorOnlyRendererProcessMain.js

@@ -2386,6 +2386,17 @@ const createHiddenContainer = (activeElement, focused) => {
   }
   return $Hidden;
 };
+const updateAttributes = ($Previous, $New) => {
+  const newAttributeNames = new Set($New.getAttributeNames());
+  for (const attributeName of $Previous.getAttributeNames()) {
+    if (!newAttributeNames.has(attributeName)) {
+      $Previous.removeAttribute(attributeName);
+    }
+  }
+  for (const attributeName of newAttributeNames) {
+    $Previous.setAttribute(attributeName, $New.getAttribute(attributeName));
+  }
+};
 const restoreFocusedElement = ($Hidden, $New, focused) => {
   const $NewFocused = $New.querySelector(`[name="${CSS.escape(focused)}"]`);
   if (!$NewFocused) {
@@ -2395,8 +2406,7 @@ const restoreFocusedElement = ($Hidden, $New, focused) => {
   if (!$Previous) {
     return;
   }
-  $Previous.className = $NewFocused.className;
-  $Previous.placeholder = $NewFocused.placeholder;
+  updateAttributes($Previous, $NewFocused);
   if ($NewFocused.childNodes) {
     $Previous.replaceChildren(...$NewFocused.childNodes);
   }
@@ -2440,31 +2450,34 @@ const restoreFocus = ($Viewlet, isRootTree, isTreeFocused, focused) => {
 };
 const rememberFocus = ($Viewlet, dom, eventMap, uid = 0) => {
   startIgnore();
-  const oldLeft = $Viewlet.style.left;
-  const oldTop = $Viewlet.style.top;
-  const oldWidth = $Viewlet.style.width;
-  const oldHeight = $Viewlet.style.height;
-  const activeElement = getActiveElementInside($Viewlet);
-  const isTreeFocused = activeElement?.getAttribute('role') === 'tree';
-  const isRootTree = $Viewlet.getAttribute('role') === 'tree' && activeElement === $Viewlet;
-  const focused = activeElement?.getAttribute('name') || null;
-  const $Hidden = createHiddenContainer(activeElement, focused);
-  if (uid) {
-    const numericUid = Number(uid);
-    const inputMap = getInputMap($Viewlet);
-    $Viewlet = renderWithUid($Viewlet, dom, eventMap, numericUid, inputMap, focused, $Hidden);
-  }
-  if (!uid) {
-    renderInto($Viewlet, dom, eventMap);
-  }
-  $Hidden.remove();
-  restoreFocus($Viewlet, isRootTree, isTreeFocused, focused);
-  $Viewlet.style.top = oldTop;
-  $Viewlet.style.left = oldLeft;
-  $Viewlet.style.height = oldHeight;
-  $Viewlet.style.width = oldWidth;
-  stopIgnore();
-  return $Viewlet;
+  try {
+    const oldLeft = $Viewlet.style.left;
+    const oldTop = $Viewlet.style.top;
+    const oldWidth = $Viewlet.style.width;
+    const oldHeight = $Viewlet.style.height;
+    const activeElement = getActiveElementInside($Viewlet);
+    const isTreeFocused = activeElement?.getAttribute('role') === 'tree';
+    const isRootTree = $Viewlet.getAttribute('role') === 'tree' && activeElement === $Viewlet;
+    const focused = activeElement?.getAttribute('name') || null;
+    const $Hidden = createHiddenContainer(activeElement, focused);
+    if (uid) {
+      const numericUid = Number(uid);
+      const inputMap = getInputMap($Viewlet);
+      $Viewlet = renderWithUid($Viewlet, dom, eventMap, numericUid, inputMap, focused, $Hidden);
+    }
+    if (!uid) {
+      renderInto($Viewlet, dom, eventMap);
+    }
+    $Hidden.remove();
+    restoreFocus($Viewlet, isRootTree, isTreeFocused, focused);
+    $Viewlet.style.top = oldTop;
+    $Viewlet.style.left = oldLeft;
+    $Viewlet.style.height = oldHeight;
+    $Viewlet.style.width = oldWidth;
+    return $Viewlet;
+  } finally {
+    stopIgnore();
+  }
 };
 
 const state = {

package/dist/rendererProcessMain.js

@@ -1540,6 +1540,17 @@ const createHiddenContainer = (activeElement, focused) => {
   }
   return $Hidden;
 };
+const updateAttributes = ($Previous, $New) => {
+  const newAttributeNames = new Set($New.getAttributeNames());
+  for (const attributeName of $Previous.getAttributeNames()) {
+    if (!newAttributeNames.has(attributeName)) {
+      $Previous.removeAttribute(attributeName);
+    }
+  }
+  for (const attributeName of newAttributeNames) {
+    $Previous.setAttribute(attributeName, $New.getAttribute(attributeName));
+  }
+};
 const restoreFocusedElement = ($Hidden, $New, focused) => {
   const $NewFocused = $New.querySelector(`[name="${CSS.escape(focused)}"]`);
   if (!$NewFocused) {
@@ -1549,8 +1560,7 @@ const restoreFocusedElement = ($Hidden, $New, focused) => {
   if (!$Previous) {
     return;
   }
-  $Previous.className = $NewFocused.className;
-  $Previous.placeholder = $NewFocused.placeholder;
+  updateAttributes($Previous, $NewFocused);
   if ($NewFocused.childNodes) {
     $Previous.replaceChildren(...$NewFocused.childNodes);
   }
@@ -1594,31 +1604,34 @@ const restoreFocus = ($Viewlet, isRootTree, isTreeFocused, focused) => {
 };
 const rememberFocus$1 = ($Viewlet, dom, eventMap, uid = 0) => {
   startIgnore();
-  const oldLeft = $Viewlet.style.left;
-  const oldTop = $Viewlet.style.top;
-  const oldWidth = $Viewlet.style.width;
-  const oldHeight = $Viewlet.style.height;
-  const activeElement = getActiveElementInside($Viewlet);
-  const isTreeFocused = activeElement?.getAttribute('role') === 'tree';
-  const isRootTree = $Viewlet.getAttribute('role') === 'tree' && activeElement === $Viewlet;
-  const focused = activeElement?.getAttribute('name') || null;
-  const $Hidden = createHiddenContainer(activeElement, focused);
-  if (uid) {
-    const numericUid = Number(uid);
-    const inputMap = getInputMap($Viewlet);
-    $Viewlet = renderWithUid($Viewlet, dom, eventMap, numericUid, inputMap, focused, $Hidden);
-  }
-  if (!uid) {
-    renderInto($Viewlet, dom, eventMap);
-  }
-  $Hidden.remove();
-  restoreFocus($Viewlet, isRootTree, isTreeFocused, focused);
-  $Viewlet.style.top = oldTop;
-  $Viewlet.style.left = oldLeft;
-  $Viewlet.style.height = oldHeight;
-  $Viewlet.style.width = oldWidth;
-  stopIgnore();
-  return $Viewlet;
+  try {
+    const oldLeft = $Viewlet.style.left;
+    const oldTop = $Viewlet.style.top;
+    const oldWidth = $Viewlet.style.width;
+    const oldHeight = $Viewlet.style.height;
+    const activeElement = getActiveElementInside($Viewlet);
+    const isTreeFocused = activeElement?.getAttribute('role') === 'tree';
+    const isRootTree = $Viewlet.getAttribute('role') === 'tree' && activeElement === $Viewlet;
+    const focused = activeElement?.getAttribute('name') || null;
+    const $Hidden = createHiddenContainer(activeElement, focused);
+    if (uid) {
+      const numericUid = Number(uid);
+      const inputMap = getInputMap($Viewlet);
+      $Viewlet = renderWithUid($Viewlet, dom, eventMap, numericUid, inputMap, focused, $Hidden);
+    }
+    if (!uid) {
+      renderInto($Viewlet, dom, eventMap);
+    }
+    $Hidden.remove();
+    restoreFocus($Viewlet, isRootTree, isTreeFocused, focused);
+    $Viewlet.style.top = oldTop;
+    $Viewlet.style.left = oldLeft;
+    $Viewlet.style.height = oldHeight;
+    $Viewlet.style.width = oldWidth;
+    return $Viewlet;
+  } finally {
+    stopIgnore();
+  }
 };
 
 const get$6 = ids => {

package/package.json

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