@elementor/editor-editing-panel 1.1.0 → 1.3.0

package/dist/index.mjs

@@ -19,12 +19,12 @@ import { __privateListenTo as listenTo, commandStartEvent } from "@elementor/edi
 import { __createPanel as createPanel } from "@elementor/editor-panels";
 
 // src/components/editing-panel.tsx
-import * as React51 from "react";
+import * as React58 from "react";
 import { ControlActionsProvider, ControlReplacementProvider } from "@elementor/editor-controls";
 import { useSelectedElement } from "@elementor/editor-elements";
 import { Panel, PanelBody, PanelHeader, PanelHeaderTitle } from "@elementor/editor-panels";
 import { ErrorBoundary } from "@elementor/ui";
-import { __ as __31 } from "@wordpress/i18n";
+import { __ as __38 } from "@wordpress/i18n";
 
 // src/contexts/element-context.tsx
 import * as React from "react";
@@ -95,10 +95,10 @@ function EditorPanelErrorFallback() {
 }
 
 // src/components/editing-panel-tabs.tsx
-import * as React50 from "react";
-import { Fragment as Fragment5 } from "react";
-import { Divider as Divider7, Stack as Stack18, Tab, TabPanel, Tabs, useTabs } from "@elementor/ui";
-import { __ as __30 } from "@wordpress/i18n";
+import * as React57 from "react";
+import { Fragment as Fragment7 } from "react";
+import { Divider as Divider8, Stack as Stack19, Tab, TabPanel, Tabs, useTabs } from "@elementor/ui";
+import { __ as __37 } from "@wordpress/i18n";
 
 // src/components/settings-tab.tsx
 import * as React9 from "react";
@@ -111,17 +111,21 @@ import { createError } from "@elementor/utils";
 // src/controls-registry/controls-registry.tsx
 import {
   ImageControl,
+  LinkControl,
   SelectControl,
   SizeControl,
   TextAreaControl,
-  TextControl
+  TextControl,
+  UrlControl
 } from "@elementor/editor-controls";
 var controlTypes = {
   image: { component: ImageControl, layout: "full" },
   text: { component: TextControl, layout: "two-columns" },
   textarea: { component: TextAreaControl, layout: "full" },
   size: { component: SizeControl, layout: "two-columns" },
-  select: { component: SelectControl, layout: "two-columns" }
+  select: { component: SelectControl, layout: "two-columns" },
+  link: { component: LinkControl, layout: "full" },
+  url: { component: UrlControl, layout: "full" }
 };
 var getControlByType = (type) => controlTypes[type]?.component;
 var getLayoutByType = (type) => controlTypes[type].layout;
@@ -254,13 +258,13 @@ var Control2 = ({ control }) => {
 };
 
 // src/components/style-tab.tsx
-import * as React49 from "react";
-import { useState as useState4 } from "react";
+import * as React56 from "react";
+import { useState as useState5 } from "react";
 import { useElementSetting as useElementSetting3, useElementStyles as useElementStyles2 } from "@elementor/editor-elements";
 import { useActiveBreakpoint } from "@elementor/editor-responsive";
 import { generateId } from "@elementor/editor-styles";
-import { Divider as Divider6 } from "@elementor/ui";
-import { __ as __29 } from "@wordpress/i18n";
+import { Divider as Divider7 } from "@elementor/ui";
+import { __ as __36 } from "@wordpress/i18n";
 
 // src/contexts/classes-prop-context.tsx
 import * as React10 from "react";
@@ -292,9 +296,10 @@ function useStyle() {
   return context;
 }
 
-// src/components/css-class-selector-section.tsx
+// src/components/css-class-selector.tsx
 import * as React13 from "react";
-import { useElementSetting as useElementSetting2, useElementStyles } from "@elementor/editor-elements";
+import { updateSettings as updateSettings2, useElementSetting as useElementSetting2, useElementStyles } from "@elementor/editor-elements";
+import { classesPropTypeUtil } from "@elementor/editor-props";
 import { Chip as Chip2, Stack as Stack3, Typography as Typography2 } from "@elementor/ui";
 import { __ } from "@wordpress/i18n";
 
@@ -310,9 +315,9 @@ import {
 
 // src/components/multi-combobox/use-combobox-actions.ts
 import { createFilterOptions } from "@elementor/ui";
-var useComboboxActions = (applied, actions, optionsLabel, onApply) => ({
+var useComboboxActions = (applied, actions, optionsLabel, onSelect) => ({
   action: {
-    is: (opt) => !!opt.action,
+    is: (opt) => typeof opt !== "string" && "action" in opt,
     getLabel: (option) => option.action.getLabel(option.label),
     groupBy: (option) => option.action.groupLabel,
     onChange: ({ action, label }) => action?.apply(label),
@@ -332,10 +337,10 @@ var useComboboxActions = (applied, actions, optionsLabel, onApply) => ({
     }
   },
   option: {
-    is: (opt) => !("action" in opt),
+    is: (opt) => typeof opt !== "string" && !("action" in opt),
     getLabel: (option) => option.label,
     groupBy: () => optionsLabel ?? "",
-    onChange: (optionValues) => onApply?.(optionValues),
+    onChange: (optionValues) => onSelect?.(optionValues),
     getFilteredOptions: (optionList, params) => {
       const appliedValues = applied.map((option) => option.value);
       const optionsWithoutApplied = optionList.filter((option) => !appliedValues.includes(option.value));
@@ -358,24 +363,19 @@ var createActionOption = (groupLabel, action, inputValue) => ({
 var MultiCombobox = ({
   actions = {},
   selected,
-  options: options5,
+  options: options10,
   optionsLabel,
-  onApply,
+  onSelect,
   onCreate,
   ...props
 }) => {
-  const { action: actionProps, option: optionProps } = useComboboxActions(selected, actions, optionsLabel, onApply);
-  const handleSelectOption = (values) => {
-    const action = values.find((value) => actionProps.is(value));
-    if (action) {
-      return actionProps.onChange(action);
-    }
-    return optionProps.onChange(values);
-  };
-  const handleCreateOption = (values) => {
-    const value = values.find((option) => typeof option === "string");
-    onCreate?.(value);
-  };
+  const { action: actionProps, option: optionProps } = useComboboxActions(
+    selected,
+    actions,
+    // TODO: make the group mechanism more generic, allow passing list of groups.
+    optionsLabel,
+    onSelect
+  );
   return /* @__PURE__ */ React12.createElement(
     Autocomplete,
     {
@@ -387,29 +387,36 @@ var MultiCombobox = ({
       disableClearable: true,
       handleHomeEndKeys: true,
       value: selected,
-      options: options5,
+      options: options10,
       renderGroup,
       renderInput: (params) => /* @__PURE__ */ React12.createElement(TextField, { ...params }),
       getLimitTagsText: (more) => /* @__PURE__ */ React12.createElement(Chip, { size: "tiny", variant: "standard", label: `+${more}`, clickable: true }),
-      onChange: (_, values, reason) => {
-        if (reason === "selectOption") {
-          return handleSelectOption(values);
-        }
+      onChange: (_, selectedOrTypedValue, reason) => {
         if (reason === "createOption") {
-          return handleCreateOption(values);
+          const typedValue = selectedOrTypedValue.find((option) => typeof option === "string");
+          return typedValue && onCreate?.(typedValue);
         }
-        onApply?.(values);
+        const action = selectedOrTypedValue.find((value) => actionProps.is(value));
+        if (reason === "selectOption" && action) {
+          return actionProps.onChange(action);
+        }
+        const selectedValues = selectedOrTypedValue.filter((v) => typeof v !== "string");
+        const fixedValues = options10.filter((option) => option.fixed);
+        optionProps.onChange([.../* @__PURE__ */ new Set([...fixedValues, ...selectedValues])]);
       },
       getOptionLabel: (option) => {
         if (optionProps.is(option)) {
           return optionProps.getLabel(option);
         }
-        return actionProps.getLabel(option) ?? "";
+        if (actionProps.is(option)) {
+          return actionProps.getLabel(option);
+        }
+        return "";
       },
       filterOptions: (optionList, params) => {
-        const filteredoptions = optionProps.getFilteredOptions(optionList, params);
+        const filteredOptions = optionProps.getFilteredOptions(optionList, params);
         const actionOptions = actionProps.getFilteredActions(optionList, params);
-        return [...actionOptions, ...filteredoptions];
+        return [...actionOptions, ...filteredOptions];
       },
       groupBy: (option) => (optionProps.is(option) ? optionProps.groupBy() : actionProps.groupBy(option)) ?? ""
     }
@@ -431,36 +438,40 @@ var GroupItems = styled3("ul")`
 	padding: 0;
 `;
 
-// src/components/css-class-selector-section.tsx
+// src/components/css-class-selector.tsx
 var ID = "elementor-css-class-selector";
 var TAGS_LIMIT = 8;
-function CssClassSelectorSection() {
-  const options5 = useOptions();
+function CssClassSelector() {
+  const options10 = useOptions();
   const { id: activeId, setId: setActiveId } = useStyle();
-  const appliedIds = useAppliedClassesIds();
-  const applied = options5.filter((option) => appliedIds.includes(option.value));
-  const active = options5.find((option) => option.value === activeId) || null;
+  const [appliedIds] = useAppliedClassesIds();
+  const handleApply = useHandleApply();
+  const handleActivate = ({ value }) => setActiveId(value);
+  const active = options10.find((option) => option.value === activeId) || null;
+  const applied = appliedIds.map((id) => options10.find((option) => option.value === id)).filter((option) => !!option);
   return /* @__PURE__ */ React13.createElement(Stack3, { gap: 1, p: 2 }, /* @__PURE__ */ React13.createElement(Typography2, { component: "label", variant: "caption", htmlFor: ID }, __("CSS Classes", "elementor")), /* @__PURE__ */ React13.createElement(
     MultiCombobox,
     {
       id: ID,
       size: "tiny",
-      options: options5,
+      options: options10,
       selected: applied,
+      onSelect: handleApply,
       limitTags: TAGS_LIMIT,
       optionsLabel: __("Global CSS Classes", "elementor"),
-      renderTags: (tagValue, getTagProps) => tagValue.map((option, index) => {
+      renderTags: (values, getTagProps) => values.map((value, index) => {
         const chipProps = getTagProps({ index });
+        const isActive = value.value === active?.value;
         return /* @__PURE__ */ React13.createElement(
           Chip2,
           {
             ...chipProps,
             key: chipProps.key,
             size: "small",
-            label: option.label,
-            variant: option.value === active?.value ? "filled" : "standard",
-            color: option.color ?? "default",
-            onClick: () => setActiveId(option.value),
+            label: value.label,
+            variant: isActive ? "filled" : "standard",
+            color: isActive && value.color ? value.color : "default",
+            onClick: () => handleActivate(value),
             onDelete: null
           }
         );
@@ -468,20 +479,51 @@ function CssClassSelectorSection() {
     }
   ));
 }
-function useAppliedClassesIds() {
-  const { element } = useElement();
-  const currentClassesProp = useClassesProp();
-  return useElementSetting2(element.id, currentClassesProp)?.value || [];
-}
 function useOptions() {
   const { element } = useElement();
   const styleDefs = useElementStyles(element.id);
   return Object.values(styleDefs).map((styleDef) => ({
     label: styleDef.label,
     value: styleDef.id,
+    fixed: true,
     color: "primary"
   }));
 }
+function useAppliedClassesIds() {
+  const { element } = useElement();
+  const currentClassesProp = useClassesProp();
+  const value = useElementSetting2(element.id, currentClassesProp)?.value || [];
+  const setValue = (ids) => {
+    updateSettings2({
+      id: element.id,
+      props: {
+        [currentClassesProp]: classesPropTypeUtil.create(ids)
+      }
+    });
+  };
+  return [value, setValue];
+}
+function useHandleApply() {
+  const { id: activeId, setId: setActiveId } = useStyle();
+  const [appliedIds, setAppliedIds] = useAppliedClassesIds();
+  return (selectedOptions) => {
+    const selectedValues = selectedOptions.map(({ value }) => value);
+    const isSameClassesAlreadyApplied = selectedValues.length === appliedIds.length && selectedValues.every((value) => appliedIds.includes(value));
+    if (isSameClassesAlreadyApplied) {
+      return;
+    }
+    setAppliedIds(selectedValues);
+    const addedValue = selectedValues.find((id) => !appliedIds.includes(id));
+    if (addedValue) {
+      setActiveId(addedValue);
+      return;
+    }
+    const removedValue = appliedIds.find((id) => !selectedValues.includes(id));
+    if (removedValue && removedValue === activeId) {
+      setActiveId(selectedValues[0] ?? null);
+    }
+  };
+}
 
 // src/components/style-sections/background-section/background-section.tsx
 import * as React16 from "react";
@@ -609,6 +651,7 @@ var BorderStyleField = () => {
 // src/components/style-sections/border-section/border-width-field.tsx
 import * as React20 from "react";
 import { EqualUnequalSizesControl } from "@elementor/editor-controls";
+import { borderWidthPropTypeUtil } from "@elementor/editor-props";
 import { SideAllIcon, SideBottomIcon, SideLeftIcon, SideRightIcon, SideTopIcon } from "@elementor/icons";
 import { __ as __5 } from "@wordpress/i18n";
 var edges = [
@@ -637,10 +680,10 @@ var BorderWidthField = () => {
   return /* @__PURE__ */ React20.createElement(StylesField, { bind: "border-width" }, /* @__PURE__ */ React20.createElement(
     EqualUnequalSizesControl,
     {
+      items: edges,
       label: __5("Border Width", "elementor"),
       icon: /* @__PURE__ */ React20.createElement(SideAllIcon, { fontSize: "tiny" }),
-      items: edges,
-      multiSizeType: "border-width"
+      multiSizePropTypeUtil: borderWidthPropTypeUtil
     }
   ));
 };
@@ -685,6 +728,7 @@ var BorderField = () => {
 // src/components/style-sections/border-section/border-radius-field.tsx
 import * as React22 from "react";
 import { EqualUnequalSizesControl as EqualUnequalSizesControl2 } from "@elementor/editor-controls";
+import { borderRadiusPropTypeUtil } from "@elementor/editor-props";
 import {
   BorderCornersIcon,
   RadiusBottomLeftIcon,
@@ -719,10 +763,10 @@ var BorderRadiusField = () => {
   return /* @__PURE__ */ React22.createElement(StylesField, { bind: "border-radius" }, /* @__PURE__ */ React22.createElement(
     EqualUnequalSizesControl2,
     {
+      items: corners,
       label: __7("Border Radius", "elementor"),
       icon: /* @__PURE__ */ React22.createElement(BorderCornersIcon, { fontSize: "tiny" }),
-      items: corners,
-      multiSizeType: "border-radius"
+      multiSizePropTypeUtil: borderRadiusPropTypeUtil
     }
   ));
 };
@@ -739,43 +783,22 @@ var EffectsSection = () => {
 };
 
 // src/components/style-sections/layout-section/layout-section.tsx
-import * as React27 from "react";
-import { Stack as Stack10 } from "@elementor/ui";
-
-// src/components/style-sections/layout-section/display-field.tsx
-import * as React25 from "react";
-import { ControlLabel as ControlLabel6, ToggleControl } from "@elementor/editor-controls";
-import { Stack as Stack8 } from "@elementor/ui";
-import { __ as __8 } from "@wordpress/i18n";
-var DisplayField = () => {
-  const options5 = [
-    {
-      value: "block",
-      renderContent: () => __8("Block", "elementor"),
-      label: __8("Block", "elementor")
-    },
-    {
-      value: "flex",
-      renderContent: () => __8("Flex", "elementor"),
-      label: __8("Flex", "elementor")
-    }
-  ];
-  return /* @__PURE__ */ React25.createElement(StylesField, { bind: "display" }, /* @__PURE__ */ React25.createElement(Stack8, { gap: 1 }, /* @__PURE__ */ React25.createElement(ControlLabel6, null, __8("Display", "elementor")), /* @__PURE__ */ React25.createElement(ToggleControl, { options: options5, fullWidth: true })));
-};
+import * as React34 from "react";
+import { ControlLabel as ControlLabel14 } from "@elementor/editor-controls";
+import { Divider as Divider3, Stack as Stack12 } from "@elementor/ui";
+import { __ as __16 } from "@wordpress/i18n";
 
-// src/components/style-sections/layout-section/justify-content-field.tsx
+// src/components/style-sections/layout-section/align-items-field.tsx
 import * as React26 from "react";
-import { ControlLabel as ControlLabel7, ToggleControl as ToggleControl2 } from "@elementor/editor-controls";
+import { ControlLabel as ControlLabel6, ToggleControl } from "@elementor/editor-controls";
 import {
-  JustifyBottomIcon,
-  JustifyCenterIcon,
-  JustifyDistributeVerticalIcon,
-  JustifySpaceAroundVerticalIcon,
-  JustifySpaceBetweenVerticalIcon,
-  JustifyTopIcon
+  LayoutAlignCenterIcon as CenterIcon,
+  LayoutAlignLeftIcon,
+  LayoutAlignRightIcon,
+  LayoutDistributeVerticalIcon as JustifyIcon
 } from "@elementor/icons";
-import { Stack as Stack9 } from "@elementor/ui";
-import { __ as __9 } from "@wordpress/i18n";
+import { DirectionProvider, Grid as Grid4, ThemeProvider, withDirection } from "@elementor/ui";
+import { __ as __8 } from "@wordpress/i18n";
 
 // src/hooks/use-direction.ts
 import { useTheme } from "@elementor/ui";
@@ -785,84 +808,461 @@ function useDirection() {
   return { isSiteRtl, isUiRtl };
 }
 
-// src/components/style-sections/layout-section/utils/rotate-flex-icon.ts
-function rotateFlexIcon(direction = "row", initValue) {
-  const rotationIndexMap = {
-    row: 0,
-    column: 1,
-    "row-reverse": 2,
-    "column-reverse": 3
-  };
-  const rotationIndex = initValue + (rotationIndexMap[direction || "row"] ?? 0);
-  return `rotate(calc(90deg * ${rotationIndex}))`;
-}
-
-// src/components/style-sections/layout-section/justify-content-field.tsx
-var JustifyContentField = () => {
+// src/components/style-sections/layout-section/utils/rotated-icon.tsx
+import * as React25 from "react";
+import { useRef as useRef2 } from "react";
+import { useTheme as useTheme2 } from "@elementor/ui";
+var CLOCKWISE_ANGLES = {
+  row: 0,
+  column: 90,
+  "row-reverse": 180,
+  "column-reverse": 270
+};
+var COUNTER_CLOCKWISE_ANGLES = {
+  row: 0,
+  column: -90,
+  "row-reverse": -180,
+  "column-reverse": -270
+};
+var RotatedIcon = ({ icon: Icon, size, isClockwise = true, offset = 0 }) => {
+  const rotate = useRef2(useGetTargetAngle(isClockwise, offset));
+  rotate.current = useGetTargetAngle(isClockwise, offset, rotate);
+  return /* @__PURE__ */ React25.createElement(Icon, { fontSize: size, sx: { transition: ".3s", rotate: `${rotate.current}deg` } });
+};
+var useGetTargetAngle = (isClockwise, offset, existingRef) => {
   const [direction] = useStylesField("flex-direction");
-  const { isUiRtl, isSiteRtl } = useDirection(), sx = { transform: rotateFlexIcon(direction, -1) }, shouldReverseOrder = isSiteRtl !== isUiRtl;
-  const StartIcon = isSiteRtl ? JustifyBottomIcon : JustifyTopIcon, EndIcon = isSiteRtl ? JustifyTopIcon : JustifyBottomIcon;
-  const options5 = [
+  const isRtl = "rtl" === useTheme2().direction;
+  const rotationMultiplier = isRtl ? -1 : 1;
+  const angleMap = isClockwise ? CLOCKWISE_ANGLES : COUNTER_CLOCKWISE_ANGLES;
+  const currentAngle = existingRef ? existingRef.current * rotationMultiplier : angleMap[direction?.value || "row"] + offset;
+  const targetAngle = angleMap[direction?.value || "row"] + offset;
+  const diffToTargetAngle = (targetAngle - currentAngle + 360) % 360;
+  const formattedDiff = (diffToTargetAngle + 180) % 360 - 180;
+  return (currentAngle + formattedDiff) * rotationMultiplier;
+};
+
+// src/components/style-sections/layout-section/align-items-field.tsx
+var StartIcon = withDirection(LayoutAlignLeftIcon);
+var EndIcon = withDirection(LayoutAlignRightIcon);
+var iconProps = {
+  isClockwise: false,
+  offset: 90
+};
+var options = [
+  {
+    value: "start",
+    label: __8("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(RotatedIcon, { icon: StartIcon, size, ...iconProps }),
+    showTooltip: true
+  },
+  {
+    value: "center",
+    label: __8("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(RotatedIcon, { icon: CenterIcon, size, ...iconProps }),
+    showTooltip: true
+  },
+  {
+    value: "end",
+    label: __8("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(RotatedIcon, { icon: EndIcon, size, ...iconProps }),
+    showTooltip: true
+  },
+  {
+    value: "stretch",
+    label: __8("Stretch", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(RotatedIcon, { icon: JustifyIcon, size, ...iconProps }),
+    showTooltip: true
+  }
+];
+var AlignItemsField = () => {
+  const { isSiteRtl } = useDirection();
+  return /* @__PURE__ */ React26.createElement(DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React26.createElement(ThemeProvider, null, /* @__PURE__ */ React26.createElement(StylesField, { bind: "align-items" }, /* @__PURE__ */ React26.createElement(Grid4, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React26.createElement(Grid4, { item: true, xs: 6 }, /* @__PURE__ */ React26.createElement(ControlLabel6, null, __8("Align items", "elementor"))), /* @__PURE__ */ React26.createElement(Grid4, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React26.createElement(ToggleControl, { options }))))));
+};
+
+// src/components/style-sections/layout-section/align-self-child-field.tsx
+import * as React27 from "react";
+import { ControlLabel as ControlLabel7, ToggleControl as ToggleControl2 } from "@elementor/editor-controls";
+import {
+  LayoutAlignCenterIcon as CenterIcon2,
+  LayoutAlignLeftIcon as LayoutAlignLeftIcon2,
+  LayoutAlignRightIcon as LayoutAlignRightIcon2,
+  LayoutDistributeVerticalIcon as JustifyIcon2
+} from "@elementor/icons";
+import { DirectionProvider as DirectionProvider2, Grid as Grid5, ThemeProvider as ThemeProvider2, withDirection as withDirection2 } from "@elementor/ui";
+import { __ as __9 } from "@wordpress/i18n";
+var StartIcon2 = withDirection2(LayoutAlignLeftIcon2);
+var EndIcon2 = withDirection2(LayoutAlignRightIcon2);
+var iconProps2 = {
+  isClockwise: false,
+  offset: 90
+};
+var options2 = [
+  {
+    value: "start",
+    label: __9("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React27.createElement(RotatedIcon, { icon: StartIcon2, size, ...iconProps2 }),
+    showTooltip: true
+  },
+  {
+    value: "center",
+    label: __9("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React27.createElement(RotatedIcon, { icon: CenterIcon2, size, ...iconProps2 }),
+    showTooltip: true
+  },
+  {
+    value: "end",
+    label: __9("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React27.createElement(RotatedIcon, { icon: EndIcon2, size, ...iconProps2 }),
+    showTooltip: true
+  },
+  {
+    value: "stretch",
+    label: __9("Stretch", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React27.createElement(RotatedIcon, { icon: JustifyIcon2, size, ...iconProps2 }),
+    showTooltip: true
+  }
+];
+var AlignSelfChild = () => {
+  const { isSiteRtl } = useDirection();
+  return /* @__PURE__ */ React27.createElement(DirectionProvider2, { rtl: isSiteRtl }, /* @__PURE__ */ React27.createElement(ThemeProvider2, null, /* @__PURE__ */ React27.createElement(StylesField, { bind: "align-self" }, /* @__PURE__ */ React27.createElement(Grid5, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React27.createElement(Grid5, { item: true, xs: 6 }, /* @__PURE__ */ React27.createElement(ControlLabel7, null, __9("Align self", "elementor"))), /* @__PURE__ */ React27.createElement(Grid5, { item: true, xs: 6, sx: { display: "flex", justifyContent: "flex-end" } }, /* @__PURE__ */ React27.createElement(ToggleControl2, { options: options2 }))))));
+};
+
+// src/components/style-sections/layout-section/display-field.tsx
+import * as React28 from "react";
+import { ControlLabel as ControlLabel8, ToggleControl as ToggleControl3 } from "@elementor/editor-controls";
+import { Stack as Stack8 } from "@elementor/ui";
+import { __ as __10 } from "@wordpress/i18n";
+var DisplayField = () => {
+  const options10 = [
     {
-      value: "start",
-      label: __9("Start", "elementor"),
-      renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(StartIcon, { fontSize: size, sx }),
-      showTooltip: true
+      value: "block",
+      renderContent: () => __10("Block", "elementor"),
+      label: __10("Block", "elementor")
     },
     {
-      value: "center",
-      label: __9("Center", "elementor"),
-      renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(JustifyCenterIcon, { fontSize: size, sx }),
-      showTooltip: true
+      value: "flex",
+      renderContent: () => __10("Flex", "elementor"),
+      label: __10("Flex", "elementor")
+    }
+  ];
+  return /* @__PURE__ */ React28.createElement(StylesField, { bind: "display" }, /* @__PURE__ */ React28.createElement(Stack8, { gap: 1 }, /* @__PURE__ */ React28.createElement(ControlLabel8, null, __10("Display", "elementor")), /* @__PURE__ */ React28.createElement(ToggleControl3, { options: options10, fullWidth: true })));
+};
+
+// src/components/style-sections/layout-section/flex-direction-field.tsx
+import * as React29 from "react";
+import { ControlLabel as ControlLabel9, ToggleControl as ToggleControl4 } from "@elementor/editor-controls";
+import { ArrowDownSmallIcon, ArrowLeftIcon, ArrowRightIcon, ArrowUpSmallIcon } from "@elementor/icons";
+import { DirectionProvider as DirectionProvider3, Grid as Grid6, ThemeProvider as ThemeProvider3, withDirection as withDirection3 } from "@elementor/ui";
+import { __ as __11 } from "@wordpress/i18n";
+var options3 = [
+  {
+    value: "row",
+    label: __11("Row", "elementor"),
+    renderContent: ({ size }) => {
+      const StartIcon4 = withDirection3(ArrowRightIcon);
+      return /* @__PURE__ */ React29.createElement(StartIcon4, { fontSize: size });
     },
-    {
-      value: "end",
-      label: __9("End", "elementor"),
-      renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(EndIcon, { fontSize: size, sx }),
-      showTooltip: true
+    showTooltip: true
+  },
+  {
+    value: "column",
+    label: __11("Column", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React29.createElement(ArrowDownSmallIcon, { fontSize: size }),
+    showTooltip: true
+  },
+  {
+    value: "row-reverse",
+    label: __11("Reversed row", "elementor"),
+    renderContent: ({ size }) => {
+      const EndIcon4 = withDirection3(ArrowLeftIcon);
+      return /* @__PURE__ */ React29.createElement(EndIcon4, { fontSize: size });
     },
+    showTooltip: true
+  },
+  {
+    value: "column-reverse",
+    label: __11("Reversed column", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React29.createElement(ArrowUpSmallIcon, { fontSize: size }),
+    showTooltip: true
+  }
+];
+var FlexDirectionField = () => {
+  const { isSiteRtl } = useDirection();
+  return /* @__PURE__ */ React29.createElement(DirectionProvider3, { rtl: isSiteRtl }, /* @__PURE__ */ React29.createElement(ThemeProvider3, null, /* @__PURE__ */ React29.createElement(StylesField, { bind: "flex-direction" }, /* @__PURE__ */ React29.createElement(Grid6, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React29.createElement(Grid6, { item: true, xs: 6 }, /* @__PURE__ */ React29.createElement(ControlLabel9, null, __11("Direction", "elementor"))), /* @__PURE__ */ React29.createElement(Grid6, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React29.createElement(ToggleControl4, { options: options3 }))))));
+};
+
+// src/components/style-sections/layout-section/flex-order-field.tsx
+import * as React30 from "react";
+import { useState as useState2 } from "react";
+import {
+  ControlLabel as ControlLabel10,
+  ControlToggleButtonGroup,
+  NumberControl
+} from "@elementor/editor-controls";
+import { ArrowDownSmallIcon as ArrowDownSmallIcon2, ArrowUpSmallIcon as ArrowUpSmallIcon2, PencilIcon } from "@elementor/icons";
+import { DirectionProvider as DirectionProvider4, Grid as Grid7, Stack as Stack9, ThemeProvider as ThemeProvider4 } from "@elementor/ui";
+import { __ as __12 } from "@wordpress/i18n";
+var FIRST_DEFAULT_VALUE = -99999;
+var LAST_DEFAULT_VALUE = 99999;
+var FIRST = "first";
+var LAST = "last";
+var CUSTOM = "custom";
+var orderValueMap = {
+  [FIRST]: FIRST_DEFAULT_VALUE,
+  [LAST]: LAST_DEFAULT_VALUE
+};
+var items = [
+  {
+    value: FIRST,
+    label: __12("First", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React30.createElement(ArrowUpSmallIcon2, { fontSize: size }),
+    showTooltip: true
+  },
+  {
+    value: LAST,
+    label: __12("Last", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React30.createElement(ArrowDownSmallIcon2, { fontSize: size }),
+    showTooltip: true
+  },
+  {
+    value: CUSTOM,
+    label: __12("Custom", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React30.createElement(PencilIcon, { fontSize: size }),
+    showTooltip: true
+  }
+];
+var FlexOrderField = () => {
+  const { isSiteRtl } = useDirection(), [order, setOrder] = useStylesField("order");
+  const [groupControlValue, setGroupControlValue] = useState2(getGroupControlValue(order?.value || null));
+  const handleToggleButtonChange = (group) => {
+    setGroupControlValue(group);
+    if (!group || group === CUSTOM) {
+      setOrder(null);
+      return;
+    }
+    setOrder({ $$type: "number", value: orderValueMap[group] });
+  };
+  return /* @__PURE__ */ React30.createElement(DirectionProvider4, { rtl: isSiteRtl }, /* @__PURE__ */ React30.createElement(ThemeProvider4, null, /* @__PURE__ */ React30.createElement(Stack9, { gap: 2 }, /* @__PURE__ */ React30.createElement(Grid7, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React30.createElement(Grid7, { item: true, xs: 6 }, /* @__PURE__ */ React30.createElement(ControlLabel10, null, __12("Order", "elementor"))), /* @__PURE__ */ React30.createElement(Grid7, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React30.createElement(
+    ControlToggleButtonGroup,
     {
-      value: "space-between",
-      label: __9("Space Between", "elementor"),
-      renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(JustifySpaceBetweenVerticalIcon, { fontSize: size, sx }),
-      showTooltip: true
-    },
+      items,
+      value: groupControlValue,
+      onChange: handleToggleButtonChange,
+      exclusive: true
+    }
+  ))), CUSTOM === groupControlValue && /* @__PURE__ */ React30.createElement(StylesField, { bind: "order" }, /* @__PURE__ */ React30.createElement(Grid7, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React30.createElement(Grid7, { item: true, xs: 6 }, /* @__PURE__ */ React30.createElement(ControlLabel10, null, __12("Custom order", "elementor"))), /* @__PURE__ */ React30.createElement(Grid7, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React30.createElement(
+    NumberControl,
     {
-      value: "space-around",
-      label: __9("Space Around", "elementor"),
-      renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(JustifySpaceAroundVerticalIcon, { fontSize: size, sx }),
-      showTooltip: true
-    },
+      min: FIRST_DEFAULT_VALUE + 1,
+      max: LAST_DEFAULT_VALUE - 1,
+      shouldForceInt: true
+    }
+  )))))));
+};
+var getGroupControlValue = (order) => {
+  if (LAST_DEFAULT_VALUE === order) {
+    return LAST;
+  }
+  if (FIRST_DEFAULT_VALUE === order) {
+    return FIRST;
+  }
+  return 0 === order || order ? CUSTOM : null;
+};
+
+// src/components/style-sections/layout-section/flex-size-field.tsx
+import * as React31 from "react";
+import {
+  ControlLabel as ControlLabel11,
+  ControlToggleButtonGroup as ControlToggleButtonGroup2,
+  NumberControl as NumberControl2,
+  SizeControl as SizeControl2
+} from "@elementor/editor-controls";
+import { ExpandIcon, PencilIcon as PencilIcon2, ShrinkIcon } from "@elementor/icons";
+import { DirectionProvider as DirectionProvider5, Grid as Grid8, Stack as Stack10, ThemeProvider as ThemeProvider5 } from "@elementor/ui";
+import { __ as __13 } from "@wordpress/i18n";
+var DEFAULT = 1;
+var items2 = [
+  {
+    value: "flex-grow",
+    label: __13("Grow", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React31.createElement(ExpandIcon, { fontSize: size }),
+    showTooltip: true
+  },
+  {
+    value: "flex-shrink",
+    label: __13("Shrink", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React31.createElement(ShrinkIcon, { fontSize: size }),
+    showTooltip: true
+  },
+  {
+    value: "custom",
+    label: __13("Custom", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React31.createElement(PencilIcon2, { fontSize: size }),
+    showTooltip: true
+  }
+];
+var FlexSizeField = () => {
+  const { isSiteRtl } = useDirection(), [growField, setGrowField] = useStylesField("flex-grow"), [shrinkField, setShrinkField] = useStylesField("flex-shrink"), [basisField, setBasisField] = useStylesField("flex-basis");
+  const grow = growField?.value || null, shrink = shrinkField?.value || null, basis = basisField?.value || null;
+  const currentGroup = React31.useMemo(() => getActiveGroup({ grow, shrink, basis }), [grow, shrink, basis]), [activeGroup, setActiveGroup] = React31.useState(currentGroup);
+  const onChangeGroup = (group = null) => {
+    setActiveGroup(group);
+    setBasisField(null);
+    if (!group || group === "custom") {
+      setGrowField(null);
+      setShrinkField(null);
+      return;
+    }
+    if (group === "flex-grow") {
+      setGrowField({ $$type: "number", value: DEFAULT });
+      setShrinkField(null);
+      return;
+    }
+    setGrowField(null);
+    setShrinkField({ $$type: "number", value: DEFAULT });
+  };
+  return /* @__PURE__ */ React31.createElement(DirectionProvider5, { rtl: isSiteRtl }, /* @__PURE__ */ React31.createElement(ThemeProvider5, null, /* @__PURE__ */ React31.createElement(Stack10, { gap: 2 }, /* @__PURE__ */ React31.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React31.createElement(ControlLabel11, null, __13("Size", "elementor"))), /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React31.createElement(
+    ControlToggleButtonGroup2,
     {
-      value: "space-evenly",
-      label: __9("Space Evenly", "elementor"),
-      renderContent: ({ size }) => /* @__PURE__ */ React26.createElement(JustifyDistributeVerticalIcon, { fontSize: size, sx }),
-      showTooltip: true
+      value: activeGroup,
+      onChange: onChangeGroup,
+      items: items2,
+      exclusive: true
     }
-  ];
-  if (shouldReverseOrder) {
-    options5.reverse();
+  ))), "custom" === activeGroup && /* @__PURE__ */ React31.createElement(FlexCustomField, null))));
+};
+var FlexCustomField = () => /* @__PURE__ */ React31.createElement(React31.Fragment, null, /* @__PURE__ */ React31.createElement(StylesField, { bind: "flex-grow" }, /* @__PURE__ */ React31.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React31.createElement(ControlLabel11, null, __13("Grow", "elementor"))), /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React31.createElement(NumberControl2, { min: 0, shouldForceInt: true })))), /* @__PURE__ */ React31.createElement(StylesField, { bind: "flex-shrink" }, /* @__PURE__ */ React31.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React31.createElement(ControlLabel11, null, __13("Shrink", "elementor"))), /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React31.createElement(NumberControl2, { min: 0, shouldForceInt: true })))), /* @__PURE__ */ React31.createElement(StylesField, { bind: "flex-basis" }, /* @__PURE__ */ React31.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React31.createElement(ControlLabel11, null, __13("Basis", "elementor"))), /* @__PURE__ */ React31.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React31.createElement(SizeControl2, null)))));
+var getActiveGroup = ({
+  grow,
+  shrink,
+  basis
+}) => {
+  if (null === grow && null === shrink && !basis) {
+    return null;
+  }
+  if (shrink && grow || basis) {
+    return "custom";
+  }
+  if (grow === DEFAULT) {
+    return "flex-grow";
+  }
+  if (shrink === DEFAULT) {
+    return "flex-shrink";
+  }
+  return "custom";
+};
+
+// src/components/style-sections/layout-section/justify-content-field.tsx
+import * as React32 from "react";
+import { ControlLabel as ControlLabel12, ToggleControl as ToggleControl5 } from "@elementor/editor-controls";
+import {
+  JustifyBottomIcon,
+  JustifyCenterIcon as CenterIcon3,
+  JustifyDistributeVerticalIcon as EvenlyIcon,
+  JustifySpaceAroundVerticalIcon as AroundIcon,
+  JustifySpaceBetweenVerticalIcon as BetweenIcon,
+  JustifyTopIcon
+} from "@elementor/icons";
+import { DirectionProvider as DirectionProvider6, Stack as Stack11, ThemeProvider as ThemeProvider6, withDirection as withDirection4 } from "@elementor/ui";
+import { __ as __14 } from "@wordpress/i18n";
+var StartIcon3 = withDirection4(JustifyTopIcon);
+var EndIcon3 = withDirection4(JustifyBottomIcon);
+var iconProps3 = {
+  isClockwise: true,
+  offset: -90
+};
+var options4 = [
+  {
+    value: "start",
+    label: __14("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(RotatedIcon, { icon: StartIcon3, size, ...iconProps3 }),
+    showTooltip: true
+  },
+  {
+    value: "center",
+    label: __14("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(RotatedIcon, { icon: CenterIcon3, size, ...iconProps3 }),
+    showTooltip: true
+  },
+  {
+    value: "end",
+    label: __14("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(RotatedIcon, { icon: EndIcon3, size, ...iconProps3 }),
+    showTooltip: true
+  },
+  {
+    value: "space-between",
+    label: __14("Space between", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(RotatedIcon, { icon: BetweenIcon, size, ...iconProps3 }),
+    showTooltip: true
+  },
+  {
+    value: "space-around",
+    label: __14("Space around", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(RotatedIcon, { icon: AroundIcon, size, ...iconProps3 }),
+    showTooltip: true
+  },
+  {
+    value: "space-evenly",
+    label: __14("Space evenly", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(RotatedIcon, { icon: EvenlyIcon, size, ...iconProps3 }),
+    showTooltip: true
+  }
+];
+var JustifyContentField = () => {
+  const { isSiteRtl } = useDirection();
+  return /* @__PURE__ */ React32.createElement(DirectionProvider6, { rtl: isSiteRtl }, /* @__PURE__ */ React32.createElement(ThemeProvider6, null, /* @__PURE__ */ React32.createElement(StylesField, { bind: "justify-content" }, /* @__PURE__ */ React32.createElement(Stack11, { gap: 1 }, /* @__PURE__ */ React32.createElement(ControlLabel12, null, __14("Justify content", "elementor")), /* @__PURE__ */ React32.createElement(ToggleControl5, { options: options4, fullWidth: true })))));
+};
+
+// src/components/style-sections/layout-section/wrap-field.tsx
+import * as React33 from "react";
+import { ControlLabel as ControlLabel13, ToggleControl as ToggleControl6 } from "@elementor/editor-controls";
+import { ArrowBackIcon, ArrowForwardIcon, ArrowRightIcon as ArrowRightIcon2 } from "@elementor/icons";
+import { DirectionProvider as DirectionProvider7, Grid as Grid9, ThemeProvider as ThemeProvider7 } from "@elementor/ui";
+import { __ as __15 } from "@wordpress/i18n";
+var options5 = [
+  {
+    value: "nowrap",
+    label: __15("No wrap", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React33.createElement(ArrowRightIcon2, { fontSize: size }),
+    showTooltip: true
+  },
+  {
+    value: "wrap",
+    label: __15("Wrap", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React33.createElement(ArrowBackIcon, { fontSize: size }),
+    showTooltip: true
+  },
+  {
+    value: "wrap-reverse",
+    label: __15("Reversed wrap", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React33.createElement(ArrowForwardIcon, { fontSize: size }),
+    showTooltip: true
   }
-  return /* @__PURE__ */ React26.createElement(StylesField, { bind: "justify-content" }, /* @__PURE__ */ React26.createElement(Stack9, { gap: 1 }, /* @__PURE__ */ React26.createElement(ControlLabel7, null, __9("Justify Content", "elementor")), /* @__PURE__ */ React26.createElement(ToggleControl2, { options: options5, fullWidth: true })));
+];
+var WrapField = () => {
+  const { isSiteRtl } = useDirection();
+  return /* @__PURE__ */ React33.createElement(DirectionProvider7, { rtl: isSiteRtl }, /* @__PURE__ */ React33.createElement(ThemeProvider7, null, /* @__PURE__ */ React33.createElement(StylesField, { bind: "flex-wrap" }, /* @__PURE__ */ React33.createElement(Grid9, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React33.createElement(Grid9, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(ControlLabel13, null, __15("Wrap", "elementor"))), /* @__PURE__ */ React33.createElement(Grid9, { item: true, xs: 6, sx: { display: "flex", justifyContent: "flex-end" } }, /* @__PURE__ */ React33.createElement(ToggleControl6, { options: options5 }))))));
 };
 
 // src/components/style-sections/layout-section/layout-section.tsx
 var LayoutSection = () => {
   const [display] = useStylesField("display");
-  return /* @__PURE__ */ React27.createElement(Stack10, { gap: 2 }, /* @__PURE__ */ React27.createElement(DisplayField, null), "flex" === display && /* @__PURE__ */ React27.createElement(JustifyContentField, null));
+  return /* @__PURE__ */ React34.createElement(Stack12, { gap: 2 }, /* @__PURE__ */ React34.createElement(DisplayField, null), "flex" === display?.value && /* @__PURE__ */ React34.createElement(FlexFields, null));
 };
+var FlexFields = () => /* @__PURE__ */ React34.createElement(React34.Fragment, null, /* @__PURE__ */ React34.createElement(FlexDirectionField, null), /* @__PURE__ */ React34.createElement(JustifyContentField, null), /* @__PURE__ */ React34.createElement(AlignItemsField, null), /* @__PURE__ */ React34.createElement(Divider3, null), /* @__PURE__ */ React34.createElement(WrapField, null), /* @__PURE__ */ React34.createElement(Divider3, null), /* @__PURE__ */ React34.createElement(ControlLabel14, null, __16("Flex child", "elementor")), /* @__PURE__ */ React34.createElement(AlignSelfChild, null), /* @__PURE__ */ React34.createElement(FlexOrderField, null), /* @__PURE__ */ React34.createElement(FlexSizeField, null));
 
 // src/components/style-sections/position-section/position-section.tsx
-import * as React31 from "react";
+import * as React38 from "react";
 import { useCallback as useCallback3 } from "react";
-import { Stack as Stack12 } from "@elementor/ui";
+import { Stack as Stack14 } from "@elementor/ui";
 
 // src/hooks/use-style-prop-history.ts
-import { useCallback as useCallback2, useMemo as useMemo2 } from "react";
+import { useCallback as useCallback2, useMemo as useMemo3 } from "react";
 import { getElementStyles, getVariantByMeta, updateStyle as updateStyle2 } from "@elementor/editor-elements";
 
 // src/hooks/use-prop-value-history.ts
-import { useCallback, useMemo } from "react";
+import { useCallback, useMemo as useMemo2 } from "react";
 import { getSessionStorageItem, setSessionStorageItem } from "@elementor/utils";
 var PROPS_VALUES_HISTORY_PREFIX = "elementor/editor-editing-panel/prop-value-history";
 var usePropValueHistory = () => {
@@ -896,7 +1296,7 @@ var usePropValueHistory = () => {
     },
     [getElementPropsHistory, elementKey]
   );
-  return useMemo(() => ({ getPropValue, setPropValue, removeProp }), [getPropValue, removeProp, setPropValue]);
+  return useMemo2(() => ({ getPropValue, setPropValue, removeProp }), [getPropValue, removeProp, setPropValue]);
 };
 
 // src/hooks/use-style-prop-history.ts
@@ -952,53 +1352,53 @@ var useStylePropsHistory = (props) => {
       bind: "classes"
     });
   }, [element.id, meta, props, styleDefID]);
-  return useMemo2(
+  return useMemo3(
     () => ({ saveStylePropsHistory, updateStylePropsFromHistory, clearCurrentStyleProps }),
     [saveStylePropsHistory, updateStylePropsFromHistory, clearCurrentStyleProps]
   );
 };
 
 // src/components/style-sections/position-section/dimensions-field.tsx
-import * as React28 from "react";
-import { ControlLabel as ControlLabel8, SizeControl as SizeControl2 } from "@elementor/editor-controls";
+import * as React35 from "react";
+import { ControlLabel as ControlLabel15, SizeControl as SizeControl3 } from "@elementor/editor-controls";
 import { SideBottomIcon as SideBottomIcon2, SideLeftIcon as SideLeftIcon2, SideRightIcon as SideRightIcon2, SideTopIcon as SideTopIcon2 } from "@elementor/icons";
-import { Grid as Grid4, Stack as Stack11 } from "@elementor/ui";
-import { __ as __10 } from "@wordpress/i18n";
+import { Grid as Grid10, Stack as Stack13 } from "@elementor/ui";
+import { __ as __17 } from "@wordpress/i18n";
 var sideIcons = {
-  left: /* @__PURE__ */ React28.createElement(SideLeftIcon2, { fontSize: "tiny" }),
-  right: /* @__PURE__ */ React28.createElement(SideRightIcon2, { fontSize: "tiny" }),
-  top: /* @__PURE__ */ React28.createElement(SideTopIcon2, { fontSize: "tiny" }),
-  bottom: /* @__PURE__ */ React28.createElement(SideBottomIcon2, { fontSize: "tiny" })
+  left: /* @__PURE__ */ React35.createElement(SideLeftIcon2, { fontSize: "tiny" }),
+  right: /* @__PURE__ */ React35.createElement(SideRightIcon2, { fontSize: "tiny" }),
+  top: /* @__PURE__ */ React35.createElement(SideTopIcon2, { fontSize: "tiny" }),
+  bottom: /* @__PURE__ */ React35.createElement(SideBottomIcon2, { fontSize: "tiny" })
 };
 var DimensionsField = () => {
-  return /* @__PURE__ */ React28.createElement(React28.Fragment, null, /* @__PURE__ */ React28.createElement(Stack11, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React28.createElement(DimensionField, { side: "top", label: __10("Top", "elementor") }), /* @__PURE__ */ React28.createElement(DimensionField, { side: "right", label: __10("Right", "elementor") })), /* @__PURE__ */ React28.createElement(Stack11, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React28.createElement(DimensionField, { side: "bottom", label: __10("Bottom", "elementor") }), /* @__PURE__ */ React28.createElement(DimensionField, { side: "left", label: __10("Left", "elementor") })));
+  return /* @__PURE__ */ React35.createElement(React35.Fragment, null, /* @__PURE__ */ React35.createElement(Stack13, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React35.createElement(DimensionField, { side: "top", label: __17("Top", "elementor") }), /* @__PURE__ */ React35.createElement(DimensionField, { side: "right", label: __17("Right", "elementor") })), /* @__PURE__ */ React35.createElement(Stack13, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React35.createElement(DimensionField, { side: "bottom", label: __17("Bottom", "elementor") }), /* @__PURE__ */ React35.createElement(DimensionField, { side: "left", label: __17("Left", "elementor") })));
 };
 var DimensionField = ({ side, label }) => {
-  return /* @__PURE__ */ React28.createElement(Grid4, { container: true, gap: 1, alignItems: "center" }, /* @__PURE__ */ React28.createElement(Grid4, { item: true, xs: 12 }, /* @__PURE__ */ React28.createElement(ControlLabel8, null, label)), /* @__PURE__ */ React28.createElement(Grid4, { item: true, xs: 12 }, /* @__PURE__ */ React28.createElement(StylesField, { bind: side }, /* @__PURE__ */ React28.createElement(SizeControl2, { startIcon: sideIcons[side] }))));
+  return /* @__PURE__ */ React35.createElement(Grid10, { container: true, gap: 1, alignItems: "center" }, /* @__PURE__ */ React35.createElement(Grid10, { item: true, xs: 12 }, /* @__PURE__ */ React35.createElement(ControlLabel15, null, label)), /* @__PURE__ */ React35.createElement(Grid10, { item: true, xs: 12 }, /* @__PURE__ */ React35.createElement(StylesField, { bind: side }, /* @__PURE__ */ React35.createElement(SizeControl3, { startIcon: sideIcons[side] }))));
 };
 
 // src/components/style-sections/position-section/position-field.tsx
-import * as React29 from "react";
-import { ControlLabel as ControlLabel9, SelectControl as SelectControl3 } from "@elementor/editor-controls";
-import { Grid as Grid5 } from "@elementor/ui";
-import { __ as __11 } from "@wordpress/i18n";
+import * as React36 from "react";
+import { ControlLabel as ControlLabel16, SelectControl as SelectControl3 } from "@elementor/editor-controls";
+import { Grid as Grid11 } from "@elementor/ui";
+import { __ as __18 } from "@wordpress/i18n";
 var positionOptions = [
-  { label: __11("Static", "elementor"), value: "static" },
-  { label: __11("Relative", "elementor"), value: "relative" },
-  { label: __11("Absolute", "elementor"), value: "absolute" },
-  { label: __11("Fixed", "elementor"), value: "fixed" }
+  { label: __18("Static", "elementor"), value: "static" },
+  { label: __18("Relative", "elementor"), value: "relative" },
+  { label: __18("Absolute", "elementor"), value: "absolute" },
+  { label: __18("Fixed", "elementor"), value: "fixed" }
 ];
 var PositionField = () => {
-  return /* @__PURE__ */ React29.createElement(StylesField, { bind: "position" }, /* @__PURE__ */ React29.createElement(Grid5, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React29.createElement(Grid5, { item: true, xs: 6 }, /* @__PURE__ */ React29.createElement(ControlLabel9, null, __11("Position", "elementor"))), /* @__PURE__ */ React29.createElement(Grid5, { item: true, xs: 6 }, /* @__PURE__ */ React29.createElement(SelectControl3, { options: positionOptions }))));
+  return /* @__PURE__ */ React36.createElement(StylesField, { bind: "position" }, /* @__PURE__ */ React36.createElement(Grid11, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React36.createElement(Grid11, { item: true, xs: 6 }, /* @__PURE__ */ React36.createElement(ControlLabel16, null, __18("Position", "elementor"))), /* @__PURE__ */ React36.createElement(Grid11, { item: true, xs: 6 }, /* @__PURE__ */ React36.createElement(SelectControl3, { options: positionOptions }))));
 };
 
 // src/components/style-sections/position-section/z-index-field.tsx
-import * as React30 from "react";
-import { ControlLabel as ControlLabel10, NumberControl } from "@elementor/editor-controls";
-import { Grid as Grid6 } from "@elementor/ui";
-import { __ as __12 } from "@wordpress/i18n";
+import * as React37 from "react";
+import { ControlLabel as ControlLabel17, NumberControl as NumberControl3 } from "@elementor/editor-controls";
+import { Grid as Grid12 } from "@elementor/ui";
+import { __ as __19 } from "@wordpress/i18n";
 var ZIndexField = () => {
-  return /* @__PURE__ */ React30.createElement(StylesField, { bind: "z-index" }, /* @__PURE__ */ React30.createElement(Grid6, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React30.createElement(Grid6, { item: true, xs: 6 }, /* @__PURE__ */ React30.createElement(ControlLabel10, null, __12("Z-Index", "elementor"))), /* @__PURE__ */ React30.createElement(Grid6, { item: true, xs: 6 }, /* @__PURE__ */ React30.createElement(NumberControl, null))));
+  return /* @__PURE__ */ React37.createElement(StylesField, { bind: "z-index" }, /* @__PURE__ */ React37.createElement(Grid12, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React37.createElement(Grid12, { item: true, xs: 6 }, /* @__PURE__ */ React37.createElement(ControlLabel17, null, __19("Z-Index", "elementor"))), /* @__PURE__ */ React37.createElement(Grid12, { item: true, xs: 6 }, /* @__PURE__ */ React37.createElement(NumberControl3, null))));
 };
 
 // src/components/style-sections/position-section/position-section.tsx
@@ -1006,8 +1406,8 @@ var dimensionsPropKeys = ["top", "bottom", "left", "right"];
 var PositionSection = () => {
   const [positionValue] = useStylesField("position");
   usePositionChangeHandler();
-  const isNotStatic = positionValue && positionValue !== "static";
-  return /* @__PURE__ */ React31.createElement(Stack12, { gap: 1.5 }, /* @__PURE__ */ React31.createElement(PositionField, null), isNotStatic ? /* @__PURE__ */ React31.createElement(React31.Fragment, null, /* @__PURE__ */ React31.createElement(DimensionsField, null), /* @__PURE__ */ React31.createElement(ZIndexField, null)) : null);
+  const isNotStatic = positionValue && positionValue?.value !== "static";
+  return /* @__PURE__ */ React38.createElement(Stack14, { gap: 1.5 }, /* @__PURE__ */ React38.createElement(PositionField, null), isNotStatic ? /* @__PURE__ */ React38.createElement(React38.Fragment, null, /* @__PURE__ */ React38.createElement(DimensionsField, null), /* @__PURE__ */ React38.createElement(ZIndexField, null)) : null);
 };
 var usePositionChangeHandler = () => {
   const dimensionsHistory = useStylePropsHistory(dimensionsPropKeys);
@@ -1032,73 +1432,73 @@ var usePositionChangeHandler = () => {
 };
 
 // src/components/style-sections/size-section/size-section.tsx
-import * as React33 from "react";
-import { ControlLabel as ControlLabel12, SizeControl as SizeControl3 } from "@elementor/editor-controls";
-import { Divider as Divider3, Grid as Grid8, Stack as Stack13 } from "@elementor/ui";
-import { __ as __14 } from "@wordpress/i18n";
+import * as React40 from "react";
+import { ControlLabel as ControlLabel19, SizeControl as SizeControl4 } from "@elementor/editor-controls";
+import { Divider as Divider4, Grid as Grid14, Stack as Stack15 } from "@elementor/ui";
+import { __ as __21 } from "@wordpress/i18n";
 
 // src/components/style-sections/size-section/overflow-field.tsx
-import * as React32 from "react";
-import { ControlLabel as ControlLabel11, ToggleControl as ToggleControl3 } from "@elementor/editor-controls";
+import * as React39 from "react";
+import { ControlLabel as ControlLabel18, ToggleControl as ToggleControl7 } from "@elementor/editor-controls";
 import { ExpandBottomIcon, EyeIcon, EyeOffIcon } from "@elementor/icons";
-import { Grid as Grid7 } from "@elementor/ui";
-import { __ as __13 } from "@wordpress/i18n";
-var options = [
+import { Grid as Grid13 } from "@elementor/ui";
+import { __ as __20 } from "@wordpress/i18n";
+var options6 = [
   {
     value: "visible",
-    label: __13("Visible", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(EyeIcon, { fontSize: size }),
+    label: __20("Visible", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React39.createElement(EyeIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "hidden",
-    label: __13("Hidden", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(EyeOffIcon, { fontSize: size }),
+    label: __20("Hidden", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React39.createElement(EyeOffIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "auto",
-    label: __13("Auto", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React32.createElement(ExpandBottomIcon, { fontSize: size }),
+    label: __20("Auto", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React39.createElement(ExpandBottomIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
 var OverflowField = () => {
-  return /* @__PURE__ */ React32.createElement(StylesField, { bind: "overflow" }, /* @__PURE__ */ React32.createElement(Grid7, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React32.createElement(Grid7, { item: true, xs: 6 }, /* @__PURE__ */ React32.createElement(ControlLabel11, null, __13("Overflow", "elementor"))), /* @__PURE__ */ React32.createElement(Grid7, { item: true, xs: 6, sx: { display: "flex", justifyContent: "flex-end" } }, /* @__PURE__ */ React32.createElement(ToggleControl3, { options }))));
+  return /* @__PURE__ */ React39.createElement(StylesField, { bind: "overflow" }, /* @__PURE__ */ React39.createElement(Grid13, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React39.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React39.createElement(ControlLabel18, null, __20("Overflow", "elementor"))), /* @__PURE__ */ React39.createElement(Grid13, { item: true, xs: 6, sx: { display: "flex", justifyContent: "flex-end" } }, /* @__PURE__ */ React39.createElement(ToggleControl7, { options: options6 }))));
 };
 
 // src/components/style-sections/size-section/size-section.tsx
 var SizeSection = () => {
-  return /* @__PURE__ */ React33.createElement(Stack13, { gap: 1.5 }, /* @__PURE__ */ React33.createElement(Grid8, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(SizeField, { bind: "width", label: __14("Width", "elementor") })), /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(SizeField, { bind: "height", label: __14("Height", "elementor") }))), /* @__PURE__ */ React33.createElement(Grid8, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(SizeField, { bind: "min-width", label: __14("Min. Width", "elementor") })), /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(SizeField, { bind: "min-height", label: __14("Min. Height", "elementor") }))), /* @__PURE__ */ React33.createElement(Grid8, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(SizeField, { bind: "max-width", label: __14("Max. Width", "elementor") })), /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(SizeField, { bind: "max-height", label: __14("Max. Height", "elementor") }))), /* @__PURE__ */ React33.createElement(Divider3, null), /* @__PURE__ */ React33.createElement(Stack13, null, /* @__PURE__ */ React33.createElement(OverflowField, null)));
+  return /* @__PURE__ */ React40.createElement(Stack15, { gap: 1.5 }, /* @__PURE__ */ React40.createElement(Grid14, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(SizeField, { bind: "width", label: __21("Width", "elementor") })), /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(SizeField, { bind: "height", label: __21("Height", "elementor") }))), /* @__PURE__ */ React40.createElement(Grid14, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(SizeField, { bind: "min-width", label: __21("Min. Width", "elementor") })), /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(SizeField, { bind: "min-height", label: __21("Min. Height", "elementor") }))), /* @__PURE__ */ React40.createElement(Grid14, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(SizeField, { bind: "max-width", label: __21("Max. Width", "elementor") })), /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(SizeField, { bind: "max-height", label: __21("Max. Height", "elementor") }))), /* @__PURE__ */ React40.createElement(Divider4, null), /* @__PURE__ */ React40.createElement(Stack15, null, /* @__PURE__ */ React40.createElement(OverflowField, null)));
 };
 var SizeField = ({ label, bind }) => {
-  return /* @__PURE__ */ React33.createElement(StylesField, { bind }, /* @__PURE__ */ React33.createElement(Grid8, { container: true, gap: 1, alignItems: "center" }, /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 12 }, /* @__PURE__ */ React33.createElement(ControlLabel12, null, label)), /* @__PURE__ */ React33.createElement(Grid8, { item: true, xs: 12 }, /* @__PURE__ */ React33.createElement(SizeControl3, null))));
+  return /* @__PURE__ */ React40.createElement(StylesField, { bind }, /* @__PURE__ */ React40.createElement(Grid14, { container: true, gap: 1, alignItems: "center" }, /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 12 }, /* @__PURE__ */ React40.createElement(ControlLabel19, null, label)), /* @__PURE__ */ React40.createElement(Grid14, { item: true, xs: 12 }, /* @__PURE__ */ React40.createElement(SizeControl4, null))));
 };
 
 // src/components/style-sections/spacing-section/spacing-section.tsx
-import * as React34 from "react";
+import * as React41 from "react";
 import { LinkedDimensionsControl } from "@elementor/editor-controls";
-import { Divider as Divider4, Stack as Stack14 } from "@elementor/ui";
-import { __ as __15 } from "@wordpress/i18n";
+import { Divider as Divider5, Stack as Stack16 } from "@elementor/ui";
+import { __ as __22 } from "@wordpress/i18n";
 var SpacingSection = () => {
-  return /* @__PURE__ */ React34.createElement(Stack14, { gap: 1.5 }, /* @__PURE__ */ React34.createElement(StylesField, { bind: "padding" }, /* @__PURE__ */ React34.createElement(LinkedDimensionsControl, { label: __15("Padding", "elementor") })), /* @__PURE__ */ React34.createElement(Divider4, null), /* @__PURE__ */ React34.createElement(StylesField, { bind: "margin" }, /* @__PURE__ */ React34.createElement(LinkedDimensionsControl, { label: __15("Margin", "elementor") })));
+  return /* @__PURE__ */ React41.createElement(Stack16, { gap: 1.5 }, /* @__PURE__ */ React41.createElement(StylesField, { bind: "padding" }, /* @__PURE__ */ React41.createElement(LinkedDimensionsControl, { label: __22("Padding", "elementor") })), /* @__PURE__ */ React41.createElement(Divider5, null), /* @__PURE__ */ React41.createElement(StylesField, { bind: "margin" }, /* @__PURE__ */ React41.createElement(LinkedDimensionsControl, { label: __22("Margin", "elementor") })));
 };
 
 // src/components/style-sections/typography-section/typography-section.tsx
-import * as React48 from "react";
-import { Divider as Divider5, Stack as Stack17 } from "@elementor/ui";
+import * as React55 from "react";
+import { Divider as Divider6, Stack as Stack18 } from "@elementor/ui";
 
 // src/components/collapsible-content.tsx
-import * as React35 from "react";
-import { useState as useState2 } from "react";
-import { Button, Collapse as Collapse3, Stack as Stack15 } from "@elementor/ui";
-import { __ as __16 } from "@wordpress/i18n";
+import * as React42 from "react";
+import { useState as useState4 } from "react";
+import { Button, Collapse as Collapse3, Stack as Stack17 } from "@elementor/ui";
+import { __ as __23 } from "@wordpress/i18n";
 var CollapsibleContent = ({ children, defaultOpen = false }) => {
-  const [open, setOpen] = useState2(defaultOpen);
+  const [open, setOpen] = useState4(defaultOpen);
   const handleToggle = () => {
     setOpen((prevOpen) => !prevOpen);
   };
-  return /* @__PURE__ */ React35.createElement(Stack15, { sx: { py: 0.5 } }, /* @__PURE__ */ React35.createElement(
+  return /* @__PURE__ */ React42.createElement(Stack17, { sx: { py: 0.5 } }, /* @__PURE__ */ React42.createElement(
     Button,
     {
       fullWidth: true,
@@ -1106,17 +1506,17 @@ var CollapsibleContent = ({ children, defaultOpen = false }) => {
       color: "secondary",
       variant: "outlined",
       onClick: handleToggle,
-      endIcon: /* @__PURE__ */ React35.createElement(CollapseIcon, { open })
+      endIcon: /* @__PURE__ */ React42.createElement(CollapseIcon, { open })
     },
-    open ? __16("Show less", "elementor") : __16("Show more", "elementor")
-  ), /* @__PURE__ */ React35.createElement(Collapse3, { in: open, timeout: "auto", unmountOnExit: true }, children));
+    open ? __23("Show less", "elementor") : __23("Show more", "elementor")
+  ), /* @__PURE__ */ React42.createElement(Collapse3, { in: open, timeout: "auto", unmountOnExit: true }, children));
 };
 
 // src/components/style-sections/typography-section/font-family-field.tsx
-import * as React36 from "react";
-import { ControlLabel as ControlLabel13, FontFamilyControl } from "@elementor/editor-controls";
-import { Grid as Grid9 } from "@elementor/ui";
-import { __ as __17 } from "@wordpress/i18n";
+import * as React43 from "react";
+import { ControlLabel as ControlLabel20, FontFamilyControl } from "@elementor/editor-controls";
+import { Grid as Grid15 } from "@elementor/ui";
+import { __ as __24 } from "@wordpress/i18n";
 
 // src/sync/get-elementor-config.ts
 var getElementorConfig = () => {
@@ -1130,184 +1530,220 @@ var FontFamilyField = () => {
   if (!fontFamilies) {
     return null;
   }
-  return /* @__PURE__ */ React36.createElement(StylesField, { bind: "font-family" }, /* @__PURE__ */ React36.createElement(Grid9, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React36.createElement(Grid9, { item: true, xs: 6 }, /* @__PURE__ */ React36.createElement(ControlLabel13, null, __17("Font Family", "elementor"))), /* @__PURE__ */ React36.createElement(Grid9, { item: true, xs: 6 }, /* @__PURE__ */ React36.createElement(FontFamilyControl, { fontFamilies }))));
+  return /* @__PURE__ */ React43.createElement(StylesField, { bind: "font-family" }, /* @__PURE__ */ React43.createElement(Grid15, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React43.createElement(Grid15, { item: true, xs: 6 }, /* @__PURE__ */ React43.createElement(ControlLabel20, null, __24("Font Family", "elementor"))), /* @__PURE__ */ React43.createElement(Grid15, { item: true, xs: 6 }, /* @__PURE__ */ React43.createElement(FontFamilyControl, { fontFamilies }))));
 };
 var getFontFamilies = () => {
   const { controls } = getElementorConfig();
-  const options5 = controls?.font?.options;
-  if (!options5) {
+  const options10 = controls?.font?.options;
+  if (!options10) {
     return null;
   }
-  return options5;
+  return options10;
 };
 
 // src/components/style-sections/typography-section/font-size-field.tsx
-import * as React37 from "react";
-import { ControlLabel as ControlLabel14, SizeControl as SizeControl4 } from "@elementor/editor-controls";
-import { Grid as Grid10 } from "@elementor/ui";
-import { __ as __18 } from "@wordpress/i18n";
+import * as React44 from "react";
+import { ControlLabel as ControlLabel21, SizeControl as SizeControl5 } from "@elementor/editor-controls";
+import { Grid as Grid16 } from "@elementor/ui";
+import { __ as __25 } from "@wordpress/i18n";
 var FontSizeField = () => {
-  return /* @__PURE__ */ React37.createElement(StylesField, { bind: "font-size" }, /* @__PURE__ */ React37.createElement(Grid10, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React37.createElement(Grid10, { item: true, xs: 6 }, /* @__PURE__ */ React37.createElement(ControlLabel14, null, __18("Font Size", "elementor"))), /* @__PURE__ */ React37.createElement(Grid10, { item: true, xs: 6 }, /* @__PURE__ */ React37.createElement(SizeControl4, null))));
+  return /* @__PURE__ */ React44.createElement(StylesField, { bind: "font-size" }, /* @__PURE__ */ React44.createElement(Grid16, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React44.createElement(Grid16, { item: true, xs: 6 }, /* @__PURE__ */ React44.createElement(ControlLabel21, null, __25("Font Size", "elementor"))), /* @__PURE__ */ React44.createElement(Grid16, { item: true, xs: 6 }, /* @__PURE__ */ React44.createElement(SizeControl5, null))));
 };
 
 // src/components/style-sections/typography-section/font-weight-field.tsx
-import * as React38 from "react";
-import { ControlLabel as ControlLabel15, SelectControl as SelectControl4 } from "@elementor/editor-controls";
-import { Grid as Grid11 } from "@elementor/ui";
-import { __ as __19 } from "@wordpress/i18n";
+import * as React45 from "react";
+import { ControlLabel as ControlLabel22, SelectControl as SelectControl4 } from "@elementor/editor-controls";
+import { Grid as Grid17 } from "@elementor/ui";
+import { __ as __26 } from "@wordpress/i18n";
 var fontWeightOptions = [
-  { label: __19("Light - 400", "elementor"), value: "400" },
-  { label: __19("Regular - 500", "elementor"), value: "500" },
-  { label: __19("Semi Bold - 600", "elementor"), value: "600" },
-  { label: __19("Bold - 700", "elementor"), value: "700" },
-  { label: __19("Black - 900", "elementor"), value: "900" }
+  { label: __26("Light - 400", "elementor"), value: "400" },
+  { label: __26("Regular - 500", "elementor"), value: "500" },
+  { label: __26("Semi Bold - 600", "elementor"), value: "600" },
+  { label: __26("Bold - 700", "elementor"), value: "700" },
+  { label: __26("Black - 900", "elementor"), value: "900" }
 ];
 var FontWeightField = () => {
-  return /* @__PURE__ */ React38.createElement(StylesField, { bind: "font-weight" }, /* @__PURE__ */ React38.createElement(Grid11, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React38.createElement(Grid11, { item: true, xs: 6 }, /* @__PURE__ */ React38.createElement(ControlLabel15, null, __19("Font Weight", "elementor"))), /* @__PURE__ */ React38.createElement(Grid11, { item: true, xs: 6 }, /* @__PURE__ */ React38.createElement(SelectControl4, { options: fontWeightOptions }))));
+  return /* @__PURE__ */ React45.createElement(StylesField, { bind: "font-weight" }, /* @__PURE__ */ React45.createElement(Grid17, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React45.createElement(Grid17, { item: true, xs: 6 }, /* @__PURE__ */ React45.createElement(ControlLabel22, null, __26("Font Weight", "elementor"))), /* @__PURE__ */ React45.createElement(Grid17, { item: true, xs: 6 }, /* @__PURE__ */ React45.createElement(SelectControl4, { options: fontWeightOptions }))));
 };
 
 // src/components/style-sections/typography-section/letter-spacing-field.tsx
-import * as React39 from "react";
-import { ControlLabel as ControlLabel16, SizeControl as SizeControl5 } from "@elementor/editor-controls";
-import { Grid as Grid12 } from "@elementor/ui";
-import { __ as __20 } from "@wordpress/i18n";
+import * as React46 from "react";
+import { ControlLabel as ControlLabel23, SizeControl as SizeControl6 } from "@elementor/editor-controls";
+import { Grid as Grid18 } from "@elementor/ui";
+import { __ as __27 } from "@wordpress/i18n";
 var LetterSpacingField = () => {
-  return /* @__PURE__ */ React39.createElement(StylesField, { bind: "letter-spacing" }, /* @__PURE__ */ React39.createElement(Grid12, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React39.createElement(Grid12, { item: true, xs: 6 }, /* @__PURE__ */ React39.createElement(ControlLabel16, null, __20("Letter Spacing", "elementor"))), /* @__PURE__ */ React39.createElement(Grid12, { item: true, xs: 6 }, /* @__PURE__ */ React39.createElement(SizeControl5, null))));
+  return /* @__PURE__ */ React46.createElement(StylesField, { bind: "letter-spacing" }, /* @__PURE__ */ React46.createElement(Grid18, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React46.createElement(Grid18, { item: true, xs: 6 }, /* @__PURE__ */ React46.createElement(ControlLabel23, null, __27("Letter Spacing", "elementor"))), /* @__PURE__ */ React46.createElement(Grid18, { item: true, xs: 6 }, /* @__PURE__ */ React46.createElement(SizeControl6, null))));
+};
+
+// src/components/style-sections/typography-section/line-height-field.tsx
+import * as React47 from "react";
+import { ControlLabel as ControlLabel24, SizeControl as SizeControl7 } from "@elementor/editor-controls";
+import { Grid as Grid19 } from "@elementor/ui";
+import { __ as __28 } from "@wordpress/i18n";
+var LineHeightField = () => {
+  return /* @__PURE__ */ React47.createElement(StylesField, { bind: "line-height" }, /* @__PURE__ */ React47.createElement(Grid19, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React47.createElement(Grid19, { item: true, xs: 6 }, /* @__PURE__ */ React47.createElement(ControlLabel24, null, __28("Line Height", "elementor"))), /* @__PURE__ */ React47.createElement(Grid19, { item: true, xs: 6 }, /* @__PURE__ */ React47.createElement(SizeControl7, null))));
 };
 
 // src/components/style-sections/typography-section/text-alignment-field.tsx
-import * as React40 from "react";
-import { ControlLabel as ControlLabel17, ToggleControl as ToggleControl4 } from "@elementor/editor-controls";
+import * as React48 from "react";
+import { ControlLabel as ControlLabel25, ToggleControl as ToggleControl8 } from "@elementor/editor-controls";
 import { AlignCenterIcon, AlignJustifiedIcon, AlignLeftIcon, AlignRightIcon } from "@elementor/icons";
-import { Grid as Grid13 } from "@elementor/ui";
-import { __ as __21 } from "@wordpress/i18n";
-var options2 = [
+import { Grid as Grid20 } from "@elementor/ui";
+import { __ as __29 } from "@wordpress/i18n";
+var options7 = [
   {
     value: "left",
-    label: __21("Left", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React40.createElement(AlignLeftIcon, { fontSize: size })
+    label: __29("Left", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(AlignLeftIcon, { fontSize: size })
   },
   {
     value: "center",
-    label: __21("Center", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React40.createElement(AlignCenterIcon, { fontSize: size })
+    label: __29("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(AlignCenterIcon, { fontSize: size })
   },
   {
     value: "right",
-    label: __21("Right", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React40.createElement(AlignRightIcon, { fontSize: size })
+    label: __29("Right", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(AlignRightIcon, { fontSize: size })
   },
   {
     value: "justify",
-    label: __21("Justify", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React40.createElement(AlignJustifiedIcon, { fontSize: size })
+    label: __29("Justify", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(AlignJustifiedIcon, { fontSize: size })
   }
 ];
 var TextAlignmentField = () => {
-  return /* @__PURE__ */ React40.createElement(StylesField, { bind: "text-align" }, /* @__PURE__ */ React40.createElement(Grid13, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React40.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(ControlLabel17, null, __21("Alignment", "elementor"))), /* @__PURE__ */ React40.createElement(Grid13, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React40.createElement(ToggleControl4, { options: options2 }))));
+  return /* @__PURE__ */ React48.createElement(StylesField, { bind: "text-align" }, /* @__PURE__ */ React48.createElement(Grid20, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React48.createElement(Grid20, { item: true, xs: 6 }, /* @__PURE__ */ React48.createElement(ControlLabel25, null, __29("Alignment", "elementor"))), /* @__PURE__ */ React48.createElement(Grid20, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React48.createElement(ToggleControl8, { options: options7 }))));
 };
 
 // src/components/style-sections/typography-section/text-color-field.tsx
-import * as React41 from "react";
-import { ColorControl as ColorControl3, ControlLabel as ControlLabel18 } from "@elementor/editor-controls";
-import { Grid as Grid14 } from "@elementor/ui";
-import { __ as __22 } from "@wordpress/i18n";
+import * as React49 from "react";
+import { ColorControl as ColorControl3, ControlLabel as ControlLabel26 } from "@elementor/editor-controls";
+import { Grid as Grid21 } from "@elementor/ui";
+import { __ as __30 } from "@wordpress/i18n";
 var TextColorField = () => {
-  return /* @__PURE__ */ React41.createElement(StylesField, { bind: "color" }, /* @__PURE__ */ React41.createElement(Grid14, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React41.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React41.createElement(ControlLabel18, null, __22("Text Color", "elementor"))), /* @__PURE__ */ React41.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React41.createElement(ColorControl3, null))));
+  return /* @__PURE__ */ React49.createElement(StylesField, { bind: "color" }, /* @__PURE__ */ React49.createElement(Grid21, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React49.createElement(Grid21, { item: true, xs: 6 }, /* @__PURE__ */ React49.createElement(ControlLabel26, null, __30("Text Color", "elementor"))), /* @__PURE__ */ React49.createElement(Grid21, { item: true, xs: 6 }, /* @__PURE__ */ React49.createElement(ColorControl3, null))));
 };
 
 // src/components/style-sections/typography-section/text-direction-field.tsx
-import * as React42 from "react";
-import { ControlLabel as ControlLabel19, ToggleControl as ToggleControl5 } from "@elementor/editor-controls";
+import * as React50 from "react";
+import { ControlLabel as ControlLabel27, ToggleControl as ToggleControl9 } from "@elementor/editor-controls";
 import { TextDirectionLtrIcon, TextDirectionRtlIcon } from "@elementor/icons";
-import { Grid as Grid15 } from "@elementor/ui";
-import { __ as __23 } from "@wordpress/i18n";
-var options3 = [
+import { Grid as Grid22 } from "@elementor/ui";
+import { __ as __31 } from "@wordpress/i18n";
+var options8 = [
   {
     value: "ltr",
-    label: __23("Left to Right", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React42.createElement(TextDirectionLtrIcon, { fontSize: size })
+    label: __31("Left to Right", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React50.createElement(TextDirectionLtrIcon, { fontSize: size })
   },
   {
     value: "rtl",
-    label: __23("Right to Left", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React42.createElement(TextDirectionRtlIcon, { fontSize: size })
+    label: __31("Right to Left", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React50.createElement(TextDirectionRtlIcon, { fontSize: size })
   }
 ];
 var TextDirectionField = () => {
-  return /* @__PURE__ */ React42.createElement(StylesField, { bind: "direction" }, /* @__PURE__ */ React42.createElement(Grid15, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React42.createElement(Grid15, { item: true, xs: 6 }, /* @__PURE__ */ React42.createElement(ControlLabel19, null, __23("Direction", "elementor"))), /* @__PURE__ */ React42.createElement(Grid15, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React42.createElement(ToggleControl5, { options: options3 }))));
+  return /* @__PURE__ */ React50.createElement(StylesField, { bind: "direction" }, /* @__PURE__ */ React50.createElement(Grid22, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React50.createElement(Grid22, { item: true, xs: 6 }, /* @__PURE__ */ React50.createElement(ControlLabel27, null, __31("Direction", "elementor"))), /* @__PURE__ */ React50.createElement(Grid22, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React50.createElement(ToggleControl9, { options: options8 }))));
 };
 
 // src/components/style-sections/typography-section/text-stroke-field.tsx
-import * as React44 from "react";
-import { ControlLabel as ControlLabel20, StrokeControl } from "@elementor/editor-controls";
-import { __ as __25 } from "@wordpress/i18n";
-
-// src/components/collapsible-field.tsx
-import * as React43 from "react";
-import { useState as useState3 } from "react";
-import { MinusIcon as MinusIcon2, PlusIcon as PlusIcon2 } from "@elementor/icons";
-import { Collapse as Collapse4, IconButton as IconButton3, Stack as Stack16 } from "@elementor/ui";
-import { __ as __24 } from "@wordpress/i18n";
-var CollapsibleField = ({ label, children, defaultOpen = false }) => {
-  const [open, setOpen] = useState3(defaultOpen);
-  const handleToggle = () => {
-    setOpen((prevOpen) => !prevOpen);
-  };
-  return /* @__PURE__ */ React43.createElement(Stack16, { gap: 1.5 }, /* @__PURE__ */ React43.createElement(Stack16, { direction: "row", justifyContent: "space-between", alignItems: "center", sx: { py: 0.5 } }, label, /* @__PURE__ */ React43.createElement(
-    IconButton3,
-    {
-      onClick: handleToggle,
-      size: "tiny",
-      "aria-label": open ? __24("Close", "elementor") : __24("Expand", "elementor")
+import * as React51 from "react";
+import { StrokeControl } from "@elementor/editor-controls";
+import { __ as __32 } from "@wordpress/i18n";
+var initTextStroke = {
+  $$type: "stroke",
+  value: {
+    color: {
+      $$type: "color",
+      value: "#000000"
     },
-    open ? /* @__PURE__ */ React43.createElement(MinusIcon2, { fontSize: "tiny" }) : /* @__PURE__ */ React43.createElement(PlusIcon2, { fontSize: "tiny" })
-  )), /* @__PURE__ */ React43.createElement(Collapse4, { in: open, unmountOnExit: true }, children));
+    width: {
+      $$type: "size",
+      value: {
+        unit: "px",
+        size: 1
+      }
+    }
+  }
 };
-
-// src/components/style-sections/typography-section/text-stroke-field.tsx
 var TextStrokeField = () => {
-  return /* @__PURE__ */ React44.createElement(StylesField, { bind: "-webkit-text-stroke" }, /* @__PURE__ */ React44.createElement(CollapsibleField, { label: /* @__PURE__ */ React44.createElement(ControlLabel20, null, __25("Text Stroke", "elementor")) }, /* @__PURE__ */ React44.createElement(StrokeControl, null)));
+  const [textStroke, setTextStroke] = useStylesField("-webkit-text-stroke");
+  const addTextStroke = () => {
+    setTextStroke(initTextStroke);
+  };
+  const removeTextStroke = () => {
+    setTextStroke(null);
+  };
+  const hasTextStroke = Boolean(textStroke);
+  return /* @__PURE__ */ React51.createElement(
+    AddOrRemoveContent,
+    {
+      label: __32("Text Stroke", "elementor"),
+      isAdded: hasTextStroke,
+      onAdd: addTextStroke,
+      onRemove: removeTextStroke
+    },
+    /* @__PURE__ */ React51.createElement(StylesField, { bind: "-webkit-text-stroke" }, /* @__PURE__ */ React51.createElement(StrokeControl, null))
+  );
 };
 
 // src/components/style-sections/typography-section/text-style-field.tsx
-import * as React45 from "react";
-import { ControlLabel as ControlLabel21 } from "@elementor/editor-controls";
+import * as React52 from "react";
+import { ControlLabel as ControlLabel28 } from "@elementor/editor-controls";
 import { ItalicIcon, StrikethroughIcon, UnderlineIcon } from "@elementor/icons";
-import { Grid as Grid16, ToggleButton as ToggleButtonBase, ToggleButtonGroup } from "@elementor/ui";
-import { __ as __26 } from "@wordpress/i18n";
+import { Grid as Grid23, ToggleButton as ToggleButtonBase, ToggleButtonGroup } from "@elementor/ui";
+import { __ as __33 } from "@wordpress/i18n";
 var buttonSize = "tiny";
 var TextStyleField = () => {
   const [fontStyle, setFontStyle] = useStylesField("font-style");
   const [textDecoration, setTextDecoration] = useStylesField("text-decoration");
-  const formats = [fontStyle, ...(textDecoration || "").split(" ")];
-  return /* @__PURE__ */ React45.createElement(Grid16, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React45.createElement(Grid16, { item: true, xs: 6 }, /* @__PURE__ */ React45.createElement(ControlLabel21, null, __26("Style", "elementor"))), /* @__PURE__ */ React45.createElement(Grid16, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React45.createElement(ToggleButtonGroup, { value: formats }, /* @__PURE__ */ React45.createElement(
+  const formats = [fontStyle?.value, ...(textDecoration?.value || "").split(" ")];
+  const handleSetFontStyle = (newValue) => {
+    if (newValue === null) {
+      return setFontStyle(null);
+    }
+    setFontStyle({
+      $$type: "string",
+      value: newValue
+    });
+  };
+  const handleSetTextDecoration = (newValue) => {
+    if (newValue === null) {
+      return setTextDecoration(null);
+    }
+    setTextDecoration({
+      $$type: "string",
+      value: newValue
+    });
+  };
+  return /* @__PURE__ */ React52.createElement(Grid23, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React52.createElement(Grid23, { item: true, xs: 6 }, /* @__PURE__ */ React52.createElement(ControlLabel28, null, __33("Style", "elementor"))), /* @__PURE__ */ React52.createElement(Grid23, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React52.createElement(ToggleButtonGroup, { value: formats }, /* @__PURE__ */ React52.createElement(
     ToggleButton,
     {
       value: "italic",
-      onChange: (v) => setFontStyle(fontStyle === v ? null : v),
+      onChange: (v) => handleSetFontStyle(fontStyle?.value === v ? null : v),
       "aria-label": "italic",
       sx: { marginLeft: "auto" }
     },
-    /* @__PURE__ */ React45.createElement(ItalicIcon, { fontSize: buttonSize })
-  ), /* @__PURE__ */ React45.createElement(
+    /* @__PURE__ */ React52.createElement(ItalicIcon, { fontSize: buttonSize })
+  ), /* @__PURE__ */ React52.createElement(
     ShorthandControl,
     {
       value: "line-through",
-      currentValues: textDecoration || "",
-      updateValues: setTextDecoration,
+      currentValues: textDecoration?.value || "",
+      updateValues: handleSetTextDecoration,
       "aria-label": "line-through"
     },
-    /* @__PURE__ */ React45.createElement(StrikethroughIcon, { fontSize: buttonSize })
-  ), /* @__PURE__ */ React45.createElement(
+    /* @__PURE__ */ React52.createElement(StrikethroughIcon, { fontSize: buttonSize })
+  ), /* @__PURE__ */ React52.createElement(
     ShorthandControl,
     {
       value: "underline",
-      currentValues: textDecoration || "",
-      updateValues: setTextDecoration,
+      currentValues: textDecoration?.value || "",
+      updateValues: handleSetTextDecoration,
       "aria-label": "underline"
     },
-    /* @__PURE__ */ React45.createElement(UnderlineIcon, { fontSize: buttonSize })
+    /* @__PURE__ */ React52.createElement(UnderlineIcon, { fontSize: buttonSize })
   ))));
 };
 var ShorthandControl = ({
@@ -1326,52 +1762,52 @@ var ShorthandControl = ({
       updateValues([...valuesArr, newValue].join(" "));
     }
   };
-  return /* @__PURE__ */ React45.createElement(ToggleButton, { value, onChange: toggleValue, selected, "aria-label": ariaLabel }, children);
+  return /* @__PURE__ */ React52.createElement(ToggleButton, { value, onChange: toggleValue, selected, "aria-label": ariaLabel }, children);
 };
 var ToggleButton = ({ onChange, ...props }) => {
   const handleChange = (_e, newValue) => {
     onChange(newValue);
   };
-  return /* @__PURE__ */ React45.createElement(ToggleButtonBase, { ...props, onChange: handleChange, size: buttonSize });
+  return /* @__PURE__ */ React52.createElement(ToggleButtonBase, { ...props, onChange: handleChange, size: buttonSize });
 };
 
 // src/components/style-sections/typography-section/transform-field.tsx
-import * as React46 from "react";
-import { ControlLabel as ControlLabel22, ToggleControl as ToggleControl6 } from "@elementor/editor-controls";
+import * as React53 from "react";
+import { ControlLabel as ControlLabel29, ToggleControl as ToggleControl10 } from "@elementor/editor-controls";
 import { LetterCaseIcon, LetterCaseLowerIcon, LetterCaseUpperIcon } from "@elementor/icons";
-import { Grid as Grid17 } from "@elementor/ui";
-import { __ as __27 } from "@wordpress/i18n";
-var options4 = [
+import { Grid as Grid24 } from "@elementor/ui";
+import { __ as __34 } from "@wordpress/i18n";
+var options9 = [
   {
     value: "capitalize",
-    label: __27("Capitalize", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React46.createElement(LetterCaseIcon, { fontSize: size })
+    label: __34("Capitalize", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React53.createElement(LetterCaseIcon, { fontSize: size })
   },
   {
     value: "uppercase",
-    label: __27("Uppercase", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React46.createElement(LetterCaseUpperIcon, { fontSize: size })
+    label: __34("Uppercase", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React53.createElement(LetterCaseUpperIcon, { fontSize: size })
   },
   {
     value: "lowercase",
-    label: __27("Lowercase", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React46.createElement(LetterCaseLowerIcon, { fontSize: size })
+    label: __34("Lowercase", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React53.createElement(LetterCaseLowerIcon, { fontSize: size })
   }
 ];
-var TransformField = () => /* @__PURE__ */ React46.createElement(StylesField, { bind: "text-transform" }, /* @__PURE__ */ React46.createElement(Grid17, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React46.createElement(Grid17, { item: true, xs: 6 }, /* @__PURE__ */ React46.createElement(ControlLabel22, null, __27("Transform", "elementor"))), /* @__PURE__ */ React46.createElement(Grid17, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React46.createElement(ToggleControl6, { options: options4 }))));
+var TransformField = () => /* @__PURE__ */ React53.createElement(StylesField, { bind: "text-transform" }, /* @__PURE__ */ React53.createElement(Grid24, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React53.createElement(Grid24, { item: true, xs: 6 }, /* @__PURE__ */ React53.createElement(ControlLabel29, null, __34("Transform", "elementor"))), /* @__PURE__ */ React53.createElement(Grid24, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React53.createElement(ToggleControl10, { options: options9 }))));
 
 // src/components/style-sections/typography-section/word-spacing-field.tsx
-import * as React47 from "react";
-import { ControlLabel as ControlLabel23, SizeControl as SizeControl6 } from "@elementor/editor-controls";
-import { Grid as Grid18 } from "@elementor/ui";
-import { __ as __28 } from "@wordpress/i18n";
+import * as React54 from "react";
+import { ControlLabel as ControlLabel30, SizeControl as SizeControl8 } from "@elementor/editor-controls";
+import { Grid as Grid25 } from "@elementor/ui";
+import { __ as __35 } from "@wordpress/i18n";
 var WordSpacingField = () => {
-  return /* @__PURE__ */ React47.createElement(StylesField, { bind: "word-spacing" }, /* @__PURE__ */ React47.createElement(Grid18, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React47.createElement(Grid18, { item: true, xs: 6 }, /* @__PURE__ */ React47.createElement(ControlLabel23, null, __28("Word Spacing", "elementor"))), /* @__PURE__ */ React47.createElement(Grid18, { item: true, xs: 6 }, /* @__PURE__ */ React47.createElement(SizeControl6, null))));
+  return /* @__PURE__ */ React54.createElement(StylesField, { bind: "word-spacing" }, /* @__PURE__ */ React54.createElement(Grid25, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React54.createElement(Grid25, { item: true, xs: 6 }, /* @__PURE__ */ React54.createElement(ControlLabel30, null, __35("Word Spacing", "elementor"))), /* @__PURE__ */ React54.createElement(Grid25, { item: true, xs: 6 }, /* @__PURE__ */ React54.createElement(SizeControl8, null))));
 };
 
 // src/components/style-sections/typography-section/typography-section.tsx
 var TypographySection = () => {
-  return /* @__PURE__ */ React48.createElement(Stack17, { gap: 1.5 }, /* @__PURE__ */ React48.createElement(FontFamilyField, null), /* @__PURE__ */ React48.createElement(FontWeightField, null), /* @__PURE__ */ React48.createElement(FontSizeField, null), /* @__PURE__ */ React48.createElement(Divider5, null), /* @__PURE__ */ React48.createElement(TextColorField, null), /* @__PURE__ */ React48.createElement(CollapsibleContent, null, /* @__PURE__ */ React48.createElement(Stack17, { gap: 1.5, sx: { pt: 1.5 } }, /* @__PURE__ */ React48.createElement(LetterSpacingField, null), /* @__PURE__ */ React48.createElement(WordSpacingField, null), /* @__PURE__ */ React48.createElement(Divider5, null), /* @__PURE__ */ React48.createElement(TextAlignmentField, null), /* @__PURE__ */ React48.createElement(TextStyleField, null), /* @__PURE__ */ React48.createElement(TransformField, null), /* @__PURE__ */ React48.createElement(TextDirectionField, null), /* @__PURE__ */ React48.createElement(TextStrokeField, null))));
+  return /* @__PURE__ */ React55.createElement(Stack18, { gap: 1.5 }, /* @__PURE__ */ React55.createElement(FontFamilyField, null), /* @__PURE__ */ React55.createElement(FontWeightField, null), /* @__PURE__ */ React55.createElement(FontSizeField, null), /* @__PURE__ */ React55.createElement(Divider6, null), /* @__PURE__ */ React55.createElement(TextAlignmentField, null), /* @__PURE__ */ React55.createElement(TextColorField, null), /* @__PURE__ */ React55.createElement(CollapsibleContent, null, /* @__PURE__ */ React55.createElement(Stack18, { gap: 1.5, sx: { pt: 1.5 } }, /* @__PURE__ */ React55.createElement(LineHeightField, null), /* @__PURE__ */ React55.createElement(LetterSpacingField, null), /* @__PURE__ */ React55.createElement(WordSpacingField, null), /* @__PURE__ */ React55.createElement(Divider6, null), /* @__PURE__ */ React55.createElement(TextStyleField, null), /* @__PURE__ */ React55.createElement(TransformField, null), /* @__PURE__ */ React55.createElement(TextDirectionField, null), /* @__PURE__ */ React55.createElement(TextStrokeField, null))));
 };
 
 // src/components/style-tab.tsx
@@ -1380,10 +1816,10 @@ var StyleTab = () => {
   const currentClassesProp = useCurrentClassesProp();
   const [activeStyleDefId, setActiveStyleDefId] = useActiveStyleDefId(currentClassesProp);
   const breakpoint = useActiveBreakpoint();
-  return /* @__PURE__ */ React49.createElement(ClassesPropProvider, { prop: currentClassesProp }, /* @__PURE__ */ React49.createElement(StyleProvider, { meta: { breakpoint, state: null }, id: activeStyleDefId, setId: setActiveStyleDefId }, /* @__PURE__ */ React49.createElement(CssClassSelectorSection, null), /* @__PURE__ */ React49.createElement(Divider6, null), /* @__PURE__ */ React49.createElement(SectionsList, null, /* @__PURE__ */ React49.createElement(Section, { title: __29("Layout", "elementor") }, /* @__PURE__ */ React49.createElement(LayoutSection, null)), /* @__PURE__ */ React49.createElement(Section, { title: __29("Spacing", "elementor") }, /* @__PURE__ */ React49.createElement(SpacingSection, null)), /* @__PURE__ */ React49.createElement(Section, { title: __29("Size", "elementor") }, /* @__PURE__ */ React49.createElement(SizeSection, null)), /* @__PURE__ */ React49.createElement(Section, { title: __29("Position", "elementor") }, /* @__PURE__ */ React49.createElement(PositionSection, null)), /* @__PURE__ */ React49.createElement(Section, { title: __29("Typography", "elementor") }, /* @__PURE__ */ React49.createElement(TypographySection, null)), /* @__PURE__ */ React49.createElement(Section, { title: __29("Background", "elementor") }, /* @__PURE__ */ React49.createElement(BackgroundSection, null)), /* @__PURE__ */ React49.createElement(Section, { title: __29("Border", "elementor") }, /* @__PURE__ */ React49.createElement(BorderSection, null)), /* @__PURE__ */ React49.createElement(Section, { title: __29("Effects", "elementor") }, /* @__PURE__ */ React49.createElement(EffectsSection, null)))));
+  return /* @__PURE__ */ React56.createElement(ClassesPropProvider, { prop: currentClassesProp }, /* @__PURE__ */ React56.createElement(StyleProvider, { meta: { breakpoint, state: null }, id: activeStyleDefId, setId: setActiveStyleDefId }, /* @__PURE__ */ React56.createElement(CssClassSelector, null), /* @__PURE__ */ React56.createElement(Divider7, null), /* @__PURE__ */ React56.createElement(SectionsList, null, /* @__PURE__ */ React56.createElement(Section, { title: __36("Layout", "elementor") }, /* @__PURE__ */ React56.createElement(LayoutSection, null)), /* @__PURE__ */ React56.createElement(Section, { title: __36("Spacing", "elementor") }, /* @__PURE__ */ React56.createElement(SpacingSection, null)), /* @__PURE__ */ React56.createElement(Section, { title: __36("Size", "elementor") }, /* @__PURE__ */ React56.createElement(SizeSection, null)), /* @__PURE__ */ React56.createElement(Section, { title: __36("Position", "elementor") }, /* @__PURE__ */ React56.createElement(PositionSection, null)), /* @__PURE__ */ React56.createElement(Section, { title: __36("Typography", "elementor") }, /* @__PURE__ */ React56.createElement(TypographySection, null)), /* @__PURE__ */ React56.createElement(Section, { title: __36("Background", "elementor") }, /* @__PURE__ */ React56.createElement(BackgroundSection, null)), /* @__PURE__ */ React56.createElement(Section, { title: __36("Border", "elementor") }, /* @__PURE__ */ React56.createElement(BorderSection, null)), /* @__PURE__ */ React56.createElement(Section, { title: __36("Effects", "elementor") }, /* @__PURE__ */ React56.createElement(EffectsSection, null)))));
 };
 function useActiveStyleDefId(currentClassesProp) {
-  const [activeStyledDefId, setActiveStyledDefId] = useState4(null);
+  const [activeStyledDefId, setActiveStyledDefId] = useState5(null);
   const fallback = useFirstElementStyleDef(currentClassesProp);
   const newId = useGeneratedId();
   return [activeStyledDefId || fallback?.id || newId, setActiveStyledDefId];
@@ -1417,7 +1853,7 @@ var EditingPanelTabs = () => {
   return (
     // When switching between elements, the local states should be reset. We are using key to rerender the tabs.
     // Reference: https://react.dev/learn/preserving-and-resetting-state#resetting-a-form-with-a-key
-    /* @__PURE__ */ React50.createElement(Fragment5, { key: element.id }, /* @__PURE__ */ React50.createElement(Stack18, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React50.createElement(Tabs, { variant: "fullWidth", indicatorColor: "secondary", textColor: "inherit", ...getTabsProps() }, /* @__PURE__ */ React50.createElement(Tab, { label: __30("General", "elementor"), ...getTabProps("settings") }), /* @__PURE__ */ React50.createElement(Tab, { label: __30("Style", "elementor"), ...getTabProps("style") })), /* @__PURE__ */ React50.createElement(Divider7, null), /* @__PURE__ */ React50.createElement(TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React50.createElement(SettingsTab, null)), /* @__PURE__ */ React50.createElement(TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React50.createElement(StyleTab, null))))
+    /* @__PURE__ */ React57.createElement(Fragment7, { key: element.id }, /* @__PURE__ */ React57.createElement(Stack19, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React57.createElement(Tabs, { variant: "fullWidth", indicatorColor: "secondary", textColor: "inherit", ...getTabsProps() }, /* @__PURE__ */ React57.createElement(Tab, { label: __37("General", "elementor"), ...getTabProps("settings") }), /* @__PURE__ */ React57.createElement(Tab, { label: __37("Style", "elementor"), ...getTabProps("style") })), /* @__PURE__ */ React57.createElement(Divider8, null), /* @__PURE__ */ React57.createElement(TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React57.createElement(SettingsTab, null)), /* @__PURE__ */ React57.createElement(TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React57.createElement(StyleTab, null))))
   );
 };
 
@@ -1430,8 +1866,8 @@ var EditingPanel = () => {
   if (!element || !elementType) {
     return null;
   }
-  const panelTitle = __31("Edit %s", "elementor").replace("%s", elementType.title);
-  return /* @__PURE__ */ React51.createElement(ErrorBoundary, { fallback: /* @__PURE__ */ React51.createElement(EditorPanelErrorFallback, null) }, /* @__PURE__ */ React51.createElement(Panel, null, /* @__PURE__ */ React51.createElement(PanelHeader, null, /* @__PURE__ */ React51.createElement(PanelHeaderTitle, null, panelTitle)), /* @__PURE__ */ React51.createElement(PanelBody, null, /* @__PURE__ */ React51.createElement(ControlActionsProvider, { items: menuItems }, /* @__PURE__ */ React51.createElement(ControlReplacementProvider, { ...controlReplacement }, /* @__PURE__ */ React51.createElement(ElementProvider, { element, elementType }, /* @__PURE__ */ React51.createElement(EditingPanelTabs, null)))))));
+  const panelTitle = __38("Edit %s", "elementor").replace("%s", elementType.title);
+  return /* @__PURE__ */ React58.createElement(ErrorBoundary, { fallback: /* @__PURE__ */ React58.createElement(EditorPanelErrorFallback, null) }, /* @__PURE__ */ React58.createElement(Panel, null, /* @__PURE__ */ React58.createElement(PanelHeader, null, /* @__PURE__ */ React58.createElement(PanelHeaderTitle, null, panelTitle)), /* @__PURE__ */ React58.createElement(PanelBody, null, /* @__PURE__ */ React58.createElement(ControlActionsProvider, { items: menuItems }, /* @__PURE__ */ React58.createElement(ControlReplacementProvider, { ...controlReplacement }, /* @__PURE__ */ React58.createElement(ElementProvider, { element, elementType }, /* @__PURE__ */ React58.createElement(EditingPanelTabs, null)))))));
 };
 
 // src/panel.ts
@@ -1488,19 +1924,19 @@ var EditingPanelHooks = () => {
 };
 
 // src/dynamics/components/dynamic-selection-control.tsx
-import * as React54 from "react";
+import * as React61 from "react";
 import { useId as useId3 } from "react";
-import { ControlLabel as ControlLabel24, useBoundProp as useBoundProp3 } from "@elementor/editor-controls";
+import { ControlLabel as ControlLabel31, useBoundProp as useBoundProp3 } from "@elementor/editor-controls";
 import { DatabaseIcon, SettingsIcon, XIcon as XIcon2 } from "@elementor/icons";
 import {
   bindPopover as bindPopover2,
   bindTrigger,
   Box as Box5,
-  Divider as Divider9,
-  IconButton as IconButton4,
+  Divider as Divider10,
+  IconButton as IconButton3,
   Paper,
   Popover as Popover2,
-  Stack as Stack20,
+  Stack as Stack21,
   Tab as Tab2,
   TabPanel as TabPanel2,
   Tabs as Tabs2,
@@ -1509,17 +1945,18 @@ import {
   usePopupState as usePopupState2,
   useTabs as useTabs2
 } from "@elementor/ui";
-import { __ as __33 } from "@wordpress/i18n";
+import { __ as __40 } from "@wordpress/i18n";
 
 // src/dynamics/dynamic-control.tsx
-import * as React52 from "react";
+import * as React59 from "react";
 import { BoundPropProvider as BoundPropProvider3, useBoundProp } from "@elementor/editor-controls";
+import { isTransformable as isTransformable2 } from "@elementor/editor-props";
 
 // src/dynamics/hooks/use-dynamic-tag.ts
-import { useMemo as useMemo4 } from "react";
+import { useMemo as useMemo5 } from "react";
 
 // src/dynamics/hooks/use-prop-dynamic-tags.ts
-import { useMemo as useMemo3 } from "react";
+import { useMemo as useMemo4 } from "react";
 
 // src/dynamics/sync/get-elementor-config.ts
 var getElementorConfig2 = () => {
@@ -1540,7 +1977,11 @@ var getAtomicDynamicTags = () => {
 };
 
 // src/dynamics/utils.ts
-import { isTransformable } from "@elementor/editor-props";
+import {
+  createPropUtils,
+  isTransformable
+} from "@elementor/editor-props";
+import { z } from "@elementor/schema";
 var DYNAMIC_PROP_TYPE_KEY = "dynamic";
 var isDynamicPropType = (prop) => prop.key === DYNAMIC_PROP_TYPE_KEY;
 var getDynamicPropType = (propType) => {
@@ -1553,6 +1994,13 @@ var isDynamicPropValue = (prop) => {
 var supportsDynamic = (propType) => {
   return !!getDynamicPropType(propType);
 };
+var dynamicPropTypeUtil = createPropUtils(
+  DYNAMIC_PROP_TYPE_KEY,
+  z.strictObject({
+    name: z.string(),
+    settings: z.record(z.any()).optional()
+  })
+);
 
 // src/dynamics/hooks/use-prop-dynamic-tags.ts
 var usePropDynamicTags = (propName) => {
@@ -1563,7 +2011,7 @@ var usePropDynamicTags = (propName) => {
     const propDynamicType = getDynamicPropType(propType);
     categories = propDynamicType?.settings.categories || [];
   }
-  return useMemo3(() => getDynamicTagsByCategories(categories), [categories.join()]);
+  return useMemo4(() => getDynamicTagsByCategories(categories), [categories.join()]);
 };
 var getDynamicTagsByCategories = (categories) => {
   const dynamicTags = getAtomicDynamicTags();
@@ -1579,13 +2027,13 @@ var getDynamicTagsByCategories = (categories) => {
 // src/dynamics/hooks/use-dynamic-tag.ts
 var useDynamicTag = (propName, tagName) => {
   const dynamicTags = usePropDynamicTags(propName);
-  return useMemo4(() => dynamicTags.find((tag) => tag.name === tagName) ?? null, [dynamicTags, tagName]);
+  return useMemo5(() => dynamicTags.find((tag) => tag.name === tagName) ?? null, [dynamicTags, tagName]);
 };
 
 // src/dynamics/dynamic-control.tsx
 var DynamicControl = ({ bind, children }) => {
-  const { value, setValue, bind: propName } = useBoundProp();
-  const { name = "", settings } = value?.value ?? {};
+  const { value, setValue, bind: propName } = useBoundProp(dynamicPropTypeUtil);
+  const { name = "", settings } = value ?? {};
   const dynamicTag = useDynamicTag(propName, name);
   if (!dynamicTag) {
     throw new Error(`Dynamic tag ${name} not found`);
@@ -1594,70 +2042,69 @@ var DynamicControl = ({ bind, children }) => {
   const dynamicValue = settings?.[bind] ?? defaultValue;
   const setDynamicValue = (newValue) => {
     setValue({
-      $$type: "dynamic",
-      value: {
-        name,
-        settings: {
-          ...settings,
-          [bind]: newValue
-        }
+      name,
+      settings: {
+        ...settings,
+        // The value inside the dynamic is not a transformable value, so we need to store the whole object.
+        [bind]: isTransformable2(newValue) ? newValue.value : newValue
       }
     });
   };
-  return /* @__PURE__ */ React52.createElement(BoundPropProvider3, { setValue: setDynamicValue, value: dynamicValue, bind }, children);
+  return /* @__PURE__ */ React59.createElement(BoundPropProvider3, { setValue: setDynamicValue, value: dynamicValue, bind }, children);
 };
 
 // src/dynamics/components/dynamic-selection.tsx
-import * as React53 from "react";
-import { Fragment as Fragment6, useState as useState5 } from "react";
+import * as React60 from "react";
+import { Fragment as Fragment8, useState as useState6 } from "react";
 import { useBoundProp as useBoundProp2 } from "@elementor/editor-controls";
 import { PhotoIcon, SearchIcon } from "@elementor/icons";
 import {
   Box as Box4,
-  Divider as Divider8,
+  Divider as Divider9,
   InputAdornment,
   Link,
   ListSubheader,
   MenuItem,
   MenuList,
-  Stack as Stack19,
+  Stack as Stack20,
   TextField as TextField2,
   Typography as Typography3
 } from "@elementor/ui";
-import { __ as __32 } from "@wordpress/i18n";
+import { __ as __39 } from "@wordpress/i18n";
 var SIZE3 = "tiny";
 var DynamicSelection = ({ onSelect }) => {
-  const [searchValue, setSearchValue] = useState5("");
+  const [searchValue, setSearchValue] = useState6("");
   const { groups: dynamicGroups } = getAtomicDynamicTags() || {};
-  const { bind, value: currentValue, setValue } = useBoundProp2();
+  const { value: anyValue } = useBoundProp2();
+  const { bind, value: dynamicvalue, setValue } = useBoundProp2(dynamicPropTypeUtil);
   const { setPropValue: updatePropValueHistory } = usePropValueHistory();
-  const isCurrentValueDynamic = isDynamicPropValue(currentValue);
-  const options5 = useFilteredOptions(bind, searchValue);
+  const isCurrentValueDynamic = !!dynamicvalue;
+  const options10 = useFilteredOptions(bind, searchValue);
   const handleSearch = (event) => {
     setSearchValue(event.target.value);
   };
   const handleSetDynamicTag = (value) => {
     if (!isCurrentValueDynamic) {
-      updatePropValueHistory(bind, currentValue);
+      updatePropValueHistory(bind, anyValue);
     }
-    setValue({ $$type: "dynamic", value: { name: value, settings: {} } });
+    setValue({ name: value, settings: {} });
     onSelect?.();
   };
-  return /* @__PURE__ */ React53.createElement(Stack19, null, /* @__PURE__ */ React53.createElement(Box4, { px: 1.5, pb: 1 }, /* @__PURE__ */ React53.createElement(
+  return /* @__PURE__ */ React60.createElement(Stack20, null, /* @__PURE__ */ React60.createElement(Box4, { px: 1.5, pb: 1 }, /* @__PURE__ */ React60.createElement(
     TextField2,
     {
       fullWidth: true,
       size: SIZE3,
       value: searchValue,
       onChange: handleSearch,
-      placeholder: __32("Search dynamic tag", "elementor"),
+      placeholder: __39("Search dynamic tag", "elementor"),
       InputProps: {
-        startAdornment: /* @__PURE__ */ React53.createElement(InputAdornment, { position: "start" }, /* @__PURE__ */ React53.createElement(SearchIcon, { fontSize: SIZE3 }))
+        startAdornment: /* @__PURE__ */ React60.createElement(InputAdornment, { position: "start" }, /* @__PURE__ */ React60.createElement(SearchIcon, { fontSize: SIZE3 }))
       }
     }
-  )), /* @__PURE__ */ React53.createElement(Divider8, null), /* @__PURE__ */ React53.createElement(Box4, { sx: { overflowY: "auto", height: 260, width: 220 } }, options5.length > 0 ? /* @__PURE__ */ React53.createElement(MenuList, { role: "listbox", tabIndex: 0 }, options5.map(([category, items], index) => /* @__PURE__ */ React53.createElement(Fragment6, { key: index }, /* @__PURE__ */ React53.createElement(ListSubheader, { sx: { typography: "caption", color: "text.tertiary" } }, dynamicGroups?.[category]?.title || category), items.map(({ value, label: tagLabel }) => {
-    const isSelected = isCurrentValueDynamic && value === currentValue?.value?.name;
-    return /* @__PURE__ */ React53.createElement(
+  )), /* @__PURE__ */ React60.createElement(Divider9, null), /* @__PURE__ */ React60.createElement(Box4, { sx: { overflowY: "auto", height: 260, width: 220 } }, options10.length > 0 ? /* @__PURE__ */ React60.createElement(MenuList, { role: "listbox", tabIndex: 0 }, options10.map(([category, items3], index) => /* @__PURE__ */ React60.createElement(Fragment8, { key: index }, /* @__PURE__ */ React60.createElement(ListSubheader, { sx: { typography: "caption", color: "text.tertiary" } }, dynamicGroups?.[category]?.title || category), items3.map(({ value, label: tagLabel }) => {
+    const isSelected = isCurrentValueDynamic && value === dynamicvalue?.name;
+    return /* @__PURE__ */ React60.createElement(
       MenuItem,
       {
         key: value,
@@ -1668,7 +2115,7 @@ var DynamicSelection = ({ onSelect }) => {
       },
       tagLabel
     );
-  })))) : /* @__PURE__ */ React53.createElement(Stack19, { alignItems: "center", p: 2.5, gap: 1.5 }, /* @__PURE__ */ React53.createElement(PhotoIcon, { fontSize: "large" }), /* @__PURE__ */ React53.createElement(Typography3, { align: "center", variant: "caption", color: "text.secondary" }, __32("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React53.createElement("br", null), "\u201C", searchValue, "\u201D."), /* @__PURE__ */ React53.createElement(Typography3, { align: "center", variant: "caption", color: "text.secondary" }, /* @__PURE__ */ React53.createElement(
+  })))) : /* @__PURE__ */ React60.createElement(Stack20, { alignItems: "center", p: 2.5, gap: 1.5 }, /* @__PURE__ */ React60.createElement(PhotoIcon, { fontSize: "large" }), /* @__PURE__ */ React60.createElement(Typography3, { align: "center", variant: "caption", color: "text.secondary" }, __39("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React60.createElement("br", null), "\u201C", searchValue, "\u201D."), /* @__PURE__ */ React60.createElement(Typography3, { align: "center", variant: "caption", color: "text.secondary" }, /* @__PURE__ */ React60.createElement(
     Link,
     {
       color: "secondary",
@@ -1676,12 +2123,12 @@ var DynamicSelection = ({ onSelect }) => {
       component: "button",
       onClick: () => setSearchValue("")
     },
-    __32("Clear the filters", "elementor")
-  ), "\xA0", __32("and try again.", "elementor")))));
+    __39("Clear the filters", "elementor")
+  ), "\xA0", __39("and try again.", "elementor")))));
 };
 var useFilteredOptions = (bind, searchValue) => {
   const dynamicTags = usePropDynamicTags(bind);
-  const options5 = dynamicTags.reduce((categories, { name, label, group }) => {
+  const options10 = dynamicTags.reduce((categories, { name, label, group }) => {
     const isVisible = label.toLowerCase().includes(searchValue.trim().toLowerCase());
     if (!isVisible) {
       return categories;
@@ -1692,44 +2139,45 @@ var useFilteredOptions = (bind, searchValue) => {
     categories.get(group)?.push({ label, value: name });
     return categories;
   }, /* @__PURE__ */ new Map());
-  return [...options5];
+  return [...options10];
 };
 
 // src/dynamics/components/dynamic-selection-control.tsx
 var SIZE4 = "tiny";
 var DynamicSelectionControl = () => {
-  const { bind, value, setValue } = useBoundProp3();
+  const { setValue: setAnyValue } = useBoundProp3();
+  const { bind, value } = useBoundProp3(dynamicPropTypeUtil);
   const { getPropValue: getPropValueFromHistory } = usePropValueHistory();
-  const { name: tagName = "" } = value?.value || {};
+  const { name: tagName = "" } = value;
   const selectionPopoverId = useId3();
   const selectionPopoverState = usePopupState2({ variant: "popover", popupId: selectionPopoverId });
   const dynamicTag = useDynamicTag(bind, tagName);
   const removeDynamicTag = () => {
     const propValue = getPropValueFromHistory(bind);
-    setValue(propValue ?? null);
+    setAnyValue(propValue ?? null);
   };
   if (!dynamicTag) {
     throw new Error(`Dynamic tag ${tagName} not found`);
   }
-  return /* @__PURE__ */ React54.createElement(Box5, null, /* @__PURE__ */ React54.createElement(
+  return /* @__PURE__ */ React61.createElement(Box5, null, /* @__PURE__ */ React61.createElement(
     Tag,
     {
       fullWidth: true,
       showActionsOnHover: true,
       label: dynamicTag.label,
-      startIcon: /* @__PURE__ */ React54.createElement(DatabaseIcon, { fontSize: SIZE4 }),
+      startIcon: /* @__PURE__ */ React61.createElement(DatabaseIcon, { fontSize: SIZE4 }),
       ...bindTrigger(selectionPopoverState),
-      actions: /* @__PURE__ */ React54.createElement(React54.Fragment, null, /* @__PURE__ */ React54.createElement(DynamicSettingsPopover, { dynamicTag }), /* @__PURE__ */ React54.createElement(
-        IconButton4,
+      actions: /* @__PURE__ */ React61.createElement(React61.Fragment, null, /* @__PURE__ */ React61.createElement(DynamicSettingsPopover, { dynamicTag }), /* @__PURE__ */ React61.createElement(
+        IconButton3,
         {
           size: SIZE4,
           onClick: removeDynamicTag,
-          "aria-label": __33("Remove dynamic value", "elementor")
+          "aria-label": __40("Remove dynamic value", "elementor")
         },
-        /* @__PURE__ */ React54.createElement(XIcon2, { fontSize: SIZE4 })
+        /* @__PURE__ */ React61.createElement(XIcon2, { fontSize: SIZE4 })
       ))
     }
-  ), /* @__PURE__ */ React54.createElement(
+  ), /* @__PURE__ */ React61.createElement(
     Popover2,
     {
       disablePortal: true,
@@ -1737,7 +2185,7 @@ var DynamicSelectionControl = () => {
       anchorOrigin: { vertical: "bottom", horizontal: "left" },
       ...bindPopover2(selectionPopoverState)
     },
-    /* @__PURE__ */ React54.createElement(Stack20, null, /* @__PURE__ */ React54.createElement(Stack20, { direction: "row", alignItems: "center", pl: 1.5, pr: 0.5, py: 1.5 }, /* @__PURE__ */ React54.createElement(DatabaseIcon, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React54.createElement(Typography4, { variant: "subtitle2" }, __33("Dynamic Tags", "elementor")), /* @__PURE__ */ React54.createElement(IconButton4, { size: SIZE4, sx: { ml: "auto" }, onClick: selectionPopoverState.close }, /* @__PURE__ */ React54.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React54.createElement(DynamicSelection, { onSelect: selectionPopoverState.close }))
+    /* @__PURE__ */ React61.createElement(Stack21, null, /* @__PURE__ */ React61.createElement(Stack21, { direction: "row", alignItems: "center", pl: 1.5, pr: 0.5, py: 1.5 }, /* @__PURE__ */ React61.createElement(DatabaseIcon, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React61.createElement(Typography4, { variant: "subtitle2" }, __40("Dynamic Tags", "elementor")), /* @__PURE__ */ React61.createElement(IconButton3, { size: SIZE4, sx: { ml: "auto" }, onClick: selectionPopoverState.close }, /* @__PURE__ */ React61.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React61.createElement(DynamicSelection, { onSelect: selectionPopoverState.close }))
   ));
 };
 var DynamicSettingsPopover = ({ dynamicTag }) => {
@@ -1747,22 +2195,22 @@ var DynamicSettingsPopover = ({ dynamicTag }) => {
   if (!hasDynamicSettings) {
     return null;
   }
-  return /* @__PURE__ */ React54.createElement(React54.Fragment, null, /* @__PURE__ */ React54.createElement(
-    IconButton4,
+  return /* @__PURE__ */ React61.createElement(React61.Fragment, null, /* @__PURE__ */ React61.createElement(
+    IconButton3,
     {
       size: SIZE4,
       ...bindTrigger(settingsPopupState),
-      "aria-label": __33("Settings", "elementor")
+      "aria-label": __40("Settings", "elementor")
     },
-    /* @__PURE__ */ React54.createElement(SettingsIcon, { fontSize: SIZE4 })
-  ), /* @__PURE__ */ React54.createElement(
+    /* @__PURE__ */ React61.createElement(SettingsIcon, { fontSize: SIZE4 })
+  ), /* @__PURE__ */ React61.createElement(
     Popover2,
     {
       disableScrollLock: true,
       anchorOrigin: { vertical: "bottom", horizontal: "center" },
       ...bindPopover2(settingsPopupState)
     },
-    /* @__PURE__ */ React54.createElement(Paper, { component: Stack20, sx: { minHeight: "300px", width: "220px" } }, /* @__PURE__ */ React54.createElement(Stack20, { direction: "row", alignItems: "center", px: 1.5, pt: 2, pb: 1 }, /* @__PURE__ */ React54.createElement(DatabaseIcon, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React54.createElement(Typography4, { variant: "subtitle2" }, dynamicTag.label), /* @__PURE__ */ React54.createElement(IconButton4, { sx: { ml: "auto" }, size: SIZE4, onClick: settingsPopupState.close }, /* @__PURE__ */ React54.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React54.createElement(DynamicSettings, { controls: dynamicTag.atomic_controls }))
+    /* @__PURE__ */ React61.createElement(Paper, { component: Stack21, sx: { minHeight: "300px", width: "220px" } }, /* @__PURE__ */ React61.createElement(Stack21, { direction: "row", alignItems: "center", px: 1.5, pt: 2, pb: 1 }, /* @__PURE__ */ React61.createElement(DatabaseIcon, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React61.createElement(Typography4, { variant: "subtitle2" }, dynamicTag.label), /* @__PURE__ */ React61.createElement(IconButton3, { sx: { ml: "auto" }, size: SIZE4, onClick: settingsPopupState.close }, /* @__PURE__ */ React61.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React61.createElement(DynamicSettings, { controls: dynamicTag.atomic_controls }))
   ));
 };
 var DynamicSettings = ({ controls }) => {
@@ -1771,10 +2219,10 @@ var DynamicSettings = ({ controls }) => {
   if (!tabs.length) {
     return null;
   }
-  return /* @__PURE__ */ React54.createElement(React54.Fragment, null, /* @__PURE__ */ React54.createElement(Tabs2, { indicatorColor: "secondary", textColor: "secondary", ...getTabsProps() }, tabs.map(({ value }, index) => /* @__PURE__ */ React54.createElement(Tab2, { key: index, label: value.label, sx: { px: 1, py: 0.5 }, ...getTabProps(index) }))), /* @__PURE__ */ React54.createElement(Divider9, null), tabs.map(({ value }, index) => {
-    return /* @__PURE__ */ React54.createElement(TabPanel2, { key: index, sx: { flexGrow: 1 }, ...getTabPanelProps(index) }, /* @__PURE__ */ React54.createElement(Stack20, { gap: 1, px: 2 }, value.items.map((item) => {
+  return /* @__PURE__ */ React61.createElement(React61.Fragment, null, /* @__PURE__ */ React61.createElement(Tabs2, { indicatorColor: "secondary", textColor: "secondary", ...getTabsProps() }, tabs.map(({ value }, index) => /* @__PURE__ */ React61.createElement(Tab2, { key: index, label: value.label, sx: { px: 1, py: 0.5 }, ...getTabProps(index) }))), /* @__PURE__ */ React61.createElement(Divider10, null), tabs.map(({ value }, index) => {
+    return /* @__PURE__ */ React61.createElement(TabPanel2, { key: index, sx: { flexGrow: 1 }, ...getTabPanelProps(index) }, /* @__PURE__ */ React61.createElement(Stack21, { gap: 1, px: 2 }, value.items.map((item) => {
       if (item.type === "control") {
-        return /* @__PURE__ */ React54.createElement(Control3, { key: item.value.bind, control: item.value });
+        return /* @__PURE__ */ React61.createElement(Control3, { key: item.value.bind, control: item.value });
       }
       return null;
     })));
@@ -1784,14 +2232,14 @@ var Control3 = ({ control }) => {
   if (!getControlByType(control.type)) {
     return null;
   }
-  return /* @__PURE__ */ React54.createElement(DynamicControl, { bind: control.bind }, control.label ? /* @__PURE__ */ React54.createElement(ControlLabel24, null, control.label) : null, /* @__PURE__ */ React54.createElement(Control, { type: control.type, props: control.props }));
+  return /* @__PURE__ */ React61.createElement(DynamicControl, { bind: control.bind }, control.label ? /* @__PURE__ */ React61.createElement(ControlLabel31, null, control.label) : null, /* @__PURE__ */ React61.createElement(Control, { type: control.type, props: control.props }));
 };
 
 // src/dynamics/hooks/use-prop-dynamic-action.tsx
-import * as React55 from "react";
+import * as React62 from "react";
 import { useBoundProp as useBoundProp4 } from "@elementor/editor-controls";
 import { DatabaseIcon as DatabaseIcon2 } from "@elementor/icons";
-import { __ as __34 } from "@wordpress/i18n";
+import { __ as __41 } from "@wordpress/i18n";
 var usePropDynamicAction = () => {
   const { bind } = useBoundProp4();
   const { elementType } = useElement();
@@ -1800,8 +2248,8 @@ var usePropDynamicAction = () => {
   return {
     visible,
     icon: DatabaseIcon2,
-    title: __34("Dynamic Tags", "elementor"),
-    popoverContent: ({ closePopover }) => /* @__PURE__ */ React55.createElement(DynamicSelection, { onSelect: closePopover })
+    title: __41("Dynamic Tags", "elementor"),
+    popoverContent: ({ closePopover }) => /* @__PURE__ */ React62.createElement(DynamicSelection, { onSelect: closePopover })
   };
 };