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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/editor-editing-panel",
-  "version": "4.1.0-824",
+  "version": "4.1.0-825",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -39,31 +39,31 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "4.1.0-824",
-    "@elementor/editor-canvas": "4.1.0-824",
-    "@elementor/editor-controls": "4.1.0-824",
-    "@elementor/editor-documents": "4.1.0-824",
-    "@elementor/editor-elements": "4.1.0-824",
-    "@elementor/editor-interactions": "4.1.0-824",
-    "@elementor/editor-notifications": "4.1.0-824",
-    "@elementor/editor-panels": "4.1.0-824",
-    "@elementor/editor-props": "4.1.0-824",
-    "@elementor/editor-responsive": "4.1.0-824",
-    "@elementor/editor-styles": "4.1.0-824",
-    "@elementor/editor-styles-repository": "4.1.0-824",
-    "@elementor/editor-ui": "4.1.0-824",
-    "@elementor/editor-v1-adapters": "4.1.0-824",
-    "@elementor/http-client": "4.1.0-824",
+    "@elementor/editor": "4.1.0-825",
+    "@elementor/editor-canvas": "4.1.0-825",
+    "@elementor/editor-controls": "4.1.0-825",
+    "@elementor/editor-documents": "4.1.0-825",
+    "@elementor/editor-elements": "4.1.0-825",
+    "@elementor/editor-interactions": "4.1.0-825",
+    "@elementor/editor-notifications": "4.1.0-825",
+    "@elementor/editor-panels": "4.1.0-825",
+    "@elementor/editor-props": "4.1.0-825",
+    "@elementor/editor-responsive": "4.1.0-825",
+    "@elementor/editor-styles": "4.1.0-825",
+    "@elementor/editor-styles-repository": "4.1.0-825",
+    "@elementor/editor-ui": "4.1.0-825",
+    "@elementor/editor-v1-adapters": "4.1.0-825",
+    "@elementor/http-client": "4.1.0-825",
     "@elementor/icons": "^1.68.0",
-    "@elementor/editor-variables": "4.1.0-824",
-    "@elementor/locations": "4.1.0-824",
-    "@elementor/menus": "4.1.0-824",
-    "@elementor/query": "4.1.0-824",
-    "@elementor/schema": "4.1.0-824",
-    "@elementor/session": "4.1.0-824",
+    "@elementor/editor-variables": "4.1.0-825",
+    "@elementor/locations": "4.1.0-825",
+    "@elementor/menus": "4.1.0-825",
+    "@elementor/query": "4.1.0-825",
+    "@elementor/schema": "4.1.0-825",
+    "@elementor/session": "4.1.0-825",
     "@elementor/ui": "1.37.5",
-    "@elementor/utils": "4.1.0-824",
-    "@elementor/wp-media": "4.1.0-824",
+    "@elementor/utils": "4.1.0-825",
+    "@elementor/wp-media": "4.1.0-825",
     "@wordpress/i18n": "^5.13.0"
   },
   "peerDependencies": {

package/src/utils/prop-dependency-utils.ts

@@ -4,9 +4,12 @@ import {
 	extractValue,
 	isDependency,
 	isDependencyMet,
+	isOverridable,
+	isTransformable,
 	type Props,
 	type PropsSchema,
 	type PropType,
+	rewrapOverridableValue,
 	type TransformablePropValue,
 } from '@elementor/editor-props';
 import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from '@elementor/session';
@@ -94,12 +97,19 @@ export function getUpdatedValues(
 
 			if ( ! testDependencies.previousValues.isMet ) {
 				const savedValue = retrievePreviousValueFromStorage< Value >( { path: dependency, elementId } );
+				const currentValue = extractValue( path, combinedValues, [], {
+					unwrapOverridableLeaf: false,
+				} ) as Value;
 
 				removePreviousValueFromStorage( { path: dependency, elementId } );
 
+				const restored = isCompatibleSavedValue( savedValue, currentValue )
+					? savedValue
+					: ( propType.default as Value );
+
 				return {
 					...newValues,
-					...updateValue( path, savedValue ?? ( propType.default as Value ), combinedValues ),
+					...updateValue( path, restored, combinedValues ),
 				};
 			}
 
@@ -165,23 +175,88 @@ function evaluatePropType( props: {
 
 function updateValue( path: string[], value: Value, values: Values ) {
 	const topPropKey = path[ 0 ];
-	const newValue: Values = { ...values };
+	const root: Values = { ...values };
 
-	path.reduce( ( carry: Values | null, key, index ) => {
-		if ( ! carry ) {
-			return null;
+	let carry: Values = 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;
+		const next = cloneDescent( carry[ key ] );
 
-			return ( carry[ key ]?.value as Values ) ?? carry.value;
+		if ( ! next ) {
+			break;
 		}
 
-		return ( carry[ key ]?.value as Values ) ?? carry.value;
-	}, newValue );
+		carry[ key ] = next.replacement;
+		carry = next.descended;
+	}
+
+	return { [ topPropKey ]: root[ topPropKey ] ?? null };
+}
+
+function cloneDescent( child: Value ): { replacement: Value; descended: Values } | null {
+	if ( ! child ) {
+		return null;
+	}
+
+	if ( isOverridable( child ) ) {
+		const origin = child.value.origin_value;
+
+		if ( ! origin || ! isTransformable( origin ) ) {
+			return null;
+		}
+
+		const descended: Values = { ...( origin.value as Values ) };
+		const replacement: Value = {
+			...child,
+			value: {
+				...child.value,
+				origin_value: { ...origin, value: descended },
+			},
+		};
+
+		return { replacement, descended };
+	}
+
+	if ( isTransformable( child ) ) {
+		const descended: Values = { ...( child.value as Values ) };
+		const replacement: Value = { ...child, value: descended };
+
+		return { replacement, descended };
+	}
+
+	return null;
+}
+
+function isCompatibleSavedValue( saved: Value | null, current: Value ): saved is Value {
+	if ( ! saved ) {
+		return false;
+	}
+
+	return isOverridable( saved ) === isOverridable( current );
+}
+
+function mergeLeafValue( existing: Value, incoming: Value ) {
+	if ( incoming === null ) {
+		return null;
+	}
+
+	if ( incoming && isOverridable( incoming ) ) {
+		return incoming;
+	}
+
+	if ( existing && isOverridable( existing ) && incoming ) {
+		return rewrapOverridableValue( existing, incoming );
+	}
 
-	return { [ topPropKey ]: newValue[ topPropKey ] ?? null };
+	return incoming;
 }
 
 function handleUnmetCondition( props: {
@@ -196,7 +271,8 @@ function handleUnmetCondition( props: {
 		( term ): term is Dependency => 'newValue' in term && !! term.newValue
 	) as Dependency | undefined;
 	const newValue = termWithNewValue?.newValue ?? null;
-	const currentValue = extractValue( dependency.split( '.' ), elementValues ) ?? defaultValue;
+	const currentValue =
+		extractValue( dependency.split( '.' ), elementValues, [], { unwrapOverridableLeaf: false } ) ?? defaultValue;
 
 	savePreviousValueToStorage( {
 		path: dependency,