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

package/dist/index.mjs

@@ -2155,7 +2155,10 @@ import { __ as __8 } from "@wordpress/i18n";
 import {
   extractValue,
   isDependency,
-  isDependencyMet
+  isDependencyMet,
+  isOverridable,
+  isTransformable,
+  rewrapOverridableValue
 } from "@elementor/editor-props";
 import { getSessionStorageItem as getSessionStorageItem2, removeSessionStorageItem, setSessionStorageItem as setSessionStorageItem2 } from "@elementor/session";
 function getElementSettingsWithDefaults(propsSchema, elementSettings) {
@@ -2212,10 +2215,14 @@ function getUpdatedValues(values, dependencies, propsSchema, elementValues, elem
       }
       if (!testDependencies.previousValues.isMet) {
         const savedValue = retrievePreviousValueFromStorage({ path: dependency, elementId });
+        const currentValue = 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;
@@ -2261,18 +2268,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;
     }
-    return carry[key]?.value ?? carry.value;
-  }, newValue);
-  return { [topPropKey]: newValue[topPropKey] ?? null };
+    carry[key] = next.replacement;
+    carry = next.descended;
+  }
+  return { [topPropKey]: root[topPropKey] ?? null };
+}
+function cloneDescent(child) {
+  if (!child) {
+    return null;
+  }
+  if (isOverridable(child)) {
+    const origin = child.value.origin_value;
+    if (!origin || !isTransformable(origin)) {
+      return null;
+    }
+    const descended = { ...origin.value };
+    const replacement = {
+      ...child,
+      value: {
+        ...child.value,
+        origin_value: { ...origin, value: descended }
+      }
+    };
+    return { replacement, descended };
+  }
+  if (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 isOverridable(saved) === isOverridable(current);
+}
+function mergeLeafValue(existing, incoming) {
+  if (incoming === null) {
+    return null;
+  }
+  if (incoming && isOverridable(incoming)) {
+    return incoming;
+  }
+  if (existing && isOverridable(existing) && incoming) {
+    return rewrapOverridableValue(existing, incoming);
+  }
+  return incoming;
 }
 function handleUnmetCondition(props) {
   const { failingDependencies, dependency, elementValues, defaultValue, elementId } = props;
@@ -2280,7 +2336,7 @@ function handleUnmetCondition(props) {
     (term) => "newValue" in term && !!term.newValue
   );
   const newValue = termWithNewValue?.newValue ?? null;
-  const currentValue = extractValue(dependency.split("."), elementValues) ?? defaultValue;
+  const currentValue = extractValue(dependency.split("."), elementValues, [], { unwrapOverridableLeaf: false }) ?? defaultValue;
   savePreviousValueToStorage({
     path: dependency,
     elementId,
@@ -2510,7 +2566,7 @@ import { stylesRepository as stylesRepository7 } from "@elementor/editor-styles-
 // src/styles-inheritance/create-styles-inheritance.ts
 import {
   isEmpty,
-  isTransformable
+  isTransformable as isTransformable2
 } from "@elementor/editor-props";
 
 // src/styles-inheritance/create-snapshots-manager.ts
@@ -2704,7 +2760,7 @@ function getValueByPath(value, path, filterPropType) {
     if (!currentScope) {
       return null;
     }
-    if (isTransformable(currentScope)) {
+    if (isTransformable2(currentScope)) {
       return currentScope.value?.[key] ?? null;
     }
     if (typeof currentScope === "object") {
@@ -2714,7 +2770,7 @@ function getValueByPath(value, path, filterPropType) {
   }, value);
 }
 function shouldUseOriginalValue(filterPropType, value) {
-  return !!filterPropType && isTransformable(value) && filterPropType.key !== value.$$type;
+  return !!filterPropType && isTransformable2(value) && filterPropType.key !== value.$$type;
 }
 var getFilterPropType = (propType, path) => {
   if (!propType || propType.kind !== "union") {
@@ -5878,7 +5934,7 @@ var filterByLicense = (tags) => {
 // src/dynamics/utils.ts
 import {
   createPropUtils,
-  isTransformable as isTransformable2
+  isTransformable as isTransformable3
 } from "@elementor/editor-props";
 import { getElementorConfig as getElementorConfig2 } from "@elementor/editor-v1-adapters";
 import { z } from "@elementor/schema";
@@ -5900,7 +5956,7 @@ var getDynamicPropType = (propType) => {
   return dynamicPropType && isDynamicPropType(dynamicPropType) ? dynamicPropType : null;
 };
 var isDynamicPropValue = (prop) => {
-  return isTransformable2(prop) && prop.$$type === DYNAMIC_PROP_TYPE_KEY;
+  return isTransformable3(prop) && prop.$$type === DYNAMIC_PROP_TYPE_KEY;
 };
 var supportsDynamic = (propType) => {
   return !!getDynamicPropType(propType);
@@ -6438,7 +6494,7 @@ function ControlsItemsStack({ items: items3 }) {
 
 // src/dynamics/dynamic-transformer.ts
 import { createTransformer } from "@elementor/editor-canvas";
-import { isTransformable as isTransformable3 } from "@elementor/editor-props";
+import { isTransformable as isTransformable4 } from "@elementor/editor-props";
 
 // src/dynamics/errors.ts
 import { createError as createError2 } from "@elementor/utils";
@@ -6456,7 +6512,7 @@ var dynamicTransformer = createTransformer((value, { propType }) => {
 });
 function simpleTransform(props) {
   const transformed = Object.entries(props).map(([settingKey, settingValue]) => {
-    const value = isTransformable3(settingValue) ? settingValue.value : settingValue;
+    const value = isTransformable4(settingValue) ? settingValue.value : settingValue;
     return [settingKey, value];
   });
   return Object.fromEntries(transformed);