@elementor/editor-controls 4.1.0-751 → 4.1.0-752

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elementor/editor-controls",
   "description": "This package contains the controls model and utils for the Elementor editor",
-  "version": "4.1.0-751",
+  "version": "4.1.0-752",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -40,22 +40,22 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor-current-user": "4.1.0-751",
-    "@elementor/editor-elements": "4.1.0-751",
-    "@elementor/editor-props": "4.1.0-751",
-    "@elementor/editor-responsive": "4.1.0-751",
-    "@elementor/editor-ui": "4.1.0-751",
-    "@elementor/editor-v1-adapters": "4.1.0-751",
-    "@elementor/env": "4.1.0-751",
-    "@elementor/http-client": "4.1.0-751",
+    "@elementor/editor-current-user": "4.1.0-752",
+    "@elementor/editor-elements": "4.1.0-752",
+    "@elementor/editor-props": "4.1.0-752",
+    "@elementor/editor-responsive": "4.1.0-752",
+    "@elementor/editor-ui": "4.1.0-752",
+    "@elementor/editor-v1-adapters": "4.1.0-752",
+    "@elementor/env": "4.1.0-752",
+    "@elementor/http-client": "4.1.0-752",
     "@elementor/icons": "^1.68.0",
-    "@elementor/locations": "4.1.0-751",
-    "@elementor/events": "4.1.0-751",
-    "@elementor/query": "4.1.0-751",
-    "@elementor/session": "4.1.0-751",
+    "@elementor/locations": "4.1.0-752",
+    "@elementor/events": "4.1.0-752",
+    "@elementor/query": "4.1.0-752",
+    "@elementor/session": "4.1.0-752",
     "@elementor/ui": "1.36.17",
-    "@elementor/utils": "4.1.0-751",
-    "@elementor/wp-media": "4.1.0-751",
+    "@elementor/utils": "4.1.0-752",
+    "@elementor/wp-media": "4.1.0-752",
     "@wordpress/i18n": "^5.13.0",
     "@monaco-editor/react": "^4.7.0",
     "dayjs": "^1.11.18",

package/src/bound-prop-context/prop-context.tsx

@@ -23,6 +23,7 @@ type PropContext< T extends PropValue, P extends PropType > = {
 	value: T | null;
 	propType: P;
 	placeholder?: T;
+	baseValue?: T;
 	isDisabled?: ( propType: PropType ) => boolean | undefined;
 };
 
@@ -38,6 +39,7 @@ export const PropProvider = < T extends PropValue, P extends PropType >( {
 	setValue,
 	propType,
 	placeholder,
+	baseValue,
 	isDisabled,
 }: PropProviderProps< T, P > ) => {
 	return (
@@ -47,6 +49,7 @@ export const PropProvider = < T extends PropValue, P extends PropType >( {
 				propType,
 				setValue: setValue as SetValue< PropValue >,
 				placeholder,
+				baseValue,
 				isDisabled,
 			} }
 		>

package/src/bound-prop-context/prop-key-context.tsx

@@ -20,6 +20,7 @@ export type PropKeyContextValue< T, P > = {
 	value: T;
 	propType: P;
 	placeholder?: T;
+	baseValue?: T;
 	path: PropKey[];
 	isDisabled?: ( propType: PropType ) => boolean | undefined;
 	disabled?: boolean;
@@ -55,7 +56,7 @@ const ObjectPropKeyProvider = ( { children, bind }: PropKeyProviderProps ) => {
 
 	const setValue: SetValue< PropValue > = ( value, options, meta ) => {
 		const newValue = {
-			...context.value,
+			...( context.value ?? context.baseValue ),
 			[ bind ]: value,
 		};
 
@@ -64,12 +65,22 @@ const ObjectPropKeyProvider = ( { children, bind }: PropKeyProviderProps ) => {
 
 	const value = context.value?.[ bind ];
 	const placeholder = context.placeholder?.[ bind ];
+	const baseValue = context.baseValue?.[ bind ];
 
 	const propType = context.propType.shape[ bind ];
 
 	return (
 		<PropKeyContext.Provider
-			value={ { ...context, value, setValue, placeholder, bind, propType, path: [ ...( path ?? [] ), bind ] } }
+			value={ {
+				...context,
+				value,
+				setValue,
+				placeholder,
+				baseValue,
+				bind,
+				propType,
+				path: [ ...( path ?? [] ), bind ],
+			} }
 		>
 			{ children }
 		</PropKeyContext.Provider>
@@ -81,7 +92,7 @@ const ArrayPropKeyProvider = ( { children, bind }: PropKeyProviderProps ) => {
 	const { path } = useContext( PropKeyContext ) ?? {};
 
 	const setValue = ( value: PropValue, options?: CreateOptions ) => {
-		const newValue = [ ...( context.value ?? [] ) ];
+		const newValue = [ ...( context.value ?? context.baseValue ?? [] ) ];
 
 		newValue[ Number( bind ) ] = value;
 
@@ -90,6 +101,7 @@ const ArrayPropKeyProvider = ( { children, bind }: PropKeyProviderProps ) => {
 
 	const value = context.value?.[ Number( bind ) ];
 	const placeholder = context.placeholder?.[ Number( bind ) ];
+	const baseValue = context.baseValue?.[ Number( bind ) ];
 
 	const propType = context.propType.item_prop_type;
 
@@ -103,6 +115,7 @@ const ArrayPropKeyProvider = ( { children, bind }: PropKeyProviderProps ) => {
 				propType,
 				path: [ ...( path ?? [] ), bind ],
 				placeholder: placeholder ?? undefined,
+				baseValue: baseValue ?? undefined,
 			} }
 		>
 			{ children }

package/src/bound-prop-context/use-bound-prop.ts

@@ -17,6 +17,7 @@ type UseBoundProp< TValue extends PropValue > = {
 	value: TValue;
 	propType: PropType;
 	placeholder?: TValue;
+	baseValue?: TValue;
 	path: PropKey[];
 	restoreValue: () => void;
 	resetValue: () => void;
@@ -73,11 +74,12 @@ export function useBoundProp< TKey extends string, TValue extends PropValue >(
 
 	const propType = resolveUnionPropType( propKeyContext.propType, propTypeUtil.key );
 
-	const hasPlaceholder = propKeyContext.placeholder !== undefined && propKeyContext.placeholder !== null;
-	const fallbackValue = hasPlaceholder ? null : propType.default;
+	const hasBaseValue = propKeyContext.baseValue !== undefined && propKeyContext.baseValue !== null;
+	const fallbackValue = hasBaseValue ? null : propType.default;
 
 	const value = propTypeUtil.extract( propKeyContext.value ?? fallbackValue ?? null );
-	const placeholder = propTypeUtil.extract( propKeyContext.placeholder ?? null );
+	const baseValue = propTypeUtil.extract( propKeyContext.baseValue ?? null );
+	const placeholder = propTypeUtil.extract( propKeyContext.placeholder ?? propKeyContext.baseValue ?? null );
 
 	return {
 		...propKeyContext,
@@ -86,6 +88,7 @@ export function useBoundProp< TKey extends string, TValue extends PropValue >(
 		value: isValid ? value : null,
 		restoreValue,
 		placeholder,
+		baseValue,
 		disabled,
 		resetValue,
 	};