@elementor/editor-editing-panel 4.1.0-823 → 4.1.0-825

package/dist/index.js

@@ -2200,10 +2200,14 @@ function getUpdatedValues(values, dependencies, propsSchema, elementValues, elem
       }
       if (!testDependencies.previousValues.isMet) {
         const savedValue = retrievePreviousValueFromStorage({ path: dependency, elementId });
+        const currentValue = (0, import_editor_props5.extractValue)(path, combinedValues, [], {
+          unwrapOverridableLeaf: false
+        });
         removePreviousValueFromStorage({ path: dependency, elementId });
+        const restored = isCompatibleSavedValue(savedValue, currentValue) ? savedValue : propType.default;
         return {
           ...newValues,
-          ...updateValue(path, savedValue ?? propType.default, combinedValues)
+          ...updateValue(path, restored, combinedValues)
         };
       }
       return newValues;
@@ -2249,18 +2253,67 @@ function evaluatePropType(props) {
 }
 function updateValue(path, value, values) {
   const topPropKey = path[0];
-  const newValue = { ...values };
-  path.reduce((carry, key, index) => {
-    if (!carry) {
-      return null;
+  const root = { ...values };
+  let carry = root;
+  for (let index = 0; index < path.length; index++) {
+    const key = path[index];
+    const isLeaf = index === path.length - 1;
+    if (isLeaf) {
+      carry[key] = mergeLeafValue(carry[key], value);
+      break;
     }
-    if (index === path.length - 1) {
-      carry[key] = value ?? null;
-      return carry[key]?.value ?? carry.value;
+    const next = cloneDescent(carry[key]);
+    if (!next) {
+      break;
+    }
+    carry[key] = next.replacement;
+    carry = next.descended;
+  }
+  return { [topPropKey]: root[topPropKey] ?? null };
+}
+function cloneDescent(child) {
+  if (!child) {
+    return null;
+  }
+  if ((0, import_editor_props5.isOverridable)(child)) {
+    const origin = child.value.origin_value;
+    if (!origin || !(0, import_editor_props5.isTransformable)(origin)) {
+      return null;
     }
-    return carry[key]?.value ?? carry.value;
-  }, newValue);
-  return { [topPropKey]: newValue[topPropKey] ?? null };
+    const descended = { ...origin.value };
+    const replacement = {
+      ...child,
+      value: {
+        ...child.value,
+        origin_value: { ...origin, value: descended }
+      }
+    };
+    return { replacement, descended };
+  }
+  if ((0, import_editor_props5.isTransformable)(child)) {
+    const descended = { ...child.value };
+    const replacement = { ...child, value: descended };
+    return { replacement, descended };
+  }
+  return null;
+}
+function isCompatibleSavedValue(saved, current) {
+  if (!saved) {
+    return false;
+  }
+  return (0, import_editor_props5.isOverridable)(saved) === (0, import_editor_props5.isOverridable)(current);
+}
+function mergeLeafValue(existing, incoming) {
+  if (incoming === null) {
+    return null;
+  }
+  if (incoming && (0, import_editor_props5.isOverridable)(incoming)) {
+    return incoming;
+  }
+  if (existing && (0, import_editor_props5.isOverridable)(existing) && incoming) {
+    return (0, import_editor_props5.rewrapOverridableValue)(existing, incoming);
+  }
+  return incoming;
 }
 function handleUnmetCondition(props) {
   const { failingDependencies, dependency, elementValues, defaultValue, elementId } = props;
@@ -2268,7 +2321,7 @@ function handleUnmetCondition(props) {
     (term) => "newValue" in term && !!term.newValue
   );
   const newValue = termWithNewValue?.newValue ?? null;
-  const currentValue = (0, import_editor_props5.extractValue)(dependency.split("."), elementValues) ?? defaultValue;
+  const currentValue = (0, import_editor_props5.extractValue)(dependency.split("."), elementValues, [], { unwrapOverridableLeaf: false }) ?? defaultValue;
   savePreviousValueToStorage({
     path: dependency,
     elementId,