@elementor/editor-components 3.35.0-481 → 3.35.0-482

package/dist/index.js

@@ -42,7 +42,7 @@ var import_editor_editing_panel8 = require("@elementor/editor-editing-panel");
 var import_editor_elements_panel = require("@elementor/editor-elements-panel");
 var import_editor_panels5 = require("@elementor/editor-panels");
 var import_editor_styles_repository2 = require("@elementor/editor-styles-repository");
-var import_editor_v1_adapters13 = require("@elementor/editor-v1-adapters");
+var import_editor_v1_adapters14 = require("@elementor/editor-v1-adapters");
 var import_store80 = require("@elementor/store");
 var import_i18n31 = require("@wordpress/i18n");
 
@@ -733,59 +733,9 @@ function deleteOverridableGroup({ componentId, groupId }) {
 // src/store/actions/delete-overridable-prop.ts
 var import_store15 = require("@elementor/store");
 
-// src/utils/revert-element-overridable-setting.ts
+// src/utils/revert-overridable-settings.ts
 var import_editor_elements2 = require("@elementor/editor-elements");
 
-// src/prop-types/component-instance-override-prop-type.ts
-var import_editor_props = require("@elementor/editor-props");
-var import_schema = require("@elementor/schema");
-var componentInstanceOverridePropTypeUtil = (0, import_editor_props.createPropUtils)(
-  "override",
-  import_schema.z.object({
-    override_key: import_schema.z.string(),
-    override_value: import_schema.z.unknown(),
-    schema_source: import_schema.z.object({
-      type: import_schema.z.literal("component"),
-      id: import_schema.z.number()
-    })
-  })
-);
-
-// src/prop-types/component-instance-overrides-prop-type.ts
-var import_editor_props3 = require("@elementor/editor-props");
-var import_schema3 = require("@elementor/schema");
-
-// src/prop-types/component-overridable-prop-type.ts
-var import_editor_props2 = require("@elementor/editor-props");
-var import_schema2 = require("@elementor/schema");
-var componentOverridablePropTypeUtil = (0, import_editor_props2.createPropUtils)(
-  "overridable",
-  import_schema2.z.object({
-    override_key: import_schema2.z.string(),
-    origin_value: import_schema2.z.object({
-      $$type: import_schema2.z.string(),
-      value: import_schema2.z.unknown()
-    }).nullable()
-  })
-);
-
-// src/prop-types/component-instance-overrides-prop-type.ts
-var componentInstanceOverridesPropTypeUtil = (0, import_editor_props3.createPropUtils)(
-  "overrides",
-  import_schema3.z.array(import_schema3.z.union([componentInstanceOverridePropTypeUtil.schema, componentOverridablePropTypeUtil.schema])).optional().default([])
-);
-
-// src/prop-types/component-instance-prop-type.ts
-var import_editor_props4 = require("@elementor/editor-props");
-var import_schema4 = require("@elementor/schema");
-var componentInstancePropTypeUtil = (0, import_editor_props4.createPropUtils)(
-  "component-instance",
-  import_schema4.z.object({
-    component_id: import_editor_props4.numberPropTypeUtil.schema,
-    overrides: import_schema4.z.optional(componentInstanceOverridesPropTypeUtil.schema)
-  })
-);
-
 // src/create-component-type.ts
 var import_editor_canvas4 = require("@elementor/editor-canvas");
 var import_editor_documents3 = require("@elementor/editor-documents");
@@ -1028,19 +978,69 @@ function createComponentModel() {
   });
 }
 
+// src/prop-types/component-instance-override-prop-type.ts
+var import_editor_props = require("@elementor/editor-props");
+var import_schema = require("@elementor/schema");
+var componentInstanceOverridePropTypeUtil = (0, import_editor_props.createPropUtils)(
+  "override",
+  import_schema.z.object({
+    override_key: import_schema.z.string(),
+    override_value: import_schema.z.unknown(),
+    schema_source: import_schema.z.object({
+      type: import_schema.z.literal("component"),
+      id: import_schema.z.number()
+    })
+  })
+);
+
+// src/prop-types/component-instance-overrides-prop-type.ts
+var import_editor_props3 = require("@elementor/editor-props");
+var import_schema3 = require("@elementor/schema");
+
+// src/prop-types/component-overridable-prop-type.ts
+var import_editor_props2 = require("@elementor/editor-props");
+var import_schema2 = require("@elementor/schema");
+var componentOverridablePropTypeUtil = (0, import_editor_props2.createPropUtils)(
+  "overridable",
+  import_schema2.z.object({
+    override_key: import_schema2.z.string(),
+    origin_value: import_schema2.z.object({
+      $$type: import_schema2.z.string(),
+      value: import_schema2.z.unknown()
+    }).nullable()
+  })
+);
+
+// src/prop-types/component-instance-overrides-prop-type.ts
+var componentInstanceOverridesPropTypeUtil = (0, import_editor_props3.createPropUtils)(
+  "overrides",
+  import_schema3.z.array(import_schema3.z.union([componentInstanceOverridePropTypeUtil.schema, componentOverridablePropTypeUtil.schema])).optional().default([])
+);
+
+// src/prop-types/component-instance-prop-type.ts
+var import_editor_props4 = require("@elementor/editor-props");
+var import_schema4 = require("@elementor/schema");
+var componentInstancePropTypeUtil = (0, import_editor_props4.createPropUtils)(
+  "component-instance",
+  import_schema4.z.object({
+    component_id: import_editor_props4.numberPropTypeUtil.schema,
+    overrides: import_schema4.z.optional(componentInstanceOverridesPropTypeUtil.schema)
+  })
+);
+
 // src/utils/is-component-instance.ts
 function isComponentInstance(elementModel) {
   return [elementModel.widgetType, elementModel.elType].includes(COMPONENT_WIDGET_TYPE);
 }
 
-// src/utils/revert-element-overridable-setting.ts
+// src/utils/revert-overridable-settings.ts
 function revertElementOverridableSetting(elementId, settingKey, originValue, overrideKey) {
   const container = (0, import_editor_elements2.getContainer)(elementId);
   if (!container) {
     return;
   }
   if (isComponentInstance(container.model.toJSON())) {
-    revertComponentInstanceSetting(elementId, overrideKey);
+    revertComponentInstanceOverridableSetting(elementId, overrideKey);
     return;
   }
   (0, import_editor_elements2.updateElementSettings)({
@@ -1049,17 +1049,17 @@ function revertElementOverridableSetting(elementId, settingKey, originValue, ove
     withHistory: false
   });
 }
-function revertComponentInstanceSetting(elementId, overrideKey) {
+function revertComponentInstanceOverridableSetting(elementId, overrideKey) {
   const setting = (0, import_editor_elements2.getElementSetting)(elementId, "component_instance");
   const componentInstance = componentInstancePropTypeUtil.extract(setting);
   const overrides = componentInstanceOverridesPropTypeUtil.extract(componentInstance?.overrides);
-  if (!overrides) {
+  if (!overrides?.length) {
     return;
   }
-  const updatedOverrides = getUpdatedComponentInstanceOverrides(overrides, overrideKey);
+  const revertedOverrides = revertComponentInstanceOverrides(overrides, overrideKey);
   const updatedSetting = componentInstancePropTypeUtil.create({
     ...componentInstance,
-    overrides: componentInstanceOverridesPropTypeUtil.create(updatedOverrides)
+    overrides: componentInstanceOverridesPropTypeUtil.create(revertedOverrides)
   });
   (0, import_editor_elements2.updateElementSettings)({
     id: elementId,
@@ -1067,22 +1067,103 @@ function revertComponentInstanceSetting(elementId, overrideKey) {
     withHistory: false
   });
 }
-function getUpdatedComponentInstanceOverrides(overrides, overrideKey) {
+function revertComponentInstanceOverrides(overrides, filterByKey) {
   return overrides.map((item) => {
-    const isOverridable = componentOverridablePropTypeUtil.isValid(item);
-    if (!isOverridable) {
+    if (!componentOverridablePropTypeUtil.isValid(item)) {
       return item;
     }
-    const isOriginValueOverride2 = componentInstanceOverridePropTypeUtil.isValid(item.value.origin_value);
-    if (!isOriginValueOverride2) {
+    if (!componentInstanceOverridePropTypeUtil.isValid(item.value.origin_value)) {
       return null;
     }
-    if (item.value.override_key !== overrideKey) {
+    if (filterByKey && item.value.override_key !== filterByKey) {
       return item;
     }
     return item.value.origin_value;
   }).filter((item) => item !== null);
 }
+function revertOverridablePropsFromSettings(settings) {
+  let hasChanges = false;
+  const revertedSettings = {};
+  for (const [key, value] of Object.entries(settings)) {
+    if (componentOverridablePropTypeUtil.isValid(value)) {
+      revertedSettings[key] = value.value.origin_value;
+      hasChanges = true;
+    } else {
+      revertedSettings[key] = value;
+    }
+  }
+  return { hasChanges, settings: revertedSettings };
+}
+function revertAllOverridablesInElementData(elementData) {
+  const revertedElement = { ...elementData };
+  if (isComponentInstance({ widgetType: elementData.widgetType, elType: elementData.elType })) {
+    revertedElement.settings = revertComponentInstanceSettings(elementData.settings);
+  } else if (revertedElement.settings) {
+    const { settings } = revertOverridablePropsFromSettings(revertedElement.settings);
+    revertedElement.settings = settings;
+  }
+  if (revertedElement.elements) {
+    revertedElement.elements = revertedElement.elements.map(revertAllOverridablesInElementData);
+  }
+  return revertedElement;
+}
+function revertComponentInstanceSettings(settings) {
+  if (!settings?.component_instance) {
+    return settings;
+  }
+  const componentInstance = componentInstancePropTypeUtil.extract(settings.component_instance);
+  const overrides = componentInstanceOverridesPropTypeUtil.extract(componentInstance?.overrides);
+  if (!overrides?.length) {
+    return settings;
+  }
+  const revertedOverrides = revertComponentInstanceOverrides(overrides);
+  return {
+    ...settings,
+    component_instance: componentInstancePropTypeUtil.create({
+      ...componentInstance,
+      overrides: componentInstanceOverridesPropTypeUtil.create(revertedOverrides)
+    })
+  };
+}
+function revertAllOverridablesInContainer(container) {
+  (0, import_editor_elements2.getAllDescendants)(container).forEach((element) => {
+    if (element.model.get("widgetType") === COMPONENT_WIDGET_TYPE) {
+      revertComponentInstanceOverridesInElement(element);
+    } else {
+      revertElementSettings(element);
+    }
+  });
+}
+function revertComponentInstanceOverridesInElement(element) {
+  const settings = element.settings?.toJSON() ?? {};
+  const componentInstance = componentInstancePropTypeUtil.extract(settings.component_instance);
+  const overrides = componentInstanceOverridesPropTypeUtil.extract(componentInstance?.overrides);
+  if (!overrides?.length) {
+    return;
+  }
+  const revertedOverrides = revertComponentInstanceOverrides(overrides);
+  const updatedSetting = componentInstancePropTypeUtil.create({
+    ...componentInstance,
+    overrides: componentInstanceOverridesPropTypeUtil.create(revertedOverrides)
+  });
+  (0, import_editor_elements2.updateElementSettings)({
+    id: element.id,
+    props: { component_instance: updatedSetting },
+    withHistory: false
+  });
+}
+function revertElementSettings(element) {
+  const settings = element.settings?.toJSON() ?? {};
+  const { hasChanges, settings: revertedSettings } = revertOverridablePropsFromSettings(settings);
+  if (!hasChanges) {
+    return;
+  }
+  (0, import_editor_elements2.updateElementSettings)({
+    id: element.id,
+    props: revertedSettings,
+    withHistory: false
+  });
+}
 
 // src/store/actions/delete-overridable-prop.ts
 function deleteOverridableProp({ componentId, propKey, source }) {
@@ -3101,10 +3182,11 @@ async function createUnpublishedComponent({
 }) {
   const generatedUid = uid ?? (0, import_utils4.generateUniqueId)("component");
   const componentBase = { uid: generatedUid, name };
+  const elementDataWithOverridablesReverted = revertAllOverridablesInElementData(element);
   (0, import_store45.__dispatch)(
     slice.actions.addUnpublished({
       ...componentBase,
-      elements: [element],
+      elements: [elementDataWithOverridablesReverted],
       overridableProps
     })
   );
@@ -5347,6 +5429,44 @@ function hasOverrides(settings) {
   return !!overridesValue?.length;
 }
 
+// src/sync/revert-overridables-on-copy-or-duplicate.ts
+var import_editor_v1_adapters13 = require("@elementor/editor-v1-adapters");
+function initRevertOverridablesOnCopyOrDuplicate() {
+  (0, import_editor_v1_adapters13.registerDataHook)("after", "document/elements/duplicate", (_args, result) => {
+    if (!isEditingComponent()) {
+      return;
+    }
+    revertOverridablesForDuplicatedElements(result);
+  });
+  (0, import_editor_v1_adapters13.registerDataHook)("after", "document/elements/copy", (args) => {
+    if (!isEditingComponent()) {
+      return;
+    }
+    revertOverridablesInStorage(args.storageKey ?? "clipboard");
+  });
+}
+function revertOverridablesForDuplicatedElements(duplicatedElements) {
+  const containers = Array.isArray(duplicatedElements) ? duplicatedElements : [duplicatedElements];
+  containers.forEach((container) => {
+    revertAllOverridablesInContainer(container);
+  });
+}
+function revertOverridablesInStorage(storageKey) {
+  const storage = window.elementorCommon?.storage;
+  if (!storage) {
+    return;
+  }
+  const storageData = storage.get(storageKey);
+  if (!storageData?.elements?.length) {
+    return;
+  }
+  const elementsDataWithOverridablesReverted = storageData.elements.map(revertAllOverridablesInElementData);
+  storage.set(storageKey, {
+    ...storageData,
+    elements: elementsDataWithOverridablesReverted
+  });
+}
+
 // src/init.ts
 function init() {
   import_editor_styles_repository2.stylesRepository.register(componentsStylesProvider);
@@ -5356,14 +5476,14 @@ function init() {
     COMPONENT_WIDGET_TYPE,
     (options) => createComponentType({ ...options, showLockedByModal: openEditModeDialog })
   );
-  (0, import_editor_v1_adapters13.registerDataHook)("dependency", "editor/documents/close", (args) => {
+  (0, import_editor_v1_adapters14.registerDataHook)("dependency", "editor/documents/close", (args) => {
     const document = (0, import_editor_documents13.getV1CurrentDocument)();
     if (document.config.type === COMPONENT_DOCUMENT_TYPE) {
       args.mode = "autosave";
     }
     return true;
   });
-  (0, import_editor_v1_adapters13.registerDataHook)("after", "preview/drop", onElementDrop);
+  (0, import_editor_v1_adapters14.registerDataHook)("after", "preview/drop", onElementDrop);
   window.elementorCommon.__beforeSave = beforeSave;
   (0, import_editor_elements_panel.injectTab)({
     id: "components",
@@ -5387,7 +5507,7 @@ function init() {
     id: "component-panel-header",
     component: ComponentPanelHeader
   });
-  (0, import_editor_v1_adapters13.registerDataHook)("after", "editor/documents/attach-preview", async () => {
+  (0, import_editor_v1_adapters14.registerDataHook)("after", "editor/documents/attach-preview", async () => {
     const { id: id2, config } = (0, import_editor_documents13.getV1CurrentDocument)();
     if (id2) {
       removeComponentStyles(id2);
@@ -5420,6 +5540,7 @@ function init() {
   initNonAtomicNestingPrevention();
   initLoadComponentDataAfterInstanceAdded();
   initHandleComponentEditModeContainer();
+  initRevertOverridablesOnCopyOrDuplicate();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {