@elementor/editor-components 4.2.0-915 → 4.2.0-917

package/dist/index.js

@@ -88,7 +88,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/init.ts
 var import_editor = require("@elementor/editor");
-var import_editor_canvas5 = require("@elementor/editor-canvas");
+var import_editor_canvas6 = require("@elementor/editor-canvas");
 var import_editor_documents6 = require("@elementor/editor-documents");
 var import_editor_editing_panel7 = require("@elementor/editor-editing-panel");
 var import_editor_elements_panel = require("@elementor/editor-elements-panel");
@@ -1142,6 +1142,7 @@ var import_icons9 = require("@elementor/icons");
 var import_i18n10 = require("@wordpress/i18n");
 
 // src/utils/detach-component-instance/detach-component-instance.ts
+var import_editor_canvas4 = require("@elementor/editor-canvas");
 var import_editor_elements3 = require("@elementor/editor-elements");
 var import_editor_v1_adapters2 = require("@elementor/editor-v1-adapters");
 var import_store10 = require("@elementor/store");
@@ -1340,7 +1341,7 @@ function resolvePropValue(propValue, overrideMap, options) {
     return resolveOverridableOverride(matchingOverride, originValue);
   }
   const matchingOverrideValue = componentInstanceOverridePropTypeUtil.extract(matchingOverride)?.override_value;
-  return matchingOverrideValue;
+  return matchingOverrideValue ?? originValue;
 }
 function resolveOverridableOverride(matchingOverride, originValue) {
   if (!originValue || !componentInstanceOverridePropTypeUtil.isValid(originValue)) {
@@ -1403,6 +1404,9 @@ function getOverridableOverride(propValue) {
 }
 
 // src/utils/detach-component-instance/detach-component-instance.ts
+var DETACH_EVENT = "elementor/components/detach-instance";
+var DETACH_UNDO_EVENT = "elementor/components/undo-detach-instance";
+var DETACH_REDO_EVENT = "elementor/components/redo-detach-instance";
 async function detachComponentInstance({
   instanceId,
   componentId,
@@ -1428,14 +1432,22 @@ async function detachComponentInstance({
           rootElement,
           overrides
         );
-        const editedComponentOnDetach = selectCurrentComponentId((0, import_store10.__getState)());
-        const overridablePropsBeforeDetach = editedComponentOnDetach ? selectOverridableProps((0, import_store10.__getState)(), editedComponentOnDetach) ?? null : null;
         const originalInstanceModel = instanceContainer.model.toJSON();
+        const actionId = (/* @__PURE__ */ new Date()).getTime();
+        window.dispatchEvent(
+          new CustomEvent(DETACH_EVENT, {
+            detail: {
+              detachedInstanceId: instanceId,
+              detachActionId: actionId
+            }
+          })
+        );
         const detachedElement = (0, import_editor_elements3.replaceElement)({
           currentElementId: instanceId,
           newElement: detachedInstanceElementData,
           withHistory: false
         });
+        (0, import_editor_elements3.selectElement)(detachedElement.id);
         const componentUid = selectComponent((0, import_store10.__getState)(), componentId)?.uid;
         trackComponentEvent({
           action: "detached",
@@ -1449,47 +1461,48 @@ async function detachComponentInstance({
         return {
           detachedElement,
           detachedInstanceElementData,
-          editedComponentOnDetach,
-          overridablePropsBeforeDetach,
-          originalInstanceModel
+          originalInstanceModel,
+          actionId
         };
       },
-      undo: (_, {
-        detachedElement,
-        originalInstanceModel,
-        overridablePropsBeforeDetach,
-        editedComponentOnDetach
-      }) => {
+      undo: (_, { detachedElement, originalInstanceModel, actionId }) => {
         const restoredInstance = (0, import_editor_elements3.replaceElement)({
           currentElementId: detachedElement.id,
           newElement: originalInstanceModel,
           withHistory: false
         });
-        const currentComponentId = selectCurrentComponentId((0, import_store10.__getState)());
-        if (currentComponentId && currentComponentId === editedComponentOnDetach && overridablePropsBeforeDetach) {
-          (0, import_store10.__dispatch)(
-            slice.actions.setOverridableProps({
-              componentId: currentComponentId,
-              overridableProps: overridablePropsBeforeDetach
-            })
-          );
-        }
+        window.dispatchEvent(
+          new CustomEvent(DETACH_UNDO_EVENT, {
+            detail: {
+              restoredInstanceId: restoredInstance.id,
+              detachActionId: actionId
+            }
+          })
+        );
+        (0, import_editor_canvas4.doAfterRender)([restoredInstance.id], () => {
+          (0, import_editor_elements3.selectElement)(restoredInstance.id);
+        });
         return restoredInstance;
       },
       redo: (_, doReturn, restoredInstance) => {
-        const { detachedInstanceElementData } = doReturn;
-        const editedComponentOnDetach = selectCurrentComponentId((0, import_store10.__getState)());
-        const overridablePropsBeforeDetach = editedComponentOnDetach ? selectOverridableProps((0, import_store10.__getState)(), editedComponentOnDetach) ?? null : null;
+        const { detachedInstanceElementData, actionId } = doReturn;
         const detachedElement = (0, import_editor_elements3.replaceElement)({
           currentElementId: restoredInstance.id,
           newElement: detachedInstanceElementData,
           withHistory: false
         });
+        window.dispatchEvent(
+          new CustomEvent(DETACH_REDO_EVENT, {
+            detail: {
+              detachedInstanceId: detachedElement.id,
+              detachActionId: actionId
+            }
+          })
+        );
+        (0, import_editor_elements3.selectElement)(detachedElement.id);
         return {
           ...doReturn,
-          detachedElement,
-          editedComponentOnDetach,
-          overridablePropsBeforeDetach
+          detachedElement
         };
       }
     },
@@ -2681,7 +2694,7 @@ function LoadTemplateComponentsInternal() {
 }
 
 // src/create-component-type.ts
-var import_editor_canvas4 = require("@elementor/editor-canvas");
+var import_editor_canvas5 = require("@elementor/editor-canvas");
 var import_editor_documents4 = require("@elementor/editor-documents");
 var import_editor_notifications2 = require("@elementor/editor-notifications");
 var import_store25 = require("@elementor/store");
@@ -2832,7 +2845,7 @@ function createComponentType(options) {
 }
 function createComponentView(options) {
   const legacyWindow = window;
-  return class extends (0, import_editor_canvas4.createTemplatedElementView)(options) {
+  return class extends (0, import_editor_canvas5.createTemplatedElementView)(options) {
     eventsManagerConfig = legacyWindow.elementorCommon.eventsManager.config;
     #componentRenderContext;
     isComponentCurrentlyEdited() {
@@ -3332,7 +3345,7 @@ function load(result) {
 function init() {
   import_editor_styles_repository2.stylesRepository.register(componentsStylesProvider);
   (0, import_store34.__registerSlice)(slice);
-  (0, import_editor_canvas5.registerElementType)(
+  (0, import_editor_canvas6.registerElementType)(
     COMPONENT_WIDGET_TYPE2,
     (options) => createComponentType({
       ...options,
@@ -3367,9 +3380,9 @@ function init() {
     condition: (_, elementType) => elementType.key === "e-component",
     component: InstanceEditingPanel
   });
-  import_editor_canvas5.settingsTransformersRegistry.register("component-instance", componentInstanceTransformer);
-  import_editor_canvas5.settingsTransformersRegistry.register("overridable", componentOverridableTransformer);
-  import_editor_canvas5.settingsTransformersRegistry.register("override", componentOverrideTransformer);
+  import_editor_canvas6.settingsTransformersRegistry.register("component-instance", componentInstanceTransformer);
+  import_editor_canvas6.settingsTransformersRegistry.register("overridable", componentOverridableTransformer);
+  import_editor_canvas6.settingsTransformersRegistry.register("override", componentOverrideTransformer);
   initCircularNestingPrevention();
   initLoadComponentDataAfterInstanceAdded();
 }