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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elementor/editor-components",
   "description": "Elementor editor components",
-  "version": "4.1.0-751",
+  "version": "4.1.0-752",
   "private": false,
   "author": "Elementor Team",
   "homepage": "https://elementor.com/",
@@ -40,31 +40,31 @@
     "dev": "tsup --config=../../tsup.dev.ts"
   },
   "dependencies": {
-    "@elementor/editor": "4.1.0-751",
-    "@elementor/editor-canvas": "4.1.0-751",
-    "@elementor/editor-controls": "4.1.0-751",
-    "@elementor/editor-documents": "4.1.0-751",
-    "@elementor/editor-editing-panel": "4.1.0-751",
-    "@elementor/editor-elements": "4.1.0-751",
-    "@elementor/editor-elements-panel": "4.1.0-751",
-    "@elementor/editor-mcp": "4.1.0-751",
-    "@elementor/editor-templates": "4.1.0-751",
-    "@elementor/editor-panels": "4.1.0-751",
-    "@elementor/editor-props": "4.1.0-751",
-    "@elementor/editor-styles-repository": "4.1.0-751",
-    "@elementor/editor-ui": "4.1.0-751",
-    "@elementor/editor-v1-adapters": "4.1.0-751",
-    "@elementor/http-client": "4.1.0-751",
+    "@elementor/editor": "4.1.0-752",
+    "@elementor/editor-canvas": "4.1.0-752",
+    "@elementor/editor-controls": "4.1.0-752",
+    "@elementor/editor-documents": "4.1.0-752",
+    "@elementor/editor-editing-panel": "4.1.0-752",
+    "@elementor/editor-elements": "4.1.0-752",
+    "@elementor/editor-elements-panel": "4.1.0-752",
+    "@elementor/editor-mcp": "4.1.0-752",
+    "@elementor/editor-templates": "4.1.0-752",
+    "@elementor/editor-panels": "4.1.0-752",
+    "@elementor/editor-props": "4.1.0-752",
+    "@elementor/editor-styles-repository": "4.1.0-752",
+    "@elementor/editor-ui": "4.1.0-752",
+    "@elementor/editor-v1-adapters": "4.1.0-752",
+    "@elementor/http-client": "4.1.0-752",
     "@elementor/icons": "^1.68.0",
-    "@elementor/events": "4.1.0-751",
-    "@elementor/query": "4.1.0-751",
-    "@elementor/schema": "4.1.0-751",
-    "@elementor/store": "4.1.0-751",
+    "@elementor/events": "4.1.0-752",
+    "@elementor/query": "4.1.0-752",
+    "@elementor/schema": "4.1.0-752",
+    "@elementor/store": "4.1.0-752",
     "@elementor/ui": "1.36.17",
-    "@elementor/utils": "4.1.0-751",
+    "@elementor/utils": "4.1.0-752",
     "@wordpress/i18n": "^5.13.0",
-    "@elementor/editor-notifications": "4.1.0-751",
-    "@elementor/editor-current-user": "4.1.0-751"
+    "@elementor/editor-notifications": "4.1.0-752",
+    "@elementor/editor-current-user": "4.1.0-752"
   },
   "peerDependencies": {
     "react": "^18.3.1",

package/src/components/instance-editing-panel/override-prop-control.tsx

@@ -50,7 +50,7 @@ import { resolveOverridePropValue } from '../../utils/resolve-override-prop-valu
 import { ControlLabel } from '../control-label';
 import { OverrideControlPropTypeNotFoundError } from '../errors';
 import { correctExposedEmptyOverride } from './utils/correct-exposed-empty-override';
-import { unwrapOverridableSettings } from './utils/resolve-element-settings';
+import { type ElementSettings, unwrapOverridableSettings } from './utils/resolve-element-settings';
 import { useOverrideControlDependencies } from './utils/use-override-dependencies';
 import { useResolvedInnerElement } from './utils/use-resolved-inner-element';
 
@@ -115,7 +115,7 @@ function OverrideControl( { overridableProp }: InternalProps ) {
 		return null;
 	}
 
-	const { propValue, placeholderValue } = resolveValueAndPlaceholder(
+	const { propValue, baseValue: resolvedBaseValue } = resolveOverrideValues(
 		matchingOverride,
 		overrideValue,
 		resolvedOriginValues,
@@ -126,8 +126,8 @@ function OverrideControl( { overridableProp }: InternalProps ) {
 		[ overridableProp.overrideKey ]: propValue,
 	} as OverridesSchema;
 
-	const placeholder = {
-		[ overridableProp.overrideKey ]: placeholderValue,
+	const baseValue = {
+		[ overridableProp.overrideKey ]: resolvedBaseValue,
 	} as OverridesSchema;
 
 	const { control, controlProps, layout } = getControlParams(
@@ -201,7 +201,7 @@ function OverrideControl( { overridableProp }: InternalProps ) {
 					propType={ propTypeSchema }
 					value={ value }
 					setValue={ setValue }
-					placeholder={ placeholder }
+					baseValue={ baseValue }
 					isDisabled={ isDisabled }
 				>
 					<PropKeyProvider bind={ overridableProp.overrideKey }>
@@ -220,24 +220,22 @@ function OverrideControl( { overridableProp }: InternalProps ) {
 	);
 }
 
-type ElementSettings = Record< string, AnyTransformable | null >;
-
-function resolveValueAndPlaceholder(
+function resolveOverrideValues(
 	matchingOverride: ComponentInstanceOverride | null,
 	overrideValue: AnyTransformable | null,
 	resolvedOriginValues: ElementSettings,
 	propKey: string
 ) {
-	const placeholderSettings = unwrapOverridableSettings( resolvedOriginValues );
-	const inheritedValue = placeholderSettings[ propKey ] ?? null;
+	const unwrappedSettings = unwrapOverridableSettings( resolvedOriginValues );
+	const inheritedValue = unwrappedSettings[ propKey ] ?? null;
 	const isInheritedDynamic = isDynamicPropValue( inheritedValue );
 
 	const shouldUseInheritedAsValue = isInheritedDynamic && ! matchingOverride;
 
 	const propValue = shouldUseInheritedAsValue ? inheritedValue : overrideValue;
-	const placeholderValue = matchingOverride || isInheritedDynamic ? null : inheritedValue;
+	const baseValue = matchingOverride || isInheritedDynamic ? null : inheritedValue;
 
-	return { propValue, placeholderValue };
+	return { propValue, baseValue };
 }
 
 // Temp solution: when removing an override on a dynamic value, fall back to propType.default
@@ -263,10 +261,8 @@ function createOverrideValue( {
 	overrideValue: ComponentInstanceOverrideProp | ComponentOverridableProp;
 	componentId: number;
 } ): ComponentInstanceOverride {
-	// this is for an override that's already set as overridable
 	const overridableValue = componentOverridablePropTypeUtil.extract( matchingOverride );
 
-	// this is for changes via the overridable-prop-indicator
 	const newOverridableValue = componentOverridablePropTypeUtil.extract( overrideValue );
 
 	const anyOverridable = newOverridableValue ?? overridableValue;