@elementor/editor-elements 4.1.0-726 → 4.1.0-728

package/dist/index.mjs

@@ -242,6 +242,37 @@ function deleteElement({ container, options = {} }) {
   });
 }
 
+// src/sync/resolve-element.ts
+function isConnected(container) {
+  if (!container) {
+    return false;
+  }
+  if (!container.view?.el) {
+    return true;
+  }
+  return container.view.el.isConnected;
+}
+function resolveContainer(container, id) {
+  const looked = container.lookup?.();
+  if (isConnected(looked)) {
+    return looked;
+  }
+  const byId = getContainer(id);
+  if (isConnected(byId)) {
+    return byId;
+  }
+  return null;
+}
+function getDocumentUtils() {
+  return window.$e?.components?.get?.("document")?.utils;
+}
+function addModelToParent(parentId, childData, options) {
+  return getDocumentUtils()?.addModelToParent?.(parentId, childData, options) ?? false;
+}
+function removeModelFromParent(parentId, childId) {
+  return getDocumentUtils()?.removeModelFromParent?.(parentId, childId) ?? false;
+}
+
 // src/sync/create-elements.ts
 var createElements = ({
   elements,
@@ -266,39 +297,54 @@ var createElements = ({
             container: element,
             parentContainer,
             model: element.model?.toJSON() || {},
-            options
+            options,
+            containerId: element.id,
+            parentContainerId: parentContainer.id
           });
         });
         return { createdElements };
       },
       undo: (_, { createdElements }) => {
-        [...createdElements].reverse().forEach(({ container }) => {
-          const freshContainer = container.lookup?.();
+        [...createdElements].reverse().forEach(({ container, containerId, parentContainerId }) => {
+          const freshContainer = resolveContainer(container, containerId);
           if (freshContainer) {
             deleteElement({
               container: freshContainer,
               options: { useHistory: false }
             });
+            return;
           }
+          removeModelFromParent(parentContainerId, containerId);
         });
       },
       redo: (_, { createdElements }) => {
         const newElements = [];
-        createdElements.forEach(({ parentContainer, model, options }) => {
-          const freshParent = parentContainer.lookup?.();
-          if (!freshParent) {
+        createdElements.forEach(({ parentContainer, parentContainerId, model, options }) => {
+          const freshParent = resolveContainer(parentContainer, parentContainerId);
+          if (freshParent) {
+            const element = createElement({
+              container: freshParent,
+              model,
+              options: { ...options, useHistory: false }
+            });
+            newElements.push({
+              container: element,
+              parentContainer: freshParent,
+              model: element.model.toJSON(),
+              options,
+              containerId: element.id,
+              parentContainerId: freshParent.id
+            });
             return;
           }
-          const element = createElement({
-            container: freshParent,
-            model,
-            options: { ...options, useHistory: false }
-          });
+          addModelToParent(parentContainerId, model);
           newElements.push({
-            container: element,
-            parentContainer: freshParent,
-            model: element.model.toJSON(),
-            options
+            container: parentContainer,
+            parentContainer,
+            model,
+            options,
+            containerId: model.id ?? "",
+            parentContainerId
           });
         });
         return { createdElements: newElements };
@@ -368,25 +414,32 @@ var duplicateElements = ({
             container: duplicatedElement,
             parentContainer: duplicatedElement.parent,
             model: duplicatedElement.model.toJSON(),
-            at: duplicatedElement.view?._index
+            at: duplicatedElement.view?._index,
+            containerId: duplicatedElement.id,
+            parentContainerId: duplicatedElement.parent.id
           });
         });
         return { duplicatedElements };
       },
       undo: (_, { duplicatedElements }) => {
         onRestoreElements?.();
-        [...duplicatedElements].reverse().forEach(({ container }) => {
-          deleteElement({
-            container,
-            options: { useHistory: false }
-          });
+        [...duplicatedElements].reverse().forEach(({ container, containerId, parentContainerId }) => {
+          const freshContainer = resolveContainer(container, containerId);
+          if (freshContainer) {
+            deleteElement({
+              container: freshContainer,
+              options: { useHistory: false }
+            });
+            return;
+          }
+          removeModelFromParent(parentContainerId, containerId);
         });
       },
       redo: (_, { duplicatedElements: previousElements }) => {
         onDuplicateElements?.();
         const duplicatedElements = [];
-        previousElements.forEach(({ parentContainer, model, at }) => {
-          const freshParent = parentContainer.lookup?.();
+        previousElements.forEach(({ parentContainer, parentContainerId, model, at }) => {
+          const freshParent = resolveContainer(parentContainer, parentContainerId);
           if (freshParent) {
             const createdElement = createElement({
               container: freshParent,
@@ -397,9 +450,21 @@ var duplicateElements = ({
               container: createdElement,
               parentContainer: freshParent,
               model,
-              at
+              at,
+              containerId: createdElement.id,
+              parentContainerId: freshParent.id
             });
+            return;
           }
+          addModelToParent(parentContainerId, model, { at });
+          duplicatedElements.push({
+            container: parentContainer,
+            parentContainer,
+            model,
+            at,
+            containerId: model.id ?? "",
+            parentContainerId
+          });
         });
         return { duplicatedElements };
       }
@@ -560,16 +625,19 @@ var moveElements = ({
             originalContainer,
             originalIndex,
             targetContainer: target,
-            options
+            options,
+            elementId: newElement.id,
+            originalContainerId: originalContainer.id,
+            targetContainerId: target.id
           });
         });
         return { movedElements };
       },
       undo: (_, { movedElements }) => {
         onRestoreElements?.();
-        [...movedElements].reverse().forEach(({ element, originalContainer, originalIndex }) => {
-          const freshElement = element.lookup?.();
-          const freshOriginalContainer = originalContainer.lookup?.();
+        [...movedElements].reverse().forEach(({ element, elementId, originalContainer, originalContainerId, originalIndex }) => {
+          const freshElement = resolveContainer(element, elementId);
+          const freshOriginalContainer = resolveContainer(originalContainer, originalContainerId);
           if (!freshElement || !freshOriginalContainer) {
             return;
           }
@@ -586,26 +654,40 @@ var moveElements = ({
       redo: (_, { movedElements }) => {
         const newMovedElements = [];
         onMoveElements?.();
-        movedElements.forEach(({ element, originalContainer, originalIndex, targetContainer, options }) => {
-          const freshElement = element.lookup?.();
-          const freshOriginalContainer = originalContainer.lookup?.();
-          const freshTarget = targetContainer.lookup?.();
-          if (!freshElement || !freshOriginalContainer || !freshTarget) {
-            return;
-          }
-          const newElement = moveElement({
-            element: freshElement,
-            targetContainer: freshTarget,
-            options: { ...options, useHistory: false }
-          });
-          newMovedElements.push({
-            element: newElement,
-            originalContainer: freshOriginalContainer,
+        movedElements.forEach(
+          ({
+            element,
+            elementId,
+            originalContainer,
+            originalContainerId,
             originalIndex,
-            targetContainer: freshTarget,
+            targetContainer,
+            targetContainerId,
             options
-          });
-        });
+          }) => {
+            const freshElement = resolveContainer(element, elementId);
+            const freshOriginalContainer = resolveContainer(originalContainer, originalContainerId);
+            const freshTarget = resolveContainer(targetContainer, targetContainerId);
+            if (!freshElement || !freshOriginalContainer || !freshTarget) {
+              return;
+            }
+            const newElement = moveElement({
+              element: freshElement,
+              targetContainer: freshTarget,
+              options: { ...options, useHistory: false }
+            });
+            newMovedElements.push({
+              element: newElement,
+              originalContainer: freshOriginalContainer,
+              originalIndex,
+              targetContainer: freshTarget,
+              options,
+              elementId: newElement.id,
+              originalContainerId: freshOriginalContainer.id,
+              targetContainerId: freshTarget.id
+            });
+          }
+        );
         return { movedElements: newMovedElements };
       }
     },
@@ -638,7 +720,9 @@ var removeElements = ({
               container,
               parent: container.parent,
               model: container.model.toJSON(),
-              at: container.view?._index ?? 0
+              at: container.view?._index ?? 0,
+              containerId: container.id,
+              parentId: container.parent.id
             });
           }
         });
@@ -653,35 +737,48 @@ var removeElements = ({
       },
       undo: (_, { removedElements }) => {
         onRestoreElements?.();
-        [...removedElements].reverse().forEach(({ parent, model, at }) => {
-          const freshParent = parent.lookup?.();
+        [...removedElements].reverse().forEach(({ parent, parentId, model, at }) => {
+          const freshParent = resolveContainer(parent, parentId);
           if (freshParent) {
             createElement({
               container: freshParent,
               model,
               options: { useHistory: false, at }
             });
+            return;
           }
+          addModelToParent(parentId, model, { at });
         });
       },
       redo: (_, { removedElements }) => {
         onRemoveElements?.();
         const newRemovedElements = [];
-        removedElements.forEach(({ container, parent, model, at }) => {
-          const freshContainer = container.lookup?.();
-          const freshParent = parent.lookup?.();
-          if (!freshContainer || !freshParent) {
+        removedElements.forEach(({ container, parent, model, at, containerId, parentId }) => {
+          const freshContainer = resolveContainer(container, containerId);
+          const freshParent = resolveContainer(parent, parentId);
+          if (freshContainer && freshParent) {
+            deleteElement({
+              container: freshContainer,
+              options: { useHistory: false }
+            });
+            newRemovedElements.push({
+              container: freshContainer,
+              parent: freshParent,
+              model,
+              at,
+              containerId,
+              parentId
+            });
             return;
           }
-          deleteElement({
-            container: freshContainer,
-            options: { useHistory: false }
-          });
+          removeModelFromParent(parentId, containerId);
           newRemovedElements.push({
-            container: freshContainer,
-            parent: freshParent,
+            container,
+            parent,
             model,
-            at
+            at,
+            containerId,
+            parentId
           });
         });
         return { removedElements: newRemovedElements };