@elementor/editor-components 3.35.0-432 → 3.35.0-433

package/dist/index.js

@@ -2740,6 +2740,7 @@ var Components = () => {
 
 // src/components/consts.ts
 var COMPONENT_DOCUMENT_TYPE = "elementor_component";
+var OVERRIDABLE_PROP_REPLACEMENT_ID = "overridable-prop";
 
 // src/components/create-component-form/create-component-form.tsx
 var React19 = __toESM(require("react"));
@@ -3415,10 +3416,10 @@ var EditModeDialog = ({ lockedBy }) => {
 };
 
 // src/components/instance-editing-panel/instance-editing-panel.tsx
-var React27 = __toESM(require("react"));
+var React28 = __toESM(require("react"));
 var import_editor_controls4 = require("@elementor/editor-controls");
 var import_editor_editing_panel5 = require("@elementor/editor-editing-panel");
-var import_editor_elements14 = require("@elementor/editor-elements");
+var import_editor_elements15 = require("@elementor/editor-elements");
 var import_editor_panels3 = require("@elementor/editor-panels");
 var import_icons14 = require("@elementor/icons");
 var import_ui22 = require("@elementor/ui");
@@ -3514,16 +3515,17 @@ var EmptyState2 = ({ onEditComponent }) => {
 };
 
 // src/components/instance-editing-panel/override-props-group.tsx
-var React26 = __toESM(require("react"));
-var import_react15 = require("react");
+var React27 = __toESM(require("react"));
+var import_react16 = require("react");
 var import_editor_editing_panel4 = require("@elementor/editor-editing-panel");
 var import_editor_ui11 = require("@elementor/editor-ui");
 var import_ui21 = require("@elementor/ui");
 
 // src/components/instance-editing-panel/override-prop-control.tsx
-var React25 = __toESM(require("react"));
+var React26 = __toESM(require("react"));
 var import_editor_controls3 = require("@elementor/editor-controls");
 var import_editor_editing_panel3 = require("@elementor/editor-editing-panel");
+var import_editor_elements14 = require("@elementor/editor-elements");
 var import_ui20 = require("@elementor/ui");
 
 // src/hooks/use-controls-by-widget-type.ts
@@ -3557,8 +3559,51 @@ function getControlsByBind(controls) {
   );
 }
 
+// src/provider/overridable-prop-context.tsx
+var React24 = __toESM(require("react"));
+var import_react15 = require("react");
+var OverridablePropContext = (0, import_react15.createContext)(null);
+function OverridablePropProvider({ children, ...props }) {
+  return /* @__PURE__ */ React24.createElement(OverridablePropContext.Provider, { value: props }, children);
+}
+var useOverridablePropValue = () => (0, import_react15.useContext)(OverridablePropContext)?.value;
+var useComponentInstanceElement = () => (0, import_react15.useContext)(OverridablePropContext)?.componentInstanceElement;
+
 // src/store/actions/update-overridable-prop.ts
 var import_store53 = require("@elementor/store");
+
+// src/utils/resolve-override-prop-value.ts
+var resolveOverridePropValue = (originalPropValue) => {
+  const isOverridable = componentOverridablePropTypeUtil.isValid(originalPropValue);
+  if (isOverridable) {
+    return getOverridableValue(originalPropValue);
+  }
+  const isOverride = componentInstanceOverridePropTypeUtil.isValid(originalPropValue);
+  if (isOverride) {
+    return getOverrideValue(originalPropValue);
+  }
+  return originalPropValue;
+};
+function getOverridableValue(overridableProp) {
+  const overridableValue = componentOverridablePropTypeUtil.extract(overridableProp);
+  if (!overridableValue) {
+    return null;
+  }
+  const isOverride = componentInstanceOverridePropTypeUtil.isValid(overridableValue.origin_value);
+  if (isOverride) {
+    return getOverrideValue(overridableValue.origin_value);
+  }
+  return overridableValue.origin_value;
+}
+function getOverrideValue(overrideProp) {
+  const overrideValue = componentInstanceOverridePropTypeUtil.extract(overrideProp);
+  if (!overrideValue) {
+    return null;
+  }
+  return overrideValue.override_value;
+}
+
+// src/store/actions/update-overridable-prop.ts
 function updateOverridableProp(componentId, propValue, originPropFields) {
   const overridableProps = selectOverridableProps((0, import_store53.__getState)(), componentId);
   if (!overridableProps) {
@@ -3568,11 +3613,12 @@ function updateOverridableProp(componentId, propValue, originPropFields) {
   if (!existingOverridableProp) {
     return;
   }
+  const originValue = resolveOverridePropValue(propValue.origin_value);
   const newOverridableProp = originPropFields ? {
-    originValue: propValue.origin_value,
+    originValue,
     originPropFields
   } : {
-    originValue: propValue.origin_value
+    originValue
   };
   const newOverridableProps = {
     ...overridableProps,
@@ -3598,11 +3644,12 @@ var getPropTypeForComponentOverride = (overridableProp) => {
   if (overridableProp.originPropFields) {
     return getPropType(overridableProp.originPropFields);
   }
-  const { elType, widgetType, propKey } = overridableProp;
+  const { elType, widgetType, propKey, elementId } = overridableProp;
   return getPropType({
     elType,
     widgetType,
-    propKey
+    propKey,
+    elementId
   });
 };
 function getPropType({ widgetType, propKey }) {
@@ -3611,23 +3658,25 @@ function getPropType({ widgetType, propKey }) {
 }
 
 // src/components/control-label.tsx
-var React24 = __toESM(require("react"));
+var React25 = __toESM(require("react"));
 var import_editor_controls2 = require("@elementor/editor-controls");
 var import_ui19 = require("@elementor/ui");
 var ControlLabel = ({ children, ...props }) => {
-  return /* @__PURE__ */ React24.createElement(import_ui19.Stack, { direction: "row", alignItems: "center", justifyItems: "start", gap: 0.25 }, /* @__PURE__ */ React24.createElement(import_editor_controls2.ControlFormLabel, { ...props }, children), /* @__PURE__ */ React24.createElement(import_editor_controls2.ControlAdornments, null));
+  return /* @__PURE__ */ React25.createElement(import_ui19.Stack, { direction: "row", alignItems: "center", justifyItems: "start", gap: 0.25 }, /* @__PURE__ */ React25.createElement(import_editor_controls2.ControlFormLabel, { ...props }, children), /* @__PURE__ */ React25.createElement(import_editor_controls2.ControlAdornments, null));
 };
 
 // src/components/instance-editing-panel/override-prop-control.tsx
 function OverridePropControl({ overridableProp, overrides }) {
-  return /* @__PURE__ */ React25.createElement(import_editor_editing_panel3.SettingsField, { bind: "component_instance", propDisplayName: overridableProp.label }, /* @__PURE__ */ React25.createElement(OverrideControl, { overridableProp, overrides }));
+  return /* @__PURE__ */ React26.createElement(import_editor_editing_panel3.SettingsField, { bind: "component_instance", propDisplayName: overridableProp.label }, /* @__PURE__ */ React26.createElement(OverrideControl, { overridableProp, overrides }));
 }
 function OverrideControl({ overridableProp, overrides }) {
+  const componentInstanceElement = (0, import_editor_editing_panel3.useElement)();
   const componentId = useCurrentComponentId();
   const { value: instanceValue, setValue: setInstanceValue } = (0, import_editor_controls3.useBoundProp)(componentInstancePropTypeUtil);
   const controls = useControlsByWidgetType(
     overridableProp?.originPropFields?.widgetType ?? overridableProp.widgetType
   );
+  const controlReplacements = (0, import_editor_editing_panel3.getControlReplacements)();
   const propType = getPropTypeForComponentOverride(overridableProp);
   if (!propType) {
     return null;
@@ -3642,13 +3691,18 @@ function OverrideControl({ overridableProp, overrides }) {
     throw new Error("Component ID is required");
   }
   const matchingOverride = getMatchingOverride(overrides, overridableProp.overrideKey);
-  const propValue = matchingOverride ? getPropValue(matchingOverride) : overridableProp.originValue;
+  const propValue = matchingOverride ? resolveOverridePropValue(matchingOverride) : overridableProp.originValue;
   const value = {
     [overridableProp.overrideKey]: propValue
   };
   const setValue = (newValue) => {
     const newPropValue = newValue[overridableProp.overrideKey];
-    const newOverrideValue = createOverrideValue(overridableProp.overrideKey, newPropValue, componentInstanceId);
+    const newOverrideValue = createOverrideValue({
+      matchingOverride,
+      overrideKey: overridableProp.overrideKey,
+      overrideValue: newPropValue,
+      componentId: componentInstanceId
+    });
     let newOverrides = overrides?.map((override) => override === matchingOverride ? newOverrideValue : override) ?? [];
     if (!matchingOverride) {
       newOverrides = [...newOverrides, newOverrideValue];
@@ -3663,33 +3717,41 @@ function OverrideControl({ overridableProp, overrides }) {
         updateOverridableProp(componentId, overridableValue, overridableProp.originPropFields);
         return;
       }
-      const { elType, widgetType, propKey } = overridableProp;
-      updateOverridableProp(componentId, overridableValue, { elType, widgetType, propKey });
+      const { elType: elType2, widgetType: widgetType2, propKey: propKey2, elementId: elementId2 } = overridableProp;
+      updateOverridableProp(componentId, overridableValue, { elType: elType2, widgetType: widgetType2, propKey: propKey2, elementId: elementId2 });
     }
   };
-  return /* @__PURE__ */ React25.createElement(
-    import_editor_controls3.PropProvider,
+  const { control, controlProps, layout } = getControlParams(
+    controls,
+    overridableProp?.originPropFields ?? overridableProp,
+    overridableProp.label
+  );
+  const { elementId, widgetType, elType, propKey } = overridableProp.originPropFields ?? overridableProp;
+  const type = elType === "widget" ? widgetType : elType;
+  const elementType = (0, import_editor_elements14.getElementType)(type);
+  if (!elementType) {
+    return null;
+  }
+  return /* @__PURE__ */ React26.createElement(
+    OverridablePropProvider,
     {
-      propType: propTypeSchema,
-      value,
-      setValue,
-      isDisabled: () => {
-        return false;
-      }
+      value: componentOverridablePropTypeUtil.extract(matchingOverride) ?? void 0,
+      componentInstanceElement
     },
-    /* @__PURE__ */ React25.createElement(import_editor_controls3.PropKeyProvider, { bind: overridableProp.overrideKey }, /* @__PURE__ */ React25.createElement(import_ui20.Stack, { direction: "column", gap: 1, mb: 1.5 }, /* @__PURE__ */ React25.createElement(ControlLabel, null, overridableProp.label), getControl(controls, overridableProp?.originPropFields ?? overridableProp)))
+    /* @__PURE__ */ React26.createElement(import_editor_editing_panel3.ElementProvider, { element: { id: elementId, type }, elementType }, /* @__PURE__ */ React26.createElement(import_editor_editing_panel3.SettingsField, { bind: propKey, propDisplayName: overridableProp.label }, /* @__PURE__ */ React26.createElement(
+      import_editor_controls3.PropProvider,
+      {
+        propType: propTypeSchema,
+        value,
+        setValue,
+        isDisabled: () => {
+          return false;
+        }
+      },
+      /* @__PURE__ */ React26.createElement(import_editor_controls3.PropKeyProvider, { bind: overridableProp.overrideKey }, /* @__PURE__ */ React26.createElement(import_editor_controls3.ControlReplacementsProvider, { replacements: controlReplacements }, /* @__PURE__ */ React26.createElement(import_ui20.Stack, { direction: "column", gap: 1, mb: 1.5 }, layout !== "custom" && /* @__PURE__ */ React26.createElement(ControlLabel, null, overridableProp.label), /* @__PURE__ */ React26.createElement(OriginalControl, { control, controlProps }))))
+    )))
   );
 }
-function getPropValue(value) {
-  const overridableValue = componentOverridablePropTypeUtil.extract(value);
-  if (overridableValue) {
-    return value;
-  }
-  if (componentInstanceOverridePropTypeUtil.isValid(value)) {
-    return value.value.override_value;
-  }
-  return null;
-}
 function getMatchingOverride(overrides, overrideKey) {
   return overrides?.find((override) => {
     const overridableValue = componentOverridablePropTypeUtil.extract(override);
@@ -3702,19 +3764,26 @@ function getMatchingOverride(overrides, overrideKey) {
     return comparedOverrideKey === overrideKey;
   }) ?? null;
 }
-function createOverrideValue(overrideKey, overrideValue, componentId) {
-  const overridableValue = componentOverridablePropTypeUtil.extract(overrideValue);
-  if (overridableValue) {
+function createOverrideValue({
+  matchingOverride,
+  overrideKey,
+  overrideValue,
+  componentId
+}) {
+  const overridableValue = componentOverridablePropTypeUtil.extract(matchingOverride);
+  const newOverridableValue = componentOverridablePropTypeUtil.extract(overrideValue);
+  const anyOverridable = newOverridableValue ?? overridableValue;
+  if (anyOverridable) {
     const innerOverride = componentInstanceOverridePropTypeUtil.create({
       override_key: overrideKey,
-      override_value: overridableValue.origin_value,
+      override_value: resolveOverridePropValue(overrideValue),
       schema_source: {
         type: "component",
         id: componentId
       }
     });
     return componentOverridablePropTypeUtil.create({
-      override_key: overridableValue.override_key,
+      override_key: anyOverridable.override_key,
       origin_value: innerOverride
     });
   }
@@ -3727,10 +3796,41 @@ function createOverrideValue(overrideKey, overrideValue, componentId) {
     }
   });
 }
-function getControl(controls, originPropFields) {
-  const ControlComponent = import_editor_editing_panel3.controlsRegistry.get(controls[originPropFields.propKey].value.type);
-  const controlProps = controls[originPropFields.propKey].value.props;
-  return /* @__PURE__ */ React25.createElement(ControlComponent, { ...controlProps });
+function getControlParams(controls, originPropFields, label) {
+  const control = controls[originPropFields.propKey];
+  const { value } = control;
+  const layout = getControlLayout(control);
+  const controlProps = populateChildControlProps(value.props);
+  if (layout === "custom") {
+    controlProps.label = label ?? value.label;
+  }
+  return {
+    control,
+    controlProps,
+    layout
+  };
+}
+function OriginalControl({ control, controlProps }) {
+  const { value } = control;
+  return /* @__PURE__ */ React26.createElement(import_editor_editing_panel3.BaseControl, { type: value.type, props: controlProps });
+}
+function getControlLayout(control) {
+  return control.value.meta?.layout || import_editor_editing_panel3.controlsRegistry.getLayout(control.value.type);
+}
+function populateChildControlProps(props) {
+  if (props.childControlType) {
+    const childComponent = import_editor_editing_panel3.controlsRegistry.get(props.childControlType);
+    const childPropType = import_editor_editing_panel3.controlsRegistry.getPropTypeUtil(props.childControlType);
+    props = {
+      ...props,
+      childControlConfig: {
+        component: childComponent,
+        props: props.childControlProps || {},
+        propTypeUtil: childPropType
+      }
+    };
+  }
+  return props;
 }
 
 // src/components/instance-editing-panel/override-props-group.tsx
@@ -3739,11 +3839,11 @@ function OverridePropsGroup({ group, props, overrides }) {
   const handleClick = () => {
     setIsOpen(!isOpen);
   };
-  const id2 = (0, import_react15.useId)();
+  const id2 = (0, import_react16.useId)();
   const labelId = `label-${id2}`;
   const contentId = `content-${id2}`;
   const title = group.label;
-  return /* @__PURE__ */ React26.createElement(import_ui21.Box, { "aria-label": `${title} section` }, /* @__PURE__ */ React26.createElement(
+  return /* @__PURE__ */ React27.createElement(import_ui21.Box, { "aria-label": `${title} section` }, /* @__PURE__ */ React27.createElement(
     import_ui21.ListItemButton,
     {
       id: labelId,
@@ -3753,7 +3853,7 @@ function OverridePropsGroup({ group, props, overrides }) {
       p: 0,
       sx: { "&:hover": { backgroundColor: "transparent" } }
     },
-    /* @__PURE__ */ React26.createElement(import_ui21.Stack, { direction: "row", alignItems: "center", justifyItems: "start", flexGrow: 1, gap: 0.5 }, /* @__PURE__ */ React26.createElement(
+    /* @__PURE__ */ React27.createElement(import_ui21.Stack, { direction: "row", alignItems: "center", justifyItems: "start", flexGrow: 1, gap: 0.5 }, /* @__PURE__ */ React27.createElement(
       import_ui21.ListItemText,
       {
         secondary: title,
@@ -3761,8 +3861,8 @@ function OverridePropsGroup({ group, props, overrides }) {
         sx: { flexGrow: 0, flexShrink: 1, marginInlineEnd: 1 }
       }
     )),
-    /* @__PURE__ */ React26.createElement(import_editor_ui11.CollapseIcon, { open: isOpen, color: "secondary", fontSize: "tiny" })
-  ), /* @__PURE__ */ React26.createElement(import_ui21.Collapse, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto" }, /* @__PURE__ */ React26.createElement(import_ui21.Stack, { direction: "column", gap: 1, p: 2 }, group.props.map((overrideKey) => /* @__PURE__ */ React26.createElement(
+    /* @__PURE__ */ React27.createElement(import_editor_ui11.CollapseIcon, { open: isOpen, color: "secondary", fontSize: "tiny" })
+  ), /* @__PURE__ */ React27.createElement(import_ui21.Collapse, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto" }, /* @__PURE__ */ React27.createElement(import_ui21.Stack, { direction: "column", gap: 1, p: 2 }, group.props.map((overrideKey) => /* @__PURE__ */ React27.createElement(
     OverridePropControl,
     {
       key: overrideKey,
@@ -3779,7 +3879,7 @@ function InstanceEditingPanel() {
   const overrides = settings?.overrides?.value;
   const component = useComponent(componentId ?? null);
   const overridableProps = useOverridableProps(componentId ?? null);
-  const componentInstanceId = (0, import_editor_elements14.useSelectedElement)()?.element?.id ?? null;
+  const componentInstanceId = (0, import_editor_elements15.useSelectedElement)()?.element?.id ?? null;
   if (!componentId || !overridableProps || !component) {
     return null;
   }
@@ -3788,7 +3888,7 @@ function InstanceEditingPanel() {
   const isNonEmptyGroup = (group) => group !== null && group.props.length > 0;
   const groups = overridableProps.groups.order.map((groupId) => overridableProps.groups.items[groupId] ?? null).filter(isNonEmptyGroup);
   const isEmpty = groups.length === 0 || Object.keys(overridableProps.props).length === 0;
-  return /* @__PURE__ */ React27.createElement(React27.Fragment, null, /* @__PURE__ */ React27.createElement(import_editor_panels3.PanelHeader, { sx: { justifyContent: "start", px: 2 } }, /* @__PURE__ */ React27.createElement(import_ui22.Stack, { direction: "row", alignContent: "space-between", flexGrow: 1 }, /* @__PURE__ */ React27.createElement(import_ui22.Stack, { direction: "row", alignItems: "center", justifyContent: "start", gap: 1, flexGrow: 1 }, /* @__PURE__ */ React27.createElement(import_icons14.ComponentsIcon, { fontSize: "small", sx: { color: "text.tertiary" } }), /* @__PURE__ */ React27.createElement(import_editor_panels3.PanelHeaderTitle, null, component.name)), /* @__PURE__ */ React27.createElement(import_ui22.Tooltip, { title: panelTitle }, /* @__PURE__ */ React27.createElement(import_ui22.IconButton, { size: "tiny", onClick: handleEditComponent, "aria-label": panelTitle }, /* @__PURE__ */ React27.createElement(import_icons14.PencilIcon, { fontSize: "tiny" }))))), /* @__PURE__ */ React27.createElement(import_editor_panels3.PanelBody, null, /* @__PURE__ */ React27.createElement(import_editor_controls4.ControlAdornmentsProvider, { items: (0, import_editor_editing_panel5.getFieldIndicators)("settings") }, isEmpty ? /* @__PURE__ */ React27.createElement(EmptyState2, { onEditComponent: handleEditComponent }) : /* @__PURE__ */ React27.createElement(import_ui22.Stack, { direction: "column", alignItems: "stretch" }, groups.map((group) => /* @__PURE__ */ React27.createElement(
+  return /* @__PURE__ */ React28.createElement(React28.Fragment, null, /* @__PURE__ */ React28.createElement(import_editor_panels3.PanelHeader, { sx: { justifyContent: "start", px: 2 } }, /* @__PURE__ */ React28.createElement(import_ui22.Stack, { direction: "row", alignContent: "space-between", flexGrow: 1 }, /* @__PURE__ */ React28.createElement(import_ui22.Stack, { direction: "row", alignItems: "center", justifyContent: "start", gap: 1, flexGrow: 1 }, /* @__PURE__ */ React28.createElement(import_icons14.ComponentsIcon, { fontSize: "small", sx: { color: "text.tertiary" } }), /* @__PURE__ */ React28.createElement(import_editor_panels3.PanelHeaderTitle, null, component.name)), /* @__PURE__ */ React28.createElement(import_ui22.Tooltip, { title: panelTitle }, /* @__PURE__ */ React28.createElement(import_ui22.IconButton, { size: "tiny", onClick: handleEditComponent, "aria-label": panelTitle }, /* @__PURE__ */ React28.createElement(import_icons14.PencilIcon, { fontSize: "tiny" }))))), /* @__PURE__ */ React28.createElement(import_editor_panels3.PanelBody, null, /* @__PURE__ */ React28.createElement(import_editor_controls4.ControlAdornmentsProvider, { items: (0, import_editor_editing_panel5.getFieldIndicators)("settings") }, isEmpty ? /* @__PURE__ */ React28.createElement(EmptyState2, { onEditComponent: handleEditComponent }) : /* @__PURE__ */ React28.createElement(import_ui22.Stack, { direction: "column", alignItems: "stretch" }, groups.map((group) => /* @__PURE__ */ React28.createElement(
     OverridePropsGroup,
     {
       key: group.id,
@@ -3803,25 +3903,17 @@ function InstanceEditingPanel() {
 var React29 = __toESM(require("react"));
 var import_editor_controls5 = require("@elementor/editor-controls");
 var import_editor_editing_panel6 = require("@elementor/editor-editing-panel");
-
-// src/provider/overridable-prop-context.tsx
-var React28 = __toESM(require("react"));
-var import_react16 = require("react");
-var OverridablePropContext = (0, import_react16.createContext)(null);
-function OverridablePropProvider({ children, ...props }) {
-  return /* @__PURE__ */ React28.createElement(OverridablePropContext.Provider, { value: props }, children);
-}
-var useOverridablePropValue = () => (0, import_react16.useContext)(OverridablePropContext)?.value;
-
-// src/components/overridable-props/overridable-prop-control.tsx
 function OverridablePropControl({
-  OriginalControl,
+  OriginalControl: OriginalControl2,
   ...props
 }) {
   const { elementType } = (0, import_editor_editing_panel6.useElement)();
   const { value, bind, setValue, placeholder, ...propContext } = (0, import_editor_controls5.useBoundProp)(componentOverridablePropTypeUtil);
   const componentId = useCurrentComponentId();
   const overridableProps = useOverridableProps(componentId);
+  const filteredReplacements = (0, import_editor_editing_panel6.getControlReplacements)().filter(
+    (r) => !r.id || r.id !== OVERRIDABLE_PROP_REPLACEMENT_ID
+  );
   if (!componentId) {
     return null;
   }
@@ -3829,6 +3921,7 @@ function OverridablePropControl({
     throw new Error("Override key is required");
   }
   const isComponentInstance2 = elementType.key === "e-component";
+  const overridablePropData = overridableProps?.props?.[value.override_key];
   const setOverridableValue = (newValue) => {
     const propValue2 = {
       ...value,
@@ -3836,14 +3929,18 @@ function OverridablePropControl({
     };
     setValue(propValue2);
     if (!isComponentInstance2) {
-      const existingProp = overridableProps?.props?.[propValue2.override_key];
-      updateOverridableProp(componentId, propValue2, existingProp?.originPropFields);
+      updateOverridableProp(componentId, propValue2, overridablePropData?.originPropFields);
     }
   };
   const defaultPropType = elementType.propsSchema[bind];
+  const overridePropType = overridablePropData ? getPropTypeForComponentOverride(overridablePropData) : void 0;
+  const resolvedPropType = overridePropType ?? defaultPropType;
+  if (!resolvedPropType) {
+    return null;
+  }
   const propType = (0, import_editor_editing_panel6.createTopLevelObjectType)({
     schema: {
-      [bind]: isComponentInstance2 && overridableProps ? getPropTypeForComponentOverride(overridableProps.props[value.override_key]) ?? defaultPropType : defaultPropType
+      [bind]: resolvedPropType
     }
   });
   const propValue = isComponentInstance2 ? (value.origin_value?.value).override_value : value.origin_value;
@@ -3859,7 +3956,7 @@ function OverridablePropControl({
       },
       placeholder: objectPlaceholder
     },
-    /* @__PURE__ */ React29.createElement(import_editor_controls5.PropKeyProvider, { bind }, /* @__PURE__ */ React29.createElement(import_editor_controls5.ControlReplacementsProvider, { replacements: [] }, /* @__PURE__ */ React29.createElement(OriginalControl, { ...props })))
+    /* @__PURE__ */ React29.createElement(import_editor_controls5.PropKeyProvider, { bind }, /* @__PURE__ */ React29.createElement(import_editor_controls5.ControlReplacementsProvider, { replacements: filteredReplacements }, /* @__PURE__ */ React29.createElement(OriginalControl2, { ...props })))
   ));
 }
 
@@ -3867,7 +3964,7 @@ function OverridablePropControl({
 var React31 = __toESM(require("react"));
 var import_editor_controls6 = require("@elementor/editor-controls");
 var import_editor_editing_panel7 = require("@elementor/editor-editing-panel");
-var import_editor_elements15 = require("@elementor/editor-elements");
+var import_editor_elements16 = require("@elementor/editor-elements");
 var import_ui24 = require("@elementor/ui");
 var import_i18n28 = require("@wordpress/i18n");
 
@@ -4036,6 +4133,7 @@ function Content2({ componentId, overridableProps }) {
   } = (0, import_editor_editing_panel7.useElement)();
   const { value, bind, propType } = (0, import_editor_controls6.useBoundProp)();
   const contextOverridableValue = useOverridablePropValue();
+  const componentInstanceElement = useComponentInstanceElement();
   const { value: boundPropOverridableValue, setValue: setOverridableValue } = (0, import_editor_controls6.useBoundProp)(
     componentOverridablePropTypeUtil
   );
@@ -4045,20 +4143,20 @@ function Content2({ componentId, overridableProps }) {
   });
   const triggerProps = (0, import_ui24.bindTrigger)(popupState);
   const popoverProps = (0, import_ui24.bindPopover)(popupState);
-  const { elType } = (0, import_editor_elements15.getWidgetsCache)()?.[elementType.key] ?? { elType: "widget" };
+  const { elType } = (0, import_editor_elements16.getWidgetsCache)()?.[elementType.key] ?? { elType: "widget" };
   const handleSubmit = ({ label, group }) => {
     const propTypeDefault = propType.default ?? {};
-    const originValue = (!overridableValue ? value : overridableValue?.origin_value) ?? propTypeDefault;
+    const originValue = resolveOverridePropValue(overridableValue?.origin_value) ?? value ?? propTypeDefault;
     const matchingOverridableProp = overridableValue ? overridableProps?.props?.[overridableValue.override_key] : void 0;
     const overridablePropConfig = setOverridableProp({
       componentId,
       overrideKey: overridableValue?.override_key ?? null,
-      elementId,
+      elementId: componentInstanceElement?.element.id ?? elementId,
       label,
       groupId: group,
       propKey: bind,
       elType: elType ?? "widget",
-      widgetType: elementType.key,
+      widgetType: componentInstanceElement?.elementType.key ?? elementType.key,
       originValue,
       originPropFields: matchingOverridableProp?.originPropFields
     });
@@ -4107,7 +4205,7 @@ function isPropAllowed(bind) {
 }
 
 // src/hooks/regenerate-override-keys.ts
-var import_editor_elements16 = require("@elementor/editor-elements");
+var import_editor_elements17 = require("@elementor/editor-elements");
 var import_editor_v1_adapters8 = require("@elementor/editor-v1-adapters");
 var import_utils8 = require("@elementor/utils");
 function initRegenerateOverrideKeys() {
@@ -4128,11 +4226,11 @@ function regenerateOverrideKeysForContainers(result) {
   });
 }
 function regenerateOverrideKeysRecursive(elementId) {
-  const container = (0, import_editor_elements16.getContainer)(elementId);
+  const container = (0, import_editor_elements17.getContainer)(elementId);
   if (!container) {
     return;
   }
-  (0, import_editor_elements16.getAllDescendants)(container).forEach(regenerateOverrideKeys);
+  (0, import_editor_elements17.getAllDescendants)(container).forEach(regenerateOverrideKeys);
 }
 function regenerateOverrideKeys(element) {
   if (!isComponentInstance(element.model.toJSON())) {
@@ -4166,7 +4264,7 @@ function regenerateOverrideKeys(element) {
       }
     }
   };
-  (0, import_editor_elements16.updateElementSettings)({
+  (0, import_editor_elements17.updateElementSettings)({
     id: element.id,
     props: { component_instance: newComponentInstance },
     withHistory: false
@@ -4190,7 +4288,7 @@ var import_editor_mcp3 = require("@elementor/editor-mcp");
 
 // src/mcp/save-as-component-tool.ts
 var import_editor_canvas8 = require("@elementor/editor-canvas");
-var import_editor_elements17 = require("@elementor/editor-elements");
+var import_editor_elements18 = require("@elementor/editor-elements");
 var import_editor_mcp2 = require("@elementor/editor-mcp");
 var import_http_client2 = require("@elementor/http-client");
 var import_schema6 = require("@elementor/schema");
@@ -4228,7 +4326,7 @@ var ERROR_MESSAGES3 = {
 var handleSaveAsComponent = async (params) => {
   const { element_id: elementId, component_name: componentName, overridable_props: overridablePropsInput } = params;
   const validElementTypes = getValidElementTypes();
-  const container = (0, import_editor_elements17.getContainer)(elementId);
+  const container = (0, import_editor_elements18.getContainer)(elementId);
   if (!container) {
     throw new Error(ERROR_MESSAGES3.ELEMENT_NOT_FOUND);
   }
@@ -4275,7 +4373,7 @@ function enrichOverridableProps(input, rootElement) {
     }
     const elType = element.elType;
     const widgetType = element.widgetType || element.elType;
-    const elementType = (0, import_editor_elements17.getElementType)(widgetType);
+    const elementType = (0, import_editor_elements18.getElementType)(widgetType);
     if (!elementType) {
       throw new Error(
         `Element type "${widgetType}" is not atomic or does not have a settings schema. Cannot expose property "${propKey}" for element "${elementId}".`
@@ -4344,7 +4442,7 @@ function findElementById(root, targetId) {
   return null;
 }
 function getValidElementTypes() {
-  const types = (0, import_editor_elements17.getWidgetsCache)();
+  const types = (0, import_editor_elements18.getWidgetsCache)();
   if (!types) {
     return [];
   }
@@ -4531,7 +4629,7 @@ function PopulateStore() {
 }
 
 // src/prevent-circular-nesting.ts
-var import_editor_elements18 = require("@elementor/editor-elements");
+var import_editor_elements19 = require("@elementor/editor-elements");
 var import_editor_notifications4 = require("@elementor/editor-notifications");
 var import_editor_v1_adapters9 = require("@elementor/editor-v1-adapters");
 var import_store64 = require("@elementor/store");
@@ -4626,7 +4724,7 @@ function blockCircularMove(args) {
     if (!container) {
       return false;
     }
-    const allElements = (0, import_editor_elements18.getAllDescendants)(container);
+    const allElements = (0, import_editor_elements19.getAllDescendants)(container);
     return allElements.some((element) => {
       const componentId = extractComponentIdFromContainer(element);
       if (componentId === null) {
@@ -4687,7 +4785,7 @@ var componentsStylesProvider = (0, import_editor_styles_repository.createStylesP
 });
 
 // src/sync/create-components-before-save.ts
-var import_editor_elements19 = require("@elementor/editor-elements");
+var import_editor_elements20 = require("@elementor/editor-elements");
 var import_store70 = require("@elementor/store");
 async function createComponentsBeforeSave({
   elements,
@@ -4755,7 +4853,7 @@ function shouldUpdateElement(element, uidToComponentId) {
   return { shouldUpdate: false, newComponentId: null };
 }
 function updateElementComponentId(elementId, componentId) {
-  (0, import_editor_elements19.updateElementSettings)({
+  (0, import_editor_elements20.updateElementSettings)({
     id: elementId,
     props: {
       component_instance: {
@@ -4905,6 +5003,7 @@ function init() {
     indicator: OverridablePropIndicator
   });
   (0, import_editor_editing_panel8.registerControlReplacement)({
+    id: OVERRIDABLE_PROP_REPLACEMENT_ID,
     component: OverridablePropControl,
     condition: ({ value }) => componentOverridablePropTypeUtil.isValid(value)
   });