@elementor/editor-editing-panel 1.46.0 → 1.48.0

package/dist/index.mjs

@@ -1,3 +1,9 @@
+// src/sync/experiments-flags.ts
+var EXPERIMENTAL_FEATURES = {
+  V_3_30: "e_v_3_30",
+  V_3_31: "e_v_3_31"
+};
+
 // src/index.ts
 import { useBoundProp as useBoundProp9 } from "@elementor/editor-controls";
 
@@ -539,13 +545,6 @@ import { classesPropTypeUtil } from "@elementor/editor-props";
 import { useGetStylesRepositoryCreateAction } from "@elementor/editor-styles-repository";
 import { isExperimentActive, undoable } from "@elementor/editor-v1-adapters";
 import { __ } from "@wordpress/i18n";
-
-// src/sync/experiments-flags.ts
-var EXPERIMENTAL_FEATURES = {
-  V_3_30: "e_v_3_30"
-};
-
-// src/components/css-classes/use-apply-and-unapply-class.ts
 function useApplyClass() {
   const { id: activeId, setId: setActiveId } = useStyle();
   const { element } = useElement();
@@ -1168,7 +1167,7 @@ function useHandleSelect() {
 import { __createPanel as createPanel } from "@elementor/editor-panels";
 
 // src/components/editing-panel.tsx
-import * as React85 from "react";
+import * as React86 from "react";
 import { ControlActionsProvider, ControlReplacementsProvider } from "@elementor/editor-controls";
 import { useSelectedElement } from "@elementor/editor-elements";
 import { Panel, PanelBody, PanelHeader, PanelHeaderTitle } from "@elementor/editor-panels";
@@ -1176,7 +1175,7 @@ import { ThemeProvider as ThemeProvider2 } from "@elementor/editor-ui";
 import { AtomIcon } from "@elementor/icons";
 import { SessionStorageProvider as SessionStorageProvider3 } from "@elementor/session";
 import { ErrorBoundary } from "@elementor/ui";
-import { __ as __55 } from "@wordpress/i18n";
+import { __ as __62 } from "@wordpress/i18n";
 
 // src/controls-actions.ts
 import { createMenu } from "@elementor/menus";
@@ -1201,7 +1200,7 @@ function PopoverAction({
   title,
   visible = true,
   icon: Icon,
-  content: PopoverContent2
+  content: PopoverContent
 }) {
   const id = useId2();
   const popupState = usePopupState2({
@@ -1218,11 +1217,18 @@ function PopoverAction({
       disableScrollLock: true,
       anchorOrigin: {
         vertical: "bottom",
-        horizontal: "center"
+        horizontal: "right"
+      },
+      transformOrigin: {
+        vertical: "top",
+        horizontal: "right"
+      },
+      PaperProps: {
+        sx: { my: 2.5 }
       },
       ...bindPopover(popupState)
     },
-    /* @__PURE__ */ React10.createElement(PopoverContent2, { close: popupState.close })
+    /* @__PURE__ */ React10.createElement(PopoverContent, { close: popupState.close })
   ));
 }
 
@@ -1242,11 +1248,11 @@ function EditorPanelErrorFallback() {
 }
 
 // src/components/editing-panel-tabs.tsx
-import * as React84 from "react";
-import { Fragment as Fragment9 } from "react";
-import { isExperimentActive as isExperimentActive13 } from "@elementor/editor-v1-adapters";
-import { Divider as Divider6, Stack as Stack18, Tab, TabPanel, Tabs, useTabs } from "@elementor/ui";
-import { __ as __54 } from "@wordpress/i18n";
+import * as React85 from "react";
+import { Fragment as Fragment10 } from "react";
+import { isExperimentActive as isExperimentActive17 } from "@elementor/editor-v1-adapters";
+import { Divider as Divider6, Stack as Stack15, Tab, TabPanel, Tabs, useTabs } from "@elementor/ui";
+import { __ as __61 } from "@wordpress/i18n";
 
 // src/contexts/scroll-context.tsx
 import * as React12 from "react";
@@ -1304,6 +1310,10 @@ var defaultPanelSettingsContext = createContext6({
   "e-flexbox": {
     defaultSectionsExpanded: fallbackEditorSettings.defaultSectionsExpanded,
     defaultTab: "style"
+  },
+  "e-divider": {
+    defaultSectionsExpanded: fallbackEditorSettings.defaultSectionsExpanded,
+    defaultTab: "style"
   }
 });
 var useDefaultPanelSettings = () => {
@@ -1332,7 +1342,7 @@ var useStateByElement = (key, initialValue) => {
 // src/components/settings-tab.tsx
 import * as React19 from "react";
 import { ControlFormLabel } from "@elementor/editor-controls";
-import { isExperimentActive as isExperimentActive4 } from "@elementor/editor-v1-adapters";
+import { isExperimentActive as isExperimentActive5 } from "@elementor/editor-v1-adapters";
 import { SessionStorageProvider } from "@elementor/session";
 import { Divider as Divider3 } from "@elementor/ui";
 
@@ -1369,7 +1379,7 @@ var controlTypes = {
   textarea: { component: TextAreaControl, layout: "full", propTypeUtil: stringPropTypeUtil },
   size: { component: SizeControl, layout: "two-columns", propTypeUtil: sizePropTypeUtil },
   select: { component: SelectControl, layout: "two-columns", propTypeUtil: stringPropTypeUtil },
-  link: { component: LinkControl, layout: "full", propTypeUtil: linkPropTypeUtil },
+  link: { component: LinkControl, layout: "custom", propTypeUtil: linkPropTypeUtil },
   url: { component: UrlControl, layout: "full", propTypeUtil: stringPropTypeUtil },
   switch: { component: SwitchControl, layout: "two-columns", propTypeUtil: booleanPropTypeUtil },
   repeatable: { component: RepeatableControl, layout: "full", propTypeUtil: void 0 },
@@ -1395,6 +1405,9 @@ var Control = ({ props, type }) => {
 import * as React14 from "react";
 import { Box as Box4, styled as styled4 } from "@elementor/ui";
 var ControlTypeContainer = ({ children, layout }) => {
+  if (layout === "custom") {
+    return children;
+  }
   return /* @__PURE__ */ React14.createElement(StyledContainer, { layout }, children);
 };
 var StyledContainer = styled4(Box4, {
@@ -1414,8 +1427,18 @@ var getGridLayout = (layout) => ({
 
 // src/controls-registry/settings-field.tsx
 import * as React15 from "react";
+import { useMemo as useMemo3 } from "react";
 import { PropKeyProvider, PropProvider } from "@elementor/editor-controls";
-import { updateElementSettings as updateElementSettings2, useElementSetting as useElementSetting2 } from "@elementor/editor-elements";
+import { setDocumentModifiedStatus as setDocumentModifiedStatus2 } from "@elementor/editor-documents";
+import {
+  getElementLabel as getElementLabel2,
+  getElementSetting as getElementSetting2,
+  updateElementSettings as updateElementSettings2,
+  useElementSettings
+} from "@elementor/editor-elements";
+import { shouldApplyEffect } from "@elementor/editor-props";
+import { isExperimentActive as isExperimentActive3, undoable as undoable2 } from "@elementor/editor-v1-adapters";
+import { __ as __5 } from "@wordpress/i18n";
 
 // src/controls-registry/create-top-level-object-type.ts
 var createTopLevelOjectType = ({ schema }) => {
@@ -1431,26 +1454,80 @@ var createTopLevelOjectType = ({ schema }) => {
 };
 
 // src/controls-registry/settings-field.tsx
-var SettingsField = ({ bind, children }) => {
+var SettingsField = ({ bind, children, propDisplayName }) => {
   const { element, elementType } = useElement();
-  const settingsValue = useElementSetting2(element.id, bind);
-  const value = { [bind]: settingsValue };
+  const elementSettingValues = useElementSettings(element.id, Object.keys(elementType.propsSchema));
+  const value = { [bind]: elementSettingValues?.[bind] };
   const propType = createTopLevelOjectType({ schema: elementType.propsSchema });
+  const undoableUpdateElementProp = useUndoableUpdateElementProp({
+    propKey: bind,
+    elementId: element.id,
+    propDisplayName
+  });
   const setValue = (newValue) => {
-    updateElementSettings2({
-      id: element.id,
-      props: { ...newValue }
-    });
+    const isVersion331Active = isExperimentActive3(EXPERIMENTAL_FEATURES.V_3_31);
+    if (isVersion331Active) {
+      undoableUpdateElementProp({ newValue });
+    } else {
+      updateElementSettings2({ id: element.id, props: newValue });
+    }
   };
-  return /* @__PURE__ */ React15.createElement(PropProvider, { propType, value, setValue }, /* @__PURE__ */ React15.createElement(PropKeyProvider, { bind }, children));
+  const isDisabled = (prop) => getDisableState(prop, elementSettingValues);
+  return /* @__PURE__ */ React15.createElement(PropProvider, { propType, value, setValue, isDisabled }, /* @__PURE__ */ React15.createElement(PropKeyProvider, { bind }, children));
 };
+function getDisableState(propType, elementValues) {
+  const disablingDependencies = propType.dependencies?.filter(({ effect }) => effect === "disable") || [];
+  if (!disablingDependencies.length) {
+    return false;
+  }
+  if (disablingDependencies.length > 1) {
+    throw new Error("Multiple disabling dependencies are not supported.");
+  }
+  return shouldApplyEffect(disablingDependencies[0], elementValues);
+}
+function useUndoableUpdateElementProp({
+  propKey,
+  elementId,
+  propDisplayName
+}) {
+  return useMemo3(() => {
+    return undoable2(
+      {
+        do: ({ newValue }) => {
+          const prevPropValue = getElementSetting2(elementId, propKey);
+          updateElementSettings2({ id: elementId, props: { ...newValue }, withHistory: false });
+          setDocumentModifiedStatus2(true);
+          return { [propKey]: prevPropValue };
+        },
+        undo: ({}, prevProps) => {
+          updateElementSettings2({ id: elementId, props: prevProps, withHistory: false });
+        }
+      },
+      {
+        title: getElementLabel2(elementId),
+        // translators: %s is the name of the property that was edited.
+        subtitle: __5("%s edited", "elementor").replace("%s", propDisplayName)
+      }
+    );
+  }, [propKey, elementId, propDisplayName]);
+}
 
 // src/components/section.tsx
 import * as React17 from "react";
-import { useId as useId3 } from "react";
-import { isExperimentActive as isExperimentActive3 } from "@elementor/editor-v1-adapters";
+import { useId as useId3, useRef as useRef3 } from "react";
+import { isExperimentActive as isExperimentActive4 } from "@elementor/editor-v1-adapters";
 import { Collapse as Collapse2, Divider as Divider2, ListItemButton, ListItemText, Stack as Stack5 } from "@elementor/ui";
 
+// src/contexts/section-context.tsx
+import { createContext as createContext7, useContext as useContext7 } from "react";
+var FALLBACK_SECTION_WIDTH = 320;
+var SectionRefContext = createContext7(null);
+var useSectionRef = () => useContext7(SectionRefContext);
+var useSectionWidth = () => {
+  const sectionRef = useSectionRef();
+  return sectionRef?.current?.offsetWidth ?? FALLBACK_SECTION_WIDTH;
+};
+
 // src/components/collapse-icon.tsx
 import { ChevronDownIcon } from "@elementor/icons";
 import { styled as styled5 } from "@elementor/ui";
@@ -1467,7 +1544,7 @@ var CollapseIcon = styled5(ChevronDownIcon, {
 import * as React16 from "react";
 import { useState as useState7 } from "react";
 import { Button, Collapse, Stack as Stack4, styled as styled6 } from "@elementor/ui";
-import { __ as __5 } from "@wordpress/i18n";
+import { __ as __6 } from "@wordpress/i18n";
 var IndicatorsWrapper = styled6("div")`
 	position: absolute;
 	top: 0;
@@ -1494,7 +1571,7 @@ var CollapsibleContent = ({ children, defaultOpen = false, titleEnd = null }) =>
       endIcon: /* @__PURE__ */ React16.createElement(CollapseIcon, { open }),
       sx: { my: 0.5 }
     },
-    open ? __5("Show less", "elementor") : __5("Show more", "elementor")
+    open ? __6("Show less", "elementor") : __6("Show more", "elementor")
   ), titleEnd && /* @__PURE__ */ React16.createElement(IndicatorsWrapper, null, getCollapsibleValue(titleEnd, open))), /* @__PURE__ */ React16.createElement(Collapse, { in: open, timeout: "auto", unmountOnExit: true }, children));
 };
 function getCollapsibleValue(value, isOpen) {
@@ -1507,13 +1584,14 @@ function getCollapsibleValue(value, isOpen) {
 // src/components/section.tsx
 function Section({ title, children, defaultExpanded = false, titleEnd }) {
   const [isOpen, setIsOpen] = useStateByElement(title, !!defaultExpanded);
+  const ref = useRef3(null);
   const handleClick = () => {
     setIsOpen(!isOpen);
   };
   const id = useId3();
   const labelId = `label-${id}`;
   const contentId = `content-${id}`;
-  const isUsingTitleEnd = isExperimentActive3(EXPERIMENTAL_FEATURES.V_3_30);
+  const isUsingTitleEnd = isExperimentActive4(EXPERIMENTAL_FEATURES.V_3_30);
   return /* @__PURE__ */ React17.createElement(React17.Fragment, null, /* @__PURE__ */ React17.createElement(
     ListItemButton,
     {
@@ -1531,7 +1609,7 @@ function Section({ title, children, defaultExpanded = false, titleEnd }) {
       }
     ), isUsingTitleEnd ? getCollapsibleValue(titleEnd, isOpen) : null),
     /* @__PURE__ */ React17.createElement(CollapseIcon, { open: isOpen, color: "secondary", fontSize: "tiny" })
-  ), /* @__PURE__ */ React17.createElement(Collapse2, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto", unmountOnExit: true }, /* @__PURE__ */ React17.createElement(Stack5, { gap: 2.5, p: 2 }, children)), /* @__PURE__ */ React17.createElement(Divider2, null));
+  ), /* @__PURE__ */ React17.createElement(Collapse2, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto", unmountOnExit: true }, /* @__PURE__ */ React17.createElement(SectionRefContext.Provider, { value: ref }, /* @__PURE__ */ React17.createElement(Stack5, { ref, gap: 2.5, p: 2 }, children))), /* @__PURE__ */ React17.createElement(Divider2, null));
 }
 
 // src/components/sections-list.tsx
@@ -1545,7 +1623,7 @@ function SectionsList(props) {
 var SettingsTab = () => {
   const { elementType, element } = useElement();
   const settingsDefault = useDefaultPanelSettings();
-  const isDefaultExpanded = (sectionId) => isExperimentActive4(EXPERIMENTAL_FEATURES.V_3_30) ? settingsDefault.defaultSectionsExpanded.settings?.includes(sectionId) : true;
+  const isDefaultExpanded = (sectionId) => isExperimentActive5(EXPERIMENTAL_FEATURES.V_3_30) ? settingsDefault.defaultSectionsExpanded.settings?.includes(sectionId) : true;
   return /* @__PURE__ */ React19.createElement(SessionStorageProvider, { prefix: element.id }, /* @__PURE__ */ React19.createElement(SectionsList, null, elementType.controls.map(({ type, value }, index) => {
     if (type === "control") {
       return /* @__PURE__ */ React19.createElement(Control2, { key: value.bind, control: value });
@@ -1575,7 +1653,10 @@ var Control2 = ({ control }) => {
   }
   const layout = control.meta?.layout || getDefaultLayout(control.type);
   const controlProps = populateChildControlProps(control.props);
-  return /* @__PURE__ */ React19.createElement(SettingsField, { bind: control.bind }, control.meta?.topDivider && /* @__PURE__ */ React19.createElement(Divider3, null), /* @__PURE__ */ React19.createElement(ControlTypeContainer, { layout }, control.label ? /* @__PURE__ */ React19.createElement(ControlFormLabel, null, control.label) : null, /* @__PURE__ */ React19.createElement(Control, { type: control.type, props: controlProps })));
+  if (layout === "custom") {
+    controlProps.label = control.label;
+  }
+  return /* @__PURE__ */ React19.createElement(SettingsField, { bind: control.bind, propDisplayName: control.label || control.bind }, control.meta?.topDivider && /* @__PURE__ */ React19.createElement(Divider3, null), /* @__PURE__ */ React19.createElement(ControlTypeContainer, { layout }, control.label && layout !== "custom" ? /* @__PURE__ */ React19.createElement(ControlFormLabel, null, control.label) : null, /* @__PURE__ */ React19.createElement(Control, { type: control.type, props: controlProps })));
 };
 function populateChildControlProps(props) {
   if (props.childControlType) {
@@ -1594,18 +1675,18 @@ function populateChildControlProps(props) {
 }
 
 // src/components/style-tab.tsx
-import * as React83 from "react";
+import * as React84 from "react";
 import { useState as useState12 } from "react";
 import { CLASSES_PROP_KEY } from "@elementor/editor-props";
 import { useActiveBreakpoint } from "@elementor/editor-responsive";
 import { SessionStorageProvider as SessionStorageProvider2 } from "@elementor/session";
-import { Divider as Divider5, Stack as Stack17 } from "@elementor/ui";
-import { __ as __53 } from "@wordpress/i18n";
+import { Divider as Divider5, Stack as Stack14 } from "@elementor/ui";
+import { __ as __60 } from "@wordpress/i18n";
 
 // src/contexts/styles-inheritance-context.tsx
 import * as React20 from "react";
-import { createContext as createContext7, useContext as useContext7 } from "react";
-import { getWidgetsCache, useElementSetting as useElementSetting3 } from "@elementor/editor-elements";
+import { createContext as createContext8, useContext as useContext8 } from "react";
+import { getWidgetsCache, useElementSetting as useElementSetting2 } from "@elementor/editor-elements";
 import { classesPropTypeUtil as classesPropTypeUtil2 } from "@elementor/editor-props";
 import { getBreakpointsTree } from "@elementor/editor-responsive";
 import { getStylesSchema } from "@elementor/editor-styles";
@@ -1845,7 +1926,7 @@ var getFilterPropType = (propType, path) => {
 };
 
 // src/contexts/styles-inheritance-context.tsx
-var Context4 = createContext7(null);
+var Context4 = createContext8(null);
 function StyleInheritanceProvider({ children }) {
   const styleDefs = useAppliedStyles();
   const breakpointsTree = getBreakpointsTree();
@@ -1853,7 +1934,7 @@ function StyleInheritanceProvider({ children }) {
   return /* @__PURE__ */ React20.createElement(Context4.Provider, { value: { getSnapshot, getInheritanceChain } }, children);
 }
 function useStylesInheritanceSnapshot() {
-  const context = useContext7(Context4);
+  const context = useContext8(Context4);
   const { meta } = useStyle();
   if (!context) {
     throw new Error("useStylesInheritanceSnapshot must be used within a StyleInheritanceProvider");
@@ -1864,7 +1945,7 @@ function useStylesInheritanceSnapshot() {
   return context.getSnapshot(meta) ?? null;
 }
 function useStylesInheritanceChain(path) {
-  const context = useContext7(Context4);
+  const context = useContext8(Context4);
   if (!context) {
     throw new Error("useStylesInheritanceChain must be used within a StyleInheritanceProvider");
   }
@@ -1881,7 +1962,7 @@ var useAppliedStyles = () => {
   const currentClassesProp = useClassesProp();
   const baseStyles = useBaseStyles();
   useStylesRerender();
-  const classesProp = useElementSetting3(element.id, currentClassesProp);
+  const classesProp = useElementSetting2(element.id, currentClassesProp);
   const appliedStyles = classesPropTypeUtil2.extract(classesProp) ?? [];
   return stylesRepository5.all().filter((style) => [...baseStyles, ...appliedStyles].includes(style.id));
 };
@@ -1893,7 +1974,7 @@ var useBaseStyles = () => {
 };
 
 // src/hooks/use-active-style-def-id.ts
-import { getElementStyles, useElementSetting as useElementSetting4 } from "@elementor/editor-elements";
+import { getElementStyles, useElementSetting as useElementSetting3 } from "@elementor/editor-elements";
 function useActiveStyleDefId(classProp) {
   const [activeStyledDefId, setActiveStyledDefId] = useStateByElement(
     "active-style-id",
@@ -1911,7 +1992,7 @@ function useFirstAppliedClass(appliedClassesIds) {
 }
 function useAppliedClassesIds(classProp) {
   const { element } = useElement();
-  return useElementSetting4(element.id, classProp);
+  return useElementSetting3(element.id, classProp);
 }
 function useActiveAndAppliedClassId(id, appliedClassesIds) {
   const isClassApplied = !!id && appliedClassesIds.includes(id);
@@ -1921,54 +2002,37 @@ function useActiveAndAppliedClassId(id, appliedClassesIds) {
 // src/components/style-sections/background-section/background-section.tsx
 import * as React29 from "react";
 import { BackgroundControl } from "@elementor/editor-controls";
+import { __ as __12 } from "@wordpress/i18n";
 
 // src/controls-registry/styles-field.tsx
-import * as React28 from "react";
+import * as React27 from "react";
 import { ControlAdornmentsProvider, PropKeyProvider as PropKeyProvider2, PropProvider as PropProvider2 } from "@elementor/editor-controls";
 import { getStylesSchema as getStylesSchema2 } from "@elementor/editor-styles";
+import { isExperimentActive as isExperimentActive9 } from "@elementor/editor-v1-adapters";
 
 // src/hooks/use-styles-fields.ts
-import { useMemo as useMemo3 } from "react";
-import {
-  createElementStyle,
-  deleteElementStyle,
-  getElementLabel as getElementLabel2
-} from "@elementor/editor-elements";
+import { useMemo as useMemo4 } from "react";
+import { createElementStyle, deleteElementStyle, getElementLabel as getElementLabel3 } from "@elementor/editor-elements";
 import { getVariantByMeta } from "@elementor/editor-styles";
+import { isElementsStylesProvider as isElementsStylesProvider3 } from "@elementor/editor-styles-repository";
 import { ELEMENTS_STYLES_RESERVED_LABEL } from "@elementor/editor-styles-repository";
-import { undoable as undoable2 } from "@elementor/editor-v1-adapters";
-import { __ as __6 } from "@wordpress/i18n";
+import { isExperimentActive as isExperimentActive6, undoable as undoable3 } from "@elementor/editor-v1-adapters";
+import { __ as __7 } from "@wordpress/i18n";
 function useStylesFields(propNames) {
-  const { element } = useElement();
-  const { id, meta, provider, canEdit } = useStyle();
-  const classesProp = useClassesProp();
-  const undoableUpdateStyle = useUndoableUpdateStyle();
-  const undoableCreateElementStyle = useUndoableCreateElementStyle();
+  const {
+    element: { id: elementId }
+  } = useElement();
+  const { id: styleId, meta, provider, canEdit } = useStyle();
+  const undoableUpdateStyle = useUndoableUpdateStyle({ elementId, meta });
+  const undoableCreateElementStyle = useUndoableCreateElementStyle({ elementId, meta });
   useStylesRerender();
-  const values = getProps({
-    elementId: element.id,
-    styleId: id,
-    provider,
-    meta,
-    propNames
-  });
-  const setValues = (props) => {
-    if (id === null) {
-      undoableCreateElementStyle({
-        elementId: element.id,
-        classesProp,
-        meta,
-        props
-      });
-      return;
+  const values = getProps({ elementId, styleId, provider, meta, propNames });
+  const setValues = (props, { history: { propDisplayName } }) => {
+    if (styleId === null) {
+      undoableCreateElementStyle({ props, propDisplayName });
+    } else {
+      undoableUpdateStyle({ provider, styleId, props, propDisplayName });
     }
-    undoableUpdateStyle({
-      elementId: element.id,
-      styleId: id,
-      provider,
-      meta,
-      props
-    });
   };
   return { values, setValues, canEdit };
 }
@@ -1985,39 +2049,52 @@ function getProps({ styleId, elementId, provider, meta, propNames }) {
     propNames.map((key) => [key, variant?.props[key] ?? null])
   );
 }
-function useUndoableCreateElementStyle() {
-  return useMemo3(() => {
-    return undoable2(
+function useUndoableCreateElementStyle({
+  elementId,
+  meta
+}) {
+  const classesProp = useClassesProp();
+  return useMemo4(() => {
+    const isVersion331Active = isExperimentActive6(EXPERIMENTAL_FEATURES.V_3_31);
+    const createStyleArgs = { elementId, classesProp, meta, label: ELEMENTS_STYLES_RESERVED_LABEL };
+    return undoable3(
       {
-        do: (payload) => {
-          return createElementStyle({
-            ...payload,
-            label: ELEMENTS_STYLES_RESERVED_LABEL
-          });
+        do: ({ props }) => {
+          return createElementStyle({ ...createStyleArgs, props });
         },
-        undo: ({ elementId }, styleId) => {
+        undo: (_, styleId) => {
           deleteElementStyle(elementId, styleId);
         },
-        redo: (payload, styleId) => {
-          return createElementStyle({
-            ...payload,
-            styleId,
-            label: ELEMENTS_STYLES_RESERVED_LABEL
-          });
+        redo: ({ props }, styleId) => {
+          return createElementStyle({ ...createStyleArgs, props, styleId });
         }
       },
       {
-        title: ({ elementId }) => getElementLabel2(elementId),
-        subtitle: __6("Style edited", "elementor")
+        title: () => {
+          if (isVersion331Active) {
+            return localStyleHistoryTitlesV331.title({ elementId });
+          }
+          return historyTitlesV330.title({ elementId });
+        },
+        subtitle: ({ propDisplayName }) => {
+          if (isVersion331Active) {
+            return localStyleHistoryTitlesV331.subtitle({ propDisplayName });
+          }
+          return historyTitlesV330.subtitle;
+        }
       }
     );
-  }, []);
+  }, [classesProp, elementId, meta]);
 }
-function useUndoableUpdateStyle() {
-  return useMemo3(() => {
-    return undoable2(
+function useUndoableUpdateStyle({
+  elementId,
+  meta
+}) {
+  return useMemo4(() => {
+    const isVersion331Active = isExperimentActive6(EXPERIMENTAL_FEATURES.V_3_31);
+    return undoable3(
       {
-        do: ({ elementId, styleId, provider, meta, props }) => {
+        do: ({ provider, styleId, props }) => {
           if (!provider.actions.updateProps) {
             throw new StylesProviderCannotUpdatePropsError({
               context: { providerKey: provider.getKey() }
@@ -2025,26 +2102,37 @@ function useUndoableUpdateStyle() {
           }
           const style = provider.actions.get(styleId, { elementId });
           const prevProps = getCurrentProps(style, meta);
-          provider.actions.updateProps(
-            {
-              id: styleId,
-              meta,
-              props
-            },
-            { elementId }
-          );
+          provider.actions.updateProps({ id: styleId, meta, props }, { elementId });
           return prevProps;
         },
-        undo: ({ elementId, styleId, meta, provider }, prevProps) => {
+        undo: ({ provider, styleId }, prevProps) => {
           provider.actions.updateProps?.({ id: styleId, meta, props: prevProps }, { elementId });
         }
       },
       {
-        title: ({ elementId }) => getElementLabel2(elementId),
-        subtitle: __6("Style edited", "elementor")
+        title: ({ provider }) => {
+          if (isVersion331Active) {
+            const isLocal = isElementsStylesProvider3(provider.getKey());
+            if (isLocal) {
+              return localStyleHistoryTitlesV331.title({ elementId });
+            }
+            return defaultHistoryTitlesV331.title({ provider });
+          }
+          return historyTitlesV330.title({ elementId });
+        },
+        subtitle: ({ provider, styleId, propDisplayName }) => {
+          if (isVersion331Active) {
+            const isLocal = isElementsStylesProvider3(provider.getKey());
+            if (isLocal) {
+              return localStyleHistoryTitlesV331.subtitle({ propDisplayName });
+            }
+            return defaultHistoryTitlesV331.subtitle({ provider, styleId, elementId, propDisplayName });
+          }
+          return historyTitlesV330.subtitle;
+        }
       }
     );
-  }, []);
+  }, [elementId, meta]);
 }
 function getCurrentProps(style, meta) {
   if (!style) {
@@ -2054,30 +2142,55 @@ function getCurrentProps(style, meta) {
   const props = variant?.props ?? {};
   return structuredClone(props);
 }
+var historyTitlesV330 = {
+  title: ({ elementId }) => getElementLabel3(elementId),
+  subtitle: __7("Style edited", "elementor")
+};
+var defaultHistoryTitlesV331 = {
+  title: ({ provider }) => {
+    const providerLabel = provider.labels?.singular;
+    return providerLabel ? capitalize(providerLabel) : __7("Style", "elementor");
+  },
+  subtitle: ({ provider, styleId, elementId, propDisplayName }) => {
+    const styleLabel = provider.actions.get(styleId, { elementId })?.label;
+    if (!styleLabel) {
+      throw new Error(`Style ${styleId} not found`);
+    }
+    return __7(`%s$1 %s$2 edited`, "elementor").replace("%s$1", styleLabel).replace("%s$2", propDisplayName);
+  }
+};
+var localStyleHistoryTitlesV331 = {
+  title: ({ elementId }) => getElementLabel3(elementId),
+  subtitle: ({ propDisplayName }) => (
+    // translators: %s is the name of the style property being edited
+    __7(`%s edited`, "elementor").replace("%s", propDisplayName)
+  )
+};
+function capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
 
 // src/hooks/use-styles-field.ts
-function useStylesField(propName) {
+function useStylesField(propName, meta) {
   const { values, setValues, canEdit } = useStylesFields([propName]);
   const value = values?.[propName] ?? null;
   const setValue = (newValue) => {
-    setValues({
-      [propName]: newValue
-    });
+    setValues({ [propName]: newValue }, meta);
   };
   return { value, setValue, canEdit };
 }
 
 // src/styles-inheritance/components/styles-inheritance-indicator.tsx
-import * as React27 from "react";
+import * as React26 from "react";
 import { useBoundProp } from "@elementor/editor-controls";
 import { isEmpty as isEmpty2 } from "@elementor/editor-props";
 import { ELEMENTS_BASE_STYLES_PROVIDER_KEY as ELEMENTS_BASE_STYLES_PROVIDER_KEY4 } from "@elementor/editor-styles-repository";
-import { isExperimentActive as isExperimentActive6 } from "@elementor/editor-v1-adapters";
+import { isExperimentActive as isExperimentActive8 } from "@elementor/editor-v1-adapters";
 import { Tooltip as Tooltip6 } from "@elementor/ui";
-import { __ as __10 } from "@wordpress/i18n";
+import { __ as __11 } from "@wordpress/i18n";
 
 // src/styles-inheritance/consts.ts
-import { isExperimentActive as isExperimentActive5 } from "@elementor/editor-v1-adapters";
+import { isExperimentActive as isExperimentActive7 } from "@elementor/editor-v1-adapters";
 var excludePropTypeTransformers = /* @__PURE__ */ new Set([
   "background-color-overlay",
   "background-image-overlay",
@@ -2090,37 +2203,25 @@ var excludePropTypeTransformers = /* @__PURE__ */ new Set([
   "image",
   "background-overlay"
 ]);
-var isUsingIndicatorPopover = () => isExperimentActive5("e_v_3_30");
+var isUsingIndicatorPopover = () => isExperimentActive7("e_v_3_30");
 
 // src/styles-inheritance/components/styles-inheritance-infotip.tsx
-import * as React26 from "react";
-import { useMemo as useMemo4, useState as useState9 } from "react";
+import * as React25 from "react";
+import { useMemo as useMemo5, useState as useState9 } from "react";
 import { createPropsResolver } from "@elementor/editor-canvas";
+import { PopoverHeader } from "@elementor/editor-ui";
 import {
   Backdrop,
   Box as Box6,
   Card,
   CardContent,
   ClickAwayListener,
-  CloseButton,
   IconButton as IconButton3,
   Infotip,
-  Stack as Stack7,
-  Tooltip as Tooltip5,
-  Typography as Typography5
+  Stack as Stack6,
+  Tooltip as Tooltip5
 } from "@elementor/ui";
-import { __ as __9 } from "@wordpress/i18n";
-
-// src/components/section-content.tsx
-import { createContext as createContext8, useContext as useContext8, useRef as useRef3 } from "react";
-import * as React21 from "react";
-import { Stack as Stack6 } from "@elementor/ui";
-var SectionContentRefContext = createContext8(null);
-var useSectionContentRef = () => useContext8(SectionContentRefContext);
-var SectionContent = ({ gap = 2, sx, children }) => {
-  const ref = useRef3(null);
-  return /* @__PURE__ */ React21.createElement(SectionContentRefContext.Provider, { value: ref }, /* @__PURE__ */ React21.createElement(Stack6, { gap, sx: { ...sx }, ref }, children));
-};
+import { __ as __10 } from "@wordpress/i18n";
 
 // src/hooks/use-direction.ts
 import { useTheme } from "@elementor/ui";
@@ -2145,7 +2246,7 @@ function useDirection() {
 // src/styles-inheritance/hooks/use-normalized-inheritance-chain-items.tsx
 import { isValidElement, useEffect as useEffect3, useState as useState8 } from "react";
 import { ELEMENTS_BASE_STYLES_PROVIDER_KEY as ELEMENTS_BASE_STYLES_PROVIDER_KEY2 } from "@elementor/editor-styles-repository";
-import { __ as __7 } from "@wordpress/i18n";
+import { __ as __8 } from "@wordpress/i18n";
 var MAXIMUM_ITEMS = 2;
 var useNormalizedInheritanceChainItems = (inheritanceChain, bind, resolve) => {
   const [items3, setItems] = useState8([]);
@@ -2156,7 +2257,7 @@ var useNormalizedInheritanceChainItems = (inheritanceChain, bind, resolve) => {
       );
       const validItems = normalizedItems.map((item) => ({
         ...item,
-        displayLabel: ELEMENTS_BASE_STYLES_PROVIDER_KEY2 !== item.provider ? item.displayLabel : __7("Base", "elementor")
+        displayLabel: ELEMENTS_BASE_STYLES_PROVIDER_KEY2 !== item.provider ? item.displayLabel : __8("Base", "elementor")
       })).filter((item) => !item.value || item.displayLabel !== "").slice(0, MAXIMUM_ITEMS);
       setItems(validItems);
     })();
@@ -2205,7 +2306,7 @@ import { createTransformersRegistry } from "@elementor/editor-canvas";
 var stylesInheritanceTransformersRegistry = createTransformersRegistry();
 
 // src/styles-inheritance/components/infotip/breakpoint-icon.tsx
-import * as React22 from "react";
+import * as React21 from "react";
 import { useBreakpoints } from "@elementor/editor-responsive";
 import {
   DesktopIcon,
@@ -2236,20 +2337,20 @@ var BreakpointIcon = ({ breakpoint }) => {
     return null;
   }
   const breakpointLabel = breakpoints.find((breakpointItem) => breakpointItem.id === currentBreakpoint)?.label;
-  return /* @__PURE__ */ React22.createElement(Tooltip3, { title: breakpointLabel, placement: "top" }, /* @__PURE__ */ React22.createElement(IconComponent, { fontSize: SIZE3, sx: { mt: "2px" } }));
+  return /* @__PURE__ */ React21.createElement(Tooltip3, { title: breakpointLabel, placement: "top" }, /* @__PURE__ */ React21.createElement(IconComponent, { fontSize: SIZE3, sx: { mt: "2px" } }));
 };
 
 // src/styles-inheritance/components/infotip/label-chip.tsx
-import * as React23 from "react";
+import * as React22 from "react";
 import { ELEMENTS_BASE_STYLES_PROVIDER_KEY as ELEMENTS_BASE_STYLES_PROVIDER_KEY3 } from "@elementor/editor-styles-repository";
 import { InfoCircleIcon } from "@elementor/icons";
 import { Chip as Chip4, Tooltip as Tooltip4 } from "@elementor/ui";
-import { __ as __8 } from "@wordpress/i18n";
+import { __ as __9 } from "@wordpress/i18n";
 var SIZE4 = "tiny";
 var LabelChip = ({ displayLabel, provider }) => {
   const isBaseStyle = provider === ELEMENTS_BASE_STYLES_PROVIDER_KEY3;
-  const chipIcon = isBaseStyle ? /* @__PURE__ */ React23.createElement(Tooltip4, { title: __8("Inherited from base styles", "elementor"), placement: "top" }, /* @__PURE__ */ React23.createElement(InfoCircleIcon, { fontSize: SIZE4 })) : void 0;
-  return /* @__PURE__ */ React23.createElement(
+  const chipIcon = isBaseStyle ? /* @__PURE__ */ React22.createElement(Tooltip4, { title: __9("Inherited from base styles", "elementor"), placement: "top" }, /* @__PURE__ */ React22.createElement(InfoCircleIcon, { fontSize: SIZE4 })) : void 0;
+  return /* @__PURE__ */ React22.createElement(
     Chip4,
     {
       label: displayLabel,
@@ -2275,10 +2376,10 @@ var LabelChip = ({ displayLabel, provider }) => {
 };
 
 // src/styles-inheritance/components/infotip/value-component.tsx
-import * as React24 from "react";
+import * as React23 from "react";
 import { Typography as Typography4 } from "@elementor/ui";
 var ValueComponent = ({ index, value }) => {
-  return /* @__PURE__ */ React24.createElement(
+  return /* @__PURE__ */ React23.createElement(
     Typography4,
     {
       variant: "caption",
@@ -2296,37 +2397,36 @@ var ValueComponent = ({ index, value }) => {
 };
 
 // src/styles-inheritance/components/infotip/action-icons.tsx
-import * as React25 from "react";
+import * as React24 from "react";
 import { Box as Box5 } from "@elementor/ui";
-var ActionIcons = () => /* @__PURE__ */ React25.createElement(Box5, { display: "flex", gap: 0.5, alignItems: "center" });
+var ActionIcons = () => /* @__PURE__ */ React24.createElement(Box5, { display: "flex", gap: 0.5, alignItems: "center" });
 
 // src/styles-inheritance/components/styles-inheritance-infotip.tsx
-var SIZE5 = "tiny";
+var SECTION_PADDING_INLINE = 32;
 var StylesInheritanceInfotip = ({ inheritanceChain, propType, path, label, children }) => {
   const [showInfotip, setShowInfotip] = useState9(false);
   const toggleInfotip = () => setShowInfotip((prev) => !prev);
   const closeInfotip = () => setShowInfotip(false);
   const key = path.join(".");
-  const sectionContentRef = useSectionContentRef();
-  const sectionContentWidth = sectionContentRef?.current?.offsetWidth ?? 320;
-  const resolve = useMemo4(() => {
+  const sectionWidth = useSectionWidth() + SECTION_PADDING_INLINE;
+  const resolve = useMemo5(() => {
     return createPropsResolver({
       transformers: stylesInheritanceTransformersRegistry,
       schema: { [key]: propType }
     });
   }, [key, propType]);
   const items3 = useNormalizedInheritanceChainItems(inheritanceChain, key, resolve);
-  const infotipContent = /* @__PURE__ */ React26.createElement(ClickAwayListener, { onClickAway: closeInfotip }, /* @__PURE__ */ React26.createElement(
+  const infotipContent = /* @__PURE__ */ React25.createElement(ClickAwayListener, { onClickAway: closeInfotip }, /* @__PURE__ */ React25.createElement(
     Card,
     {
       elevation: 0,
       sx: {
-        width: `${sectionContentWidth}px`,
-        maxWidth: 500,
+        width: `${sectionWidth - SECTION_PADDING_INLINE}px`,
+        maxWidth: 496,
         overflowX: "hidden"
       }
     },
-    /* @__PURE__ */ React26.createElement(
+    /* @__PURE__ */ React25.createElement(
       CardContent,
       {
         sx: {
@@ -2339,42 +2439,35 @@ var StylesInheritanceInfotip = ({ inheritanceChain, propType, path, label, child
           }
         }
       },
-      /* @__PURE__ */ React26.createElement(Stack7, { direction: "row", alignItems: "center", sx: { pl: 1.5, pr: 0.5, minHeight: 36, py: 0.5 } }, /* @__PURE__ */ React26.createElement(Typography5, { variant: "subtitle2", color: "secondary", sx: { fontSize: 12, fontWeight: "500" } }, __9("Style origin", "elementor")), /* @__PURE__ */ React26.createElement(
-        CloseButton,
-        {
-          slotProps: { icon: { fontSize: SIZE5 } },
-          sx: { ml: "auto" },
-          onClick: closeInfotip
-        }
-      )),
-      /* @__PURE__ */ React26.createElement(
-        Stack7,
+      /* @__PURE__ */ React25.createElement(PopoverHeader, { title: __10("Style origin", "elementor"), onClose: closeInfotip }),
+      /* @__PURE__ */ React25.createElement(
+        Stack6,
         {
           gap: 1.5,
           sx: { pl: 2, pr: 1, pb: 2, overflowX: "hidden", overflowY: "auto" },
           role: "list"
         },
         items3.map((item, index) => {
-          return /* @__PURE__ */ React26.createElement(
+          return /* @__PURE__ */ React25.createElement(
             Box6,
             {
               key: item.id,
               display: "flex",
               gap: 0.5,
               role: "listitem",
-              "aria-label": __9("Inheritance item: %s", "elementor").replace(
+              "aria-label": __10("Inheritance item: %s", "elementor").replace(
                 "%s",
                 item.displayLabel
               )
             },
-            /* @__PURE__ */ React26.createElement(Box6, { display: "flex", gap: 0.5, sx: { flexWrap: "wrap", width: "100%" } }, /* @__PURE__ */ React26.createElement(BreakpointIcon, { breakpoint: item.breakpoint }), /* @__PURE__ */ React26.createElement(LabelChip, { displayLabel: item.displayLabel, provider: item.provider }), /* @__PURE__ */ React26.createElement(ValueComponent, { index, value: item.value })),
-            /* @__PURE__ */ React26.createElement(ActionIcons, null)
+            /* @__PURE__ */ React25.createElement(Box6, { display: "flex", gap: 0.5, sx: { flexWrap: "wrap", width: "100%" } }, /* @__PURE__ */ React25.createElement(BreakpointIcon, { breakpoint: item.breakpoint }), /* @__PURE__ */ React25.createElement(LabelChip, { displayLabel: item.displayLabel, provider: item.provider }), /* @__PURE__ */ React25.createElement(ValueComponent, { index, value: item.value })),
+            /* @__PURE__ */ React25.createElement(ActionIcons, null)
           );
         })
       )
     )
   ));
-  return /* @__PURE__ */ React26.createElement(TooltipOrInfotip, { showInfotip, onClose: closeInfotip, infotipContent }, /* @__PURE__ */ React26.createElement(IconButton3, { onClick: toggleInfotip, "aria-label": label, sx: { my: "-1px" } }, children));
+  return /* @__PURE__ */ React25.createElement(TooltipOrInfotip, { showInfotip, onClose: closeInfotip, infotipContent }, /* @__PURE__ */ React25.createElement(IconButton3, { onClick: toggleInfotip, "aria-label": label, sx: { my: "-1px" } }, children));
 };
 function TooltipOrInfotip({
   children,
@@ -2385,7 +2478,7 @@ function TooltipOrInfotip({
   const { isSiteRtl } = useDirection();
   const forceInfotipAlignLeft = isSiteRtl ? 9999999 : -9999999;
   if (showInfotip) {
-    return /* @__PURE__ */ React26.createElement(React26.Fragment, null, /* @__PURE__ */ React26.createElement(
+    return /* @__PURE__ */ React25.createElement(React25.Fragment, null, /* @__PURE__ */ React25.createElement(
       Backdrop,
       {
         open: showInfotip,
@@ -2395,7 +2488,7 @@ function TooltipOrInfotip({
           zIndex: (theme) => theme.zIndex.modal - 1
         }
       }
-    ), /* @__PURE__ */ React26.createElement(
+    ), /* @__PURE__ */ React25.createElement(
       Infotip,
       {
         placement: "top",
@@ -2422,26 +2515,26 @@ function TooltipOrInfotip({
       children
     ));
   }
-  return /* @__PURE__ */ React26.createElement(Tooltip5, { title: __9("Style origin", "elementor"), placement: "top" }, children);
+  return /* @__PURE__ */ React25.createElement(Tooltip5, { title: __10("Style origin", "elementor"), placement: "top" }, children);
 }
 
 // src/styles-inheritance/components/styles-inheritance-indicator.tsx
 var StylesInheritanceIndicator = () => {
   const { path, propType } = useBoundProp();
-  const isUsingNestedProps = isExperimentActive6(EXPERIMENTAL_FEATURES.V_3_30);
+  const isUsingNestedProps = isExperimentActive8(EXPERIMENTAL_FEATURES.V_3_30);
   const finalPath = isUsingNestedProps ? path : path.slice(0, 1);
   const inheritanceChain = useStylesInheritanceChain(finalPath);
   if (!inheritanceChain.length) {
     return null;
   }
-  return /* @__PURE__ */ React27.createElement(Indicator, { inheritanceChain, path: finalPath, propType });
+  return /* @__PURE__ */ React26.createElement(Indicator, { inheritanceChain, path: finalPath, propType });
 };
 var Indicator = ({ inheritanceChain, path, propType }) => {
   const { id: currentStyleId, provider: currentStyleProvider, meta: currentStyleMeta } = useStyle();
   const currentItem = currentStyleId ? getValueFromInheritanceChain(inheritanceChain, currentStyleId, currentStyleMeta) : null;
   const hasValue = !isEmpty2(currentItem?.value);
   const [actualStyle] = inheritanceChain;
-  if (actualStyle.provider === ELEMENTS_BASE_STYLES_PROVIDER_KEY4) {
+  if (!isExperimentActive8(EXPERIMENTAL_FEATURES.V_3_31) && actualStyle.provider === ELEMENTS_BASE_STYLES_PROVIDER_KEY4) {
     return null;
   }
   const isFinalValue = currentItem === actualStyle;
@@ -2451,9 +2544,9 @@ var Indicator = ({ inheritanceChain, path, propType }) => {
     isOverridden: hasValue && !isFinalValue ? true : void 0
   };
   if (!isUsingIndicatorPopover()) {
-    return /* @__PURE__ */ React27.createElement(Tooltip6, { title: __10("Style origin", "elementor"), placement: "top" }, /* @__PURE__ */ React27.createElement(StyleIndicator, { ...styleIndicatorProps, "aria-label": label }));
+    return /* @__PURE__ */ React26.createElement(Tooltip6, { title: __11("Style origin", "elementor"), placement: "top" }, /* @__PURE__ */ React26.createElement(StyleIndicator, { ...styleIndicatorProps, "aria-label": label }));
   }
-  return /* @__PURE__ */ React27.createElement(
+  return /* @__PURE__ */ React26.createElement(
     StylesInheritanceInfotip,
     {
       inheritanceChain,
@@ -2461,30 +2554,37 @@ var Indicator = ({ inheritanceChain, path, propType }) => {
       propType,
       label
     },
-    /* @__PURE__ */ React27.createElement(StyleIndicator, { ...styleIndicatorProps })
+    /* @__PURE__ */ React26.createElement(StyleIndicator, { ...styleIndicatorProps })
   );
 };
 var getLabel = ({ isFinalValue, hasValue }) => {
   if (isFinalValue) {
-    return __10("This is the final value", "elementor");
+    return __11("This is the final value", "elementor");
   }
   if (hasValue) {
-    return __10("This value is overridden by another style", "elementor");
+    return __11("This value is overridden by another style", "elementor");
   }
-  return __10("This has value from another style", "elementor");
+  return __11("This has value from another style", "elementor");
 };
 
 // src/controls-registry/styles-field.tsx
-var StylesField = ({ bind, placeholder, children }) => {
-  const { value, setValue, canEdit } = useStylesField(bind);
+var StylesField = ({ bind, placeholder, propDisplayName, children }) => {
+  const { value, setValue, canEdit } = useStylesField(bind, {
+    history: { propDisplayName }
+  });
+  const isVersion331Active = isExperimentActive9("e_v_3_31");
+  const stylesInheritanceChain = useStylesInheritanceChain([bind]);
   const stylesSchema = getStylesSchema2();
   const propType = createTopLevelOjectType({ schema: stylesSchema });
   const values = { [bind]: value };
-  const placeholderValues = { [bind]: placeholder };
+  const [actualValue] = stylesInheritanceChain;
+  const placeholderValues = {
+    [bind]: isVersion331Active ? actualValue?.value : placeholder
+  };
   const setValues = (newValue) => {
     setValue(newValue[bind]);
   };
-  return /* @__PURE__ */ React28.createElement(
+  return /* @__PURE__ */ React27.createElement(
     ControlAdornmentsProvider,
     {
       items: [
@@ -2494,27 +2594,33 @@ var StylesField = ({ bind, placeholder, children }) => {
         }
       ]
     },
-    /* @__PURE__ */ React28.createElement(
+    /* @__PURE__ */ React27.createElement(
       PropProvider2,
       {
         propType,
         value: values,
         setValue: setValues,
         placeholder: placeholderValues,
-        disabled: !canEdit
+        isDisabled: () => !canEdit
       },
-      /* @__PURE__ */ React28.createElement(PropKeyProvider2, { bind }, children)
+      /* @__PURE__ */ React27.createElement(PropKeyProvider2, { bind }, children)
     )
   );
 };
 
+// src/components/section-content.tsx
+import * as React28 from "react";
+import { Stack as Stack7 } from "@elementor/ui";
+var SectionContent = ({ gap = 2, sx, children }) => /* @__PURE__ */ React28.createElement(Stack7, { gap, sx: { ...sx } }, children);
+
 // src/components/style-sections/background-section/background-section.tsx
+var BACKGROUND_LABEL = __12("Background", "elementor");
 var BackgroundSection = () => {
-  return /* @__PURE__ */ React29.createElement(SectionContent, null, /* @__PURE__ */ React29.createElement(StylesField, { bind: "background" }, /* @__PURE__ */ React29.createElement(BackgroundControl, null)));
+  return /* @__PURE__ */ React29.createElement(SectionContent, null, /* @__PURE__ */ React29.createElement(StylesField, { bind: "background", propDisplayName: BACKGROUND_LABEL }, /* @__PURE__ */ React29.createElement(BackgroundControl, null)));
 };
 
 // src/components/style-sections/border-section/border-section.tsx
-import * as React39 from "react";
+import * as React40 from "react";
 
 // src/components/panel-divider.tsx
 import * as React30 from "react";
@@ -2522,15 +2628,15 @@ import { Divider as Divider4 } from "@elementor/ui";
 var PanelDivider = () => /* @__PURE__ */ React30.createElement(Divider4, { sx: { my: 0.5 } });
 
 // src/components/style-sections/border-section/border-field.tsx
-import * as React36 from "react";
+import * as React37 from "react";
 import { ControlFormLabel as ControlFormLabel3 } from "@elementor/editor-controls";
-import { __ as __14 } from "@wordpress/i18n";
+import { __ as __16 } from "@wordpress/i18n";
 
 // src/components/add-or-remove-content.tsx
 import * as React31 from "react";
 import { MinusIcon, PlusIcon } from "@elementor/icons";
 import { Collapse as Collapse3, IconButton as IconButton4, Stack as Stack8 } from "@elementor/ui";
-var SIZE6 = "tiny";
+var SIZE5 = "tiny";
 var AddOrRemoveContent = ({
   isAdded,
   onAdd,
@@ -2550,15 +2656,18 @@ var AddOrRemoveContent = ({
       }
     },
     renderLabel(),
-    isAdded ? /* @__PURE__ */ React31.createElement(IconButton4, { size: SIZE6, onClick: onRemove, "aria-label": "Remove", disabled }, /* @__PURE__ */ React31.createElement(MinusIcon, { fontSize: SIZE6 })) : /* @__PURE__ */ React31.createElement(IconButton4, { size: SIZE6, onClick: onAdd, "aria-label": "Add", disabled }, /* @__PURE__ */ React31.createElement(PlusIcon, { fontSize: SIZE6 }))
+    isAdded ? /* @__PURE__ */ React31.createElement(IconButton4, { size: SIZE5, onClick: onRemove, "aria-label": "Remove", disabled }, /* @__PURE__ */ React31.createElement(MinusIcon, { fontSize: SIZE5 })) : /* @__PURE__ */ React31.createElement(IconButton4, { size: SIZE5, onClick: onAdd, "aria-label": "Add", disabled }, /* @__PURE__ */ React31.createElement(PlusIcon, { fontSize: SIZE5 }))
   ), /* @__PURE__ */ React31.createElement(Collapse3, { in: isAdded, unmountOnExit: true }, /* @__PURE__ */ React31.createElement(SectionContent, null, children)));
 };
 
 // src/components/style-sections/border-section/border-color-field.tsx
-import * as React33 from "react";
+import * as React34 from "react";
 import { ColorControl } from "@elementor/editor-controls";
-import { Grid } from "@elementor/ui";
-import { __ as __11 } from "@wordpress/i18n";
+import { __ as __13 } from "@wordpress/i18n";
+
+// src/components/styles-field-layout.tsx
+import * as React33 from "react";
+import { Grid, Stack as Stack10 } from "@elementor/ui";
 
 // src/components/control-label.tsx
 import * as React32 from "react";
@@ -2568,77 +2677,103 @@ var ControlLabel = ({ children }) => {
   return /* @__PURE__ */ React32.createElement(Stack9, { direction: "row", alignItems: "center", justifyItems: "start", gap: 0.25 }, /* @__PURE__ */ React32.createElement(ControlFormLabel2, null, children), /* @__PURE__ */ React32.createElement(ControlAdornments, null));
 };
 
+// src/components/styles-field-layout.tsx
+var StylesFieldLayout = React33.forwardRef((props, ref) => {
+  const { direction = "row", children, label } = props;
+  const LayoutComponent = direction === "row" ? Row : Column;
+  return /* @__PURE__ */ React33.createElement(LayoutComponent, { label, ref, children });
+});
+var Row = React33.forwardRef(
+  ({ label, children }, ref) => {
+    return /* @__PURE__ */ React33.createElement(Grid, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref }, /* @__PURE__ */ React33.createElement(Grid, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(ControlLabel, null, label)), /* @__PURE__ */ React33.createElement(
+      Grid,
+      {
+        item: true,
+        xs: 6,
+        sx: (theme) => ({
+          width: `calc(50% - ${theme.spacing(2)})`
+        })
+      },
+      children
+    ));
+  }
+);
+var Column = React33.forwardRef(
+  ({ label, children }, ref) => {
+    return /* @__PURE__ */ React33.createElement(Stack10, { gap: 0.75, ref }, /* @__PURE__ */ React33.createElement(ControlLabel, null, label), children);
+  }
+);
+
 // src/components/style-sections/border-section/border-color-field.tsx
-var BorderColorField = () => {
-  return /* @__PURE__ */ React33.createElement(StylesField, { bind: "border-color" }, /* @__PURE__ */ React33.createElement(Grid, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React33.createElement(Grid, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(ControlLabel, null, __11("Border color", "elementor"))), /* @__PURE__ */ React33.createElement(Grid, { item: true, xs: 6 }, /* @__PURE__ */ React33.createElement(ColorControl, null))));
-};
+var BORDER_COLOR_LABEL = __13("Border color", "elementor");
+var BorderColorField = () => /* @__PURE__ */ React34.createElement(StylesField, { bind: "border-color", propDisplayName: BORDER_COLOR_LABEL }, /* @__PURE__ */ React34.createElement(StylesFieldLayout, { label: BORDER_COLOR_LABEL }, /* @__PURE__ */ React34.createElement(ColorControl, null)));
 
 // src/components/style-sections/border-section/border-style-field.tsx
-import * as React34 from "react";
+import * as React35 from "react";
 import { SelectControl as SelectControl2 } from "@elementor/editor-controls";
-import { Grid as Grid2 } from "@elementor/ui";
-import { __ as __12 } from "@wordpress/i18n";
+import { __ as __14 } from "@wordpress/i18n";
+var BORDER_TYPE_LABEL = __14("Border type", "elementor");
 var borderStyles = [
-  { value: "none", label: __12("None", "elementor") },
-  { value: "solid", label: __12("Solid", "elementor") },
-  { value: "dashed", label: __12("Dashed", "elementor") },
-  { value: "dotted", label: __12("Dotted", "elementor") },
-  { value: "double", label: __12("Double", "elementor") },
-  { value: "groove", label: __12("Groove", "elementor") },
-  { value: "ridge", label: __12("Ridge", "elementor") },
-  { value: "inset", label: __12("Inset", "elementor") },
-  { value: "outset", label: __12("Outset", "elementor") }
+  { value: "none", label: __14("None", "elementor") },
+  { value: "solid", label: __14("Solid", "elementor") },
+  { value: "dashed", label: __14("Dashed", "elementor") },
+  { value: "dotted", label: __14("Dotted", "elementor") },
+  { value: "double", label: __14("Double", "elementor") },
+  { value: "groove", label: __14("Groove", "elementor") },
+  { value: "ridge", label: __14("Ridge", "elementor") },
+  { value: "inset", label: __14("Inset", "elementor") },
+  { value: "outset", label: __14("Outset", "elementor") }
 ];
-var BorderStyleField = () => {
-  return /* @__PURE__ */ React34.createElement(StylesField, { bind: "border-style" }, /* @__PURE__ */ React34.createElement(Grid2, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React34.createElement(Grid2, { item: true, xs: 6 }, /* @__PURE__ */ React34.createElement(ControlLabel, null, __12("Border type", "elementor"))), /* @__PURE__ */ React34.createElement(Grid2, { item: true, xs: 6, sx: { overflow: "hidden" } }, /* @__PURE__ */ React34.createElement(SelectControl2, { options: borderStyles }))));
-};
+var BorderStyleField = () => /* @__PURE__ */ React35.createElement(StylesField, { bind: "border-style", propDisplayName: BORDER_TYPE_LABEL }, /* @__PURE__ */ React35.createElement(StylesFieldLayout, { label: BORDER_TYPE_LABEL }, /* @__PURE__ */ React35.createElement(SelectControl2, { options: borderStyles })));
 
 // src/components/style-sections/border-section/border-width-field.tsx
-import * as React35 from "react";
+import * as React36 from "react";
 import { EqualUnequalSizesControl } from "@elementor/editor-controls";
 import { borderWidthPropTypeUtil } from "@elementor/editor-props";
 import { SideAllIcon, SideBottomIcon, SideLeftIcon, SideRightIcon, SideTopIcon } from "@elementor/icons";
 import { withDirection } from "@elementor/ui";
-import { __ as __13 } from "@wordpress/i18n";
+import { __ as __15 } from "@wordpress/i18n";
+var BORDER_WIDTH_LABEL = __15("Border width", "elementor");
 var InlineStartIcon = withDirection(SideRightIcon);
 var InlineEndIcon = withDirection(SideLeftIcon);
 var getEdges = (isSiteRtl) => [
   {
-    label: __13("Top", "elementor"),
-    icon: /* @__PURE__ */ React35.createElement(SideTopIcon, { fontSize: "tiny" }),
+    label: __15("Top", "elementor"),
+    icon: /* @__PURE__ */ React36.createElement(SideTopIcon, { fontSize: "tiny" }),
     bind: "block-start"
   },
   {
-    label: isSiteRtl ? __13("Left", "elementor") : __13("Right", "elementor"),
-    icon: /* @__PURE__ */ React35.createElement(InlineStartIcon, { fontSize: "tiny" }),
+    label: isSiteRtl ? __15("Left", "elementor") : __15("Right", "elementor"),
+    icon: /* @__PURE__ */ React36.createElement(InlineStartIcon, { fontSize: "tiny" }),
     bind: "inline-end"
   },
   {
-    label: __13("Bottom", "elementor"),
-    icon: /* @__PURE__ */ React35.createElement(SideBottomIcon, { fontSize: "tiny" }),
+    label: __15("Bottom", "elementor"),
+    icon: /* @__PURE__ */ React36.createElement(SideBottomIcon, { fontSize: "tiny" }),
     bind: "block-end"
   },
   {
-    label: isSiteRtl ? __13("Right", "elementor") : __13("Left", "elementor"),
-    icon: /* @__PURE__ */ React35.createElement(InlineEndIcon, { fontSize: "tiny" }),
+    label: isSiteRtl ? __15("Right", "elementor") : __15("Left", "elementor"),
+    icon: /* @__PURE__ */ React36.createElement(InlineEndIcon, { fontSize: "tiny" }),
     bind: "inline-start"
   }
 ];
 var BorderWidthField = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React35.createElement(StylesField, { bind: "border-width" }, /* @__PURE__ */ React35.createElement(
+  return /* @__PURE__ */ React36.createElement(StylesField, { bind: "border-width", propDisplayName: BORDER_WIDTH_LABEL }, /* @__PURE__ */ React36.createElement(
     EqualUnequalSizesControl,
     {
       items: getEdges(isSiteRtl),
-      label: __13("Border width", "elementor"),
-      icon: /* @__PURE__ */ React35.createElement(SideAllIcon, { fontSize: "tiny" }),
-      tooltipLabel: __13("Adjust borders", "elementor"),
+      label: BORDER_WIDTH_LABEL,
+      icon: /* @__PURE__ */ React36.createElement(SideAllIcon, { fontSize: "tiny" }),
+      tooltipLabel: __15("Adjust borders", "elementor"),
       multiSizePropTypeUtil: borderWidthPropTypeUtil
     }
   ));
 };
 
 // src/components/style-sections/border-section/border-field.tsx
+var BORDER_LABEL = __16("Border", "elementor");
 var initialBorder = {
   "border-width": { $$type: "size", value: { size: 1, unit: "px" } },
   "border-color": { $$type: "color", value: "#000000" },
@@ -2646,34 +2781,38 @@ var initialBorder = {
 };
 var BorderField = () => {
   const { values, setValues, canEdit } = useStylesFields(Object.keys(initialBorder));
+  const meta = { history: { propDisplayName: BORDER_LABEL } };
   const addBorder = () => {
-    setValues(initialBorder);
+    setValues(initialBorder, meta);
   };
   const removeBorder = () => {
-    setValues({
-      "border-width": null,
-      "border-color": null,
-      "border-style": null
-    });
+    setValues(
+      {
+        "border-width": null,
+        "border-color": null,
+        "border-style": null
+      },
+      meta
+    );
   };
   const hasBorder = Object.values(values ?? {}).some(Boolean);
-  return /* @__PURE__ */ React36.createElement(
+  return /* @__PURE__ */ React37.createElement(
     AddOrRemoveContent,
     {
       isAdded: hasBorder,
       onAdd: addBorder,
       onRemove: removeBorder,
       disabled: !canEdit,
-      renderLabel: () => /* @__PURE__ */ React36.createElement(ControlFormLabel3, null, __14("Border", "elementor"))
+      renderLabel: () => /* @__PURE__ */ React37.createElement(ControlFormLabel3, null, BORDER_LABEL)
     },
-    /* @__PURE__ */ React36.createElement(BorderWidthField, null),
-    /* @__PURE__ */ React36.createElement(BorderColorField, null),
-    /* @__PURE__ */ React36.createElement(BorderStyleField, null)
+    /* @__PURE__ */ React37.createElement(BorderWidthField, null),
+    /* @__PURE__ */ React37.createElement(BorderColorField, null),
+    /* @__PURE__ */ React37.createElement(BorderStyleField, null)
   );
 };
 
 // src/components/style-sections/border-section/border-radius-field.tsx
-import * as React38 from "react";
+import * as React39 from "react";
 import { EqualUnequalSizesControl as EqualUnequalSizesControl2 } from "@elementor/editor-controls";
 import { borderRadiusPropTypeUtil } from "@elementor/editor-props";
 import {
@@ -2684,89 +2823,96 @@ import {
   RadiusTopRightIcon
 } from "@elementor/icons";
 import { withDirection as withDirection2 } from "@elementor/ui";
-import { __ as __15 } from "@wordpress/i18n";
+import { __ as __17 } from "@wordpress/i18n";
 
 // src/styles-inheritance/components/ui-providers.tsx
-import * as React37 from "react";
+import * as React38 from "react";
 import { DirectionProvider, ThemeProvider } from "@elementor/ui";
 var UiProviders = ({ children }) => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React37.createElement(DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React37.createElement(ThemeProvider, null, children));
+  return /* @__PURE__ */ React38.createElement(DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React38.createElement(ThemeProvider, null, children));
 };
 
 // src/components/style-sections/border-section/border-radius-field.tsx
+var BORDER_RADIUS_LABEL = __17("Border radius", "elementor");
 var StartStartIcon = withDirection2(RadiusTopLeftIcon);
 var StartEndIcon = withDirection2(RadiusTopRightIcon);
 var EndStartIcon = withDirection2(RadiusBottomLeftIcon);
 var EndEndIcon = withDirection2(RadiusBottomRightIcon);
-var getStartStartLabel = (isSiteRtl) => isSiteRtl ? __15("Top right", "elementor") : __15("Top left", "elementor");
-var getStartEndLabel = (isSiteRtl) => isSiteRtl ? __15("Top left", "elementor") : __15("Top right", "elementor");
-var getEndStartLabel = (isSiteRtl) => isSiteRtl ? __15("Bottom right", "elementor") : __15("Bottom left", "elementor");
-var getEndEndLabel = (isSiteRtl) => isSiteRtl ? __15("Bottom left", "elementor") : __15("Bottom right", "elementor");
+var getStartStartLabel = (isSiteRtl) => isSiteRtl ? __17("Top right", "elementor") : __17("Top left", "elementor");
+var getStartEndLabel = (isSiteRtl) => isSiteRtl ? __17("Top left", "elementor") : __17("Top right", "elementor");
+var getEndStartLabel = (isSiteRtl) => isSiteRtl ? __17("Bottom right", "elementor") : __17("Bottom left", "elementor");
+var getEndEndLabel = (isSiteRtl) => isSiteRtl ? __17("Bottom left", "elementor") : __17("Bottom right", "elementor");
 var getCorners = (isSiteRtl) => [
   {
     label: getStartStartLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React38.createElement(StartStartIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React39.createElement(StartStartIcon, { fontSize: "tiny" }),
     bind: "start-start"
   },
   {
     label: getStartEndLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React38.createElement(StartEndIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React39.createElement(StartEndIcon, { fontSize: "tiny" }),
     bind: "start-end"
   },
   {
     label: getEndStartLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React38.createElement(EndStartIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React39.createElement(EndStartIcon, { fontSize: "tiny" }),
     bind: "end-start"
   },
   {
     label: getEndEndLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React38.createElement(EndEndIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React39.createElement(EndEndIcon, { fontSize: "tiny" }),
     bind: "end-end"
   }
 ];
 var BorderRadiusField = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React38.createElement(UiProviders, null, /* @__PURE__ */ React38.createElement(StylesField, { bind: "border-radius" }, /* @__PURE__ */ React38.createElement(
+  return /* @__PURE__ */ React39.createElement(UiProviders, null, /* @__PURE__ */ React39.createElement(StylesField, { bind: "border-radius", propDisplayName: BORDER_RADIUS_LABEL }, /* @__PURE__ */ React39.createElement(
     EqualUnequalSizesControl2,
     {
       items: getCorners(isSiteRtl),
-      label: __15("Border radius", "elementor"),
-      icon: /* @__PURE__ */ React38.createElement(BorderCornersIcon, { fontSize: "tiny" }),
-      tooltipLabel: __15("Adjust corners", "elementor"),
+      label: BORDER_RADIUS_LABEL,
+      icon: /* @__PURE__ */ React39.createElement(BorderCornersIcon, { fontSize: "tiny" }),
+      tooltipLabel: __17("Adjust corners", "elementor"),
       multiSizePropTypeUtil: borderRadiusPropTypeUtil
     }
   )));
 };
 
 // src/components/style-sections/border-section/border-section.tsx
-var BorderSection = () => /* @__PURE__ */ React39.createElement(SectionContent, null, /* @__PURE__ */ React39.createElement(BorderRadiusField, null), /* @__PURE__ */ React39.createElement(PanelDivider, null), /* @__PURE__ */ React39.createElement(BorderField, null));
+var BorderSection = () => /* @__PURE__ */ React40.createElement(SectionContent, null, /* @__PURE__ */ React40.createElement(BorderRadiusField, null), /* @__PURE__ */ React40.createElement(PanelDivider, null), /* @__PURE__ */ React40.createElement(BorderField, null));
 
 // src/components/style-sections/effects-section/effects-section.tsx
-import * as React41 from "react";
-import { BoxShadowRepeaterControl } from "@elementor/editor-controls";
+import * as React42 from "react";
+import { BoxShadowRepeaterControl, FilterRepeaterControl, TransformRepeaterControl } from "@elementor/editor-controls";
+import { isExperimentActive as isExperimentActive10 } from "@elementor/editor-v1-adapters";
+import { __ as __19 } from "@wordpress/i18n";
 
 // src/components/style-sections/layout-section/opacity-control-field.tsx
-import * as React40 from "react";
+import * as React41 from "react";
 import { useRef as useRef4 } from "react";
 import { SizeControl as SizeControl2 } from "@elementor/editor-controls";
-import { Grid as Grid3 } from "@elementor/ui";
-import { __ as __16 } from "@wordpress/i18n";
+import { __ as __18 } from "@wordpress/i18n";
+var OPACITY_LABEL = __18("Opacity", "elementor");
 var OpacityControlField = () => {
-  const rowRef = useRef4();
-  return /* @__PURE__ */ React40.createElement(StylesField, { bind: "opacity" }, /* @__PURE__ */ React40.createElement(Grid3, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: rowRef }, /* @__PURE__ */ React40.createElement(Grid3, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(ControlLabel, null, __16("Opacity", "elementor"))), /* @__PURE__ */ React40.createElement(Grid3, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(SizeControl2, { units: ["%"], anchorRef: rowRef, defaultUnit: "%" }))));
+  const rowRef = useRef4(null);
+  return /* @__PURE__ */ React41.createElement(StylesField, { bind: "opacity", propDisplayName: OPACITY_LABEL }, /* @__PURE__ */ React41.createElement(StylesFieldLayout, { ref: rowRef, label: OPACITY_LABEL }, /* @__PURE__ */ React41.createElement(SizeControl2, { units: ["%"], anchorRef: rowRef, defaultUnit: "%" })));
 };
 
 // src/components/style-sections/effects-section/effects-section.tsx
+var BOX_SHADOW_LABEL = __19("Box shadow", "elementor");
+var FILTER_LABEL = __19("Filter", "elementor");
+var TRANSFORM_LABEL = __19("Transform", "elementor");
 var EffectsSection = () => {
-  return /* @__PURE__ */ React41.createElement(SectionContent, null, /* @__PURE__ */ React41.createElement(StylesField, { bind: "opacity" }, /* @__PURE__ */ React41.createElement(OpacityControlField, null)), /* @__PURE__ */ React41.createElement(PanelDivider, null), /* @__PURE__ */ React41.createElement(StylesField, { bind: "box-shadow" }, /* @__PURE__ */ React41.createElement(BoxShadowRepeaterControl, null)));
+  const isVersion331Active = isExperimentActive10(EXPERIMENTAL_FEATURES.V_3_31);
+  return /* @__PURE__ */ React42.createElement(SectionContent, null, isVersion331Active && /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(OpacityControlField, null), /* @__PURE__ */ React42.createElement(PanelDivider, null)), /* @__PURE__ */ React42.createElement(StylesField, { bind: "box-shadow", propDisplayName: BOX_SHADOW_LABEL }, /* @__PURE__ */ React42.createElement(BoxShadowRepeaterControl, null)), isVersion331Active && /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(PanelDivider, null), /* @__PURE__ */ React42.createElement(StylesField, { bind: "transform", propDisplayName: TRANSFORM_LABEL }, /* @__PURE__ */ React42.createElement(TransformRepeaterControl, null)), /* @__PURE__ */ React42.createElement(PanelDivider, null), /* @__PURE__ */ React42.createElement(StylesField, { bind: "filter", propDisplayName: FILTER_LABEL }, /* @__PURE__ */ React42.createElement(FilterRepeaterControl, null))));
 };
 
 // src/components/style-sections/layout-section/layout-section.tsx
-import * as React53 from "react";
+import * as React54 from "react";
 import { ControlFormLabel as ControlFormLabel4 } from "@elementor/editor-controls";
 import { useParentElement } from "@elementor/editor-elements";
-import { __ as __27 } from "@wordpress/i18n";
+import { __ as __31 } from "@wordpress/i18n";
 
 // src/hooks/use-computed-style.ts
 import { __privateUseListenTo as useListenTo, commandEndEvent, windowEvent } from "@elementor/editor-v1-adapters";
@@ -2794,7 +2940,7 @@ function useComputedStyle(elementId) {
 }
 
 // src/components/style-sections/layout-section/align-content-field.tsx
-import * as React43 from "react";
+import * as React44 from "react";
 import { ToggleControl } from "@elementor/editor-controls";
 import {
   JustifyBottomIcon,
@@ -2804,13 +2950,15 @@ import {
   JustifySpaceBetweenVerticalIcon as BetweenIcon,
   JustifyTopIcon
 } from "@elementor/icons";
-import { Stack as Stack10, withDirection as withDirection3 } from "@elementor/ui";
-import { __ as __17 } from "@wordpress/i18n";
+import { withDirection as withDirection3 } from "@elementor/ui";
+import { __ as __21 } from "@wordpress/i18n";
 
 // src/components/style-sections/layout-section/utils/rotated-icon.tsx
-import * as React42 from "react";
+import * as React43 from "react";
 import { useRef as useRef5 } from "react";
 import { useTheme as useTheme2 } from "@elementor/ui";
+import { __ as __20 } from "@wordpress/i18n";
+var FLEX_DIRECTION_LABEL = __20("Flex direction", "elementor");
 var CLOCKWISE_ANGLES = {
   row: 0,
   column: 90,
@@ -2832,10 +2980,12 @@ var RotatedIcon = ({
 }) => {
   const rotate = useRef5(useGetTargetAngle(isClockwise, offset, disableRotationForReversed));
   rotate.current = useGetTargetAngle(isClockwise, offset, disableRotationForReversed, rotate);
-  return /* @__PURE__ */ React42.createElement(Icon, { fontSize: size, sx: { transition: ".3s", rotate: `${rotate.current}deg` } });
+  return /* @__PURE__ */ React43.createElement(Icon, { fontSize: size, sx: { transition: ".3s", rotate: `${rotate.current}deg` } });
 };
 var useGetTargetAngle = (isClockwise, offset, disableRotationForReversed, existingRef) => {
-  const { value: direction } = useStylesField("flex-direction");
+  const { value: direction } = useStylesField("flex-direction", {
+    history: { propDisplayName: FLEX_DIRECTION_LABEL }
+  });
   const isRtl = "rtl" === useTheme2().direction;
   const rotationMultiplier = isRtl ? -1 : 1;
   const angleMap = isClockwise ? CLOCKWISE_ANGLES : COUNTER_CLOCKWISE_ANGLES;
@@ -2851,6 +3001,7 @@ var useGetTargetAngle = (isClockwise, offset, disableRotationForReversed, existi
 };
 
 // src/components/style-sections/layout-section/align-content-field.tsx
+var ALIGN_CONTENT_LABEL = __21("Align content", "elementor");
 var StartIcon = withDirection3(JustifyTopIcon);
 var EndIcon = withDirection3(JustifyBottomIcon);
 var iconProps = {
@@ -2861,47 +3012,45 @@ var iconProps = {
 var options = [
   {
     value: "start",
-    label: __17("Start", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React43.createElement(RotatedIcon, { icon: StartIcon, size, ...iconProps }),
+    label: __21("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: StartIcon, size, ...iconProps }),
     showTooltip: true
   },
   {
     value: "center",
-    label: __17("Center", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React43.createElement(RotatedIcon, { icon: CenterIcon, size, ...iconProps }),
+    label: __21("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: CenterIcon, size, ...iconProps }),
     showTooltip: true
   },
   {
     value: "end",
-    label: __17("End", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React43.createElement(RotatedIcon, { icon: EndIcon, size, ...iconProps }),
+    label: __21("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: EndIcon, size, ...iconProps }),
     showTooltip: true
   },
   {
     value: "space-between",
-    label: __17("Space between", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React43.createElement(RotatedIcon, { icon: BetweenIcon, size, ...iconProps }),
+    label: __21("Space between", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: BetweenIcon, size, ...iconProps }),
     showTooltip: true
   },
   {
     value: "space-around",
-    label: __17("Space around", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React43.createElement(RotatedIcon, { icon: AroundIcon, size, ...iconProps }),
+    label: __21("Space around", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: AroundIcon, size, ...iconProps }),
     showTooltip: true
   },
   {
     value: "space-evenly",
-    label: __17("Space evenly", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React43.createElement(RotatedIcon, { icon: EvenlyIcon, size, ...iconProps }),
+    label: __21("Space evenly", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: EvenlyIcon, size, ...iconProps }),
     showTooltip: true
   }
 ];
-var AlignContentField = () => {
-  return /* @__PURE__ */ React43.createElement(UiProviders, null, /* @__PURE__ */ React43.createElement(StylesField, { bind: "align-content" }, /* @__PURE__ */ React43.createElement(Stack10, { gap: 1 }, /* @__PURE__ */ React43.createElement(ControlLabel, null, __17("Align content", "elementor")), /* @__PURE__ */ React43.createElement(ToggleControl, { options, fullWidth: true }))));
-};
+var AlignContentField = () => /* @__PURE__ */ React44.createElement(StylesField, { bind: "align-content", propDisplayName: ALIGN_CONTENT_LABEL }, /* @__PURE__ */ React44.createElement(UiProviders, null, /* @__PURE__ */ React44.createElement(StylesFieldLayout, { label: ALIGN_CONTENT_LABEL, direction: "column" }, /* @__PURE__ */ React44.createElement(ToggleControl, { options, fullWidth: true }))));
 
 // src/components/style-sections/layout-section/align-items-field.tsx
-import * as React44 from "react";
+import * as React45 from "react";
 import { ToggleControl as ToggleControl2 } from "@elementor/editor-controls";
 import {
   LayoutAlignCenterIcon as CenterIcon2,
@@ -2909,8 +3058,9 @@ import {
   LayoutAlignRightIcon,
   LayoutDistributeVerticalIcon as JustifyIcon
 } from "@elementor/icons";
-import { Grid as Grid4, withDirection as withDirection4 } from "@elementor/ui";
-import { __ as __18 } from "@wordpress/i18n";
+import { withDirection as withDirection4 } from "@elementor/ui";
+import { __ as __22 } from "@wordpress/i18n";
+var ALIGN_ITEMS_LABEL = __22("Align items", "elementor");
 var StartIcon2 = withDirection4(LayoutAlignLeftIcon);
 var EndIcon2 = withDirection4(LayoutAlignRightIcon);
 var iconProps2 = {
@@ -2920,35 +3070,35 @@ var iconProps2 = {
 var options2 = [
   {
     value: "start",
-    label: __18("Start", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: StartIcon2, size, ...iconProps2 }),
+    label: __22("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(RotatedIcon, { icon: StartIcon2, size, ...iconProps2 }),
     showTooltip: true
   },
   {
     value: "center",
-    label: __18("Center", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: CenterIcon2, size, ...iconProps2 }),
+    label: __22("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(RotatedIcon, { icon: CenterIcon2, size, ...iconProps2 }),
     showTooltip: true
   },
   {
     value: "end",
-    label: __18("End", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: EndIcon2, size, ...iconProps2 }),
+    label: __22("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(RotatedIcon, { icon: EndIcon2, size, ...iconProps2 }),
     showTooltip: true
   },
   {
     value: "stretch",
-    label: __18("Stretch", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React44.createElement(RotatedIcon, { icon: JustifyIcon, size, ...iconProps2 }),
+    label: __22("Stretch", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(RotatedIcon, { icon: JustifyIcon, size, ...iconProps2 }),
     showTooltip: true
   }
 ];
 var AlignItemsField = () => {
-  return /* @__PURE__ */ React44.createElement(UiProviders, null, /* @__PURE__ */ React44.createElement(StylesField, { bind: "align-items" }, /* @__PURE__ */ React44.createElement(Grid4, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React44.createElement(Grid4, { item: true, xs: 6 }, /* @__PURE__ */ React44.createElement(ControlLabel, null, __18("Align items", "elementor"))), /* @__PURE__ */ React44.createElement(Grid4, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React44.createElement(ToggleControl2, { options: options2 })))));
+  return /* @__PURE__ */ React45.createElement(UiProviders, null, /* @__PURE__ */ React45.createElement(StylesField, { bind: "align-items", propDisplayName: ALIGN_ITEMS_LABEL }, /* @__PURE__ */ React45.createElement(StylesFieldLayout, { label: ALIGN_ITEMS_LABEL }, /* @__PURE__ */ React45.createElement(ToggleControl2, { options: options2 }))));
 };
 
 // src/components/style-sections/layout-section/align-self-child-field.tsx
-import * as React45 from "react";
+import * as React46 from "react";
 import { ToggleControl as ToggleControl3 } from "@elementor/editor-controls";
 import {
   LayoutAlignCenterIcon as CenterIcon3,
@@ -2956,8 +3106,9 @@ import {
   LayoutAlignRightIcon as LayoutAlignRightIcon2,
   LayoutDistributeVerticalIcon as JustifyIcon2
 } from "@elementor/icons";
-import { Grid as Grid5, withDirection as withDirection5 } from "@elementor/ui";
-import { __ as __19 } from "@wordpress/i18n";
+import { withDirection as withDirection5 } from "@elementor/ui";
+import { __ as __23 } from "@wordpress/i18n";
+var ALIGN_SELF_LABEL = __23("Align self", "elementor");
 var ALIGN_SELF_CHILD_OFFSET_MAP = {
   row: 90,
   "row-reverse": 90,
@@ -2972,8 +3123,8 @@ var iconProps3 = {
 var getOptions = (parentStyleDirection) => [
   {
     value: "start",
-    label: __19("Start", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(
+    label: __23("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React46.createElement(
       RotatedIcon,
       {
         icon: StartIcon3,
@@ -2986,8 +3137,8 @@ var getOptions = (parentStyleDirection) => [
   },
   {
     value: "center",
-    label: __19("Center", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(
+    label: __23("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React46.createElement(
       RotatedIcon,
       {
         icon: CenterIcon3,
@@ -3000,8 +3151,8 @@ var getOptions = (parentStyleDirection) => [
   },
   {
     value: "end",
-    label: __19("End", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(
+    label: __23("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React46.createElement(
       RotatedIcon,
       {
         icon: EndIcon3,
@@ -3014,8 +3165,8 @@ var getOptions = (parentStyleDirection) => [
   },
   {
     value: "stretch",
-    label: __19("Stretch", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React45.createElement(
+    label: __23("Stretch", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React46.createElement(
       RotatedIcon,
       {
         icon: JustifyIcon2,
@@ -3027,107 +3178,107 @@ var getOptions = (parentStyleDirection) => [
     showTooltip: true
   }
 ];
-var AlignSelfChild = ({ parentStyleDirection }) => {
-  return /* @__PURE__ */ React45.createElement(UiProviders, null, /* @__PURE__ */ React45.createElement(StylesField, { bind: "align-self" }, /* @__PURE__ */ React45.createElement(Grid5, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React45.createElement(Grid5, { item: true, xs: 6 }, /* @__PURE__ */ React45.createElement(ControlLabel, null, __19("Align self", "elementor"))), /* @__PURE__ */ React45.createElement(Grid5, { item: true, xs: 6, sx: { display: "flex", justifyContent: "flex-end" } }, /* @__PURE__ */ React45.createElement(ToggleControl3, { options: getOptions(parentStyleDirection) })))));
-};
+var AlignSelfChild = ({ parentStyleDirection }) => /* @__PURE__ */ React46.createElement(StylesField, { bind: "align-self", propDisplayName: ALIGN_SELF_LABEL }, /* @__PURE__ */ React46.createElement(UiProviders, null, /* @__PURE__ */ React46.createElement(StylesFieldLayout, { label: ALIGN_SELF_LABEL }, /* @__PURE__ */ React46.createElement(ToggleControl3, { options: getOptions(parentStyleDirection) }))));
 
 // src/components/style-sections/layout-section/display-field.tsx
-import * as React46 from "react";
+import * as React47 from "react";
 import { ToggleControl as ToggleControl4 } from "@elementor/editor-controls";
-import { isExperimentActive as isExperimentActive7 } from "@elementor/editor-v1-adapters";
-import { Stack as Stack11 } from "@elementor/ui";
-import { __ as __20 } from "@wordpress/i18n";
+import { isExperimentActive as isExperimentActive11 } from "@elementor/editor-v1-adapters";
+import { __ as __24 } from "@wordpress/i18n";
+var DISPLAY_LABEL = __24("Display", "elementor");
 var displayFieldItems = [
   {
     value: "block",
-    renderContent: () => __20("Block", "elementor"),
-    label: __20("Block", "elementor"),
+    renderContent: () => __24("Block", "elementor"),
+    label: __24("Block", "elementor"),
     showTooltip: true
   },
   {
     value: "flex",
-    renderContent: () => __20("Flex", "elementor"),
-    label: __20("Flex", "elementor"),
+    renderContent: () => __24("Flex", "elementor"),
+    label: __24("Flex", "elementor"),
     showTooltip: true
   },
   {
     value: "inline-block",
-    renderContent: () => __20("In-blk", "elementor"),
-    label: __20("Inline-block", "elementor"),
+    renderContent: () => __24("In-blk", "elementor"),
+    label: __24("Inline-block", "elementor"),
     showTooltip: true
   }
 ];
 var DisplayField = () => {
-  const isDisplayNoneFeatureActive = isExperimentActive7(EXPERIMENTAL_FEATURES.V_3_30);
+  const isDisplayNoneFeatureActive = isExperimentActive11(EXPERIMENTAL_FEATURES.V_3_30);
   const items3 = [...displayFieldItems];
   if (isDisplayNoneFeatureActive) {
     items3.push({
       value: "none",
-      renderContent: () => __20("None", "elementor"),
-      label: __20("None", "elementor"),
+      renderContent: () => __24("None", "elementor"),
+      label: __24("None", "elementor"),
       showTooltip: true
     });
   }
   items3.push({
     value: "inline-flex",
-    renderContent: () => __20("In-flx", "elementor"),
-    label: __20("Inline-flex", "elementor"),
+    renderContent: () => __24("In-flx", "elementor"),
+    label: __24("Inline-flex", "elementor"),
     showTooltip: true
   });
   const placeholder = useDisplayPlaceholderValue();
-  return /* @__PURE__ */ React46.createElement(StylesField, { bind: "display", placeholder }, /* @__PURE__ */ React46.createElement(Stack11, { gap: 0.75 }, /* @__PURE__ */ React46.createElement(ControlLabel, null, __20("Display", "elementor")), /* @__PURE__ */ React46.createElement(ToggleControl4, { options: items3, maxItems: 4, fullWidth: true })));
+  return /* @__PURE__ */ React47.createElement(StylesField, { bind: "display", propDisplayName: DISPLAY_LABEL, placeholder }, /* @__PURE__ */ React47.createElement(StylesFieldLayout, { label: DISPLAY_LABEL, direction: "column" }, /* @__PURE__ */ React47.createElement(ToggleControl4, { options: items3, maxItems: 4, fullWidth: true })));
 };
 var useDisplayPlaceholderValue = () => useStylesInheritanceChain(["display"])[0]?.value ?? void 0;
 
 // src/components/style-sections/layout-section/flex-direction-field.tsx
-import * as React47 from "react";
+import * as React48 from "react";
 import { ToggleControl as ToggleControl5 } from "@elementor/editor-controls";
 import { ArrowDownSmallIcon, ArrowLeftIcon, ArrowRightIcon, ArrowUpSmallIcon } from "@elementor/icons";
-import { Grid as Grid6, withDirection as withDirection6 } from "@elementor/ui";
-import { __ as __21 } from "@wordpress/i18n";
+import { withDirection as withDirection6 } from "@elementor/ui";
+import { __ as __25 } from "@wordpress/i18n";
+var FLEX_DIRECTION_LABEL2 = __25("Direction", "elementor");
 var options3 = [
   {
     value: "row",
-    label: __21("Row", "elementor"),
+    label: __25("Row", "elementor"),
     renderContent: ({ size }) => {
       const StartIcon5 = withDirection6(ArrowRightIcon);
-      return /* @__PURE__ */ React47.createElement(StartIcon5, { fontSize: size });
+      return /* @__PURE__ */ React48.createElement(StartIcon5, { fontSize: size });
     },
     showTooltip: true
   },
   {
     value: "column",
-    label: __21("Column", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React47.createElement(ArrowDownSmallIcon, { fontSize: size }),
+    label: __25("Column", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(ArrowDownSmallIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "row-reverse",
-    label: __21("Reversed row", "elementor"),
+    label: __25("Reversed row", "elementor"),
     renderContent: ({ size }) => {
       const EndIcon5 = withDirection6(ArrowLeftIcon);
-      return /* @__PURE__ */ React47.createElement(EndIcon5, { fontSize: size });
+      return /* @__PURE__ */ React48.createElement(EndIcon5, { fontSize: size });
     },
     showTooltip: true
   },
   {
     value: "column-reverse",
-    label: __21("Reversed column", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React47.createElement(ArrowUpSmallIcon, { fontSize: size }),
+    label: __25("Reversed column", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(ArrowUpSmallIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
 var FlexDirectionField = () => {
-  return /* @__PURE__ */ React47.createElement(UiProviders, null, /* @__PURE__ */ React47.createElement(StylesField, { bind: "flex-direction" }, /* @__PURE__ */ React47.createElement(Grid6, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React47.createElement(Grid6, { item: true, xs: 6 }, /* @__PURE__ */ React47.createElement(ControlLabel, null, __21("Direction", "elementor"))), /* @__PURE__ */ React47.createElement(Grid6, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React47.createElement(ToggleControl5, { options: options3 })))));
+  return /* @__PURE__ */ React48.createElement(StylesField, { bind: "flex-direction", propDisplayName: FLEX_DIRECTION_LABEL2 }, /* @__PURE__ */ React48.createElement(UiProviders, null, /* @__PURE__ */ React48.createElement(StylesFieldLayout, { label: FLEX_DIRECTION_LABEL2 }, /* @__PURE__ */ React48.createElement(ToggleControl5, { options: options3 }))));
 };
 
 // src/components/style-sections/layout-section/flex-order-field.tsx
-import * as React48 from "react";
+import * as React49 from "react";
 import { useState as useState10 } from "react";
 import { ControlToggleButtonGroup, NumberControl } from "@elementor/editor-controls";
 import { ArrowDownSmallIcon as ArrowDownSmallIcon2, ArrowUpSmallIcon as ArrowUpSmallIcon2, PencilIcon } from "@elementor/icons";
-import { Grid as Grid7 } from "@elementor/ui";
-import { __ as __22 } from "@wordpress/i18n";
+import { Grid as Grid2 } from "@elementor/ui";
+import { __ as __26 } from "@wordpress/i18n";
+var ORDER_LABEL = __26("Order", "elementor");
 var FIRST_DEFAULT_VALUE = -99999;
 var LAST_DEFAULT_VALUE = 99999;
 var FIRST = "first";
@@ -3140,25 +3291,31 @@ var orderValueMap = {
 var items = [
   {
     value: FIRST,
-    label: __22("First", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(ArrowUpSmallIcon2, { fontSize: size }),
+    label: __26("First", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React49.createElement(ArrowUpSmallIcon2, { fontSize: size }),
     showTooltip: true
   },
   {
     value: LAST,
-    label: __22("Last", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(ArrowDownSmallIcon2, { fontSize: size }),
+    label: __26("Last", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React49.createElement(ArrowDownSmallIcon2, { fontSize: size }),
     showTooltip: true
   },
   {
     value: CUSTOM,
-    label: __22("Custom", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React48.createElement(PencilIcon, { fontSize: size }),
+    label: __26("Custom", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React49.createElement(PencilIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
 var FlexOrderField = () => {
-  const { value: order, setValue: setOrder, canEdit } = useStylesField("order");
+  const {
+    value: order,
+    setValue: setOrder,
+    canEdit
+  } = useStylesField("order", {
+    history: { propDisplayName: ORDER_LABEL }
+  });
   const [groupControlValue, setGroupControlValue] = useState10(getGroupControlValue(order?.value || null));
   const handleToggleButtonChange = (group) => {
     setGroupControlValue(group);
@@ -3168,7 +3325,7 @@ var FlexOrderField = () => {
     }
     setOrder({ $$type: "number", value: orderValueMap[group] });
   };
-  return /* @__PURE__ */ React48.createElement(UiProviders, null, /* @__PURE__ */ React48.createElement(StylesField, { bind: "order" }, /* @__PURE__ */ React48.createElement(SectionContent, null, /* @__PURE__ */ React48.createElement(Grid7, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React48.createElement(Grid7, { item: true, xs: 6 }, /* @__PURE__ */ React48.createElement(ControlLabel, null, __22("Order", "elementor"))), /* @__PURE__ */ React48.createElement(Grid7, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React48.createElement(
+  return /* @__PURE__ */ React49.createElement(StylesField, { bind: "order", propDisplayName: ORDER_LABEL }, /* @__PURE__ */ React49.createElement(UiProviders, null, /* @__PURE__ */ React49.createElement(SectionContent, null, /* @__PURE__ */ React49.createElement(StylesFieldLayout, { label: ORDER_LABEL }, /* @__PURE__ */ React49.createElement(
     ControlToggleButtonGroup,
     {
       items,
@@ -3177,7 +3334,7 @@ var FlexOrderField = () => {
       exclusive: true,
       disabled: !canEdit
     }
-  ))), CUSTOM === groupControlValue && /* @__PURE__ */ React48.createElement(Grid7, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React48.createElement(Grid7, { item: true, xs: 6 }, /* @__PURE__ */ React48.createElement(ControlLabel, null, __22("Custom order", "elementor"))), /* @__PURE__ */ React48.createElement(Grid7, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React48.createElement(
+  )), CUSTOM === groupControlValue && /* @__PURE__ */ React49.createElement(Grid2, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React49.createElement(Grid2, { item: true, xs: 6 }, /* @__PURE__ */ React49.createElement(ControlLabel, null, __26("Custom order", "elementor"))), /* @__PURE__ */ React49.createElement(Grid2, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React49.createElement(
     NumberControl,
     {
       min: FIRST_DEFAULT_VALUE + 1,
@@ -3197,8 +3354,8 @@ var getGroupControlValue = (order) => {
 };
 
 // src/components/style-sections/layout-section/flex-size-field.tsx
-import * as React49 from "react";
-import { useMemo as useMemo5, useRef as useRef6, useState as useState11 } from "react";
+import * as React50 from "react";
+import { useMemo as useMemo6, useRef as useRef6, useState as useState11 } from "react";
 import {
   ControlToggleButtonGroup as ControlToggleButtonGroup2,
   NumberControl as NumberControl2,
@@ -3206,26 +3363,26 @@ import {
 } from "@elementor/editor-controls";
 import { numberPropTypeUtil } from "@elementor/editor-props";
 import { ExpandIcon, PencilIcon as PencilIcon2, ShrinkIcon } from "@elementor/icons";
-import { Grid as Grid8 } from "@elementor/ui";
-import { __ as __23 } from "@wordpress/i18n";
+import { __ as __27 } from "@wordpress/i18n";
+var FLEX_SIZE_LABEL = __27("Flex Size", "elementor");
 var DEFAULT = 1;
 var items2 = [
   {
     value: "flex-grow",
-    label: __23("Grow", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React49.createElement(ExpandIcon, { fontSize: size }),
+    label: __27("Grow", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React50.createElement(ExpandIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "flex-shrink",
-    label: __23("Shrink", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React49.createElement(ShrinkIcon, { fontSize: size }),
+    label: __27("Shrink", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React50.createElement(ShrinkIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "custom",
-    label: __23("Custom", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React49.createElement(PencilIcon2, { fontSize: size }),
+    label: __27("Custom", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React50.createElement(PencilIcon2, { fontSize: size }),
     showTooltip: true
   }
 ];
@@ -3234,32 +3391,32 @@ var FlexSizeField = () => {
   const grow = values?.["flex-grow"]?.value || null;
   const shrink = values?.["flex-shrink"]?.value || null;
   const basis = values?.["flex-basis"]?.value || null;
-  const currentGroup = useMemo5(() => getActiveGroup({ grow, shrink, basis }), [grow, shrink, basis]), [activeGroup, setActiveGroup] = useState11(currentGroup);
+  const currentGroup = useMemo6(() => getActiveGroup({ grow, shrink, basis }), [grow, shrink, basis]), [activeGroup, setActiveGroup] = useState11(currentGroup);
   const onChangeGroup = (group = null) => {
     setActiveGroup(group);
+    let props;
     if (!group || group === "custom") {
-      setValues({
+      props = {
         "flex-basis": null,
         "flex-grow": null,
         "flex-shrink": null
-      });
-      return;
-    }
-    if (group === "flex-grow") {
-      setValues({
+      };
+    } else if (group === "flex-grow") {
+      props = {
         "flex-basis": null,
         "flex-grow": numberPropTypeUtil.create(DEFAULT),
         "flex-shrink": null
-      });
-      return;
+      };
+    } else {
+      props = {
+        "flex-basis": null,
+        "flex-grow": null,
+        "flex-shrink": numberPropTypeUtil.create(DEFAULT)
+      };
     }
-    setValues({
-      "flex-basis": null,
-      "flex-grow": null,
-      "flex-shrink": numberPropTypeUtil.create(DEFAULT)
-    });
+    setValues(props, { history: { propDisplayName: FLEX_SIZE_LABEL } });
   };
-  return /* @__PURE__ */ React49.createElement(UiProviders, null, /* @__PURE__ */ React49.createElement(SectionContent, null, /* @__PURE__ */ React49.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React49.createElement(StylesField, { bind: activeGroup ?? "" }, /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React49.createElement(ControlLabel, null, __23("Size", "elementor"))), /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React49.createElement(
+  return /* @__PURE__ */ React50.createElement(UiProviders, null, /* @__PURE__ */ React50.createElement(SectionContent, null, /* @__PURE__ */ React50.createElement(StylesField, { bind: activeGroup ?? "", propDisplayName: FLEX_SIZE_LABEL }, /* @__PURE__ */ React50.createElement(StylesFieldLayout, { label: FLEX_SIZE_LABEL }, /* @__PURE__ */ React50.createElement(
     ControlToggleButtonGroup2,
     {
       value: activeGroup,
@@ -3268,11 +3425,11 @@ var FlexSizeField = () => {
       items: items2,
       exclusive: true
     }
-  )))), "custom" === activeGroup && /* @__PURE__ */ React49.createElement(FlexCustomField, null)));
+  ))), "custom" === activeGroup && /* @__PURE__ */ React50.createElement(FlexCustomField, null)));
 };
 var FlexCustomField = () => {
-  const flexBasisRowRef = useRef6();
-  return /* @__PURE__ */ React49.createElement(React49.Fragment, null, /* @__PURE__ */ React49.createElement(StylesField, { bind: "flex-grow" }, /* @__PURE__ */ React49.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React49.createElement(ControlLabel, null, __23("Grow", "elementor"))), /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React49.createElement(NumberControl2, { min: 0, shouldForceInt: true })))), /* @__PURE__ */ React49.createElement(StylesField, { bind: "flex-shrink" }, /* @__PURE__ */ React49.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React49.createElement(ControlLabel, null, __23("Shrink", "elementor"))), /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React49.createElement(NumberControl2, { min: 0, shouldForceInt: true })))), /* @__PURE__ */ React49.createElement(StylesField, { bind: "flex-basis" }, /* @__PURE__ */ React49.createElement(Grid8, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: flexBasisRowRef }, /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6 }, /* @__PURE__ */ React49.createElement(ControlLabel, null, __23("Basis", "elementor"))), /* @__PURE__ */ React49.createElement(Grid8, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React49.createElement(SizeControl3, { extendedOptions: ["auto"], anchorRef: flexBasisRowRef })))));
+  const flexBasisRowRef = useRef6(null);
+  return /* @__PURE__ */ React50.createElement(React50.Fragment, null, /* @__PURE__ */ React50.createElement(StylesField, { bind: "flex-grow", propDisplayName: FLEX_SIZE_LABEL }, /* @__PURE__ */ React50.createElement(StylesFieldLayout, { label: __27("Grow", "elementor") }, /* @__PURE__ */ React50.createElement(NumberControl2, { min: 0, shouldForceInt: true }))), /* @__PURE__ */ React50.createElement(StylesField, { bind: "flex-shrink", propDisplayName: FLEX_SIZE_LABEL }, /* @__PURE__ */ React50.createElement(StylesFieldLayout, { label: __27("Shrink", "elementor") }, /* @__PURE__ */ React50.createElement(NumberControl2, { min: 0, shouldForceInt: true }))), /* @__PURE__ */ React50.createElement(StylesField, { bind: "flex-basis", propDisplayName: FLEX_SIZE_LABEL }, /* @__PURE__ */ React50.createElement(StylesFieldLayout, { label: __27("Basis", "elementor"), ref: flexBasisRowRef }, /* @__PURE__ */ React50.createElement(SizeControl3, { extendedOptions: ["auto"], anchorRef: flexBasisRowRef }))));
 };
 var getActiveGroup = ({
   grow,
@@ -3295,16 +3452,16 @@ var getActiveGroup = ({
 };
 
 // src/components/style-sections/layout-section/gap-control-field.tsx
-import * as React50 from "react";
+import * as React51 from "react";
 import { GapControl } from "@elementor/editor-controls";
-import { Stack as Stack12 } from "@elementor/ui";
-import { __ as __24 } from "@wordpress/i18n";
+import { __ as __28 } from "@wordpress/i18n";
+var GAPS_LABEL = __28("Gaps", "elementor");
 var GapControlField = () => {
-  return /* @__PURE__ */ React50.createElement(Stack12, { gap: 1 }, /* @__PURE__ */ React50.createElement(StylesField, { bind: "gap" }, /* @__PURE__ */ React50.createElement(GapControl, { label: __24("Gaps", "elementor") })));
+  return /* @__PURE__ */ React51.createElement(StylesField, { bind: "gap", propDisplayName: GAPS_LABEL }, /* @__PURE__ */ React51.createElement(GapControl, { label: GAPS_LABEL }));
 };
 
 // src/components/style-sections/layout-section/justify-content-field.tsx
-import * as React51 from "react";
+import * as React52 from "react";
 import { ToggleControl as ToggleControl6 } from "@elementor/editor-controls";
 import {
   JustifyBottomIcon as JustifyBottomIcon2,
@@ -3314,8 +3471,9 @@ import {
   JustifySpaceBetweenVerticalIcon as BetweenIcon2,
   JustifyTopIcon as JustifyTopIcon2
 } from "@elementor/icons";
-import { Stack as Stack13, withDirection as withDirection7 } from "@elementor/ui";
-import { __ as __25 } from "@wordpress/i18n";
+import { withDirection as withDirection7 } from "@elementor/ui";
+import { __ as __29 } from "@wordpress/i18n";
+var JUSTIFY_CONTENT_LABEL = __29("Justify content", "elementor");
 var StartIcon4 = withDirection7(JustifyTopIcon2);
 var EndIcon4 = withDirection7(JustifyBottomIcon2);
 var iconProps4 = {
@@ -3325,91 +3483,95 @@ var iconProps4 = {
 var options4 = [
   {
     value: "flex-start",
-    label: __25("Start", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React51.createElement(RotatedIcon, { icon: StartIcon4, size, ...iconProps4 }),
+    label: __29("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(RotatedIcon, { icon: StartIcon4, size, ...iconProps4 }),
     showTooltip: true
   },
   {
     value: "center",
-    label: __25("Center", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React51.createElement(RotatedIcon, { icon: CenterIcon4, size, ...iconProps4 }),
+    label: __29("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(RotatedIcon, { icon: CenterIcon4, size, ...iconProps4 }),
     showTooltip: true
   },
   {
     value: "flex-end",
-    label: __25("End", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React51.createElement(RotatedIcon, { icon: EndIcon4, size, ...iconProps4 }),
+    label: __29("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(RotatedIcon, { icon: EndIcon4, size, ...iconProps4 }),
     showTooltip: true
   },
   {
     value: "space-between",
-    label: __25("Space between", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React51.createElement(RotatedIcon, { icon: BetweenIcon2, size, ...iconProps4 }),
+    label: __29("Space between", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(RotatedIcon, { icon: BetweenIcon2, size, ...iconProps4 }),
     showTooltip: true
   },
   {
     value: "space-around",
-    label: __25("Space around", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React51.createElement(RotatedIcon, { icon: AroundIcon2, size, ...iconProps4 }),
+    label: __29("Space around", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(RotatedIcon, { icon: AroundIcon2, size, ...iconProps4 }),
     showTooltip: true
   },
   {
     value: "space-evenly",
-    label: __25("Space evenly", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React51.createElement(RotatedIcon, { icon: EvenlyIcon2, size, ...iconProps4 }),
+    label: __29("Space evenly", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(RotatedIcon, { icon: EvenlyIcon2, size, ...iconProps4 }),
     showTooltip: true
   }
 ];
-var JustifyContentField = () => {
-  return /* @__PURE__ */ React51.createElement(UiProviders, null, /* @__PURE__ */ React51.createElement(StylesField, { bind: "justify-content" }, /* @__PURE__ */ React51.createElement(Stack13, { gap: 0.75 }, /* @__PURE__ */ React51.createElement(ControlLabel, null, __25("Justify content", "elementor")), /* @__PURE__ */ React51.createElement(ToggleControl6, { options: options4, fullWidth: true }))));
-};
+var JustifyContentField = () => /* @__PURE__ */ React52.createElement(StylesField, { bind: "justify-content", propDisplayName: JUSTIFY_CONTENT_LABEL }, /* @__PURE__ */ React52.createElement(UiProviders, null, /* @__PURE__ */ React52.createElement(StylesFieldLayout, { label: JUSTIFY_CONTENT_LABEL, direction: "column" }, /* @__PURE__ */ React52.createElement(ToggleControl6, { options: options4, fullWidth: true }))));
 
 // src/components/style-sections/layout-section/wrap-field.tsx
-import * as React52 from "react";
+import * as React53 from "react";
 import { ToggleControl as ToggleControl7 } from "@elementor/editor-controls";
 import { ArrowBackIcon, ArrowForwardIcon, ArrowRightIcon as ArrowRightIcon2 } from "@elementor/icons";
-import { Grid as Grid9 } from "@elementor/ui";
-import { __ as __26 } from "@wordpress/i18n";
+import { __ as __30 } from "@wordpress/i18n";
+var FLEX_WRAP_LABEL = __30("Wrap", "elementor");
 var options5 = [
   {
     value: "nowrap",
-    label: __26("No wrap", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(ArrowRightIcon2, { fontSize: size }),
+    label: __30("No wrap", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React53.createElement(ArrowRightIcon2, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "wrap",
-    label: __26("Wrap", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(ArrowBackIcon, { fontSize: size }),
+    label: __30("Wrap", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React53.createElement(ArrowBackIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "wrap-reverse",
-    label: __26("Reversed wrap", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React52.createElement(ArrowForwardIcon, { fontSize: size }),
+    label: __30("Reversed wrap", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React53.createElement(ArrowForwardIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
 var WrapField = () => {
-  return /* @__PURE__ */ React52.createElement(UiProviders, null, /* @__PURE__ */ React52.createElement(StylesField, { bind: "flex-wrap" }, /* @__PURE__ */ React52.createElement(Grid9, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React52.createElement(Grid9, { item: true, xs: 6 }, /* @__PURE__ */ React52.createElement(ControlLabel, null, __26("Wrap", "elementor"))), /* @__PURE__ */ React52.createElement(Grid9, { item: true, xs: 6, sx: { display: "flex", justifyContent: "flex-end" } }, /* @__PURE__ */ React52.createElement(ToggleControl7, { options: options5 })))));
+  return /* @__PURE__ */ React53.createElement(StylesField, { bind: "flex-wrap", propDisplayName: FLEX_WRAP_LABEL }, /* @__PURE__ */ React53.createElement(UiProviders, null, /* @__PURE__ */ React53.createElement(StylesFieldLayout, { label: FLEX_WRAP_LABEL }, /* @__PURE__ */ React53.createElement(ToggleControl7, { options: options5 }))));
 };
 
 // src/components/style-sections/layout-section/layout-section.tsx
+var DISPLAY_LABEL2 = __31("Display", "elementor");
+var FLEX_WRAP_LABEL2 = __31("Flex wrap", "elementor");
 var LayoutSection = () => {
-  const { value: display } = useStylesField("display");
+  const { value: display } = useStylesField("display", {
+    history: { propDisplayName: DISPLAY_LABEL2 }
+  });
   const displayPlaceholder = useDisplayPlaceholderValue();
   const isDisplayFlex = shouldDisplayFlexFields(display, displayPlaceholder);
   const { element } = useElement();
   const parent = useParentElement(element.id);
   const parentStyle = useComputedStyle(parent?.id || null);
   const parentStyleDirection = parentStyle?.flexDirection ?? "row";
-  return /* @__PURE__ */ React53.createElement(SectionContent, null, /* @__PURE__ */ React53.createElement(DisplayField, null), isDisplayFlex && /* @__PURE__ */ React53.createElement(FlexFields, null), "flex" === parentStyle?.display && /* @__PURE__ */ React53.createElement(FlexChildFields, { parentStyleDirection }));
+  return /* @__PURE__ */ React54.createElement(SectionContent, null, /* @__PURE__ */ React54.createElement(DisplayField, null), isDisplayFlex && /* @__PURE__ */ React54.createElement(FlexFields, null), "flex" === parentStyle?.display && /* @__PURE__ */ React54.createElement(FlexChildFields, { parentStyleDirection }));
 };
 var FlexFields = () => {
-  const { value: flexWrap } = useStylesField("flex-wrap");
-  return /* @__PURE__ */ React53.createElement(React53.Fragment, null, /* @__PURE__ */ React53.createElement(FlexDirectionField, null), /* @__PURE__ */ React53.createElement(JustifyContentField, null), /* @__PURE__ */ React53.createElement(AlignItemsField, null), /* @__PURE__ */ React53.createElement(PanelDivider, null), /* @__PURE__ */ React53.createElement(GapControlField, null), /* @__PURE__ */ React53.createElement(WrapField, null), ["wrap", "wrap-reverse"].includes(flexWrap?.value) && /* @__PURE__ */ React53.createElement(AlignContentField, null));
+  const { value: flexWrap } = useStylesField("flex-wrap", {
+    history: { propDisplayName: FLEX_WRAP_LABEL2 }
+  });
+  return /* @__PURE__ */ React54.createElement(React54.Fragment, null, /* @__PURE__ */ React54.createElement(FlexDirectionField, null), /* @__PURE__ */ React54.createElement(JustifyContentField, null), /* @__PURE__ */ React54.createElement(AlignItemsField, null), /* @__PURE__ */ React54.createElement(PanelDivider, null), /* @__PURE__ */ React54.createElement(GapControlField, null), /* @__PURE__ */ React54.createElement(WrapField, null), ["wrap", "wrap-reverse"].includes(flexWrap?.value) && /* @__PURE__ */ React54.createElement(AlignContentField, null));
 };
-var FlexChildFields = ({ parentStyleDirection }) => /* @__PURE__ */ React53.createElement(React53.Fragment, null, /* @__PURE__ */ React53.createElement(PanelDivider, null), /* @__PURE__ */ React53.createElement(ControlFormLabel4, null, __27("Flex child", "elementor")), /* @__PURE__ */ React53.createElement(AlignSelfChild, { parentStyleDirection }), /* @__PURE__ */ React53.createElement(FlexOrderField, null), /* @__PURE__ */ React53.createElement(FlexSizeField, null));
+var FlexChildFields = ({ parentStyleDirection }) => /* @__PURE__ */ React54.createElement(React54.Fragment, null, /* @__PURE__ */ React54.createElement(PanelDivider, null), /* @__PURE__ */ React54.createElement(ControlFormLabel4, null, __31("Flex child", "elementor")), /* @__PURE__ */ React54.createElement(AlignSelfChild, { parentStyleDirection }), /* @__PURE__ */ React54.createElement(FlexOrderField, null), /* @__PURE__ */ React54.createElement(FlexSizeField, null));
 var shouldDisplayFlexFields = (display, local) => {
   const value = display?.value ?? local?.value;
   if (!value) {
@@ -3419,38 +3581,39 @@ var shouldDisplayFlexFields = (display, local) => {
 };
 
 // src/components/style-sections/position-section/position-section.tsx
-import * as React58 from "react";
-import { isExperimentActive as isExperimentActive8 } from "@elementor/editor-v1-adapters";
+import * as React59 from "react";
+import { isExperimentActive as isExperimentActive12 } from "@elementor/editor-v1-adapters";
 import { useSessionStorage } from "@elementor/session";
+import { __ as __36 } from "@wordpress/i18n";
 
 // src/components/style-sections/position-section/dimensions-field.tsx
-import * as React54 from "react";
+import * as React55 from "react";
 import { useRef as useRef7 } from "react";
 import { SizeControl as SizeControl4 } from "@elementor/editor-controls";
 import { SideBottomIcon as SideBottomIcon2, SideLeftIcon as SideLeftIcon2, SideRightIcon as SideRightIcon2, SideTopIcon as SideTopIcon2 } from "@elementor/icons";
-import { Grid as Grid10, Stack as Stack14, withDirection as withDirection8 } from "@elementor/ui";
-import { __ as __28 } from "@wordpress/i18n";
+import { Grid as Grid3, Stack as Stack11, withDirection as withDirection8 } from "@elementor/ui";
+import { __ as __32 } from "@wordpress/i18n";
 var InlineStartIcon2 = withDirection8(SideLeftIcon2);
 var InlineEndIcon2 = withDirection8(SideRightIcon2);
 var sideIcons = {
-  "inset-block-start": /* @__PURE__ */ React54.createElement(SideTopIcon2, { fontSize: "tiny" }),
-  "inset-block-end": /* @__PURE__ */ React54.createElement(SideBottomIcon2, { fontSize: "tiny" }),
-  "inset-inline-start": /* @__PURE__ */ React54.createElement(RotatedIcon, { icon: InlineStartIcon2, size: "tiny" }),
-  "inset-inline-end": /* @__PURE__ */ React54.createElement(RotatedIcon, { icon: InlineEndIcon2, size: "tiny" })
+  "inset-block-start": /* @__PURE__ */ React55.createElement(SideTopIcon2, { fontSize: "tiny" }),
+  "inset-block-end": /* @__PURE__ */ React55.createElement(SideBottomIcon2, { fontSize: "tiny" }),
+  "inset-inline-start": /* @__PURE__ */ React55.createElement(RotatedIcon, { icon: InlineStartIcon2, size: "tiny" }),
+  "inset-inline-end": /* @__PURE__ */ React55.createElement(RotatedIcon, { icon: InlineEndIcon2, size: "tiny" })
 };
-var getInlineStartLabel = (isSiteRtl) => isSiteRtl ? __28("Right", "elementor") : __28("Left", "elementor");
-var getInlineEndLabel = (isSiteRtl) => isSiteRtl ? __28("Left", "elementor") : __28("Right", "elementor");
+var getInlineStartLabel = (isSiteRtl) => isSiteRtl ? __32("Right", "elementor") : __32("Left", "elementor");
+var getInlineEndLabel = (isSiteRtl) => isSiteRtl ? __32("Left", "elementor") : __32("Right", "elementor");
 var DimensionsField = () => {
   const { isSiteRtl } = useDirection();
-  const rowRefs = [useRef7(), useRef7()];
-  return /* @__PURE__ */ React54.createElement(UiProviders, null, /* @__PURE__ */ React54.createElement(Stack14, { direction: "row", gap: 2, flexWrap: "nowrap", ref: rowRefs[0] }, /* @__PURE__ */ React54.createElement(DimensionField, { side: "inset-block-start", label: __28("Top", "elementor"), rowRef: rowRefs[0] }), /* @__PURE__ */ React54.createElement(
+  const rowRefs = [useRef7(null), useRef7(null)];
+  return /* @__PURE__ */ React55.createElement(UiProviders, null, /* @__PURE__ */ React55.createElement(Stack11, { direction: "row", gap: 2, flexWrap: "nowrap", ref: rowRefs[0] }, /* @__PURE__ */ React55.createElement(DimensionField, { side: "inset-block-start", label: __32("Top", "elementor"), rowRef: rowRefs[0] }), /* @__PURE__ */ React55.createElement(
     DimensionField,
     {
       side: "inset-inline-end",
       label: getInlineEndLabel(isSiteRtl),
       rowRef: rowRefs[0]
     }
-  )), /* @__PURE__ */ React54.createElement(Stack14, { direction: "row", gap: 2, flexWrap: "nowrap", ref: rowRefs[1] }, /* @__PURE__ */ React54.createElement(DimensionField, { side: "inset-block-end", label: __28("Bottom", "elementor"), rowRef: rowRefs[1] }), /* @__PURE__ */ React54.createElement(
+  )), /* @__PURE__ */ React55.createElement(Stack11, { direction: "row", gap: 2, flexWrap: "nowrap", ref: rowRefs[1] }, /* @__PURE__ */ React55.createElement(DimensionField, { side: "inset-block-end", label: __32("Bottom", "elementor"), rowRef: rowRefs[1] }), /* @__PURE__ */ React55.createElement(
     DimensionField,
     {
       side: "inset-inline-start",
@@ -3463,47 +3626,52 @@ var DimensionField = ({
   side,
   label,
   rowRef
-}) => /* @__PURE__ */ React54.createElement(StylesField, { bind: side }, /* @__PURE__ */ React54.createElement(Grid10, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React54.createElement(Grid10, { item: true, xs: 12 }, /* @__PURE__ */ React54.createElement(ControlLabel, null, label)), /* @__PURE__ */ React54.createElement(Grid10, { item: true, xs: 12 }, /* @__PURE__ */ React54.createElement(SizeControl4, { startIcon: sideIcons[side], extendedOptions: ["auto"], anchorRef: rowRef }))));
+}) => /* @__PURE__ */ React55.createElement(StylesField, { bind: side, propDisplayName: label }, /* @__PURE__ */ React55.createElement(Grid3, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React55.createElement(Grid3, { item: true, xs: 12 }, /* @__PURE__ */ React55.createElement(ControlLabel, null, label)), /* @__PURE__ */ React55.createElement(Grid3, { item: true, xs: 12 }, /* @__PURE__ */ React55.createElement(SizeControl4, { startIcon: sideIcons[side], extendedOptions: ["auto"], anchorRef: rowRef }))));
 
 // src/components/style-sections/position-section/offset-field.tsx
-import * as React55 from "react";
+import * as React56 from "react";
 import { useRef as useRef8 } from "react";
 import { SizeControl as SizeControl5 } from "@elementor/editor-controls";
-import { Grid as Grid11 } from "@elementor/ui";
-import { __ as __29 } from "@wordpress/i18n";
+import { __ as __33 } from "@wordpress/i18n";
+var OFFSET_LABEL = __33("Anchor offset", "elementor");
+var UNITS = ["px", "em", "rem", "vw", "vh"];
 var OffsetField = () => {
-  const rowRef = useRef8();
-  return /* @__PURE__ */ React55.createElement(StylesField, { bind: "scroll-margin-top" }, /* @__PURE__ */ React55.createElement(Grid11, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: rowRef }, /* @__PURE__ */ React55.createElement(Grid11, { item: true, xs: 6 }, /* @__PURE__ */ React55.createElement(ControlLabel, null, __29("Anchor offset", "elementor"))), /* @__PURE__ */ React55.createElement(Grid11, { item: true, xs: 6 }, /* @__PURE__ */ React55.createElement(SizeControl5, { units: ["px", "em", "rem", "vw", "vh"], anchorRef: rowRef }))));
+  const rowRef = useRef8(null);
+  return /* @__PURE__ */ React56.createElement(StylesField, { bind: "scroll-margin-top", propDisplayName: OFFSET_LABEL }, /* @__PURE__ */ React56.createElement(StylesFieldLayout, { label: OFFSET_LABEL, ref: rowRef }, /* @__PURE__ */ React56.createElement(SizeControl5, { units: UNITS, anchorRef: rowRef })));
 };
 
 // src/components/style-sections/position-section/position-field.tsx
-import * as React56 from "react";
+import * as React57 from "react";
 import { SelectControl as SelectControl3 } from "@elementor/editor-controls";
-import { Grid as Grid12 } from "@elementor/ui";
-import { __ as __30 } from "@wordpress/i18n";
+import { __ as __34 } from "@wordpress/i18n";
+var POSITION_LABEL = __34("Position", "elementor");
 var positionOptions = [
-  { label: __30("Static", "elementor"), value: "static" },
-  { label: __30("Relative", "elementor"), value: "relative" },
-  { label: __30("Absolute", "elementor"), value: "absolute" },
-  { label: __30("Fixed", "elementor"), value: "fixed" },
-  { label: __30("Sticky", "elementor"), value: "sticky" }
+  { label: __34("Static", "elementor"), value: "static" },
+  { label: __34("Relative", "elementor"), value: "relative" },
+  { label: __34("Absolute", "elementor"), value: "absolute" },
+  { label: __34("Fixed", "elementor"), value: "fixed" },
+  { label: __34("Sticky", "elementor"), value: "sticky" }
 ];
 var PositionField = ({ onChange }) => {
-  return /* @__PURE__ */ React56.createElement(StylesField, { bind: "position" }, /* @__PURE__ */ React56.createElement(Grid12, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React56.createElement(Grid12, { item: true, xs: 6 }, /* @__PURE__ */ React56.createElement(ControlLabel, null, __30("Position", "elementor"))), /* @__PURE__ */ React56.createElement(Grid12, { item: true, xs: 6, sx: { overflow: "hidden" } }, /* @__PURE__ */ React56.createElement(SelectControl3, { options: positionOptions, onChange }))));
+  return /* @__PURE__ */ React57.createElement(StylesField, { bind: "position", propDisplayName: POSITION_LABEL }, /* @__PURE__ */ React57.createElement(StylesFieldLayout, { label: POSITION_LABEL }, /* @__PURE__ */ React57.createElement(SelectControl3, { options: positionOptions, onChange })));
 };
 
 // src/components/style-sections/position-section/z-index-field.tsx
-import * as React57 from "react";
+import * as React58 from "react";
 import { NumberControl as NumberControl3 } from "@elementor/editor-controls";
-import { Grid as Grid13 } from "@elementor/ui";
-import { __ as __31 } from "@wordpress/i18n";
+import { __ as __35 } from "@wordpress/i18n";
+var Z_INDEX_LABEL = __35("Z-index", "elementor");
 var ZIndexField = () => {
-  return /* @__PURE__ */ React57.createElement(StylesField, { bind: "z-index" }, /* @__PURE__ */ React57.createElement(Grid13, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React57.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React57.createElement(ControlLabel, null, __31("Z-index", "elementor"))), /* @__PURE__ */ React57.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React57.createElement(NumberControl3, null))));
+  return /* @__PURE__ */ React58.createElement(StylesField, { bind: "z-index", propDisplayName: Z_INDEX_LABEL }, /* @__PURE__ */ React58.createElement(StylesFieldLayout, { label: Z_INDEX_LABEL }, /* @__PURE__ */ React58.createElement(NumberControl3, null)));
 };
 
 // src/components/style-sections/position-section/position-section.tsx
+var POSITION_LABEL2 = __36("Position", "elementor");
+var DIMENSIONS_LABEL = __36("Dimensions", "elementor");
 var PositionSection = () => {
-  const { value: positionValue } = useStylesField("position");
+  const { value: positionValue } = useStylesField("position", {
+    history: { propDisplayName: POSITION_LABEL2 }
+  });
   const { values: dimensions, setValues: setDimensions } = useStylesFields([
     "inset-block-start",
     "inset-block-end",
@@ -3511,27 +3679,31 @@ var PositionSection = () => {
     "inset-inline-end"
   ]);
   const [dimensionsValuesFromHistory, updateDimensionsHistory, clearDimensionsHistory] = usePersistDimensions();
-  const isCssIdFeatureActive = isExperimentActive8("e_v_3_30");
+  const isCssIdFeatureActive = isExperimentActive12("e_v_3_30");
   const onPositionChange = (newPosition, previousPosition) => {
+    const meta = { history: { propDisplayName: DIMENSIONS_LABEL } };
     if (newPosition === "static") {
       if (dimensions) {
         updateDimensionsHistory(dimensions);
-        setDimensions({
-          "inset-block-start": void 0,
-          "inset-block-end": void 0,
-          "inset-inline-start": void 0,
-          "inset-inline-end": void 0
-        });
+        setDimensions(
+          {
+            "inset-block-start": void 0,
+            "inset-block-end": void 0,
+            "inset-inline-start": void 0,
+            "inset-inline-end": void 0
+          },
+          meta
+        );
       }
     } else if (previousPosition === "static") {
       if (dimensionsValuesFromHistory) {
-        setDimensions(dimensionsValuesFromHistory);
+        setDimensions(dimensionsValuesFromHistory, meta);
         clearDimensionsHistory();
       }
     }
   };
   const isNotStatic = positionValue && positionValue?.value !== "static";
-  return /* @__PURE__ */ React58.createElement(SectionContent, null, /* @__PURE__ */ React58.createElement(PositionField, { onChange: onPositionChange }), isNotStatic ? /* @__PURE__ */ React58.createElement(React58.Fragment, null, /* @__PURE__ */ React58.createElement(DimensionsField, null), /* @__PURE__ */ React58.createElement(ZIndexField, null)) : null, isCssIdFeatureActive && /* @__PURE__ */ React58.createElement(React58.Fragment, null, /* @__PURE__ */ React58.createElement(PanelDivider, null), /* @__PURE__ */ React58.createElement(OffsetField, null)));
+  return /* @__PURE__ */ React59.createElement(SectionContent, null, /* @__PURE__ */ React59.createElement(PositionField, { onChange: onPositionChange }), isNotStatic ? /* @__PURE__ */ React59.createElement(React59.Fragment, null, /* @__PURE__ */ React59.createElement(DimensionsField, null), /* @__PURE__ */ React59.createElement(ZIndexField, null)) : null, isCssIdFeatureActive && /* @__PURE__ */ React59.createElement(React59.Fragment, null, /* @__PURE__ */ React59.createElement(PanelDivider, null), /* @__PURE__ */ React59.createElement(OffsetField, null)));
 };
 var usePersistDimensions = () => {
   const { id: styleDefID, meta } = useStyle();
@@ -3541,22 +3713,22 @@ var usePersistDimensions = () => {
 };
 
 // src/components/style-sections/size-section/size-section.tsx
-import * as React64 from "react";
+import * as React65 from "react";
 import { useRef as useRef9 } from "react";
 import { AspectRatioControl, SizeControl as SizeControl6 } from "@elementor/editor-controls";
-import { isExperimentActive as isExperimentActive10 } from "@elementor/editor-v1-adapters";
-import { Grid as Grid16, Stack as Stack16 } from "@elementor/ui";
-import { __ as __35 } from "@wordpress/i18n";
+import { isExperimentActive as isExperimentActive14 } from "@elementor/editor-v1-adapters";
+import { Grid as Grid4, Stack as Stack13 } from "@elementor/ui";
+import { __ as __41 } from "@wordpress/i18n";
 
 // src/components/style-tab-collapsible-content.tsx
-import * as React60 from "react";
-import { isExperimentActive as isExperimentActive9 } from "@elementor/editor-v1-adapters";
+import * as React61 from "react";
+import { isExperimentActive as isExperimentActive13 } from "@elementor/editor-v1-adapters";
 
 // src/styles-inheritance/components/styles-inheritance-section-indicators.tsx
-import * as React59 from "react";
-import { isElementsStylesProvider as isElementsStylesProvider3 } from "@elementor/editor-styles-repository";
-import { Stack as Stack15, Tooltip as Tooltip7 } from "@elementor/ui";
-import { __ as __32 } from "@wordpress/i18n";
+import * as React60 from "react";
+import { isElementsStylesProvider as isElementsStylesProvider4 } from "@elementor/editor-styles-repository";
+import { Stack as Stack12, Tooltip as Tooltip7 } from "@elementor/ui";
+import { __ as __37 } from "@wordpress/i18n";
 var StylesInheritanceSectionIndicators = ({ fields }) => {
   const { id, meta, provider } = useStyle();
   const snapshot = useStylesInheritanceSnapshot();
@@ -3567,17 +3739,17 @@ var StylesInheritanceSectionIndicators = ({ fields }) => {
   if (!hasValues && !hasOverrides) {
     return null;
   }
-  const hasValueLabel = __32("Has effective styles", "elementor");
-  const hasOverridesLabel = __32("Has overridden styles", "elementor");
-  return /* @__PURE__ */ React59.createElement(Tooltip7, { title: __32("Has styles", "elementor"), placement: "top" }, /* @__PURE__ */ React59.createElement(Stack15, { direction: "row", sx: { "& > *": { marginInlineStart: -0.25 } }, role: "list" }, hasValues && provider && /* @__PURE__ */ React59.createElement(
+  const hasValueLabel = __37("Has effective styles", "elementor");
+  const hasOverridesLabel = __37("Has overridden styles", "elementor");
+  return /* @__PURE__ */ React60.createElement(Tooltip7, { title: __37("Has styles", "elementor"), placement: "top" }, /* @__PURE__ */ React60.createElement(Stack12, { direction: "row", sx: { "& > *": { marginInlineStart: -0.25 } }, role: "list" }, hasValues && provider && /* @__PURE__ */ React60.createElement(
     StyleIndicator,
     {
       getColor: getStylesProviderThemeColor(provider.getKey()),
-      "data-variant": isElementsStylesProvider3(provider.getKey()) ? "local" : "global",
+      "data-variant": isElementsStylesProvider4(provider.getKey()) ? "local" : "global",
       role: "listitem",
       "aria-label": hasValueLabel
     }
-  ), hasOverrides && /* @__PURE__ */ React59.createElement(
+  ), hasOverrides && /* @__PURE__ */ React60.createElement(
     StyleIndicator,
     {
       isOverridden: true,
@@ -3617,67 +3789,69 @@ function getCurrentStyleFromChain(chain, styleId, meta) {
 
 // src/components/style-tab-collapsible-content.tsx
 var StyleTabCollapsibleContent = ({ fields = [], children }) => {
-  return /* @__PURE__ */ React60.createElement(CollapsibleContent, { titleEnd: getStylesInheritanceIndicators(fields) }, children);
+  return /* @__PURE__ */ React61.createElement(CollapsibleContent, { titleEnd: getStylesInheritanceIndicators(fields) }, children);
 };
 function getStylesInheritanceIndicators(fields) {
-  const isUsingFieldsIndicators = isExperimentActive9(EXPERIMENTAL_FEATURES.V_3_30);
+  const isUsingFieldsIndicators = isExperimentActive13(EXPERIMENTAL_FEATURES.V_3_30);
   if (fields.length === 0 || !isUsingFieldsIndicators) {
     return null;
   }
-  return (isOpen) => !isOpen ? /* @__PURE__ */ React60.createElement(StylesInheritanceSectionIndicators, { fields }) : null;
+  return (isOpen) => !isOpen ? /* @__PURE__ */ React61.createElement(StylesInheritanceSectionIndicators, { fields }) : null;
 }
 
 // src/components/style-sections/size-section/object-fit-field.tsx
-import * as React61 from "react";
+import * as React62 from "react";
 import { SelectControl as SelectControl4 } from "@elementor/editor-controls";
-import { Grid as Grid14 } from "@elementor/ui";
-import { __ as __33 } from "@wordpress/i18n";
+import { __ as __38 } from "@wordpress/i18n";
+var OBJECT_FIT_LABEL = __38("Object fit", "elementor");
 var positionOptions2 = [
-  { label: __33("Fill", "elementor"), value: "fill" },
-  { label: __33("Cover", "elementor"), value: "cover" },
-  { label: __33("Contain", "elementor"), value: "contain" },
-  { label: __33("None", "elementor"), value: "none" },
-  { label: __33("Scale down", "elementor"), value: "scale-down" }
+  { label: __38("Fill", "elementor"), value: "fill" },
+  { label: __38("Cover", "elementor"), value: "cover" },
+  { label: __38("Contain", "elementor"), value: "contain" },
+  { label: __38("None", "elementor"), value: "none" },
+  { label: __38("Scale down", "elementor"), value: "scale-down" }
 ];
 var ObjectFitField = () => {
-  return /* @__PURE__ */ React61.createElement(StylesField, { bind: "object-fit" }, /* @__PURE__ */ React61.createElement(Grid14, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React61.createElement(Grid14, { item: true, xs: 6 }, /* @__PURE__ */ React61.createElement(ControlLabel, null, __33("Object fit", "elementor"))), /* @__PURE__ */ React61.createElement(Grid14, { item: true, xs: 6, sx: { overflow: "hidden" } }, /* @__PURE__ */ React61.createElement(SelectControl4, { options: positionOptions2 }))));
+  return /* @__PURE__ */ React62.createElement(StylesField, { bind: "object-fit", propDisplayName: OBJECT_FIT_LABEL }, /* @__PURE__ */ React62.createElement(StylesFieldLayout, { label: OBJECT_FIT_LABEL }, /* @__PURE__ */ React62.createElement(SelectControl4, { options: positionOptions2 })));
 };
 
 // src/components/style-sections/size-section/object-position-field.tsx
-import * as React62 from "react";
+import * as React63 from "react";
 import { PositionControl } from "@elementor/editor-controls";
+import { __ as __39 } from "@wordpress/i18n";
+var OBJECT_POSITION_LABEL = __39("Object position", "elementor");
 var ObjectPositionField = () => {
-  return /* @__PURE__ */ React62.createElement(StylesField, { bind: "object-position" }, /* @__PURE__ */ React62.createElement(PositionControl, null));
+  return /* @__PURE__ */ React63.createElement(StylesField, { bind: "object-position", propDisplayName: OBJECT_POSITION_LABEL }, /* @__PURE__ */ React63.createElement(PositionControl, null));
 };
 
 // src/components/style-sections/size-section/overflow-field.tsx
-import * as React63 from "react";
+import * as React64 from "react";
 import { ToggleControl as ToggleControl8 } from "@elementor/editor-controls";
 import { EyeIcon, EyeOffIcon, LetterAIcon } from "@elementor/icons";
-import { Grid as Grid15 } from "@elementor/ui";
-import { __ as __34 } from "@wordpress/i18n";
+import { __ as __40 } from "@wordpress/i18n";
+var OVERFLOW_LABEL = __40("Overflow", "elementor");
 var options6 = [
   {
     value: "visible",
-    label: __34("Visible", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React63.createElement(EyeIcon, { fontSize: size }),
+    label: __40("Visible", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React64.createElement(EyeIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "hidden",
-    label: __34("Hidden", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React63.createElement(EyeOffIcon, { fontSize: size }),
+    label: __40("Hidden", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React64.createElement(EyeOffIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "auto",
-    label: __34("Auto", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React63.createElement(LetterAIcon, { fontSize: size }),
+    label: __40("Auto", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React64.createElement(LetterAIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
 var OverflowField = () => {
-  return /* @__PURE__ */ React63.createElement(StylesField, { bind: "overflow" }, /* @__PURE__ */ React63.createElement(Grid15, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React63.createElement(Grid15, { item: true, xs: 6 }, /* @__PURE__ */ React63.createElement(ControlLabel, null, __34("Overflow", "elementor"))), /* @__PURE__ */ React63.createElement(Grid15, { item: true, xs: 6, sx: { display: "flex", justifyContent: "flex-end" } }, /* @__PURE__ */ React63.createElement(ToggleControl8, { options: options6 }))));
+  return /* @__PURE__ */ React64.createElement(StylesField, { bind: "overflow", propDisplayName: OVERFLOW_LABEL }, /* @__PURE__ */ React64.createElement(StylesFieldLayout, { label: OVERFLOW_LABEL }, /* @__PURE__ */ React64.createElement(ToggleControl8, { options: options6 })));
 };
 
 // src/components/style-sections/size-section/size-section.tsx
@@ -3686,98 +3860,104 @@ var CssSizeProps = [
   [
     {
       bind: "width",
-      label: __35("Width", "elementor")
+      label: __41("Width", "elementor")
     },
     {
       bind: "height",
-      label: __35("Height", "elementor")
+      label: __41("Height", "elementor")
     }
   ],
   [
     {
       bind: "min-width",
-      label: __35("Min width", "elementor")
+      label: __41("Min width", "elementor")
     },
     {
       bind: "min-height",
-      label: __35("Min height", "elementor")
+      label: __41("Min height", "elementor")
     }
   ],
   [
     {
       bind: "max-width",
-      label: __35("Max width", "elementor")
+      label: __41("Max width", "elementor")
     },
     {
       bind: "max-height",
-      label: __35("Max height", "elementor")
+      label: __41("Max height", "elementor")
     }
   ]
 ];
+var ASPECT_RATIO_LABEL = __41("Aspect Ratio", "elementor");
+var OBJECT_FIT_LABEL2 = __41("Object fit", "elementor");
 var SizeSection = () => {
-  const { value: fitValue } = useStylesField("object-fit");
+  const { value: fitValue } = useStylesField("object-fit", {
+    history: { propDisplayName: OBJECT_FIT_LABEL2 }
+  });
   const isNotFill = fitValue && fitValue?.value !== "fill";
-  const gridRowRefs = [useRef9(), useRef9(), useRef9()];
-  const isVersion330Active = isExperimentActive10(EXPERIMENT_ID);
-  return /* @__PURE__ */ React64.createElement(SectionContent, null, CssSizeProps.map((row, rowIndex) => /* @__PURE__ */ React64.createElement(Grid16, { key: rowIndex, container: true, gap: 2, flexWrap: "nowrap", ref: gridRowRefs[rowIndex] }, row.map((props) => /* @__PURE__ */ React64.createElement(Grid16, { item: true, xs: 6, key: props.bind }, /* @__PURE__ */ React64.createElement(SizeField, { ...props, rowRef: gridRowRefs[rowIndex], extendedOptions: ["auto"] }))))), /* @__PURE__ */ React64.createElement(PanelDivider, null), /* @__PURE__ */ React64.createElement(Stack16, null, /* @__PURE__ */ React64.createElement(OverflowField, null)), isVersion330Active && /* @__PURE__ */ React64.createElement(StyleTabCollapsibleContent, { fields: ["aspect-ratio", "object-fit"] }, /* @__PURE__ */ React64.createElement(Stack16, { gap: 2 }, /* @__PURE__ */ React64.createElement(StylesField, { bind: "aspect-ratio" }, /* @__PURE__ */ React64.createElement(AspectRatioControl, { label: __35("Aspect Ratio", "elementor") })), /* @__PURE__ */ React64.createElement(PanelDivider, null), /* @__PURE__ */ React64.createElement(ObjectFitField, null), isNotFill && /* @__PURE__ */ React64.createElement(Grid16, { item: true, xs: 6 }, /* @__PURE__ */ React64.createElement(ObjectPositionField, null)))));
+  const gridRowRefs = [useRef9(null), useRef9(null), useRef9(null)];
+  const isVersion330Active = isExperimentActive14(EXPERIMENT_ID);
+  return /* @__PURE__ */ React65.createElement(SectionContent, null, CssSizeProps.map((row, rowIndex) => /* @__PURE__ */ React65.createElement(Grid4, { key: rowIndex, container: true, gap: 2, flexWrap: "nowrap", ref: gridRowRefs[rowIndex] }, row.map((props) => /* @__PURE__ */ React65.createElement(Grid4, { item: true, xs: 6, key: props.bind }, /* @__PURE__ */ React65.createElement(SizeField, { ...props, rowRef: gridRowRefs[rowIndex], extendedOptions: ["auto"] }))))), /* @__PURE__ */ React65.createElement(PanelDivider, null), /* @__PURE__ */ React65.createElement(Stack13, null, /* @__PURE__ */ React65.createElement(OverflowField, null)), isVersion330Active && /* @__PURE__ */ React65.createElement(StyleTabCollapsibleContent, { fields: ["aspect-ratio", "object-fit"] }, /* @__PURE__ */ React65.createElement(Stack13, { gap: 2, pt: 2 }, /* @__PURE__ */ React65.createElement(StylesField, { bind: "aspect-ratio", propDisplayName: ASPECT_RATIO_LABEL }, /* @__PURE__ */ React65.createElement(AspectRatioControl, { label: ASPECT_RATIO_LABEL })), /* @__PURE__ */ React65.createElement(PanelDivider, null), /* @__PURE__ */ React65.createElement(ObjectFitField, null), isNotFill && /* @__PURE__ */ React65.createElement(Grid4, { item: true, xs: 6 }, /* @__PURE__ */ React65.createElement(ObjectPositionField, null)))));
 };
 var SizeField = ({ label, bind, rowRef, extendedOptions }) => {
-  return /* @__PURE__ */ React64.createElement(StylesField, { bind }, /* @__PURE__ */ React64.createElement(Grid16, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React64.createElement(Grid16, { item: true, xs: 12 }, /* @__PURE__ */ React64.createElement(ControlLabel, null, label)), /* @__PURE__ */ React64.createElement(Grid16, { item: true, xs: 12 }, /* @__PURE__ */ React64.createElement(SizeControl6, { extendedOptions, anchorRef: rowRef }))));
+  return /* @__PURE__ */ React65.createElement(StylesField, { bind, propDisplayName: label }, /* @__PURE__ */ React65.createElement(Grid4, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React65.createElement(Grid4, { item: true, xs: 12 }, /* @__PURE__ */ React65.createElement(ControlLabel, null, label)), /* @__PURE__ */ React65.createElement(Grid4, { item: true, xs: 12 }, /* @__PURE__ */ React65.createElement(SizeControl6, { extendedOptions, anchorRef: rowRef }))));
 };
 
 // src/components/style-sections/spacing-section/spacing-section.tsx
-import * as React65 from "react";
+import * as React66 from "react";
 import { LinkedDimensionsControl } from "@elementor/editor-controls";
-import { __ as __36 } from "@wordpress/i18n";
+import { __ as __42 } from "@wordpress/i18n";
+var MARGIN_LABEL = __42("Margin", "elementor");
+var PADDING_LABEL = __42("Padding", "elementor");
 var SpacingSection = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React65.createElement(SectionContent, null, /* @__PURE__ */ React65.createElement(StylesField, { bind: "margin" }, /* @__PURE__ */ React65.createElement(
+  return /* @__PURE__ */ React66.createElement(SectionContent, null, /* @__PURE__ */ React66.createElement(StylesField, { bind: "margin", propDisplayName: MARGIN_LABEL }, /* @__PURE__ */ React66.createElement(
     LinkedDimensionsControl,
     {
-      label: __36("Margin", "elementor"),
+      label: MARGIN_LABEL,
       isSiteRtl,
       extendedOptions: ["auto"]
     }
-  )), /* @__PURE__ */ React65.createElement(PanelDivider, null), /* @__PURE__ */ React65.createElement(StylesField, { bind: "padding" }, /* @__PURE__ */ React65.createElement(LinkedDimensionsControl, { label: __36("Padding", "elementor"), isSiteRtl })));
+  )), /* @__PURE__ */ React66.createElement(PanelDivider, null), /* @__PURE__ */ React66.createElement(StylesField, { bind: "padding", propDisplayName: PADDING_LABEL }, /* @__PURE__ */ React66.createElement(LinkedDimensionsControl, { label: PADDING_LABEL, isSiteRtl })));
 };
 
 // src/components/style-sections/typography-section/typography-section.tsx
-import * as React81 from "react";
-import { isExperimentActive as isExperimentActive11 } from "@elementor/editor-v1-adapters";
+import * as React82 from "react";
+import { isExperimentActive as isExperimentActive15 } from "@elementor/editor-v1-adapters";
+import { __ as __59 } from "@wordpress/i18n";
 
 // src/components/style-sections/typography-section/column-count-field.tsx
-import * as React66 from "react";
+import * as React67 from "react";
 import { NumberControl as NumberControl4 } from "@elementor/editor-controls";
-import { Grid as Grid17 } from "@elementor/ui";
-import { __ as __37 } from "@wordpress/i18n";
+import { __ as __43 } from "@wordpress/i18n";
+var COLUMN_COUNT_LABEL = __43("Columns", "elementor");
 var ColumnCountField = () => {
-  return /* @__PURE__ */ React66.createElement(StylesField, { bind: "column-count" }, /* @__PURE__ */ React66.createElement(Grid17, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React66.createElement(Grid17, { item: true, xs: 6 }, /* @__PURE__ */ React66.createElement(ControlLabel, null, __37("Columns", "elementor"))), /* @__PURE__ */ React66.createElement(Grid17, { item: true, xs: 6 }, /* @__PURE__ */ React66.createElement(NumberControl4, { shouldForceInt: true, min: 0, step: 1 }))));
+  return /* @__PURE__ */ React67.createElement(StylesField, { bind: "column-count", propDisplayName: COLUMN_COUNT_LABEL }, /* @__PURE__ */ React67.createElement(StylesFieldLayout, { label: COLUMN_COUNT_LABEL }, /* @__PURE__ */ React67.createElement(NumberControl4, { shouldForceInt: true, min: 0, step: 1 })));
 };
 
 // src/components/style-sections/typography-section/column-gap-field.tsx
-import * as React67 from "react";
+import * as React68 from "react";
 import { useRef as useRef10 } from "react";
 import { SizeControl as SizeControl7 } from "@elementor/editor-controls";
-import { Grid as Grid18 } from "@elementor/ui";
-import { __ as __38 } from "@wordpress/i18n";
+import { __ as __44 } from "@wordpress/i18n";
+var COLUMN_GAP_LABEL = __44("Column gap", "elementor");
 var ColumnGapField = () => {
-  const rowRef = useRef10();
-  return /* @__PURE__ */ React67.createElement(StylesField, { bind: "column-gap" }, /* @__PURE__ */ React67.createElement(Grid18, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: rowRef }, /* @__PURE__ */ React67.createElement(Grid18, { item: true, xs: 6 }, /* @__PURE__ */ React67.createElement(ControlLabel, null, __38("Column gap", "elementor"))), /* @__PURE__ */ React67.createElement(Grid18, { item: true, xs: 6 }, /* @__PURE__ */ React67.createElement(SizeControl7, { anchorRef: rowRef }))));
+  const rowRef = useRef10(null);
+  return /* @__PURE__ */ React68.createElement(StylesField, { bind: "column-gap", propDisplayName: COLUMN_GAP_LABEL }, /* @__PURE__ */ React68.createElement(StylesFieldLayout, { label: COLUMN_GAP_LABEL, ref: rowRef }, /* @__PURE__ */ React68.createElement(SizeControl7, { anchorRef: rowRef })));
 };
 
 // src/components/style-sections/typography-section/font-family-field.tsx
-import * as React68 from "react";
+import * as React69 from "react";
 import { FontFamilyControl } from "@elementor/editor-controls";
-import { Grid as Grid19 } from "@elementor/ui";
-import { __ as __40 } from "@wordpress/i18n";
+import { __ as __46 } from "@wordpress/i18n";
 
 // src/components/style-sections/typography-section/hooks/use-font-families.ts
-import { useMemo as useMemo6 } from "react";
-import { __ as __39 } from "@wordpress/i18n";
+import { useMemo as useMemo7 } from "react";
+import { __ as __45 } from "@wordpress/i18n";
 var supportedCategories = {
-  system: __39("System", "elementor"),
-  custom: __39("Custom Fonts", "elementor"),
-  googlefonts: __39("Google Fonts", "elementor")
+  system: __45("System", "elementor"),
+  custom: __45("Custom Fonts", "elementor"),
+  googlefonts: __45("Google Fonts", "elementor")
 };
 var getFontFamilies = () => {
   const { controls } = getElementorConfig();
@@ -3789,7 +3969,7 @@ var getFontFamilies = () => {
 };
 var useFontFamilies = () => {
   const fontFamilies = getFontFamilies();
-  return useMemo6(() => {
+  return useMemo7(() => {
     const categoriesOrder = ["system", "custom", "googlefonts"];
     return Object.entries(fontFamilies || {}).reduce((acc, [font, category]) => {
       if (!supportedCategories[category]) {
@@ -3809,199 +3989,204 @@ var useFontFamilies = () => {
 };
 
 // src/components/style-sections/typography-section/font-family-field.tsx
+var FONT_FAMILY_LABEL = __46("Font family", "elementor");
 var FontFamilyField = () => {
   const fontFamilies = useFontFamilies();
+  const sectionWidth = useSectionWidth();
   if (fontFamilies.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ React68.createElement(StylesField, { bind: "font-family" }, /* @__PURE__ */ React68.createElement(Grid19, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React68.createElement(Grid19, { item: true, xs: 6 }, /* @__PURE__ */ React68.createElement(ControlLabel, null, __40("Font family", "elementor"))), /* @__PURE__ */ React68.createElement(Grid19, { item: true, xs: 6, sx: { minWidth: 0 } }, /* @__PURE__ */ React68.createElement(FontFamilyControl, { fontFamilies }))));
+  return /* @__PURE__ */ React69.createElement(StylesField, { bind: "font-family", propDisplayName: FONT_FAMILY_LABEL }, /* @__PURE__ */ React69.createElement(StylesFieldLayout, { label: FONT_FAMILY_LABEL }, /* @__PURE__ */ React69.createElement(FontFamilyControl, { fontFamilies, sectionWidth })));
 };
 
 // src/components/style-sections/typography-section/font-size-field.tsx
-import * as React69 from "react";
+import * as React70 from "react";
 import { useRef as useRef11 } from "react";
 import { SizeControl as SizeControl8 } from "@elementor/editor-controls";
-import { Grid as Grid20 } from "@elementor/ui";
-import { __ as __41 } from "@wordpress/i18n";
+import { __ as __47 } from "@wordpress/i18n";
+var FONT_SIZE_LABEL = __47("Font size", "elementor");
 var FontSizeField = () => {
-  const rowRef = useRef11();
-  return /* @__PURE__ */ React69.createElement(StylesField, { bind: "font-size" }, /* @__PURE__ */ React69.createElement(Grid20, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: rowRef }, /* @__PURE__ */ React69.createElement(Grid20, { item: true, xs: 6 }, /* @__PURE__ */ React69.createElement(ControlLabel, null, __41("Font size", "elementor"))), /* @__PURE__ */ React69.createElement(Grid20, { item: true, xs: 6 }, /* @__PURE__ */ React69.createElement(SizeControl8, { anchorRef: rowRef }))));
+  const rowRef = useRef11(null);
+  return /* @__PURE__ */ React70.createElement(StylesField, { bind: "font-size", propDisplayName: FONT_SIZE_LABEL }, /* @__PURE__ */ React70.createElement(StylesFieldLayout, { label: FONT_SIZE_LABEL, ref: rowRef }, /* @__PURE__ */ React70.createElement(SizeControl8, { anchorRef: rowRef })));
 };
 
 // src/components/style-sections/typography-section/font-style-field.tsx
-import * as React70 from "react";
-import { ControlFormLabel as ControlFormLabel5, ToggleControl as ToggleControl9 } from "@elementor/editor-controls";
+import * as React71 from "react";
+import { ToggleControl as ToggleControl9 } from "@elementor/editor-controls";
 import { ItalicIcon, MinusIcon as MinusIcon2 } from "@elementor/icons";
-import { Grid as Grid21 } from "@elementor/ui";
-import { __ as __42 } from "@wordpress/i18n";
+import { __ as __48 } from "@wordpress/i18n";
+var FONT_STYLE_LABEL = __48("Font style", "elementor");
 var options7 = [
   {
     value: "normal",
-    label: __42("Normal", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React70.createElement(MinusIcon2, { fontSize: size }),
+    label: __48("Normal", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React71.createElement(MinusIcon2, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "italic",
-    label: __42("Italic", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React70.createElement(ItalicIcon, { fontSize: size }),
+    label: __48("Italic", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React71.createElement(ItalicIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
-var FontStyleField = () => /* @__PURE__ */ React70.createElement(StylesField, { bind: "font-style" }, /* @__PURE__ */ React70.createElement(Grid21, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React70.createElement(Grid21, { item: true, xs: 6 }, /* @__PURE__ */ React70.createElement(ControlFormLabel5, null, __42("Font style", "elementor"))), /* @__PURE__ */ React70.createElement(Grid21, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React70.createElement(ToggleControl9, { options: options7 }))));
+var FontStyleField = () => {
+  return /* @__PURE__ */ React71.createElement(StylesField, { bind: "font-style", propDisplayName: FONT_STYLE_LABEL }, /* @__PURE__ */ React71.createElement(StylesFieldLayout, { label: FONT_STYLE_LABEL }, /* @__PURE__ */ React71.createElement(ToggleControl9, { options: options7 })));
+};
 
 // src/components/style-sections/typography-section/font-weight-field.tsx
-import * as React71 from "react";
+import * as React72 from "react";
 import { SelectControl as SelectControl5 } from "@elementor/editor-controls";
-import { Grid as Grid22 } from "@elementor/ui";
-import { __ as __43 } from "@wordpress/i18n";
+import { __ as __49 } from "@wordpress/i18n";
+var FONT_WEIGHT_LABEL = __49("Font weight", "elementor");
 var fontWeightOptions = [
-  { value: "100", label: __43("100 - Thin", "elementor") },
-  { value: "200", label: __43("200 - Extra light", "elementor") },
-  { value: "300", label: __43("300 - Light", "elementor") },
-  { value: "400", label: __43("400 - Normal", "elementor") },
-  { value: "500", label: __43("500 - Medium", "elementor") },
-  { value: "600", label: __43("600 - Semi bold", "elementor") },
-  { value: "700", label: __43("700 - Bold", "elementor") },
-  { value: "800", label: __43("800 - Extra bold", "elementor") },
-  { value: "900", label: __43("900 - Black", "elementor") }
+  { value: "100", label: __49("100 - Thin", "elementor") },
+  { value: "200", label: __49("200 - Extra light", "elementor") },
+  { value: "300", label: __49("300 - Light", "elementor") },
+  { value: "400", label: __49("400 - Normal", "elementor") },
+  { value: "500", label: __49("500 - Medium", "elementor") },
+  { value: "600", label: __49("600 - Semi bold", "elementor") },
+  { value: "700", label: __49("700 - Bold", "elementor") },
+  { value: "800", label: __49("800 - Extra bold", "elementor") },
+  { value: "900", label: __49("900 - Black", "elementor") }
 ];
 var FontWeightField = () => {
-  return /* @__PURE__ */ React71.createElement(StylesField, { bind: "font-weight" }, /* @__PURE__ */ React71.createElement(Grid22, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React71.createElement(Grid22, { item: true, xs: 6 }, /* @__PURE__ */ React71.createElement(ControlLabel, null, __43("Font weight", "elementor"))), /* @__PURE__ */ React71.createElement(Grid22, { item: true, xs: 6, sx: { overflow: "hidden" } }, /* @__PURE__ */ React71.createElement(SelectControl5, { options: fontWeightOptions }))));
+  return /* @__PURE__ */ React72.createElement(StylesField, { bind: "font-weight", propDisplayName: FONT_WEIGHT_LABEL }, /* @__PURE__ */ React72.createElement(StylesFieldLayout, { label: FONT_WEIGHT_LABEL }, /* @__PURE__ */ React72.createElement(SelectControl5, { options: fontWeightOptions })));
 };
 
 // src/components/style-sections/typography-section/letter-spacing-field.tsx
-import * as React72 from "react";
+import * as React73 from "react";
 import { useRef as useRef12 } from "react";
 import { SizeControl as SizeControl9 } from "@elementor/editor-controls";
-import { Grid as Grid23 } from "@elementor/ui";
-import { __ as __44 } from "@wordpress/i18n";
+import { __ as __50 } from "@wordpress/i18n";
+var LETTER_SPACING_LABEL = __50("Letter spacing", "elementor");
 var LetterSpacingField = () => {
-  const rowRef = useRef12();
-  return /* @__PURE__ */ React72.createElement(StylesField, { bind: "letter-spacing" }, /* @__PURE__ */ React72.createElement(Grid23, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: rowRef }, /* @__PURE__ */ React72.createElement(Grid23, { item: true, xs: 6 }, /* @__PURE__ */ React72.createElement(ControlLabel, null, __44("Letter spacing", "elementor"))), /* @__PURE__ */ React72.createElement(Grid23, { item: true, xs: 6 }, /* @__PURE__ */ React72.createElement(SizeControl9, { anchorRef: rowRef }))));
+  const rowRef = useRef12(null);
+  return /* @__PURE__ */ React73.createElement(StylesField, { bind: "letter-spacing", propDisplayName: LETTER_SPACING_LABEL }, /* @__PURE__ */ React73.createElement(StylesFieldLayout, { label: LETTER_SPACING_LABEL, ref: rowRef }, /* @__PURE__ */ React73.createElement(SizeControl9, { anchorRef: rowRef })));
 };
 
 // src/components/style-sections/typography-section/line-height-field.tsx
-import * as React73 from "react";
+import * as React74 from "react";
 import { useRef as useRef13 } from "react";
 import { SizeControl as SizeControl10 } from "@elementor/editor-controls";
-import { Grid as Grid24 } from "@elementor/ui";
-import { __ as __45 } from "@wordpress/i18n";
+import { __ as __51 } from "@wordpress/i18n";
+var LINE_HEIGHT_LABEL = __51("Line height", "elementor");
 var LineHeightField = () => {
-  const rowRef = useRef13();
-  return /* @__PURE__ */ React73.createElement(StylesField, { bind: "line-height" }, /* @__PURE__ */ React73.createElement(Grid24, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: rowRef }, /* @__PURE__ */ React73.createElement(Grid24, { item: true, xs: 6 }, /* @__PURE__ */ React73.createElement(ControlLabel, null, __45("Line height", "elementor"))), /* @__PURE__ */ React73.createElement(Grid24, { item: true, xs: 6 }, /* @__PURE__ */ React73.createElement(SizeControl10, { anchorRef: rowRef }))));
+  const rowRef = useRef13(null);
+  return /* @__PURE__ */ React74.createElement(StylesField, { bind: "line-height", propDisplayName: LINE_HEIGHT_LABEL }, /* @__PURE__ */ React74.createElement(StylesFieldLayout, { label: LINE_HEIGHT_LABEL, ref: rowRef }, /* @__PURE__ */ React74.createElement(SizeControl10, { anchorRef: rowRef })));
 };
 
 // src/components/style-sections/typography-section/text-alignment-field.tsx
-import * as React74 from "react";
+import * as React75 from "react";
 import { ToggleControl as ToggleControl10 } from "@elementor/editor-controls";
 import { AlignCenterIcon, AlignJustifiedIcon, AlignLeftIcon, AlignRightIcon } from "@elementor/icons";
-import { Grid as Grid25, withDirection as withDirection9 } from "@elementor/ui";
-import { __ as __46 } from "@wordpress/i18n";
+import { withDirection as withDirection9 } from "@elementor/ui";
+import { __ as __52 } from "@wordpress/i18n";
+var TEXT_ALIGNMENT_LABEL = __52("Text align", "elementor");
 var AlignStartIcon = withDirection9(AlignLeftIcon);
 var AlignEndIcon = withDirection9(AlignRightIcon);
 var options8 = [
   {
     value: "start",
-    label: __46("Start", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React74.createElement(AlignStartIcon, { fontSize: size }),
+    label: __52("Start", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React75.createElement(AlignStartIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "center",
-    label: __46("Center", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React74.createElement(AlignCenterIcon, { fontSize: size }),
+    label: __52("Center", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React75.createElement(AlignCenterIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "end",
-    label: __46("End", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React74.createElement(AlignEndIcon, { fontSize: size }),
+    label: __52("End", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React75.createElement(AlignEndIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "justify",
-    label: __46("Justify", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React74.createElement(AlignJustifiedIcon, { fontSize: size }),
+    label: __52("Justify", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React75.createElement(AlignJustifiedIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
 var TextAlignmentField = () => {
-  return /* @__PURE__ */ React74.createElement(UiProviders, null, /* @__PURE__ */ React74.createElement(StylesField, { bind: "text-align" }, /* @__PURE__ */ React74.createElement(Grid25, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React74.createElement(Grid25, { item: true, xs: 6 }, /* @__PURE__ */ React74.createElement(ControlLabel, null, __46("Text align", "elementor"))), /* @__PURE__ */ React74.createElement(Grid25, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React74.createElement(ToggleControl10, { options: options8 })))));
+  return /* @__PURE__ */ React75.createElement(StylesField, { bind: "text-align", propDisplayName: TEXT_ALIGNMENT_LABEL }, /* @__PURE__ */ React75.createElement(UiProviders, null, /* @__PURE__ */ React75.createElement(StylesFieldLayout, { label: TEXT_ALIGNMENT_LABEL }, /* @__PURE__ */ React75.createElement(ToggleControl10, { options: options8 }))));
 };
 
 // src/components/style-sections/typography-section/text-color-field.tsx
-import * as React75 from "react";
+import * as React76 from "react";
 import { ColorControl as ColorControl2 } from "@elementor/editor-controls";
-import { Grid as Grid26 } from "@elementor/ui";
-import { __ as __47 } from "@wordpress/i18n";
+import { __ as __53 } from "@wordpress/i18n";
+var TEXT_COLOR_LABEL = __53("Text color", "elementor");
 var TextColorField = () => {
-  return /* @__PURE__ */ React75.createElement(StylesField, { bind: "color" }, /* @__PURE__ */ React75.createElement(Grid26, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React75.createElement(Grid26, { item: true, xs: 6 }, /* @__PURE__ */ React75.createElement(ControlLabel, null, __47("Text color", "elementor"))), /* @__PURE__ */ React75.createElement(Grid26, { item: true, xs: 6 }, /* @__PURE__ */ React75.createElement(ColorControl2, null))));
+  return /* @__PURE__ */ React76.createElement(StylesField, { bind: "color", propDisplayName: TEXT_COLOR_LABEL }, /* @__PURE__ */ React76.createElement(StylesFieldLayout, { label: TEXT_COLOR_LABEL }, /* @__PURE__ */ React76.createElement(ColorControl2, null)));
 };
 
 // src/components/style-sections/typography-section/text-decoration-field.tsx
-import * as React76 from "react";
+import * as React77 from "react";
 import { ToggleControl as ToggleControl11 } from "@elementor/editor-controls";
 import { MinusIcon as MinusIcon3, OverlineIcon, StrikethroughIcon, UnderlineIcon } from "@elementor/icons";
-import { Grid as Grid27 } from "@elementor/ui";
-import { __ as __48 } from "@wordpress/i18n";
+import { __ as __54 } from "@wordpress/i18n";
+var TEXT_DECORATION_LABEL = __54("Line decoration", "elementor");
 var options9 = [
   {
     value: "none",
-    label: __48("None", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React76.createElement(MinusIcon3, { fontSize: size }),
+    label: __54("None", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React77.createElement(MinusIcon3, { fontSize: size }),
     showTooltip: true,
     exclusive: true
   },
   {
     value: "underline",
-    label: __48("Underline", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React76.createElement(UnderlineIcon, { fontSize: size }),
+    label: __54("Underline", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React77.createElement(UnderlineIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "line-through",
-    label: __48("Line-through", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React76.createElement(StrikethroughIcon, { fontSize: size }),
+    label: __54("Line-through", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React77.createElement(StrikethroughIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "overline",
-    label: __48("Overline", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React76.createElement(OverlineIcon, { fontSize: size }),
+    label: __54("Overline", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React77.createElement(OverlineIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
-var TextDecorationField = () => /* @__PURE__ */ React76.createElement(StylesField, { bind: "text-decoration" }, /* @__PURE__ */ React76.createElement(Grid27, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React76.createElement(Grid27, { item: true, xs: 6 }, /* @__PURE__ */ React76.createElement(ControlLabel, null, __48("Line decoration", "elementor"))), /* @__PURE__ */ React76.createElement(Grid27, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React76.createElement(ToggleControl11, { options: options9, exclusive: false }))));
+var TextDecorationField = () => /* @__PURE__ */ React77.createElement(StylesField, { bind: "text-decoration", propDisplayName: TEXT_DECORATION_LABEL }, /* @__PURE__ */ React77.createElement(StylesFieldLayout, { label: TEXT_DECORATION_LABEL }, /* @__PURE__ */ React77.createElement(ToggleControl11, { options: options9, exclusive: false })));
 
 // src/components/style-sections/typography-section/text-direction-field.tsx
-import * as React77 from "react";
+import * as React78 from "react";
 import { ToggleControl as ToggleControl12 } from "@elementor/editor-controls";
 import { TextDirectionLtrIcon, TextDirectionRtlIcon } from "@elementor/icons";
-import { Grid as Grid28 } from "@elementor/ui";
-import { __ as __49 } from "@wordpress/i18n";
+import { __ as __55 } from "@wordpress/i18n";
+var TEXT_DIRECTION_LABEL = __55("Direction", "elementor");
 var options10 = [
   {
     value: "ltr",
-    label: __49("Left to right", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React77.createElement(TextDirectionLtrIcon, { fontSize: size }),
+    label: __55("Left to right", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React78.createElement(TextDirectionLtrIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "rtl",
-    label: __49("Right to left", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React77.createElement(TextDirectionRtlIcon, { fontSize: size }),
+    label: __55("Right to left", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React78.createElement(TextDirectionRtlIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
 var TextDirectionField = () => {
-  return /* @__PURE__ */ React77.createElement(StylesField, { bind: "direction" }, /* @__PURE__ */ React77.createElement(Grid28, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React77.createElement(Grid28, { item: true, xs: 6 }, /* @__PURE__ */ React77.createElement(ControlLabel, null, __49("Direction", "elementor"))), /* @__PURE__ */ React77.createElement(Grid28, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React77.createElement(ToggleControl12, { options: options10 }))));
+  return /* @__PURE__ */ React78.createElement(StylesField, { bind: "direction", propDisplayName: TEXT_DIRECTION_LABEL }, /* @__PURE__ */ React78.createElement(StylesFieldLayout, { label: TEXT_DIRECTION_LABEL }, /* @__PURE__ */ React78.createElement(ToggleControl12, { options: options10 })));
 };
 
 // src/components/style-sections/typography-section/text-stroke-field.tsx
-import * as React78 from "react";
+import * as React79 from "react";
 import { StrokeControl } from "@elementor/editor-controls";
-import { __ as __50 } from "@wordpress/i18n";
+import { __ as __56 } from "@wordpress/i18n";
 var initTextStroke = {
   $$type: "stroke",
   value: {
@@ -4018,8 +4203,11 @@ var initTextStroke = {
     }
   }
 };
+var TEXT_STROKE_LABEL = __56("Text stroke", "elementor");
 var TextStrokeField = () => {
-  const { value, setValue, canEdit } = useStylesField("stroke");
+  const { value, setValue, canEdit } = useStylesField("stroke", {
+    history: { propDisplayName: TEXT_STROKE_LABEL }
+  });
   const addTextStroke = () => {
     setValue(initTextStroke);
   };
@@ -4027,70 +4215,73 @@ var TextStrokeField = () => {
     setValue(null);
   };
   const hasTextStroke = Boolean(value);
-  return /* @__PURE__ */ React78.createElement(StylesField, { bind: "stroke" }, /* @__PURE__ */ React78.createElement(
+  return /* @__PURE__ */ React79.createElement(StylesField, { bind: "stroke", propDisplayName: TEXT_STROKE_LABEL }, /* @__PURE__ */ React79.createElement(
     AddOrRemoveContent,
     {
       isAdded: hasTextStroke,
       onAdd: addTextStroke,
       onRemove: removeTextStroke,
       disabled: !canEdit,
-      renderLabel: () => /* @__PURE__ */ React78.createElement(ControlLabel, null, __50("Text stroke", "elementor"))
+      renderLabel: () => /* @__PURE__ */ React79.createElement(ControlLabel, null, TEXT_STROKE_LABEL)
     },
-    /* @__PURE__ */ React78.createElement(StrokeControl, null)
+    /* @__PURE__ */ React79.createElement(StrokeControl, null)
   ));
 };
 
 // src/components/style-sections/typography-section/transform-field.tsx
-import * as React79 from "react";
+import * as React80 from "react";
 import { ToggleControl as ToggleControl13 } from "@elementor/editor-controls";
 import { LetterCaseIcon, LetterCaseLowerIcon, LetterCaseUpperIcon, MinusIcon as MinusIcon4 } from "@elementor/icons";
-import { Grid as Grid29 } from "@elementor/ui";
-import { __ as __51 } from "@wordpress/i18n";
+import { __ as __57 } from "@wordpress/i18n";
+var TEXT_TRANSFORM_LABEL = __57("Text transform", "elementor");
 var options11 = [
   {
     value: "none",
-    label: __51("None", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React79.createElement(MinusIcon4, { fontSize: size }),
+    label: __57("None", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React80.createElement(MinusIcon4, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "capitalize",
-    label: __51("Capitalize", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React79.createElement(LetterCaseIcon, { fontSize: size }),
+    label: __57("Capitalize", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React80.createElement(LetterCaseIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "uppercase",
-    label: __51("Uppercase", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React79.createElement(LetterCaseUpperIcon, { fontSize: size }),
+    label: __57("Uppercase", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React80.createElement(LetterCaseUpperIcon, { fontSize: size }),
     showTooltip: true
   },
   {
     value: "lowercase",
-    label: __51("Lowercase", "elementor"),
-    renderContent: ({ size }) => /* @__PURE__ */ React79.createElement(LetterCaseLowerIcon, { fontSize: size }),
+    label: __57("Lowercase", "elementor"),
+    renderContent: ({ size }) => /* @__PURE__ */ React80.createElement(LetterCaseLowerIcon, { fontSize: size }),
     showTooltip: true
   }
 ];
-var TransformField = () => /* @__PURE__ */ React79.createElement(StylesField, { bind: "text-transform" }, /* @__PURE__ */ React79.createElement(Grid29, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React79.createElement(Grid29, { item: true, xs: 6 }, /* @__PURE__ */ React79.createElement(ControlLabel, null, __51("Text transform", "elementor"))), /* @__PURE__ */ React79.createElement(Grid29, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React79.createElement(ToggleControl13, { options: options11 }))));
+var TransformField = () => /* @__PURE__ */ React80.createElement(StylesField, { bind: "text-transform", propDisplayName: TEXT_TRANSFORM_LABEL }, /* @__PURE__ */ React80.createElement(StylesFieldLayout, { label: TEXT_TRANSFORM_LABEL }, /* @__PURE__ */ React80.createElement(ToggleControl13, { options: options11 })));
 
 // src/components/style-sections/typography-section/word-spacing-field.tsx
-import * as React80 from "react";
+import * as React81 from "react";
 import { useRef as useRef14 } from "react";
 import { SizeControl as SizeControl11 } from "@elementor/editor-controls";
-import { Grid as Grid30 } from "@elementor/ui";
-import { __ as __52 } from "@wordpress/i18n";
+import { __ as __58 } from "@wordpress/i18n";
+var WORD_SPACING_LABEL = __58("Word spacing", "elementor");
 var WordSpacingField = () => {
-  const rowRef = useRef14();
-  return /* @__PURE__ */ React80.createElement(StylesField, { bind: "word-spacing" }, /* @__PURE__ */ React80.createElement(Grid30, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap", ref: rowRef }, /* @__PURE__ */ React80.createElement(Grid30, { item: true, xs: 6 }, /* @__PURE__ */ React80.createElement(ControlLabel, null, __52("Word spacing", "elementor"))), /* @__PURE__ */ React80.createElement(Grid30, { item: true, xs: 6 }, /* @__PURE__ */ React80.createElement(SizeControl11, { anchorRef: rowRef }))));
+  const rowRef = useRef14(null);
+  return /* @__PURE__ */ React81.createElement(StylesField, { bind: "word-spacing", propDisplayName: WORD_SPACING_LABEL }, /* @__PURE__ */ React81.createElement(StylesFieldLayout, { label: WORD_SPACING_LABEL, ref: rowRef }, /* @__PURE__ */ React81.createElement(SizeControl11, { anchorRef: rowRef })));
 };
 
 // src/components/style-sections/typography-section/typography-section.tsx
+var COLUMN_COUNT_LABEL2 = __59("Column count", "elementor");
 var TypographySection = () => {
-  const { value: columnCount } = useStylesField("column-count");
+  const { value: columnCount } = useStylesField("column-count", {
+    history: { propDisplayName: COLUMN_COUNT_LABEL2 }
+  });
   const hasMultiColumns = !!(columnCount?.value && columnCount?.value > 1);
-  const isVersion330Active = isExperimentActive11("e_v_3_30");
-  return /* @__PURE__ */ React81.createElement(SectionContent, null, /* @__PURE__ */ React81.createElement(FontFamilyField, null), /* @__PURE__ */ React81.createElement(FontWeightField, null), /* @__PURE__ */ React81.createElement(FontSizeField, null), /* @__PURE__ */ React81.createElement(PanelDivider, null), /* @__PURE__ */ React81.createElement(TextAlignmentField, null), /* @__PURE__ */ React81.createElement(TextColorField, null), /* @__PURE__ */ React81.createElement(
+  const isVersion330Active = isExperimentActive15("e_v_3_30");
+  return /* @__PURE__ */ React82.createElement(SectionContent, null, /* @__PURE__ */ React82.createElement(FontFamilyField, null), /* @__PURE__ */ React82.createElement(FontWeightField, null), /* @__PURE__ */ React82.createElement(FontSizeField, null), /* @__PURE__ */ React82.createElement(PanelDivider, null), /* @__PURE__ */ React82.createElement(TextAlignmentField, null), /* @__PURE__ */ React82.createElement(TextColorField, null), /* @__PURE__ */ React82.createElement(
     StyleTabCollapsibleContent,
     {
       fields: [
@@ -4105,26 +4296,26 @@ var TypographySection = () => {
         "stroke"
       ]
     },
-    /* @__PURE__ */ React81.createElement(SectionContent, { sx: { pt: 2 } }, /* @__PURE__ */ React81.createElement(LineHeightField, null), /* @__PURE__ */ React81.createElement(LetterSpacingField, null), /* @__PURE__ */ React81.createElement(WordSpacingField, null), isVersion330Active && /* @__PURE__ */ React81.createElement(React81.Fragment, null, /* @__PURE__ */ React81.createElement(ColumnCountField, null), hasMultiColumns && /* @__PURE__ */ React81.createElement(ColumnGapField, null)), /* @__PURE__ */ React81.createElement(PanelDivider, null), /* @__PURE__ */ React81.createElement(TextDecorationField, null), /* @__PURE__ */ React81.createElement(TransformField, null), /* @__PURE__ */ React81.createElement(TextDirectionField, null), /* @__PURE__ */ React81.createElement(FontStyleField, null), /* @__PURE__ */ React81.createElement(TextStrokeField, null))
+    /* @__PURE__ */ React82.createElement(SectionContent, { sx: { pt: 2 } }, /* @__PURE__ */ React82.createElement(LineHeightField, null), /* @__PURE__ */ React82.createElement(LetterSpacingField, null), /* @__PURE__ */ React82.createElement(WordSpacingField, null), isVersion330Active && /* @__PURE__ */ React82.createElement(React82.Fragment, null, /* @__PURE__ */ React82.createElement(ColumnCountField, null), hasMultiColumns && /* @__PURE__ */ React82.createElement(ColumnGapField, null)), /* @__PURE__ */ React82.createElement(PanelDivider, null), /* @__PURE__ */ React82.createElement(TextDecorationField, null), /* @__PURE__ */ React82.createElement(TransformField, null), /* @__PURE__ */ React82.createElement(TextDirectionField, null), /* @__PURE__ */ React82.createElement(FontStyleField, null), /* @__PURE__ */ React82.createElement(TextStrokeField, null))
   ));
 };
 
 // src/components/style-tab-section.tsx
-import * as React82 from "react";
-import { isExperimentActive as isExperimentActive12 } from "@elementor/editor-v1-adapters";
+import * as React83 from "react";
+import { isExperimentActive as isExperimentActive16 } from "@elementor/editor-v1-adapters";
 var StyleTabSection = ({ section, fields = [] }) => {
   const { component, name, title } = section;
   const tabDefaults = useDefaultPanelSettings();
   const SectionComponent = component;
-  const isExpanded = isExperimentActive12(EXPERIMENTAL_FEATURES.V_3_30) ? tabDefaults.defaultSectionsExpanded.style?.includes(name) : false;
-  return /* @__PURE__ */ React82.createElement(Section, { title, defaultExpanded: isExpanded, titleEnd: getStylesInheritanceIndicators(fields) }, /* @__PURE__ */ React82.createElement(SectionComponent, null));
+  const isExpanded = isExperimentActive16(EXPERIMENTAL_FEATURES.V_3_30) ? tabDefaults.defaultSectionsExpanded.style?.includes(name) : false;
+  return /* @__PURE__ */ React83.createElement(Section, { title, defaultExpanded: isExpanded, titleEnd: getStylesInheritanceIndicators(fields) }, /* @__PURE__ */ React83.createElement(SectionComponent, null));
 };
 
 // src/components/style-tab.tsx
 var TABS_HEADER_HEIGHT = "37px";
 var stickyHeaderStyles = {
   position: "sticky",
-  zIndex: 1,
+  zIndex: 1100,
   opacity: 1,
   backgroundColor: "background.default",
   transition: "top 300ms ease"
@@ -4134,7 +4325,7 @@ var StyleTab = () => {
   const [activeStyleDefId, setActiveStyleDefId] = useActiveStyleDefId(currentClassesProp);
   const [activeStyleState, setActiveStyleState] = useState12(null);
   const breakpoint = useActiveBreakpoint();
-  return /* @__PURE__ */ React83.createElement(ClassesPropProvider, { prop: currentClassesProp }, /* @__PURE__ */ React83.createElement(
+  return /* @__PURE__ */ React84.createElement(ClassesPropProvider, { prop: currentClassesProp }, /* @__PURE__ */ React84.createElement(
     StyleProvider,
     {
       meta: { breakpoint, state: activeStyleState },
@@ -4145,13 +4336,13 @@ var StyleTab = () => {
       },
       setMetaState: setActiveStyleState
     },
-    /* @__PURE__ */ React83.createElement(SessionStorageProvider2, { prefix: activeStyleDefId ?? "" }, /* @__PURE__ */ React83.createElement(StyleInheritanceProvider, null, /* @__PURE__ */ React83.createElement(ClassesHeader, null, /* @__PURE__ */ React83.createElement(CssClassSelector, null), /* @__PURE__ */ React83.createElement(Divider5, null)), /* @__PURE__ */ React83.createElement(SectionsList, null, /* @__PURE__ */ React83.createElement(
+    /* @__PURE__ */ React84.createElement(SessionStorageProvider2, { prefix: activeStyleDefId ?? "" }, /* @__PURE__ */ React84.createElement(StyleInheritanceProvider, null, /* @__PURE__ */ React84.createElement(ClassesHeader, null, /* @__PURE__ */ React84.createElement(CssClassSelector, null), /* @__PURE__ */ React84.createElement(Divider5, null)), /* @__PURE__ */ React84.createElement(SectionsList, null, /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: LayoutSection,
           name: "Layout",
-          title: __53("Layout", "elementor")
+          title: __60("Layout", "elementor")
         },
         fields: [
           "display",
@@ -4164,23 +4355,23 @@ var StyleTab = () => {
           "gap"
         ]
       }
-    ), /* @__PURE__ */ React83.createElement(
+    ), /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: SpacingSection,
           name: "Spacing",
-          title: __53("Spacing", "elementor")
+          title: __60("Spacing", "elementor")
         },
         fields: ["margin", "padding"]
       }
-    ), /* @__PURE__ */ React83.createElement(
+    ), /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: SizeSection,
           name: "Size",
-          title: __53("Size", "elementor")
+          title: __60("Size", "elementor")
         },
         fields: [
           "width",
@@ -4194,23 +4385,23 @@ var StyleTab = () => {
           "object-fit"
         ]
       }
-    ), /* @__PURE__ */ React83.createElement(
+    ), /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: PositionSection,
           name: "Position",
-          title: __53("Position", "elementor")
+          title: __60("Position", "elementor")
         },
         fields: ["position", "z-index", "scroll-margin-top"]
       }
-    ), /* @__PURE__ */ React83.createElement(
+    ), /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: TypographySection,
           name: "Typography",
-          title: __53("Typography", "elementor")
+          title: __60("Typography", "elementor")
         },
         fields: [
           "font-family",
@@ -4229,33 +4420,33 @@ var StyleTab = () => {
           "stroke"
         ]
       }
-    ), /* @__PURE__ */ React83.createElement(
+    ), /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: BackgroundSection,
           name: "Background",
-          title: __53("Background", "elementor")
+          title: __60("Background", "elementor")
         },
         fields: ["background"]
       }
-    ), /* @__PURE__ */ React83.createElement(
+    ), /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: BorderSection,
           name: "Border",
-          title: __53("Border", "elementor")
+          title: __60("Border", "elementor")
         },
         fields: ["border-radius", "border-width", "border-color", "border-style"]
       }
-    ), /* @__PURE__ */ React83.createElement(
+    ), /* @__PURE__ */ React84.createElement(
       StyleTabSection,
       {
         section: {
           component: EffectsSection,
           name: "Effects",
-          title: __53("Effects", "elementor")
+          title: __60("Effects", "elementor")
         },
         fields: ["box-shadow"]
       }
@@ -4264,7 +4455,7 @@ var StyleTab = () => {
 };
 function ClassesHeader({ children }) {
   const scrollDirection = useScrollDirection();
-  return /* @__PURE__ */ React83.createElement(Stack17, { sx: { ...stickyHeaderStyles, top: scrollDirection === "up" ? TABS_HEADER_HEIGHT : 0 } }, children);
+  return /* @__PURE__ */ React84.createElement(Stack14, { sx: { ...stickyHeaderStyles, top: scrollDirection === "up" ? TABS_HEADER_HEIGHT : 0 } }, children);
 }
 function useCurrentClassesProp() {
   const { elementType } = useElement();
@@ -4283,15 +4474,15 @@ 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__ */ React84.createElement(Fragment9, { key: element.id }, /* @__PURE__ */ React84.createElement(PanelTabContent, null))
+    /* @__PURE__ */ React85.createElement(Fragment10, { key: element.id }, /* @__PURE__ */ React85.createElement(PanelTabContent, null))
   );
 };
 var PanelTabContent = () => {
   const editorDefaults = useDefaultPanelSettings();
-  const defaultComponentTab = isExperimentActive13(EXPERIMENTAL_FEATURES.V_3_30) ? editorDefaults.defaultTab : "settings";
+  const defaultComponentTab = isExperimentActive17(EXPERIMENTAL_FEATURES.V_3_30) ? editorDefaults.defaultTab : "settings";
   const [currentTab, setCurrentTab] = useStateByElement("tab", defaultComponentTab);
   const { getTabProps, getTabPanelProps, getTabsProps } = useTabs(currentTab);
-  return /* @__PURE__ */ React84.createElement(ScrollProvider, null, /* @__PURE__ */ React84.createElement(Stack18, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React84.createElement(Stack18, { sx: { ...stickyHeaderStyles, top: 0 } }, /* @__PURE__ */ React84.createElement(
+  return /* @__PURE__ */ React85.createElement(ScrollProvider, null, /* @__PURE__ */ React85.createElement(Stack15, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React85.createElement(Stack15, { sx: { ...stickyHeaderStyles, top: 0 } }, /* @__PURE__ */ React85.createElement(
     Tabs,
     {
       variant: "fullWidth",
@@ -4303,9 +4494,9 @@ var PanelTabContent = () => {
         setCurrentTab(newValue);
       }
     },
-    /* @__PURE__ */ React84.createElement(Tab, { label: __54("General", "elementor"), ...getTabProps("settings") }),
-    /* @__PURE__ */ React84.createElement(Tab, { label: __54("Style", "elementor"), ...getTabProps("style") })
-  ), /* @__PURE__ */ React84.createElement(Divider6, null)), /* @__PURE__ */ React84.createElement(TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React84.createElement(SettingsTab, null)), /* @__PURE__ */ React84.createElement(TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React84.createElement(StyleTab, null))));
+    /* @__PURE__ */ React85.createElement(Tab, { label: __61("General", "elementor"), ...getTabProps("settings") }),
+    /* @__PURE__ */ React85.createElement(Tab, { label: __61("Style", "elementor"), ...getTabProps("style") })
+  ), /* @__PURE__ */ React85.createElement(Divider6, null)), /* @__PURE__ */ React85.createElement(TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React85.createElement(SettingsTab, null)), /* @__PURE__ */ React85.createElement(TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React85.createElement(StyleTab, null))));
 };
 
 // src/components/editing-panel.tsx
@@ -4317,8 +4508,8 @@ var EditingPanel = () => {
   if (!element || !elementType) {
     return null;
   }
-  const panelTitle = __55("Edit %s", "elementor").replace("%s", elementType.title);
-  return /* @__PURE__ */ React85.createElement(ErrorBoundary, { fallback: /* @__PURE__ */ React85.createElement(EditorPanelErrorFallback, null) }, /* @__PURE__ */ React85.createElement(SessionStorageProvider3, { prefix: "elementor" }, /* @__PURE__ */ React85.createElement(ThemeProvider2, null, /* @__PURE__ */ React85.createElement(Panel, null, /* @__PURE__ */ React85.createElement(PanelHeader, null, /* @__PURE__ */ React85.createElement(PanelHeaderTitle, null, panelTitle), /* @__PURE__ */ React85.createElement(AtomIcon, { fontSize: "small", sx: { color: "text.tertiary" } })), /* @__PURE__ */ React85.createElement(PanelBody, null, /* @__PURE__ */ React85.createElement(ControlActionsProvider, { items: menuItems }, /* @__PURE__ */ React85.createElement(ControlReplacementsProvider, { replacements: controlReplacements }, /* @__PURE__ */ React85.createElement(ElementProvider, { element, elementType }, /* @__PURE__ */ React85.createElement(EditingPanelTabs, null)))))))));
+  const panelTitle = __62("Edit %s", "elementor").replace("%s", elementType.title);
+  return /* @__PURE__ */ React86.createElement(ErrorBoundary, { fallback: /* @__PURE__ */ React86.createElement(EditorPanelErrorFallback, null) }, /* @__PURE__ */ React86.createElement(SessionStorageProvider3, { prefix: "elementor" }, /* @__PURE__ */ React86.createElement(ThemeProvider2, null, /* @__PURE__ */ React86.createElement(Panel, null, /* @__PURE__ */ React86.createElement(PanelHeader, null, /* @__PURE__ */ React86.createElement(PanelHeaderTitle, null, panelTitle), /* @__PURE__ */ React86.createElement(AtomIcon, { fontSize: "small", sx: { color: "text.tertiary" } })), /* @__PURE__ */ React86.createElement(PanelBody, null, /* @__PURE__ */ React86.createElement(ControlActionsProvider, { items: menuItems }, /* @__PURE__ */ React86.createElement(ControlReplacementsProvider, { replacements: controlReplacements }, /* @__PURE__ */ React86.createElement(ElementProvider, { element, elementType }, /* @__PURE__ */ React86.createElement(EditingPanelTabs, null)))))))));
 };
 
 // src/panel.ts
@@ -4327,11 +4518,18 @@ var { panel, usePanelActions, usePanelStatus } = createPanel({
   component: EditingPanel
 });
 
+// src/components/popover-scrollable-content.tsx
+import * as React87 from "react";
+import { PopoverScrollableContent as BasePopoverScrollableContent } from "@elementor/editor-ui";
+var PopoverScrollableContent = (props) => {
+  const sectionWidth = useSectionWidth();
+  return /* @__PURE__ */ React87.createElement(BasePopoverScrollableContent, { ...props, width: sectionWidth });
+};
+
 // src/init.ts
 import { injectIntoLogic } from "@elementor/editor";
-import { PrefetchUserData } from "@elementor/editor-current-user";
 import { __registerPanel as registerPanel } from "@elementor/editor-panels";
-import { blockCommand, isExperimentActive as isExperimentActive14 } from "@elementor/editor-v1-adapters";
+import { blockCommand, isExperimentActive as isExperimentActive18 } from "@elementor/editor-v1-adapters";
 
 // src/hooks/use-open-editor-panel.ts
 import { useEffect as useEffect4 } from "react";
@@ -4371,7 +4569,7 @@ import { settingsTransformersRegistry, styleTransformersRegistry } from "@elemen
 import { injectIntoRepeaterItemIcon, injectIntoRepeaterItemLabel } from "@elementor/editor-controls";
 
 // src/dynamics/components/background-control-dynamic-tag.tsx
-import * as React86 from "react";
+import * as React88 from "react";
 import { PropKeyProvider as PropKeyProvider3, PropProvider as PropProvider3, useBoundProp as useBoundProp3 } from "@elementor/editor-controls";
 import {
   backgroundImageOverlayPropTypeUtil
@@ -4379,10 +4577,10 @@ import {
 import { DatabaseIcon } from "@elementor/icons";
 
 // src/dynamics/hooks/use-dynamic-tag.ts
-import { useMemo as useMemo8 } from "react";
+import { useMemo as useMemo9 } from "react";
 
 // src/dynamics/hooks/use-prop-dynamic-tags.ts
-import { useMemo as useMemo7 } from "react";
+import { useMemo as useMemo8 } from "react";
 import { useBoundProp as useBoundProp2 } from "@elementor/editor-controls";
 
 // src/dynamics/sync/get-elementor-config.ts
@@ -4437,7 +4635,7 @@ var usePropDynamicTags = () => {
     const propDynamicType = getDynamicPropType(propType);
     categories = propDynamicType?.settings.categories || [];
   }
-  return useMemo7(() => getDynamicTagsByCategories(categories), [categories.join()]);
+  return useMemo8(() => getDynamicTagsByCategories(categories), [categories.join()]);
 };
 var getDynamicTagsByCategories = (categories) => {
   const dynamicTags = getAtomicDynamicTags();
@@ -4453,40 +4651,40 @@ var getDynamicTagsByCategories = (categories) => {
 // src/dynamics/hooks/use-dynamic-tag.ts
 var useDynamicTag = (tagName) => {
   const dynamicTags = usePropDynamicTags();
-  return useMemo8(() => dynamicTags.find((tag) => tag.name === tagName) ?? null, [dynamicTags, tagName]);
+  return useMemo9(() => dynamicTags.find((tag) => tag.name === tagName) ?? null, [dynamicTags, tagName]);
 };
 
 // src/dynamics/components/background-control-dynamic-tag.tsx
-var BackgroundControlDynamicTagIcon = () => /* @__PURE__ */ React86.createElement(DatabaseIcon, { fontSize: "tiny" });
+var BackgroundControlDynamicTagIcon = () => /* @__PURE__ */ React88.createElement(DatabaseIcon, { fontSize: "tiny" });
 var BackgroundControlDynamicTagLabel = ({ value }) => {
   const context = useBoundProp3(backgroundImageOverlayPropTypeUtil);
-  return /* @__PURE__ */ React86.createElement(PropProvider3, { ...context, value: value.value }, /* @__PURE__ */ React86.createElement(PropKeyProvider3, { bind: "image" }, /* @__PURE__ */ React86.createElement(Wrapper, { rawValue: value.value })));
+  return /* @__PURE__ */ React88.createElement(PropProvider3, { ...context, value: value.value }, /* @__PURE__ */ React88.createElement(PropKeyProvider3, { bind: "image" }, /* @__PURE__ */ React88.createElement(Wrapper, { rawValue: value.value })));
 };
 var Wrapper = ({ rawValue }) => {
   const { propType } = useBoundProp3();
   const imageOverlayPropType = propType.prop_types["background-image-overlay"];
-  return /* @__PURE__ */ React86.createElement(PropProvider3, { propType: imageOverlayPropType.shape.image, value: rawValue, setValue: () => void 0 }, /* @__PURE__ */ React86.createElement(PropKeyProvider3, { bind: "src" }, /* @__PURE__ */ React86.createElement(Content, { rawValue: rawValue.image })));
+  return /* @__PURE__ */ React88.createElement(PropProvider3, { propType: imageOverlayPropType.shape.image, value: rawValue, setValue: () => void 0 }, /* @__PURE__ */ React88.createElement(PropKeyProvider3, { bind: "src" }, /* @__PURE__ */ React88.createElement(Content, { rawValue: rawValue.image })));
 };
 var Content = ({ rawValue }) => {
   const src = rawValue.value.src;
   const dynamicTag = useDynamicTag(src.value.name || "");
-  return /* @__PURE__ */ React86.createElement(React86.Fragment, null, dynamicTag?.label);
+  return /* @__PURE__ */ React88.createElement(React88.Fragment, null, dynamicTag?.label);
 };
 
 // src/dynamics/components/dynamic-selection-control.tsx
-import * as React90 from "react";
-import { ControlFormLabel as ControlFormLabel6, useBoundProp as useBoundProp6 } from "@elementor/editor-controls";
-import { PopoverHeader as PopoverHeader2, PopoverScrollableContent } from "@elementor/editor-ui";
+import * as React91 from "react";
+import { ControlFormLabel as ControlFormLabel5, useBoundProp as useBoundProp6 } from "@elementor/editor-controls";
+import { PopoverHeader as PopoverHeader3, PopoverScrollableContent as PopoverScrollableContent2 } from "@elementor/editor-ui";
 import { DatabaseIcon as DatabaseIcon3, SettingsIcon, XIcon } from "@elementor/icons";
 import {
   bindPopover as bindPopover2,
   bindTrigger as bindTrigger2,
   Box as Box8,
   Divider as Divider8,
-  Grid as Grid31,
+  Grid as Grid5,
   IconButton as IconButton5,
   Popover as Popover2,
-  Stack as Stack21,
+  Stack as Stack17,
   Tab as Tab2,
   TabPanel as TabPanel2,
   Tabs as Tabs2,
@@ -4494,12 +4692,7 @@ import {
   usePopupState as usePopupState3,
   useTabs as useTabs2
 } from "@elementor/ui";
-import { __ as __57 } from "@wordpress/i18n";
-
-// src/components/popover-content.tsx
-import * as React87 from "react";
-import { Stack as Stack19 } from "@elementor/ui";
-var PopoverContent = ({ alignItems, gap = 1.5, p, children }) => /* @__PURE__ */ React87.createElement(Stack19, { alignItems, gap, p }, children);
+import { __ as __64 } from "@wordpress/i18n";
 
 // src/hooks/use-persist-dynamic-value.ts
 import { useSessionStorage as useSessionStorage2 } from "@elementor/session";
@@ -4510,7 +4703,7 @@ var usePersistDynamicValue = (propKey) => {
 };
 
 // src/dynamics/dynamic-control.tsx
-import * as React88 from "react";
+import * as React89 from "react";
 import { PropKeyProvider as PropKeyProvider4, PropProvider as PropProvider4, useBoundProp as useBoundProp4 } from "@elementor/editor-controls";
 var DynamicControl = ({ bind, children }) => {
   const { value, setValue } = useBoundProp4(dynamicPropTypeUtil);
@@ -4532,18 +4725,18 @@ var DynamicControl = ({ bind, children }) => {
     });
   };
   const propType = createTopLevelOjectType({ schema: dynamicTag.props_schema });
-  return /* @__PURE__ */ React88.createElement(PropProvider4, { propType, setValue: setDynamicValue, value: { [bind]: dynamicValue } }, /* @__PURE__ */ React88.createElement(PropKeyProvider4, { bind }, children));
+  return /* @__PURE__ */ React89.createElement(PropProvider4, { propType, setValue: setDynamicValue, value: { [bind]: dynamicValue } }, /* @__PURE__ */ React89.createElement(PropKeyProvider4, { bind }, children));
 };
 
 // src/dynamics/components/dynamic-selection.tsx
-import { Fragment as Fragment11, useState as useState13 } from "react";
-import * as React89 from "react";
+import { Fragment as Fragment12, useState as useState13 } from "react";
+import * as React90 from "react";
 import { useBoundProp as useBoundProp5 } from "@elementor/editor-controls";
-import { PopoverHeader, PopoverMenuList, PopoverSearch } from "@elementor/editor-ui";
+import { PopoverHeader as PopoverHeader2, PopoverMenuList, PopoverSearch } from "@elementor/editor-ui";
 import { DatabaseIcon as DatabaseIcon2 } from "@elementor/icons";
-import { Box as Box7, Divider as Divider7, Link as Link2, Stack as Stack20, Typography as Typography6, useTheme as useTheme3 } from "@elementor/ui";
-import { __ as __56 } from "@wordpress/i18n";
-var SIZE7 = "tiny";
+import { Box as Box7, Divider as Divider7, Link as Link2, Stack as Stack16, Typography as Typography5, useTheme as useTheme3 } from "@elementor/ui";
+import { __ as __63 } from "@wordpress/i18n";
+var SIZE6 = "tiny";
 var DynamicSelection = ({ close: closePopover }) => {
   const [searchValue, setSearchValue] = useState13("");
   const { groups: dynamicGroups } = getAtomicDynamicTags() || {};
@@ -4577,21 +4770,21 @@ var DynamicSelection = ({ close: closePopover }) => {
       label: item.label
     }))
   ]);
-  return /* @__PURE__ */ React89.createElement(React89.Fragment, null, /* @__PURE__ */ React89.createElement(
-    PopoverHeader,
+  return /* @__PURE__ */ React90.createElement(React90.Fragment, null, /* @__PURE__ */ React90.createElement(
+    PopoverHeader2,
     {
-      title: __56("Dynamic tags", "elementor"),
+      title: __63("Dynamic tags", "elementor"),
       onClose: closePopover,
-      icon: /* @__PURE__ */ React89.createElement(DatabaseIcon2, { fontSize: SIZE7 })
+      icon: /* @__PURE__ */ React90.createElement(DatabaseIcon2, { fontSize: SIZE6 })
     }
-  ), /* @__PURE__ */ React89.createElement(Stack20, null, hasNoDynamicTags ? /* @__PURE__ */ React89.createElement(NoDynamicTags, null) : /* @__PURE__ */ React89.createElement(Fragment11, null, /* @__PURE__ */ React89.createElement(
+  ), /* @__PURE__ */ React90.createElement(Stack16, null, hasNoDynamicTags ? /* @__PURE__ */ React90.createElement(NoDynamicTags, null) : /* @__PURE__ */ React90.createElement(Fragment12, null, /* @__PURE__ */ React90.createElement(
     PopoverSearch,
     {
       value: searchValue,
       onSearch: handleSearch,
-      placeholder: __56("Search dynamic tags\u2026", "elementor")
+      placeholder: __63("Search dynamic tags\u2026", "elementor")
     }
-  ), /* @__PURE__ */ React89.createElement(Divider7, null), /* @__PURE__ */ React89.createElement(
+  ), /* @__PURE__ */ React90.createElement(Divider7, null), /* @__PURE__ */ React90.createElement(PopoverScrollableContent, null, /* @__PURE__ */ React90.createElement(
     PopoverMenuList,
     {
       items: virtualizedItems,
@@ -4599,12 +4792,12 @@ var DynamicSelection = ({ close: closePopover }) => {
       onClose: closePopover,
       selectedValue: dynamicValue?.name,
       itemStyle: (item) => item.type === "item" ? { paddingInlineStart: theme.spacing(3.5) } : {},
-      noResultsComponent: /* @__PURE__ */ React89.createElement(NoResults, { searchValue, onClear: () => setSearchValue("") })
+      noResultsComponent: /* @__PURE__ */ React90.createElement(NoResults, { searchValue, onClear: () => setSearchValue("") })
     }
-  ))));
+  )))));
 };
-var NoResults = ({ searchValue, onClear }) => /* @__PURE__ */ React89.createElement(
-  Stack20,
+var NoResults = ({ searchValue, onClear }) => /* @__PURE__ */ React90.createElement(
+  Stack16,
   {
     gap: 1,
     alignItems: "center",
@@ -4614,12 +4807,12 @@ var NoResults = ({ searchValue, onClear }) => /* @__PURE__ */ React89.createElem
     color: "text.secondary",
     sx: { pb: 3.5 }
   },
-  /* @__PURE__ */ React89.createElement(DatabaseIcon2, { fontSize: "large" }),
-  /* @__PURE__ */ React89.createElement(Typography6, { align: "center", variant: "subtitle2" }, __56("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React89.createElement("br", null), "\u201C", searchValue, "\u201D."),
-  /* @__PURE__ */ React89.createElement(Typography6, { align: "center", variant: "caption" }, __56("Try something else.", "elementor"), "\xA0", /* @__PURE__ */ React89.createElement(Link2, { color: "text.secondary", variant: "caption", component: "button", onClick: onClear }, __56("Clear & try again", "elementor")))
+  /* @__PURE__ */ React90.createElement(DatabaseIcon2, { fontSize: "large" }),
+  /* @__PURE__ */ React90.createElement(Typography5, { align: "center", variant: "subtitle2" }, __63("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React90.createElement("br", null), "\u201C", searchValue, "\u201D."),
+  /* @__PURE__ */ React90.createElement(Typography5, { align: "center", variant: "caption", sx: { display: "flex", flexDirection: "column" } }, __63("Try something else.", "elementor"), /* @__PURE__ */ React90.createElement(Link2, { color: "text.secondary", variant: "caption", component: "button", onClick: onClear }, __63("Clear & try again", "elementor")))
 );
-var NoDynamicTags = () => /* @__PURE__ */ React89.createElement(Box7, { sx: { overflowY: "hidden", height: 297, width: 220 } }, /* @__PURE__ */ React89.createElement(Divider7, null), /* @__PURE__ */ React89.createElement(
-  Stack20,
+var NoDynamicTags = () => /* @__PURE__ */ React90.createElement(Box7, { sx: { overflowY: "hidden", height: 297, width: 220 } }, /* @__PURE__ */ React90.createElement(Divider7, null), /* @__PURE__ */ React90.createElement(
+  Stack16,
   {
     gap: 1,
     alignItems: "center",
@@ -4629,9 +4822,9 @@ var NoDynamicTags = () => /* @__PURE__ */ React89.createElement(Box7, { sx: { ov
     color: "text.secondary",
     sx: { pb: 3.5 }
   },
-  /* @__PURE__ */ React89.createElement(DatabaseIcon2, { fontSize: "large" }),
-  /* @__PURE__ */ React89.createElement(Typography6, { align: "center", variant: "subtitle2" }, __56("Streamline your workflow with dynamic tags", "elementor")),
-  /* @__PURE__ */ React89.createElement(Typography6, { align: "center", variant: "caption" }, __56("You'll need Elementor Pro to use this feature.", "elementor"))
+  /* @__PURE__ */ React90.createElement(DatabaseIcon2, { fontSize: "large" }),
+  /* @__PURE__ */ React90.createElement(Typography5, { align: "center", variant: "subtitle2" }, __63("Streamline your workflow with dynamic tags", "elementor")),
+  /* @__PURE__ */ React90.createElement(Typography5, { align: "center", variant: "caption" }, __63("You'll need Elementor Pro to use this feature.", "elementor"))
 ));
 var useFilteredOptions = (searchValue) => {
   const dynamicTags = usePropDynamicTags();
@@ -4650,7 +4843,7 @@ var useFilteredOptions = (searchValue) => {
 };
 
 // src/dynamics/components/dynamic-selection-control.tsx
-var SIZE8 = "tiny";
+var SIZE7 = "tiny";
 var DynamicSelectionControl = () => {
   const { setValue: setAnyValue } = useBoundProp6();
   const { bind, value } = useBoundProp6(dynamicPropTypeUtil);
@@ -4664,33 +4857,37 @@ var DynamicSelectionControl = () => {
   if (!dynamicTag) {
     throw new Error(`Dynamic tag ${tagName} not found`);
   }
-  return /* @__PURE__ */ React90.createElement(Box8, null, /* @__PURE__ */ React90.createElement(
+  return /* @__PURE__ */ React91.createElement(Box8, null, /* @__PURE__ */ React91.createElement(
     Tag,
     {
       fullWidth: true,
       showActionsOnHover: true,
       label: dynamicTag.label,
-      startIcon: /* @__PURE__ */ React90.createElement(DatabaseIcon3, { fontSize: SIZE8 }),
+      startIcon: /* @__PURE__ */ React91.createElement(DatabaseIcon3, { fontSize: SIZE7 }),
       ...bindTrigger2(selectionPopoverState),
-      actions: /* @__PURE__ */ React90.createElement(React90.Fragment, null, /* @__PURE__ */ React90.createElement(DynamicSettingsPopover, { dynamicTag }), /* @__PURE__ */ React90.createElement(
+      actions: /* @__PURE__ */ React91.createElement(React91.Fragment, null, /* @__PURE__ */ React91.createElement(DynamicSettingsPopover, { dynamicTag }), /* @__PURE__ */ React91.createElement(
         IconButton5,
         {
-          size: SIZE8,
+          size: SIZE7,
           onClick: removeDynamicTag,
-          "aria-label": __57("Remove dynamic value", "elementor")
+          "aria-label": __64("Remove dynamic value", "elementor")
         },
-        /* @__PURE__ */ React90.createElement(XIcon, { fontSize: SIZE8 })
+        /* @__PURE__ */ React91.createElement(XIcon, { fontSize: SIZE7 })
       ))
     }
-  ), /* @__PURE__ */ React90.createElement(
+  ), /* @__PURE__ */ React91.createElement(
     Popover2,
     {
       disablePortal: true,
       disableScrollLock: true,
-      anchorOrigin: { vertical: "bottom", horizontal: "left" },
+      anchorOrigin: { vertical: "bottom", horizontal: "right" },
+      transformOrigin: { vertical: "top", horizontal: "right" },
+      PaperProps: {
+        sx: { my: 1 }
+      },
       ...bindPopover2(selectionPopoverState)
     },
-    /* @__PURE__ */ React90.createElement(Stack21, null, /* @__PURE__ */ React90.createElement(DynamicSelection, { close: selectionPopoverState.close }))
+    /* @__PURE__ */ React91.createElement(Stack17, null, /* @__PURE__ */ React91.createElement(DynamicSelection, { close: selectionPopoverState.close }))
   ));
 };
 var DynamicSettingsPopover = ({ dynamicTag }) => {
@@ -4699,23 +4896,26 @@ var DynamicSettingsPopover = ({ dynamicTag }) => {
   if (!hasDynamicSettings) {
     return null;
   }
-  return /* @__PURE__ */ React90.createElement(React90.Fragment, null, /* @__PURE__ */ React90.createElement(IconButton5, { size: SIZE8, ...bindTrigger2(popupState), "aria-label": __57("Settings", "elementor") }, /* @__PURE__ */ React90.createElement(SettingsIcon, { fontSize: SIZE8 })), /* @__PURE__ */ React90.createElement(
+  return /* @__PURE__ */ React91.createElement(React91.Fragment, null, /* @__PURE__ */ React91.createElement(IconButton5, { size: SIZE7, ...bindTrigger2(popupState), "aria-label": __64("Settings", "elementor") }, /* @__PURE__ */ React91.createElement(SettingsIcon, { fontSize: SIZE7 })), /* @__PURE__ */ React91.createElement(
     Popover2,
     {
       disablePortal: true,
       disableScrollLock: true,
       anchorOrigin: { vertical: "bottom", horizontal: "center" },
+      PaperProps: {
+        sx: { my: 0.5 }
+      },
       ...bindPopover2(popupState)
     },
-    /* @__PURE__ */ React90.createElement(
-      PopoverHeader2,
+    /* @__PURE__ */ React91.createElement(
+      PopoverHeader3,
       {
         title: dynamicTag.label,
         onClose: popupState.close,
-        icon: /* @__PURE__ */ React90.createElement(DatabaseIcon3, { fontSize: SIZE8 })
+        icon: /* @__PURE__ */ React91.createElement(DatabaseIcon3, { fontSize: SIZE7 })
       }
     ),
-    /* @__PURE__ */ React90.createElement(DynamicSettings, { controls: dynamicTag.atomic_controls })
+    /* @__PURE__ */ React91.createElement(DynamicSettings, { controls: dynamicTag.atomic_controls })
   ));
 };
 var DynamicSettings = ({ controls }) => {
@@ -4724,10 +4924,10 @@ var DynamicSettings = ({ controls }) => {
   if (!tabs.length) {
     return null;
   }
-  return /* @__PURE__ */ React90.createElement(PopoverScrollableContent, null, /* @__PURE__ */ React90.createElement(Tabs2, { size: "small", variant: "fullWidth", ...getTabsProps() }, tabs.map(({ value }, index) => /* @__PURE__ */ React90.createElement(Tab2, { key: index, label: value.label, sx: { px: 1, py: 0.5 }, ...getTabProps(index) }))), /* @__PURE__ */ React90.createElement(Divider8, null), tabs.map(({ value }, index) => {
-    return /* @__PURE__ */ React90.createElement(TabPanel2, { key: index, sx: { flexGrow: 1, py: 0 }, ...getTabPanelProps(index) }, /* @__PURE__ */ React90.createElement(PopoverContent, { p: 2, gap: 2 }, value.items.map((item) => {
+  return /* @__PURE__ */ React91.createElement(PopoverScrollableContent2, null, /* @__PURE__ */ React91.createElement(Tabs2, { size: "small", variant: "fullWidth", ...getTabsProps() }, tabs.map(({ value }, index) => /* @__PURE__ */ React91.createElement(Tab2, { key: index, label: value.label, sx: { px: 1, py: 0.5 }, ...getTabProps(index) }))), /* @__PURE__ */ React91.createElement(Divider8, null), tabs.map(({ value }, index) => {
+    return /* @__PURE__ */ React91.createElement(TabPanel2, { key: index, sx: { flexGrow: 1, py: 0 }, ...getTabPanelProps(index) }, /* @__PURE__ */ React91.createElement(Stack17, { p: 2, gap: 2 }, value.items.map((item) => {
       if (item.type === "control") {
-        return /* @__PURE__ */ React90.createElement(Control3, { key: item.value.bind, control: item.value });
+        return /* @__PURE__ */ React91.createElement(Control3, { key: item.value.bind, control: item.value });
       }
       return null;
     })));
@@ -4737,7 +4937,7 @@ var Control3 = ({ control }) => {
   if (!getControl(control.type)) {
     return null;
   }
-  return /* @__PURE__ */ React90.createElement(DynamicControl, { bind: control.bind }, /* @__PURE__ */ React90.createElement(Grid31, { container: true, gap: 0.75 }, control.label ? /* @__PURE__ */ React90.createElement(Grid31, { item: true, xs: 12 }, /* @__PURE__ */ React90.createElement(ControlFormLabel6, null, control.label)) : null, /* @__PURE__ */ React90.createElement(Grid31, { item: true, xs: 12 }, /* @__PURE__ */ React90.createElement(Control, { type: control.type, props: control.props }))));
+  return /* @__PURE__ */ React91.createElement(DynamicControl, { bind: control.bind }, /* @__PURE__ */ React91.createElement(Grid5, { container: true, gap: 0.75 }, control.label ? /* @__PURE__ */ React91.createElement(Grid5, { item: true, xs: 12 }, /* @__PURE__ */ React91.createElement(ControlFormLabel5, null, control.label)) : null, /* @__PURE__ */ React91.createElement(Grid5, { item: true, xs: 12 }, /* @__PURE__ */ React91.createElement(Control, { type: control.type, props: control.props }))));
 };
 
 // src/dynamics/dynamic-transformer.ts
@@ -4790,18 +4990,18 @@ function getDynamicValue(name, settings) {
 }
 
 // src/dynamics/hooks/use-prop-dynamic-action.tsx
-import * as React91 from "react";
+import * as React92 from "react";
 import { useBoundProp as useBoundProp7 } from "@elementor/editor-controls";
 import { DatabaseIcon as DatabaseIcon4 } from "@elementor/icons";
-import { __ as __58 } from "@wordpress/i18n";
+import { __ as __65 } from "@wordpress/i18n";
 var usePropDynamicAction = () => {
   const { propType } = useBoundProp7();
   const visible = !!propType && supportsDynamic(propType);
   return {
     visible,
     icon: DatabaseIcon4,
-    title: __58("Dynamic tags", "elementor"),
-    content: ({ close }) => /* @__PURE__ */ React91.createElement(DynamicSelection, { close })
+    title: __65("Dynamic tags", "elementor"),
+    content: ({ close }) => /* @__PURE__ */ React92.createElement(DynamicSelection, { close })
   };
 };
 
@@ -4833,7 +5033,7 @@ var init = () => {
 // src/reset-style-props.tsx
 import { useBoundProp as useBoundProp8 } from "@elementor/editor-controls";
 import { BrushBigIcon } from "@elementor/icons";
-import { __ as __59 } from "@wordpress/i18n";
+import { __ as __66 } from "@wordpress/i18n";
 var { registerAction } = controlActionsMenu;
 function initResetStyleProps() {
   registerAction({
@@ -4847,7 +5047,7 @@ function useResetStyleValueProps() {
   const { value, setValue, path, bind } = useBoundProp8();
   return {
     visible: isStyle && value !== null && value !== void 0 && path.length <= 2 && !EXCLUDED_BINDS.includes(bind),
-    title: __59("Clear", "elementor"),
+    title: __66("Clear", "elementor"),
     icon: BrushBigIcon,
     onClick: () => setValue(null)
   };
@@ -4857,36 +5057,36 @@ function useResetStyleValueProps() {
 import { createTransformer as createTransformer6, styleTransformersRegistry as styleTransformersRegistry2 } from "@elementor/editor-canvas";
 
 // src/styles-inheritance/transformers/background-color-overlay-transformer.tsx
-import * as React92 from "react";
+import * as React93 from "react";
 import { createTransformer as createTransformer2 } from "@elementor/editor-canvas";
-import { Stack as Stack22, styled as styled7, UnstableColorIndicator } from "@elementor/ui";
-var backgroundColorOverlayTransformer = createTransformer2((value) => /* @__PURE__ */ React92.createElement(Stack22, { direction: "row", gap: 10 }, /* @__PURE__ */ React92.createElement(ItemIconColor, { value }), /* @__PURE__ */ React92.createElement(ItemLabelColor, { value })));
+import { Stack as Stack18, styled as styled7, UnstableColorIndicator } from "@elementor/ui";
+var backgroundColorOverlayTransformer = createTransformer2((value) => /* @__PURE__ */ React93.createElement(Stack18, { direction: "row", gap: 10 }, /* @__PURE__ */ React93.createElement(ItemIconColor, { value }), /* @__PURE__ */ React93.createElement(ItemLabelColor, { value })));
 var ItemIconColor = ({ value }) => {
   const { color } = value;
-  return /* @__PURE__ */ React92.createElement(StyledUnstableColorIndicator, { size: "inherit", component: "span", value: color });
+  return /* @__PURE__ */ React93.createElement(StyledUnstableColorIndicator, { size: "inherit", component: "span", value: color });
 };
 var ItemLabelColor = ({ value: { color } }) => {
-  return /* @__PURE__ */ React92.createElement("span", null, color);
+  return /* @__PURE__ */ React93.createElement("span", null, color);
 };
 var StyledUnstableColorIndicator = styled7(UnstableColorIndicator)(({ theme }) => ({
   borderRadius: `${theme.shape.borderRadius / 2}px`
 }));
 
 // src/styles-inheritance/transformers/background-gradient-overlay-transformer.tsx
-import * as React93 from "react";
+import * as React94 from "react";
 import { createTransformer as createTransformer3 } from "@elementor/editor-canvas";
-import { Stack as Stack23 } from "@elementor/ui";
-import { __ as __60 } from "@wordpress/i18n";
-var backgroundGradientOverlayTransformer = createTransformer3((value) => /* @__PURE__ */ React93.createElement(Stack23, { direction: "row", gap: 10 }, /* @__PURE__ */ React93.createElement(ItemIconGradient, { value }), /* @__PURE__ */ React93.createElement(ItemLabelGradient, { value })));
+import { Stack as Stack19 } from "@elementor/ui";
+import { __ as __67 } from "@wordpress/i18n";
+var backgroundGradientOverlayTransformer = createTransformer3((value) => /* @__PURE__ */ React94.createElement(Stack19, { direction: "row", gap: 10 }, /* @__PURE__ */ React94.createElement(ItemIconGradient, { value }), /* @__PURE__ */ React94.createElement(ItemLabelGradient, { value })));
 var ItemIconGradient = ({ value }) => {
   const gradient = getGradientValue(value);
-  return /* @__PURE__ */ React93.createElement(StyledUnstableColorIndicator, { size: "inherit", component: "span", value: gradient });
+  return /* @__PURE__ */ React94.createElement(StyledUnstableColorIndicator, { size: "inherit", component: "span", value: gradient });
 };
 var ItemLabelGradient = ({ value }) => {
   if (value.type === "linear") {
-    return /* @__PURE__ */ React93.createElement("span", null, __60("Linear Gradient", "elementor"));
+    return /* @__PURE__ */ React94.createElement("span", null, __67("Linear Gradient", "elementor"));
   }
-  return /* @__PURE__ */ React93.createElement("span", null, __60("Radial Gradient", "elementor"));
+  return /* @__PURE__ */ React94.createElement("span", null, __67("Radial Gradient", "elementor"));
 };
 var getGradientValue = (gradient) => {
   const stops = gradient.stops?.map(({ color, offset }) => `${color} ${offset ?? 0}%`)?.join(",");
@@ -4897,15 +5097,15 @@ var getGradientValue = (gradient) => {
 };
 
 // src/styles-inheritance/transformers/background-image-overlay-transformer.tsx
-import * as React94 from "react";
+import * as React95 from "react";
 import { createTransformer as createTransformer4 } from "@elementor/editor-canvas";
 import { EllipsisWithTooltip as EllipsisWithTooltip2 } from "@elementor/editor-ui";
-import { CardMedia, Stack as Stack24 } from "@elementor/ui";
+import { CardMedia, Stack as Stack20 } from "@elementor/ui";
 import { useWpMediaAttachment } from "@elementor/wp-media";
-var backgroundImageOverlayTransformer = createTransformer4((value) => /* @__PURE__ */ React94.createElement(Stack24, { direction: "row", gap: 10 }, /* @__PURE__ */ React94.createElement(ItemIconImage, { value }), /* @__PURE__ */ React94.createElement(ItemLabelImage, { value })));
+var backgroundImageOverlayTransformer = createTransformer4((value) => /* @__PURE__ */ React95.createElement(Stack20, { direction: "row", gap: 10 }, /* @__PURE__ */ React95.createElement(ItemIconImage, { value }), /* @__PURE__ */ React95.createElement(ItemLabelImage, { value })));
 var ItemIconImage = ({ value }) => {
   const { imageUrl } = useImage(value);
-  return /* @__PURE__ */ React94.createElement(
+  return /* @__PURE__ */ React95.createElement(
     CardMedia,
     {
       image: imageUrl,
@@ -4920,7 +5120,7 @@ var ItemIconImage = ({ value }) => {
 };
 var ItemLabelImage = ({ value }) => {
   const { imageTitle } = useImage(value);
-  return /* @__PURE__ */ React94.createElement(EllipsisWithTooltip2, { title: imageTitle }, /* @__PURE__ */ React94.createElement("span", null, imageTitle));
+  return /* @__PURE__ */ React95.createElement(EllipsisWithTooltip2, { title: imageTitle }, /* @__PURE__ */ React95.createElement("span", null, imageTitle));
 };
 var useImage = (image) => {
   let imageTitle, imageUrl = null;
@@ -4945,14 +5145,14 @@ var getFileExtensionFromFilename = (filename) => {
 };
 
 // src/styles-inheritance/transformers/background-overlay-transformer.tsx
-import * as React95 from "react";
+import * as React96 from "react";
 import { createTransformer as createTransformer5 } from "@elementor/editor-canvas";
-import { Stack as Stack25 } from "@elementor/ui";
+import { Stack as Stack21 } from "@elementor/ui";
 var backgroundOverlayTransformer = createTransformer5((values) => {
   if (!values || values.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ React95.createElement(Stack25, { direction: "column" }, values.map((item, index) => /* @__PURE__ */ React95.createElement(Stack25, { key: index }, item)));
+  return /* @__PURE__ */ React96.createElement(Stack21, { direction: "column" }, values.map((item, index) => /* @__PURE__ */ React96.createElement(Stack21, { key: index }, item)));
 });
 
 // src/styles-inheritance/init-styles-inheritance-transformers.ts
@@ -4996,13 +5196,9 @@ function init3() {
     id: "editing-panel-hooks",
     component: EditingPanelHooks
   });
-  injectIntoLogic({
-    id: "current-user-data",
-    component: PrefetchUserData
-  });
   init();
   init2();
-  if (isExperimentActive14(EXPERIMENTAL_FEATURES.V_3_30)) {
+  if (isExperimentActive18(EXPERIMENTAL_FEATURES.V_3_30)) {
     initResetStyleProps();
   }
 }
@@ -5013,6 +5209,8 @@ var blockV1Panel = () => {
   });
 };
 export {
+  EXPERIMENTAL_FEATURES,
+  PopoverScrollableContent,
   controlActionsMenu,
   init3 as init,
   injectIntoClassSelectorActions,
@@ -5021,6 +5219,7 @@ export {
   useBoundProp9 as useBoundProp,
   useFontFamilies,
   usePanelActions,
-  usePanelStatus
+  usePanelStatus,
+  useSectionWidth
 };
 //# sourceMappingURL=index.mjs.map