@lvce-editor/virtual-dom 1.32.0 → 1.34.0

package/dist/index.js

@@ -533,6 +533,17 @@ const applyPatch = ($Element, patches) => {
   }
 };
 
+let ignore = false;
+const startIgnore = () => {
+  ignore = true;
+};
+const stopIgnore = () => {
+  ignore = false;
+};
+const enabled = () => {
+  return ignore;
+};
+
 let id = 0;
 const create = () => {
   return ++id;
@@ -624,6 +635,9 @@ const getEventListenerArgs = (params, event) => {
 
 const createFn = info => {
   const fn = event => {
+    if (enabled()) {
+      return;
+    }
     if (info.preventDefault) {
       event.preventDefault(event);
     }
@@ -682,6 +696,7 @@ const render = (elements, eventMap = {}, newEventMap = {}) => {
 };
 
 const rememberFocus = ($Viewlet, dom, eventMap, uid = 0) => {
+  startIgnore();
   const oldLeft = $Viewlet.style.left;
   const oldTop = $Viewlet.style.top;
   const oldWidth = $Viewlet.style.width;
@@ -721,6 +736,9 @@ const rememberFocus = ($Viewlet, dom, eventMap, uid = 0) => {
         const $Previous = $Hidden.firstChild;
         $Previous.className = $NewFocused.className;
         $Previous.placeholder = $NewFocused.placeholder;
+        if ($NewFocused.childNodes) {
+          $Previous.append(...$NewFocused.childNodes);
+        }
         $NewFocused.replaceWith($Previous);
       }
     }
@@ -748,6 +766,7 @@ const rememberFocus = ($Viewlet, dom, eventMap, uid = 0) => {
   $Viewlet.style.left = oldLeft;
   $Viewlet.style.height = oldHeight;
   $Viewlet.style.width = oldWidth;
+  stopIgnore();
   return $Viewlet;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/virtual-dom",
-  "version": "1.32.0",
+  "version": "1.34.0",
   "main": "dist/index.js",
   "type": "module",
   "keywords": [],

package/src/parts/CreateEventListenerFunction/CreateEventListenerFunction.ts

@@ -1,10 +1,14 @@
 import * as ComponentUid from '../ComponentUid/ComponentUid.ts'
+import * as EventState from '../EventState/EventState.ts'
 import * as GetEventListenerArgs from '../GetEventListenerArgs/GetEventListenerArgs.ts'
 import * as IpcState from '../IpcState/IpcState.ts'
 import * as NameAnonymousFunction from '../NameAnonymousFunction/NameAnonymousFunction.ts'
 
 export const createFn = (info): any => {
   const fn = (event): void => {
+    if (EventState.enabled()) {
+      return
+    }
     if (info.preventDefault) {
       event.preventDefault(event)
     }

package/src/parts/EventState/EventState.ts

@@ -0,0 +1,13 @@
+let ignore = false
+
+export const startIgnore = (): void => {
+  ignore = true
+}
+
+export const stopIgnore = (): void => {
+  ignore = false
+}
+
+export const enabled = (): boolean => {
+  return ignore
+}

package/src/parts/RememberFocus/RememberFocus.ts

@@ -1,4 +1,5 @@
 import * as ComponentUid from '../ComponentUid/ComponentUid.ts'
+import * as EventState from '../EventState/EventState.ts'
 import * as QueryInputs from '../QueryInputs/QueryInputs.ts'
 import * as RegisterEventListeners from '../RegisterEventListeners/RegisterEventListeners.ts'
 import * as VirtualDom from '../VirtualDom/VirtualDom.ts'
@@ -9,6 +10,7 @@ export const rememberFocus = (
   eventMap: any,
   uid = 0,
 ): any => {
+  EventState.startIgnore()
   const oldLeft = $Viewlet.style.left
   const oldTop = $Viewlet.style.top
   const oldWidth = $Viewlet.style.width
@@ -50,6 +52,9 @@ export const rememberFocus = (
         const $Previous = $Hidden.firstChild as HTMLInputElement
         $Previous.className = $NewFocused.className
         $Previous.placeholder = $NewFocused.placeholder
+        if ($NewFocused.childNodes) {
+          $Previous.append(...$NewFocused.childNodes)
+        }
         $NewFocused.replaceWith($Previous)
       }
     }
@@ -81,5 +86,7 @@ export const rememberFocus = (
   $Viewlet.style.height = oldHeight
   $Viewlet.style.width = oldWidth
 
+  EventState.stopIgnore()
+
   return $Viewlet
 }