@elementor/editor-editing-panel 1.24.0 → 1.28.0

package/dist/index.mjs

@@ -10,14 +10,15 @@ import * as React7 from "react";
 import { getElementSetting, updateElementSettings as updateElementSettings2, useElementSetting as useElementSetting2 } from "@elementor/editor-elements";
 import { classesPropTypeUtil } from "@elementor/editor-props";
 import {
-  ELEMENTS_STYLES_PROVIDER_KEY,
+  isElementsStylesProvider as isElementsStylesProvider2,
   stylesRepository as stylesRepository4,
   useCreateActionsByProvider,
-  useProviders
+  useProviders,
+  validateStyleLabel as validateStyleLabel2
 } from "@elementor/editor-styles-repository";
 import { MapPinIcon } from "@elementor/icons";
 import { createLocation } from "@elementor/locations";
-import { Chip as Chip2, Stack as Stack2, Typography as Typography2 } from "@elementor/ui";
+import { Chip as Chip2, FormLabel, Stack as Stack3 } from "@elementor/ui";
 import { __ as __3 } from "@wordpress/i18n";
 
 // src/contexts/classes-prop-context.tsx
@@ -92,7 +93,7 @@ function useStyle() {
 }
 function getProviderByStyleId(styleId) {
   const styleProvider = stylesRepository.getProviders().find((provider) => {
-    return provider.actions.get().find((style) => style.id === styleId);
+    return provider.actions.all().find((style) => style.id === styleId);
   });
   return styleProvider ?? null;
 }
@@ -112,6 +113,7 @@ function MultiCombobox({
   selected,
   options: options13,
   onSelect,
+  placeholder,
   ...props
 }) {
   const filter = useFilterOptions();
@@ -134,6 +136,7 @@ function MultiCombobox({
         TextField,
         {
           ...params,
+          placeholder,
           sx: (theme) => ({
             ".MuiAutocomplete-inputRoot.MuiInputBase-adornedStart": {
               paddingLeft: theme.spacing(0.25),
@@ -230,13 +233,13 @@ function isAction(option) {
 // src/components/css-classes/css-class-item.tsx
 import * as React6 from "react";
 import { useState as useState2 } from "react";
-import { stylesRepository as stylesRepository3 } from "@elementor/editor-styles-repository";
+import { stylesRepository as stylesRepository3, validateStyleLabel } from "@elementor/editor-styles-repository";
 import { EditableField, EllipsisWithTooltip, useEditable } from "@elementor/editor-ui";
 import { DotsVerticalIcon } from "@elementor/icons";
 import {
   bindTrigger,
   Chip,
-  Stack,
+  Stack as Stack2,
   Typography,
   UnstableChipGroup,
   usePopupState
@@ -245,9 +248,9 @@ import { __ as __2 } from "@wordpress/i18n";
 
 // src/components/css-classes/css-class-menu.tsx
 import * as React5 from "react";
-import { stylesRepository as stylesRepository2 } from "@elementor/editor-styles-repository";
+import { isElementsStylesProvider, stylesRepository as stylesRepository2 } from "@elementor/editor-styles-repository";
 import { MenuListItem } from "@elementor/editor-ui";
-import { bindMenu, Divider, Menu, MenuSubheader } from "@elementor/ui";
+import { bindMenu, Divider, Menu, MenuSubheader, Stack } from "@elementor/ui";
 import { __ } from "@wordpress/i18n";
 
 // src/hooks/use-unapply-class.ts
@@ -272,16 +275,40 @@ var useUnapplyClass = (classId) => {
   };
 };
 
+// src/components/style-indicator.tsx
+import { styled as styled2 } from "@elementor/ui";
+var StyleIndicator = styled2("div", {
+  shouldForwardProp: (prop) => prop !== "variant"
+})`
+	width: 5px;
+	height: 5px;
+	border-radius: 50%;
+	background-color: ${({ theme, variant }) => {
+  switch (variant) {
+    case "overridden":
+      return theme.palette.warning.light;
+    case "global":
+      return theme.palette.global.dark;
+    case "local":
+      return theme.palette.accent.main;
+    default:
+      return theme.palette.text.disabled;
+  }
+}};
+`;
+
 // src/components/css-classes/css-class-menu.tsx
 var STATES = ["hover", "focus", "active"];
 function CssClassMenu({ styleId, provider, popupState, handleRename, anchorEl }) {
+  const styledStates = useStyledStates(styleId);
+  const indicatorVariant = !provider || isElementsStylesProvider(provider) ? "local" : "global";
   const handleKeyDown = (e) => {
     e.stopPropagation();
   };
   return /* @__PURE__ */ React5.createElement(
     Menu,
     {
-      MenuListProps: { dense: true },
+      MenuListProps: { dense: true, sx: { minWidth: "160px" } },
       ...bindMenu(popupState),
       anchorEl,
       anchorOrigin: {
@@ -292,23 +319,51 @@ function CssClassMenu({ styleId, provider, popupState, handleRename, anchorEl })
         horizontal: "left",
         vertical: -4
       },
-      onKeyDown: handleKeyDown
+      onKeyDown: handleKeyDown,
+      disableAutoFocusItem: true
     },
     getMenuItemsByProvider({ provider, styleId, handleRename, closeMenu: popupState.close }),
-    /* @__PURE__ */ React5.createElement(MenuSubheader, { sx: { typography: "caption", color: "text.secondary", pb: 0.5, pt: 1 } }, __("Pseudo classes", "elementor")),
-    /* @__PURE__ */ React5.createElement(StateMenuItem, { key: "normal", state: null, styleId, closeMenu: popupState.close }),
+    /* @__PURE__ */ React5.createElement(MenuSubheader, { sx: { typography: "caption", color: "text.secondary", pb: 0.5, pt: 1 } }, __("States", "elementor")),
+    /* @__PURE__ */ React5.createElement(
+      StateMenuItem,
+      {
+        key: "normal",
+        state: null,
+        styleId,
+        closeMenu: popupState.close,
+        isStyled: styledStates.normal,
+        indicatorVariant
+      }
+    ),
     STATES.map((state) => {
-      return /* @__PURE__ */ React5.createElement(StateMenuItem, { key: state, state, styleId, closeMenu: popupState.close });
+      return /* @__PURE__ */ React5.createElement(
+        StateMenuItem,
+        {
+          key: state,
+          state,
+          styleId,
+          closeMenu: popupState.close,
+          isStyled: styledStates[state],
+          indicatorVariant
+        }
+      );
     })
   );
 }
+function useStyledStates(styleId) {
+  const { meta } = useStyle();
+  const styleDef = stylesRepository2.all().find((style) => style.id === styleId);
+  return Object.fromEntries(
+    styleDef?.variants.filter((variant) => meta.breakpoint === variant.meta.breakpoint).map((variant) => [variant.meta.state ?? "normal", true]) ?? []
+  );
+}
 function getMenuItemsByProvider({
   provider,
   styleId,
   handleRename,
   closeMenu
 }) {
-  if (!styleId) {
+  if (!styleId || !provider) {
     return [];
   }
   const providerInstance = stylesRepository2.getProviderByKey(provider);
@@ -324,7 +379,7 @@ function getMenuItemsByProvider({
         MenuSubheader,
         {
           key: "provider-label",
-          sx: { typography: "caption", color: "text.secondary", pb: 0.5, pt: 1 }
+          sx: { typography: "caption", color: "text.secondary", pb: 0.5, pt: 1, textTransform: "capitalize" }
         },
         providerInstance?.labels?.singular
       )
@@ -333,7 +388,14 @@ function getMenuItemsByProvider({
   }
   return actions;
 }
-function StateMenuItem({ state, styleId, closeMenu, ...props }) {
+function StateMenuItem({
+  state,
+  styleId,
+  closeMenu,
+  isStyled = false,
+  indicatorVariant,
+  ...props
+}) {
   const { id: activeId, setId: setActiveId, setMetaState: setActiveMetaState, meta } = useStyle();
   const { state: activeState } = meta;
   const isActive = styleId === activeId;
@@ -352,7 +414,7 @@ function StateMenuItem({ state, styleId, closeMenu, ...props }) {
         closeMenu();
       }
     },
-    state ? state : "Normal"
+    /* @__PURE__ */ React5.createElement(Stack, { gap: 0.75, direction: "row", alignItems: "center" }, isStyled && /* @__PURE__ */ React5.createElement(StyleIndicator, { "aria-label": __("Has style", "elementor"), variant: indicatorVariant }), state ?? "normal")
   );
 }
 function UnapplyClassMenuItem({ styleId, closeMenu, ...props }) {
@@ -391,8 +453,8 @@ function RenameClassMenuItem({
 var CHIP_SIZE = "tiny";
 function CssClassItem({
   id,
-  label,
   provider,
+  label,
   isActive,
   color: colorProp,
   icon,
@@ -416,7 +478,7 @@ function CssClassItem({
     validation: validateLabel
   });
   const color = error ? "error" : colorProp;
-  const providerActions = stylesRepository3.getProviderByKey(provider)?.actions;
+  const providerActions = provider ? stylesRepository3.getProviderByKey(provider)?.actions : null;
   const allowRename = Boolean(providerActions?.update);
   const isShowingState = isActive && meta.state;
   return /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(
@@ -465,7 +527,7 @@ function CssClassItem({
       {
         icon: isShowingState ? void 0 : /* @__PURE__ */ React6.createElement(DotsVerticalIcon, { fontSize: "tiny" }),
         size: CHIP_SIZE,
-        label: isShowingState ? /* @__PURE__ */ React6.createElement(Stack, { direction: "row", gap: 0.5, alignItems: "center" }, /* @__PURE__ */ React6.createElement(Typography, { variant: "inherit" }, meta.state), /* @__PURE__ */ React6.createElement(DotsVerticalIcon, { fontSize: "tiny" })) : void 0,
+        label: isShowingState ? /* @__PURE__ */ React6.createElement(Stack2, { direction: "row", gap: 0.5, alignItems: "center" }, /* @__PURE__ */ React6.createElement(Typography, { variant: "inherit" }, meta.state), /* @__PURE__ */ React6.createElement(DotsVerticalIcon, { fontSize: "tiny" })) : void 0,
         variant: "filled",
         shape: "rounded",
         color,
@@ -491,13 +553,11 @@ function CssClassItem({
   ));
 }
 var validateLabel = (newLabel) => {
-  if (!stylesRepository3.isLabelValid(newLabel)) {
-    return __2("Format is not valid", "elementor");
-  }
-  if (stylesRepository3.isLabelExist(newLabel)) {
-    return __2("Existing name", "elementor");
+  const result = validateStyleLabel(newLabel);
+  if (result.isValid) {
+    return null;
   }
-  return null;
+  return result.error;
 };
 
 // src/components/css-classes/css-class-selector.tsx
@@ -509,7 +569,7 @@ var EMPTY_OPTION = {
   fixed: true,
   color: "accent",
   icon: /* @__PURE__ */ React7.createElement(MapPinIcon, null),
-  provider: ELEMENTS_STYLES_PROVIDER_KEY
+  provider: null
 };
 var { Slot: ClassSelectorActionsSlot, inject: injectIntoClassSelectorActions } = createLocation();
 function CssClassSelector() {
@@ -520,11 +580,13 @@ function CssClassSelector() {
   const handleApply = useHandleApply(appliedIds, setAppliedIds);
   const applied = useAppliedOptions(options13, appliedIds);
   const active = applied.find((option) => option.value === activeId) ?? EMPTY_OPTION;
-  return /* @__PURE__ */ React7.createElement(Stack2, { gap: 1, p: 2 }, /* @__PURE__ */ React7.createElement(Stack2, { direction: "row", gap: 1, alignItems: "center", justifyContent: "space-between" }, /* @__PURE__ */ React7.createElement(Typography2, { component: "label", variant: "caption", htmlFor: ID }, __3("CSS classes", "elementor")), /* @__PURE__ */ React7.createElement(Stack2, { direction: "row", gap: 1 }, /* @__PURE__ */ React7.createElement(ClassSelectorActionsSlot, null))), /* @__PURE__ */ React7.createElement(
+  const showPlaceholder = applied.every(({ fixed }) => fixed);
+  return /* @__PURE__ */ React7.createElement(Stack3, { p: 2 }, /* @__PURE__ */ React7.createElement(Stack3, { direction: "row", gap: 1, alignItems: "center", justifyContent: "space-between" }, /* @__PURE__ */ React7.createElement(FormLabel, { htmlFor: ID, size: "small" }, __3("Classes", "elementor")), /* @__PURE__ */ React7.createElement(Stack3, { direction: "row", gap: 1 }, /* @__PURE__ */ React7.createElement(ClassSelectorActionsSlot, null))), /* @__PURE__ */ React7.createElement(
     MultiCombobox,
     {
       id: ID,
       size: "tiny",
+      placeholder: showPlaceholder ? __3("Type to search/add global classes", "elementor") : void 0,
       options: options13,
       selected: applied,
       onSelect: handleApply,
@@ -560,6 +622,9 @@ function CssClassSelector() {
   ));
 }
 var updateClassByProvider = (provider, data) => {
+  if (!provider) {
+    return;
+  }
   const providerInstance = stylesRepository4.getProviderByKey(provider);
   if (!providerInstance) {
     return;
@@ -570,8 +635,8 @@ function useOptions() {
   const { element } = useElement();
   const isProviderEditable = (provider) => !!provider.actions.updateProps;
   return useProviders().filter(isProviderEditable).flatMap((provider) => {
-    const isElements = provider.key === ELEMENTS_STYLES_PROVIDER_KEY;
-    const styleDefs = provider.actions.get({ elementId: element.id });
+    const isElements = isElementsStylesProvider2(provider.getKey());
+    const styleDefs = provider.actions.all({ elementId: element.id });
     if (isElements && styleDefs.length === 0) {
       return [EMPTY_OPTION];
     }
@@ -582,8 +647,9 @@ function useOptions() {
         fixed: isElements,
         color: isElements ? "accent" : "global",
         icon: isElements ? /* @__PURE__ */ React7.createElement(MapPinIcon, null) : null,
-        provider: provider.key,
-        group: provider.labels?.plural
+        provider: provider.getKey(),
+        // translators: %s is the plural label of the provider (e.g "Existing classes").
+        group: __3("Existing %s", "elementor").replace("%s", provider.labels?.plural ?? "")
       };
     });
   });
@@ -595,10 +661,10 @@ function useCreateActions({
   return useCreateActionsByProvider().map(([provider, create]) => {
     return {
       // translators: %s is the label of the new class.
-      label: (value) => __3('Create new "%s"', "elementor").replace("%s", value),
-      // translators: %s is the singular label of css class provider (e.g "Global CSS Class").
-      group: __3("Create New %s", "elementor").replace("%s", provider.labels?.singular ?? ""),
-      condition: (_, inputValue) => isLabelValid(inputValue) && !hasReachedLimit(provider),
+      label: (value) => __3('Create "%s"', "elementor").replace("%s", value),
+      // translators: %s is the singular label of css class provider (e.g "CSS Class").
+      group: __3("Create a new %s", "elementor").replace("%s", provider.labels?.singular ?? ""),
+      condition: (_, inputValue) => validateStyleLabel2(inputValue).isValid && !hasReachedLimit(provider),
       apply: (label) => {
         const createdId = create(label);
         if (!createdId) {
@@ -611,18 +677,12 @@ function useCreateActions({
   });
 }
 function hasReachedLimit(provider) {
-  if (provider.limit === void 0) {
-    return false;
-  }
-  return provider.actions.get().length >= provider.limit;
-}
-function isLabelValid(newLabel) {
-  return stylesRepository4.isLabelValid(newLabel) && !stylesRepository4.isLabelExist(newLabel);
+  return provider.actions.all().length >= provider.limit;
 }
 function useAppliedOptions(options13, appliedIds) {
   const applied = options13.filter((option) => option.value && appliedIds.includes(option.value));
   const hasElementsProviderStyleApplied = applied.some(
-    (option) => option.provider === ELEMENTS_STYLES_PROVIDER_KEY
+    (option) => option.provider && isElementsStylesProvider2(option.provider)
   );
   if (!hasElementsProviderStyleApplied) {
     applied.unshift(EMPTY_OPTION);
@@ -693,7 +753,7 @@ import { createMenu } from "@elementor/menus";
 import * as React8 from "react";
 import { useId as useId2 } from "react";
 import { XIcon } from "@elementor/icons";
-import { bindPopover, bindToggle, IconButton, Popover, Stack as Stack3, Tooltip, Typography as Typography3, usePopupState as usePopupState2 } from "@elementor/ui";
+import { bindPopover, bindToggle, IconButton, Popover, Stack as Stack4, Tooltip, Typography as Typography2, usePopupState as usePopupState2 } from "@elementor/ui";
 var SIZE = "tiny";
 function PopoverAction({
   title,
@@ -720,7 +780,7 @@ function PopoverAction({
       },
       ...bindPopover(popupState)
     },
-    /* @__PURE__ */ React8.createElement(Stack3, { direction: "row", alignItems: "center", pl: 1.5, pr: 0.5, py: 1.5 }, /* @__PURE__ */ React8.createElement(Icon, { fontSize: SIZE, sx: { mr: 0.5 } }), /* @__PURE__ */ React8.createElement(Typography3, { variant: "subtitle2" }, title), /* @__PURE__ */ React8.createElement(IconButton, { sx: { ml: "auto" }, size: SIZE, onClick: popupState.close }, /* @__PURE__ */ React8.createElement(XIcon, { fontSize: SIZE }))),
+    /* @__PURE__ */ React8.createElement(Stack4, { direction: "row", alignItems: "center", pl: 1.5, pr: 0.5, py: 1.5 }, /* @__PURE__ */ React8.createElement(Icon, { fontSize: SIZE, sx: { mr: 0.5 } }), /* @__PURE__ */ React8.createElement(Typography2, { variant: "subtitle2" }, title), /* @__PURE__ */ React8.createElement(IconButton, { sx: { ml: "auto" }, size: SIZE, onClick: popupState.close }, /* @__PURE__ */ React8.createElement(XIcon, { fontSize: SIZE }))),
     /* @__PURE__ */ React8.createElement(PopoverContent2, { closePopover: popupState.close })
   ));
 }
@@ -742,7 +802,7 @@ function EditorPanelErrorFallback() {
 // src/components/editing-panel-tabs.tsx
 import * as React66 from "react";
 import { Fragment as Fragment8 } from "react";
-import { Divider as Divider5, Stack as Stack15, Tab, TabPanel, Tabs, useTabs } from "@elementor/ui";
+import { Divider as Divider5, Stack as Stack16, Tab, TabPanel, Tabs, useTabs } from "@elementor/ui";
 import { __ as __44 } from "@wordpress/i18n";
 
 // src/components/settings-tab.tsx
@@ -791,7 +851,7 @@ var Control = ({ props, type }) => {
 
 // src/controls-registry/control-type-container.tsx
 import * as React11 from "react";
-import { Box as Box3, styled as styled2 } from "@elementor/ui";
+import { Box as Box3, styled as styled3 } from "@elementor/ui";
 var ControlTypeContainer = ({
   controlType,
   children
@@ -799,7 +859,7 @@ var ControlTypeContainer = ({
   const layout = getLayoutByType(controlType);
   return /* @__PURE__ */ React11.createElement(StyledContainer, { layout }, children);
 };
-var StyledContainer = styled2(Box3, {
+var StyledContainer = styled3(Box3, {
   shouldForwardProp: (prop) => !["layout"].includes(prop)
 })(({ layout, theme }) => ({
   display: "grid",
@@ -809,8 +869,8 @@ var StyledContainer = styled2(Box3, {
 var getGridLayout = (layout) => ({
   justifyContent: "space-between",
   gridTemplateColumns: {
-    full: "1fr",
-    "two-columns": "repeat(2, 1fr)"
+    full: "minmax(0, 1fr)",
+    "two-columns": "repeat(2, minmax(0, 1fr))"
   }[layout]
 });
 
@@ -850,12 +910,12 @@ var SettingsField = ({ bind, children }) => {
 // src/components/section.tsx
 import * as React13 from "react";
 import { useId as useId3, useState as useState3 } from "react";
-import { Collapse, Divider as Divider2, ListItemButton, ListItemText, Stack as Stack4 } from "@elementor/ui";
+import { Collapse, Divider as Divider2, ListItemButton, ListItemText, Stack as Stack5 } from "@elementor/ui";
 
 // src/components/collapse-icon.tsx
 import { ChevronDownIcon } from "@elementor/icons";
-import { styled as styled3 } from "@elementor/ui";
-var CollapseIcon = styled3(ChevronDownIcon, {
+import { styled as styled4 } from "@elementor/ui";
+var CollapseIcon = styled4(ChevronDownIcon, {
   shouldForwardProp: (prop) => prop !== "open"
 })(({ theme, open }) => ({
   transform: open ? "rotate(180deg)" : "rotate(0deg)",
@@ -886,7 +946,7 @@ function Section({ title, children, defaultExpanded = false }) {
       }
     ),
     /* @__PURE__ */ React13.createElement(CollapseIcon, { open: isOpen, color: "secondary", fontSize: "tiny" })
-  ), /* @__PURE__ */ React13.createElement(Collapse, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto", unmountOnExit: true }, /* @__PURE__ */ React13.createElement(Stack4, { gap: 2.5, p: 2 }, children)), /* @__PURE__ */ React13.createElement(Divider2, null));
+  ), /* @__PURE__ */ React13.createElement(Collapse, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto", unmountOnExit: true }, /* @__PURE__ */ React13.createElement(Stack5, { gap: 2.5, p: 2 }, children)), /* @__PURE__ */ React13.createElement(Divider2, null));
 }
 
 // src/components/sections-list.tsx
@@ -923,8 +983,7 @@ var Control2 = ({ control }) => {
 
 // src/components/style-tab.tsx
 import * as React65 from "react";
-import { useState as useState7 } from "react";
-import { getElementStyles, useElementSetting as useElementSetting5 } from "@elementor/editor-elements";
+import { useState as useState8 } from "react";
 import { CLASSES_PROP_KEY } from "@elementor/editor-props";
 import { useActiveBreakpoint } from "@elementor/editor-responsive";
 import { SessionStorageProvider as SessionStorageProvider2 } from "@elementor/session";
@@ -947,6 +1006,9 @@ var useStylesRerender = () => {
   useEffect(() => provider?.subscribe(reRender), [provider]);
 };
 
+// src/styles-inheritance/create-snapshots-manager.ts
+import { filterEmptyValues } from "@elementor/editor-props";
+
 // src/styles-inheritance/utils.ts
 var DEFAULT_STATE = "normal";
 var DEFAULT_BREAKPOINT = "desktop";
@@ -1032,17 +1094,21 @@ function buildStateSnapshotSlot(styles, parentBreakpoint, currentBreakpoint, sta
 }
 function buildInitialSnapshotFromStyles(styles) {
   const snapshot = {};
-  styles.forEach((styleVariantWithId) => {
+  styles.forEach((styleData) => {
     const {
-      styleVariant: { props }
-    } = styleVariantWithId;
+      variant: { props }
+    } = styleData;
     Object.entries(props).forEach(([key, value]) => {
+      const filteredValue = filterEmptyValues(value);
+      if (filteredValue === null) {
+        return;
+      }
       if (!snapshot[key]) {
         snapshot[key] = [];
       }
       const snapshotPropValue = {
-        ...styleVariantWithId,
-        value
+        ...styleData,
+        value: filteredValue
       };
       snapshot[key].push(snapshotPropValue);
     });
@@ -1074,8 +1140,9 @@ function createStylesInheritance(styleDefs, breakpointsRoot) {
 function buildStyleVariantsByMetaMapping(styleDefs) {
   const breakpointStateSlots = {};
   styleDefs.forEach((styleDef) => {
-    styleDef.variants.forEach((styleVariant) => {
-      const { meta } = styleVariant;
+    const provider = getProviderByStyleId(styleDef.id)?.getKey() ?? null;
+    styleDef.variants.forEach((variant) => {
+      const { meta } = variant;
       const { state, breakpoint } = meta;
       const breakpointKey = getBreakpointKey(breakpoint);
       const stateKey = getStateKey(state);
@@ -1087,8 +1154,9 @@ function buildStyleVariantsByMetaMapping(styleDefs) {
         breakpointNode[stateKey] = [];
       }
       breakpointNode[stateKey].push({
-        styleId: styleDef.id,
-        styleVariant
+        style: styleDef,
+        variant,
+        provider
       });
     });
   });
@@ -1137,6 +1205,30 @@ var useBaseStyles = () => {
   return Object.values(widgetCache?.base_styles ?? {});
 };
 
+// src/hooks/use-active-style-def-id.ts
+import { useState as useState4 } from "react";
+import { getElementStyles, useElementSetting as useElementSetting5 } from "@elementor/editor-elements";
+function useActiveStyleDefId(classProp) {
+  const [activeStyledDefId, setActiveStyledDefId] = useState4(null);
+  const appliedClassesIds = useAppliedClassesIds2(classProp)?.value || [];
+  const fallback = useFirstAppliedClass(appliedClassesIds);
+  const activeAndAppliedClassId = useActiveAndAppliedClassId(activeStyledDefId, appliedClassesIds);
+  return [activeAndAppliedClassId || fallback?.id || null, setActiveStyledDefId];
+}
+function useFirstAppliedClass(appliedClassesIds) {
+  const { element } = useElement();
+  const stylesDefs = getElementStyles(element.id) ?? {};
+  return Object.values(stylesDefs).find((styleDef) => appliedClassesIds.includes(styleDef.id));
+}
+function useAppliedClassesIds2(classProp) {
+  const { element } = useElement();
+  return useElementSetting5(element.id, classProp);
+}
+function useActiveAndAppliedClassId(id, appliedClassesIds) {
+  const isClassApplied = !!id && appliedClassesIds.includes(id);
+  return isClassApplied ? id : null;
+}
+
 // src/components/style-sections/background-section/background-section.tsx
 import * as React19 from "react";
 import { BackgroundControl } from "@elementor/editor-controls";
@@ -1154,7 +1246,7 @@ import {
   getElementLabel
 } from "@elementor/editor-elements";
 import { getVariantByMeta } from "@elementor/editor-styles";
-import { LOCAL_STYLES_RESERVED_LABEL } from "@elementor/editor-styles-repository";
+import { ELEMENTS_STYLES_RESERVED_LABEL } from "@elementor/editor-styles-repository";
 import { undoable } from "@elementor/editor-v1-adapters";
 import { __ as __4 } from "@wordpress/i18n";
 function useStylesFields(propNames) {
@@ -1195,9 +1287,9 @@ function getProps({ styleId, elementId, provider, meta, propNames }) {
   if (!provider || !styleId) {
     return null;
   }
-  const style = provider.actions.getById?.(styleId, { elementId });
+  const style = provider.actions.get(styleId, { elementId });
   if (!style) {
-    throw new StyleNotFoundUnderProviderError({ context: { styleId, providerKey: provider.key } });
+    throw new StyleNotFoundUnderProviderError({ context: { styleId, providerKey: provider.getKey() } });
   }
   const variant = getVariantByMeta(style, meta);
   return Object.fromEntries(
@@ -1211,7 +1303,7 @@ function useUndoableCreateElementStyle() {
         do: (payload) => {
           return createElementStyle({
             ...payload,
-            label: LOCAL_STYLES_RESERVED_LABEL
+            label: ELEMENTS_STYLES_RESERVED_LABEL
           });
         },
         undo: ({ elementId }, styleId) => {
@@ -1221,7 +1313,7 @@ function useUndoableCreateElementStyle() {
           return createElementStyle({
             ...payload,
             styleId,
-            label: LOCAL_STYLES_RESERVED_LABEL
+            label: ELEMENTS_STYLES_RESERVED_LABEL
           });
         }
       },
@@ -1239,10 +1331,10 @@ function useUndoableUpdateStyle() {
         do: ({ elementId, styleId, provider, meta, props }) => {
           if (!provider.actions.updateProps) {
             throw new StylesProviderCannotUpdatePropsError({
-              context: { providerKey: provider.key }
+              context: { providerKey: provider.getKey() }
             });
           }
-          const style = provider.actions.getById(styleId, { elementId });
+          const style = provider.actions.get(styleId, { elementId });
           const prevProps = getCurrentProps(style, meta);
           provider.actions.updateProps(
             {
@@ -1289,28 +1381,8 @@ function useStylesField(propName) {
 // src/styles-inheritance/styles-inheritance-indicator.tsx
 import * as React17 from "react";
 import { useBoundProp } from "@elementor/editor-controls";
-import { ELEMENTS_STYLES_PROVIDER_KEY as ELEMENTS_STYLES_PROVIDER_KEY2 } from "@elementor/editor-styles-repository";
-import { styled as styled4 } from "@elementor/ui";
+import { ELEMENTS_BASE_STYLES_PROVIDER_KEY, isElementsStylesProvider as isElementsStylesProvider3 } from "@elementor/editor-styles-repository";
 import { __ as __5 } from "@wordpress/i18n";
-var Circle = styled4("div", {
-  shouldForwardProp: (prop) => prop !== "variant"
-})`
-	width: 5px;
-	height: 5px;
-	border-radius: 50%;
-	background-color: ${({ theme, variant }) => {
-  switch (variant) {
-    case "overridden":
-      return theme.palette.warning.light;
-    case "global-affects":
-      return theme.palette.global.dark;
-    case "local-affects":
-      return theme.palette.primary.main;
-    default:
-      return theme.palette.text.disabled;
-  }
-}};
-`;
 var StylesInheritanceIndicator = () => {
   const { value, path } = useBoundProp();
   const { id: currentStyleId, provider: currentStyleProvider, meta: currentStyleMeta } = useStyle();
@@ -1319,35 +1391,39 @@ var StylesInheritanceIndicator = () => {
   if (!inheritanceChain.length) {
     return null;
   }
-  const [{ styleId, styleVariant }] = inheritanceChain;
-  const { breakpoint, state } = styleVariant.meta;
-  if (styleId === currentStyleId && breakpoint === currentStyleMeta.breakpoint && state === currentStyleMeta.state) {
+  const [{ style, variant, provider }] = inheritanceChain;
+  if (provider === ELEMENTS_BASE_STYLES_PROVIDER_KEY) {
+    return null;
+  }
+  const { breakpoint, state } = variant.meta;
+  if (style.id === currentStyleId && breakpoint === currentStyleMeta.breakpoint && state === currentStyleMeta.state) {
     return /* @__PURE__ */ React17.createElement(
-      Circle,
+      StyleIndicator,
       {
         "aria-label": __5("This is the final value", "elementor"),
-        variant: currentStyleProvider?.key === ELEMENTS_STYLES_PROVIDER_KEY2 ? "local-affects" : "global-affects"
+        variant: isElementsStylesProvider3(currentStyleProvider?.getKey()) ? "local" : "global"
       }
     );
   }
   if (value !== null && value !== void 0) {
     return /* @__PURE__ */ React17.createElement(
-      Circle,
+      StyleIndicator,
       {
         "aria-label": __5("This value is overridden by another style", "elementor"),
         variant: "overridden"
       }
     );
   }
-  return /* @__PURE__ */ React17.createElement(Circle, { "aria-label": __5("This has value from another style", "elementor") });
+  return /* @__PURE__ */ React17.createElement(StyleIndicator, { "aria-label": __5("This has value from another style", "elementor") });
 };
 
 // src/controls-registry/styles-field.tsx
-var StylesField = ({ bind, children }) => {
+var StylesField = ({ bind, placeholder, children }) => {
   const [value, setValue] = useStylesField(bind);
   const stylesSchema = getStylesSchema();
   const propType = createTopLevelOjectType({ schema: stylesSchema });
   const values = { [bind]: value };
+  const placeholderValues = { [bind]: placeholder };
   const setValues = (newValue) => {
     setValue(newValue[bind]);
   };
@@ -1361,7 +1437,16 @@ var StylesField = ({ bind, children }) => {
         }
       ]
     },
-    /* @__PURE__ */ React18.createElement(PropProvider2, { propType, value: values, setValue: setValues }, /* @__PURE__ */ React18.createElement(PropKeyProvider2, { bind }, children))
+    /* @__PURE__ */ React18.createElement(
+      PropProvider2,
+      {
+        propType,
+        value: values,
+        setValue: setValues,
+        placeholder: placeholderValues
+      },
+      /* @__PURE__ */ React18.createElement(PropKeyProvider2, { bind }, children)
+    )
   );
 };
 
@@ -1371,7 +1456,7 @@ var BackgroundSection = () => {
 };
 
 // src/components/style-sections/border-section/border-section.tsx
-import * as React30 from "react";
+import * as React29 from "react";
 
 // src/components/panel-divider.tsx
 import * as React20 from "react";
@@ -1380,31 +1465,31 @@ var PanelDivider = () => /* @__PURE__ */ React20.createElement(Divider3, { sx: {
 
 // src/components/section-content.tsx
 import * as React21 from "react";
-import { Stack as Stack5 } from "@elementor/ui";
-var SectionContent = ({ gap = 2, sx, children }) => /* @__PURE__ */ React21.createElement(Stack5, { gap, sx: { ...sx } }, children);
+import { Stack as Stack6 } from "@elementor/ui";
+var SectionContent = ({ gap = 2, sx, children }) => /* @__PURE__ */ React21.createElement(Stack6, { gap, sx: { ...sx } }, children);
 
 // src/components/style-sections/border-section/border-field.tsx
-import * as React28 from "react";
+import * as React27 from "react";
 import { __ as __9 } from "@wordpress/i18n";
 
 // src/components/add-or-remove-content.tsx
 import * as React23 from "react";
 import { MinusIcon, PlusIcon } from "@elementor/icons";
-import { Collapse as Collapse2, IconButton as IconButton2, Stack as Stack7 } from "@elementor/ui";
+import { Collapse as Collapse2, IconButton as IconButton2, Stack as Stack8 } from "@elementor/ui";
 
 // src/components/control-label.tsx
 import * as React22 from "react";
 import { ControlAdornments, ControlFormLabel as ControlFormLabel2 } from "@elementor/editor-controls";
-import { Stack as Stack6 } from "@elementor/ui";
+import { Stack as Stack7 } from "@elementor/ui";
 var ControlLabel = ({ children }) => {
-  return /* @__PURE__ */ React22.createElement(Stack6, { direction: "row", alignItems: "center", justifyItems: "start", gap: 1 }, /* @__PURE__ */ React22.createElement(ControlFormLabel2, null, children), /* @__PURE__ */ React22.createElement(ControlAdornments, null));
+  return /* @__PURE__ */ React22.createElement(Stack7, { direction: "row", alignItems: "center", justifyItems: "start", gap: 1 }, /* @__PURE__ */ React22.createElement(ControlFormLabel2, null, children), /* @__PURE__ */ React22.createElement(ControlAdornments, null));
 };
 
 // src/components/add-or-remove-content.tsx
 var SIZE2 = "tiny";
 var AddOrRemoveContent = ({ isAdded, label, onAdd, onRemove, children }) => {
   return /* @__PURE__ */ React23.createElement(SectionContent, null, /* @__PURE__ */ React23.createElement(
-    Stack7,
+    Stack8,
     {
       direction: "row",
       sx: {
@@ -1447,7 +1532,7 @@ var BorderStyleField = () => {
 };
 
 // src/components/style-sections/border-section/border-width-field.tsx
-import * as React27 from "react";
+import * as React26 from "react";
 import { EqualUnequalSizesControl } from "@elementor/editor-controls";
 import { borderWidthPropTypeUtil } from "@elementor/editor-props";
 import { SideAllIcon, SideBottomIcon, SideLeftIcon, SideRightIcon, SideTopIcon } from "@elementor/icons";
@@ -1462,82 +1547,39 @@ function useDirection() {
   return { isSiteRtl, isUiRtl };
 }
 
-// src/components/style-sections/layout-section/utils/rotated-icon.tsx
-import * as React26 from "react";
-import { useRef } from "react";
-import { useTheme as useTheme2 } from "@elementor/ui";
-var CLOCKWISE_ANGLES = {
-  row: 0,
-  column: 90,
-  "row-reverse": 180,
-  "column-reverse": 270
-};
-var COUNTER_CLOCKWISE_ANGLES = {
-  row: 0,
-  column: -90,
-  "row-reverse": -180,
-  "column-reverse": -270
-};
-var RotatedIcon = ({
-  icon: Icon,
-  size,
-  isClockwise = true,
-  offset = 0,
-  disableRotationForReversed = false
-}) => {
-  const rotate = useRef(useGetTargetAngle(isClockwise, offset, disableRotationForReversed));
-  rotate.current = useGetTargetAngle(isClockwise, offset, disableRotationForReversed, rotate);
-  return /* @__PURE__ */ React26.createElement(Icon, { fontSize: size, sx: { transition: ".3s", rotate: `${rotate.current}deg` } });
-};
-var useGetTargetAngle = (isClockwise, offset, disableRotationForReversed, existingRef) => {
-  const [direction] = useStylesField("flex-direction");
-  const isRtl = "rtl" === useTheme2().direction;
-  const rotationMultiplier = isRtl ? -1 : 1;
-  const angleMap = isClockwise ? CLOCKWISE_ANGLES : COUNTER_CLOCKWISE_ANGLES;
-  const currentDirection = direction?.value || "row";
-  const currentAngle = existingRef ? existingRef.current * rotationMultiplier : angleMap[currentDirection] + offset;
-  const targetAngle = angleMap[currentDirection] + offset;
-  const diffToTargetAngle = (targetAngle - currentAngle + 360) % 360;
-  const formattedDiff = (diffToTargetAngle + 180) % 360 - 180;
-  if (disableRotationForReversed && ["row-reverse", "column-reverse"].includes(currentDirection)) {
-    return 0;
-  }
-  return (currentAngle + formattedDiff) * rotationMultiplier;
-};
-
 // src/components/style-sections/border-section/border-width-field.tsx
 var InlineStartIcon = withDirection(SideRightIcon);
 var InlineEndIcon = withDirection(SideLeftIcon);
 var getEdges = (isSiteRtl) => [
   {
     label: __8("Top", "elementor"),
-    icon: /* @__PURE__ */ React27.createElement(SideTopIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React26.createElement(SideTopIcon, { fontSize: "tiny" }),
     bind: "block-start"
   },
   {
     label: isSiteRtl ? __8("Left", "elementor") : __8("Right", "elementor"),
-    icon: /* @__PURE__ */ React27.createElement(RotatedIcon, { icon: InlineStartIcon, size: "tiny" }),
+    icon: /* @__PURE__ */ React26.createElement(InlineStartIcon, { fontSize: "tiny" }),
     bind: "inline-end"
   },
   {
     label: __8("Bottom", "elementor"),
-    icon: /* @__PURE__ */ React27.createElement(SideBottomIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React26.createElement(SideBottomIcon, { fontSize: "tiny" }),
     bind: "block-end"
   },
   {
     label: isSiteRtl ? __8("Right", "elementor") : __8("Left", "elementor"),
-    icon: /* @__PURE__ */ React27.createElement(RotatedIcon, { icon: InlineEndIcon, size: "tiny" }),
+    icon: /* @__PURE__ */ React26.createElement(InlineEndIcon, { fontSize: "tiny" }),
     bind: "inline-start"
   }
 ];
 var BorderWidthField = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React27.createElement(StylesField, { bind: "border-width" }, /* @__PURE__ */ React27.createElement(
+  return /* @__PURE__ */ React26.createElement(StylesField, { bind: "border-width" }, /* @__PURE__ */ React26.createElement(
     EqualUnequalSizesControl,
     {
       items: getEdges(isSiteRtl),
       label: __8("Border width", "elementor"),
-      icon: /* @__PURE__ */ React27.createElement(SideAllIcon, { fontSize: "tiny" }),
+      icon: /* @__PURE__ */ React26.createElement(SideAllIcon, { fontSize: "tiny" }),
       tooltipLabel: __8("Adjust borders", "elementor"),
       multiSizePropTypeUtil: borderWidthPropTypeUtil
     }
@@ -1563,7 +1605,7 @@ var BorderField = () => {
     });
   };
   const hasBorder = Object.values(border ?? {}).some(Boolean);
-  return /* @__PURE__ */ React28.createElement(
+  return /* @__PURE__ */ React27.createElement(
     AddOrRemoveContent,
     {
       label: __9("Border", "elementor"),
@@ -1571,14 +1613,14 @@ var BorderField = () => {
       onAdd: addBorder,
       onRemove: removeBorder
     },
-    /* @__PURE__ */ React28.createElement(BorderWidthField, null),
-    /* @__PURE__ */ React28.createElement(BorderColorField, null),
-    /* @__PURE__ */ React28.createElement(BorderStyleField, null)
+    /* @__PURE__ */ React27.createElement(BorderWidthField, null),
+    /* @__PURE__ */ React27.createElement(BorderColorField, null),
+    /* @__PURE__ */ React27.createElement(BorderStyleField, null)
   );
 };
 
 // src/components/style-sections/border-section/border-radius-field.tsx
-import * as React29 from "react";
+import * as React28 from "react";
 import { EqualUnequalSizesControl as EqualUnequalSizesControl2 } from "@elementor/editor-controls";
 import { borderRadiusPropTypeUtil } from "@elementor/editor-props";
 import {
@@ -1601,33 +1643,33 @@ var getEndEndLabel = (isSiteRtl) => isSiteRtl ? __10("Bottom left", "elementor")
 var getCorners = (isSiteRtl) => [
   {
     label: getStartStartLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React29.createElement(RotatedIcon, { icon: StartStartIcon, size: "tiny" }),
+    icon: /* @__PURE__ */ React28.createElement(StartStartIcon, { fontSize: "tiny" }),
     bind: "start-start"
   },
   {
     label: getStartEndLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React29.createElement(RotatedIcon, { icon: StartEndIcon, size: "tiny" }),
+    icon: /* @__PURE__ */ React28.createElement(StartEndIcon, { fontSize: "tiny" }),
     bind: "start-end"
   },
   {
     label: getEndStartLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React29.createElement(RotatedIcon, { icon: EndStartIcon, size: "tiny" }),
+    icon: /* @__PURE__ */ React28.createElement(EndStartIcon, { fontSize: "tiny" }),
     bind: "end-start"
   },
   {
     label: getEndEndLabel(isSiteRtl),
-    icon: /* @__PURE__ */ React29.createElement(RotatedIcon, { icon: EndEndIcon, size: "tiny" }),
+    icon: /* @__PURE__ */ React28.createElement(EndEndIcon, { fontSize: "tiny" }),
     bind: "end-end"
   }
 ];
 var BorderRadiusField = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React29.createElement(StylesField, { bind: "border-radius" }, /* @__PURE__ */ React29.createElement(
+  return /* @__PURE__ */ React28.createElement(StylesField, { bind: "border-radius" }, /* @__PURE__ */ React28.createElement(
     EqualUnequalSizesControl2,
     {
       items: getCorners(isSiteRtl),
       label: __10("Border radius", "elementor"),
-      icon: /* @__PURE__ */ React29.createElement(BorderCornersIcon, { fontSize: "tiny" }),
+      icon: /* @__PURE__ */ React28.createElement(BorderCornersIcon, { fontSize: "tiny" }),
       tooltipLabel: __10("Adjust corners", "elementor"),
       multiSizePropTypeUtil: borderRadiusPropTypeUtil
     }
@@ -1635,13 +1677,13 @@ var BorderRadiusField = () => {
 };
 
 // src/components/style-sections/border-section/border-section.tsx
-var BorderSection = () => /* @__PURE__ */ React30.createElement(SectionContent, null, /* @__PURE__ */ React30.createElement(BorderRadiusField, null), /* @__PURE__ */ React30.createElement(PanelDivider, null), /* @__PURE__ */ React30.createElement(BorderField, null));
+var BorderSection = () => /* @__PURE__ */ React29.createElement(SectionContent, null, /* @__PURE__ */ React29.createElement(BorderRadiusField, null), /* @__PURE__ */ React29.createElement(PanelDivider, null), /* @__PURE__ */ React29.createElement(BorderField, null));
 
 // src/components/style-sections/effects-section/effects-section.tsx
-import * as React31 from "react";
+import * as React30 from "react";
 import { BoxShadowRepeaterControl } from "@elementor/editor-controls";
 var EffectsSection = () => {
-  return /* @__PURE__ */ React31.createElement(SectionContent, null, /* @__PURE__ */ React31.createElement(StylesField, { bind: "box-shadow" }, /* @__PURE__ */ React31.createElement(BoxShadowRepeaterControl, null)));
+  return /* @__PURE__ */ React30.createElement(SectionContent, null, /* @__PURE__ */ React30.createElement(StylesField, { bind: "box-shadow" }, /* @__PURE__ */ React30.createElement(BoxShadowRepeaterControl, null)));
 };
 
 // src/components/style-sections/layout-section/layout-section.tsx
@@ -1686,8 +1728,53 @@ import {
   JustifySpaceBetweenVerticalIcon as BetweenIcon,
   JustifyTopIcon
 } from "@elementor/icons";
-import { DirectionProvider, Stack as Stack8, ThemeProvider, withDirection as withDirection3 } from "@elementor/ui";
+import { DirectionProvider, Stack as Stack9, ThemeProvider, withDirection as withDirection3 } from "@elementor/ui";
 import { __ as __11 } from "@wordpress/i18n";
+
+// src/components/style-sections/layout-section/utils/rotated-icon.tsx
+import * as React31 from "react";
+import { useRef } from "react";
+import { useTheme as useTheme2 } from "@elementor/ui";
+var CLOCKWISE_ANGLES = {
+  row: 0,
+  column: 90,
+  "row-reverse": 180,
+  "column-reverse": 270
+};
+var COUNTER_CLOCKWISE_ANGLES = {
+  row: 0,
+  column: -90,
+  "row-reverse": -180,
+  "column-reverse": -270
+};
+var RotatedIcon = ({
+  icon: Icon,
+  size,
+  isClockwise = true,
+  offset = 0,
+  disableRotationForReversed = false
+}) => {
+  const rotate = useRef(useGetTargetAngle(isClockwise, offset, disableRotationForReversed));
+  rotate.current = useGetTargetAngle(isClockwise, offset, disableRotationForReversed, rotate);
+  return /* @__PURE__ */ React31.createElement(Icon, { fontSize: size, sx: { transition: ".3s", rotate: `${rotate.current}deg` } });
+};
+var useGetTargetAngle = (isClockwise, offset, disableRotationForReversed, existingRef) => {
+  const [direction] = useStylesField("flex-direction");
+  const isRtl = "rtl" === useTheme2().direction;
+  const rotationMultiplier = isRtl ? -1 : 1;
+  const angleMap = isClockwise ? CLOCKWISE_ANGLES : COUNTER_CLOCKWISE_ANGLES;
+  const currentDirection = direction?.value || "row";
+  const currentAngle = existingRef ? existingRef.current * rotationMultiplier : angleMap[currentDirection] + offset;
+  const targetAngle = angleMap[currentDirection] + offset;
+  const diffToTargetAngle = (targetAngle - currentAngle + 360) % 360;
+  const formattedDiff = (diffToTargetAngle + 180) % 360 - 180;
+  if (disableRotationForReversed && ["row-reverse", "column-reverse"].includes(currentDirection)) {
+    return 0;
+  }
+  return (currentAngle + formattedDiff) * rotationMultiplier;
+};
+
+// src/components/style-sections/layout-section/align-content-field.tsx
 var StartIcon = withDirection3(JustifyTopIcon);
 var EndIcon = withDirection3(JustifyBottomIcon);
 var iconProps = {
@@ -1735,7 +1822,7 @@ var options = [
 ];
 var AlignContentField = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React32.createElement(DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React32.createElement(ThemeProvider, null, /* @__PURE__ */ React32.createElement(StylesField, { bind: "align-content" }, /* @__PURE__ */ React32.createElement(Stack8, { gap: 1 }, /* @__PURE__ */ React32.createElement(ControlLabel, null, __11("Align content", "elementor")), /* @__PURE__ */ React32.createElement(ToggleControl, { options, fullWidth: true })))));
+  return /* @__PURE__ */ React32.createElement(DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React32.createElement(ThemeProvider, null, /* @__PURE__ */ React32.createElement(StylesField, { bind: "align-content" }, /* @__PURE__ */ React32.createElement(Stack9, { gap: 1 }, /* @__PURE__ */ React32.createElement(ControlLabel, null, __11("Align content", "elementor")), /* @__PURE__ */ React32.createElement(ToggleControl, { options, fullWidth: true })))));
 };
 
 // src/components/style-sections/layout-section/align-items-field.tsx
@@ -1837,37 +1924,39 @@ var AlignSelfChild = () => {
 // src/components/style-sections/layout-section/display-field.tsx
 import * as React35 from "react";
 import { ToggleControl as ToggleControl4 } from "@elementor/editor-controls";
-import { Stack as Stack9 } from "@elementor/ui";
+import { Stack as Stack10 } from "@elementor/ui";
 import { __ as __14 } from "@wordpress/i18n";
+var displayFieldOptions = [
+  {
+    value: "block",
+    renderContent: () => __14("Block", "elementor"),
+    label: __14("Block", "elementor"),
+    showTooltip: true
+  },
+  {
+    value: "flex",
+    renderContent: () => __14("Flex", "elementor"),
+    label: __14("Flex", "elementor"),
+    showTooltip: true
+  },
+  {
+    value: "inline-block",
+    renderContent: () => __14("In-blk", "elementor"),
+    label: __14("Inline-block", "elementor"),
+    showTooltip: true
+  },
+  {
+    value: "inline-flex",
+    renderContent: () => __14("In-flx", "elementor"),
+    label: __14("Inline-flex", "elementor"),
+    showTooltip: true
+  }
+];
 var DisplayField = () => {
-  const options13 = [
-    {
-      value: "block",
-      renderContent: () => __14("Block", "elementor"),
-      label: __14("Block", "elementor"),
-      showTooltip: true
-    },
-    {
-      value: "flex",
-      renderContent: () => __14("Flex", "elementor"),
-      label: __14("Flex", "elementor"),
-      showTooltip: true
-    },
-    {
-      value: "inline-block",
-      renderContent: () => __14("In-blk", "elementor"),
-      label: __14("Inline-block", "elementor"),
-      showTooltip: true
-    },
-    {
-      value: "inline-flex",
-      renderContent: () => __14("In-flx", "elementor"),
-      label: __14("Inline-flex", "elementor"),
-      showTooltip: true
-    }
-  ];
-  return /* @__PURE__ */ React35.createElement(StylesField, { bind: "display" }, /* @__PURE__ */ React35.createElement(Stack9, { gap: 0.75 }, /* @__PURE__ */ React35.createElement(ControlLabel, null, __14("Display", "elementor")), /* @__PURE__ */ React35.createElement(ToggleControl4, { options: options13, fullWidth: true })));
+  const placeholder = useDisplayPlaceholderValue();
+  return /* @__PURE__ */ React35.createElement(StylesField, { bind: "display", placeholder }, /* @__PURE__ */ React35.createElement(Stack10, { gap: 0.75 }, /* @__PURE__ */ React35.createElement(ControlLabel, null, __14("Display", "elementor")), /* @__PURE__ */ React35.createElement(ToggleControl4, { options: displayFieldOptions, fullWidth: true })));
 };
+var useDisplayPlaceholderValue = () => useStylesInheritanceField("display")[0]?.value ?? void 0;
 
 // src/components/style-sections/layout-section/flex-direction-field.tsx
 import * as React36 from "react";
@@ -1880,8 +1969,8 @@ var options4 = [
     value: "row",
     label: __15("Row", "elementor"),
     renderContent: ({ size }) => {
-      const StartIcon6 = withDirection6(ArrowRightIcon);
-      return /* @__PURE__ */ React36.createElement(StartIcon6, { fontSize: size });
+      const StartIcon5 = withDirection6(ArrowRightIcon);
+      return /* @__PURE__ */ React36.createElement(StartIcon5, { fontSize: size });
     },
     showTooltip: true
   },
@@ -1895,8 +1984,8 @@ var options4 = [
     value: "row-reverse",
     label: __15("Reversed row", "elementor"),
     renderContent: ({ size }) => {
-      const EndIcon6 = withDirection6(ArrowLeftIcon);
-      return /* @__PURE__ */ React36.createElement(EndIcon6, { fontSize: size });
+      const EndIcon5 = withDirection6(ArrowLeftIcon);
+      return /* @__PURE__ */ React36.createElement(EndIcon5, { fontSize: size });
     },
     showTooltip: true
   },
@@ -1914,7 +2003,7 @@ var FlexDirectionField = () => {
 
 // src/components/style-sections/layout-section/flex-order-field.tsx
 import * as React37 from "react";
-import { useState as useState4 } from "react";
+import { useState as useState5 } from "react";
 import { ControlToggleButtonGroup, NumberControl } from "@elementor/editor-controls";
 import { ArrowDownSmallIcon as ArrowDownSmallIcon2, ArrowUpSmallIcon as ArrowUpSmallIcon2, PencilIcon } from "@elementor/icons";
 import { DirectionProvider as DirectionProvider5, Grid as Grid6, ThemeProvider as ThemeProvider5 } from "@elementor/ui";
@@ -1950,7 +2039,7 @@ var items = [
 ];
 var FlexOrderField = () => {
   const { isSiteRtl } = useDirection(), [order, setOrder] = useStylesField("order");
-  const [groupControlValue, setGroupControlValue] = useState4(getGroupControlValue(order?.value || null));
+  const [groupControlValue, setGroupControlValue] = useState5(getGroupControlValue(order?.value || null));
   const handleToggleButtonChange = (group) => {
     setGroupControlValue(group);
     if (!group || group === CUSTOM) {
@@ -1988,14 +2077,15 @@ var getGroupControlValue = (order) => {
 
 // src/components/style-sections/layout-section/flex-size-field.tsx
 import * as React38 from "react";
-import { useMemo as useMemo2, useState as useState5 } from "react";
+import { useMemo as useMemo2, useState as useState6 } from "react";
 import {
   ControlToggleButtonGroup as ControlToggleButtonGroup2,
   NumberControl as NumberControl2,
   SizeControl as SizeControl2
 } from "@elementor/editor-controls";
+import { numberPropTypeUtil } from "@elementor/editor-props";
 import { ExpandIcon, PencilIcon as PencilIcon2, ShrinkIcon } from "@elementor/icons";
-import { DirectionProvider as DirectionProvider6, Grid as Grid7, ThemeProvider as ThemeProvider6, Typography as Typography4 } from "@elementor/ui";
+import { DirectionProvider as DirectionProvider6, Grid as Grid7, ThemeProvider as ThemeProvider6 } from "@elementor/ui";
 import { __ as __17 } from "@wordpress/i18n";
 var DEFAULT = 1;
 var items2 = [
@@ -2019,26 +2109,37 @@ var items2 = [
   }
 ];
 var FlexSizeField = () => {
-  const { isSiteRtl } = useDirection(), [growField, setGrowField] = useStylesField("flex-grow"), [shrinkField, setShrinkField] = useStylesField("flex-shrink"), [basisField, setBasisField] = useStylesField("flex-basis");
-  const grow = growField?.value || null, shrink = shrinkField?.value || null, basis = basisField?.value || null;
-  const currentGroup = useMemo2(() => getActiveGroup({ grow, shrink, basis }), [grow, shrink, basis]), [activeGroup, setActiveGroup] = useState5(currentGroup);
+  const { isSiteRtl } = useDirection();
+  const [fields, setFields] = useStylesFields(["flex-grow", "flex-shrink", "flex-basis"]);
+  const grow = fields?.["flex-grow"]?.value || null;
+  const shrink = fields?.["flex-shrink"]?.value || null;
+  const basis = fields?.["flex-basis"]?.value || null;
+  const currentGroup = useMemo2(() => getActiveGroup({ grow, shrink, basis }), [grow, shrink, basis]), [activeGroup, setActiveGroup] = useState6(currentGroup);
   const onChangeGroup = (group = null) => {
     setActiveGroup(group);
-    setBasisField(null);
     if (!group || group === "custom") {
-      setGrowField(null);
-      setShrinkField(null);
+      setFields({
+        "flex-basis": null,
+        "flex-grow": null,
+        "flex-shrink": null
+      });
       return;
     }
     if (group === "flex-grow") {
-      setGrowField({ $$type: "number", value: DEFAULT });
-      setShrinkField(null);
+      setFields({
+        "flex-basis": null,
+        "flex-grow": numberPropTypeUtil.create(DEFAULT),
+        "flex-shrink": null
+      });
       return;
     }
-    setGrowField(null);
-    setShrinkField({ $$type: "number", value: DEFAULT });
+    setFields({
+      "flex-basis": null,
+      "flex-grow": null,
+      "flex-shrink": numberPropTypeUtil.create(DEFAULT)
+    });
   };
-  return /* @__PURE__ */ React38.createElement(DirectionProvider6, { rtl: isSiteRtl }, /* @__PURE__ */ React38.createElement(ThemeProvider6, null, /* @__PURE__ */ React38.createElement(SectionContent, null, /* @__PURE__ */ React38.createElement(Typography4, { fontSize: "large" }, activeGroup), /* @__PURE__ */ React38.createElement(Grid7, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React38.createElement(Grid7, { item: true, xs: 6 }, /* @__PURE__ */ React38.createElement(StylesField, { bind: activeGroup ?? "" }, /* @__PURE__ */ React38.createElement(ControlLabel, null, __17("Size", "elementor")))), /* @__PURE__ */ React38.createElement(Grid7, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React38.createElement(
+  return /* @__PURE__ */ React38.createElement(DirectionProvider6, { rtl: isSiteRtl }, /* @__PURE__ */ React38.createElement(ThemeProvider6, null, /* @__PURE__ */ React38.createElement(SectionContent, null, /* @__PURE__ */ React38.createElement(Grid7, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React38.createElement(Grid7, { item: true, xs: 6 }, /* @__PURE__ */ React38.createElement(StylesField, { bind: activeGroup ?? "" }, /* @__PURE__ */ React38.createElement(ControlLabel, null, __17("Size", "elementor")))), /* @__PURE__ */ React38.createElement(Grid7, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React38.createElement(
     ControlToggleButtonGroup2,
     {
       value: activeGroup,
@@ -2072,10 +2173,10 @@ var getActiveGroup = ({
 // src/components/style-sections/layout-section/gap-control-field.tsx
 import * as React39 from "react";
 import { GapControl } from "@elementor/editor-controls";
-import { Stack as Stack10 } from "@elementor/ui";
+import { Stack as Stack11 } from "@elementor/ui";
 import { __ as __18 } from "@wordpress/i18n";
 var GapControlField = () => {
-  return /* @__PURE__ */ React39.createElement(Stack10, { gap: 1 }, /* @__PURE__ */ React39.createElement(StylesField, { bind: "gap" }, /* @__PURE__ */ React39.createElement(GapControl, { label: __18("Gaps", "elementor") })));
+  return /* @__PURE__ */ React39.createElement(Stack11, { gap: 1 }, /* @__PURE__ */ React39.createElement(StylesField, { bind: "gap" }, /* @__PURE__ */ React39.createElement(GapControl, { label: __18("Gaps", "elementor") })));
 };
 
 // src/components/style-sections/layout-section/justify-content-field.tsx
@@ -2089,7 +2190,7 @@ import {
   JustifySpaceBetweenVerticalIcon as BetweenIcon2,
   JustifyTopIcon as JustifyTopIcon2
 } from "@elementor/icons";
-import { DirectionProvider as DirectionProvider7, Stack as Stack11, ThemeProvider as ThemeProvider7, withDirection as withDirection7 } from "@elementor/ui";
+import { DirectionProvider as DirectionProvider7, Stack as Stack12, ThemeProvider as ThemeProvider7, withDirection as withDirection7 } from "@elementor/ui";
 import { __ as __19 } from "@wordpress/i18n";
 var StartIcon4 = withDirection7(JustifyTopIcon2);
 var EndIcon4 = withDirection7(JustifyBottomIcon2);
@@ -2137,7 +2238,7 @@ var options5 = [
 ];
 var JustifyContentField = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React40.createElement(DirectionProvider7, { rtl: isSiteRtl }, /* @__PURE__ */ React40.createElement(ThemeProvider7, null, /* @__PURE__ */ React40.createElement(StylesField, { bind: "justify-content" }, /* @__PURE__ */ React40.createElement(Stack11, { gap: 0.75 }, /* @__PURE__ */ React40.createElement(ControlLabel, null, __19("Justify content", "elementor")), /* @__PURE__ */ React40.createElement(ToggleControl6, { options: options5, fullWidth: true })))));
+  return /* @__PURE__ */ React40.createElement(DirectionProvider7, { rtl: isSiteRtl }, /* @__PURE__ */ React40.createElement(ThemeProvider7, null, /* @__PURE__ */ React40.createElement(StylesField, { bind: "justify-content" }, /* @__PURE__ */ React40.createElement(Stack12, { gap: 0.75 }, /* @__PURE__ */ React40.createElement(ControlLabel, null, __19("Justify content", "elementor")), /* @__PURE__ */ React40.createElement(ToggleControl6, { options: options5, fullWidth: true })))));
 };
 
 // src/components/style-sections/layout-section/wrap-field.tsx
@@ -2174,16 +2275,25 @@ var WrapField = () => {
 // src/components/style-sections/layout-section/layout-section.tsx
 var LayoutSection = () => {
   const [display] = useStylesField("display");
+  const displayPlaceholder = useDisplayPlaceholderValue();
+  const isDisplayFlex = shouldDisplayFlexFields(display, displayPlaceholder);
   const { element } = useElement();
   const parent = useParentElement(element.id);
   const parentStyle = useComputedStyle(parent?.id || null);
-  return /* @__PURE__ */ React42.createElement(SectionContent, null, /* @__PURE__ */ React42.createElement(DisplayField, null), ("flex" === display?.value || "inline-flex" === display?.value) && /* @__PURE__ */ React42.createElement(FlexFields, null), "flex" === parentStyle?.display && /* @__PURE__ */ React42.createElement(FlexChildFields, null));
+  return /* @__PURE__ */ React42.createElement(SectionContent, null, /* @__PURE__ */ React42.createElement(DisplayField, null), isDisplayFlex && /* @__PURE__ */ React42.createElement(FlexFields, null), "flex" === parentStyle?.display && /* @__PURE__ */ React42.createElement(FlexChildFields, null));
 };
 var FlexFields = () => {
   const [flexWrap] = useStylesField("flex-wrap");
   return /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(FlexDirectionField, null), /* @__PURE__ */ React42.createElement(JustifyContentField, null), /* @__PURE__ */ React42.createElement(AlignItemsField, null), /* @__PURE__ */ React42.createElement(PanelDivider, null), /* @__PURE__ */ React42.createElement(GapControlField, null), /* @__PURE__ */ React42.createElement(WrapField, null), ["wrap", "wrap-reverse"].includes(flexWrap?.value) && /* @__PURE__ */ React42.createElement(AlignContentField, null));
 };
 var FlexChildFields = () => /* @__PURE__ */ React42.createElement(React42.Fragment, null, /* @__PURE__ */ React42.createElement(PanelDivider, null), /* @__PURE__ */ React42.createElement(ControlFormLabel3, null, __21("Flex child", "elementor")), /* @__PURE__ */ React42.createElement(AlignSelfChild, null), /* @__PURE__ */ React42.createElement(FlexOrderField, null), /* @__PURE__ */ React42.createElement(FlexSizeField, null));
+var shouldDisplayFlexFields = (display, local) => {
+  const value = display?.value ?? local?.value;
+  if (!value) {
+    return false;
+  }
+  return "flex" === value || "inline-flex" === value;
+};
 
 // src/components/style-sections/position-section/position-section.tsx
 import * as React46 from "react";
@@ -2193,7 +2303,7 @@ import { useSessionStorage } from "@elementor/session";
 import * as React43 from "react";
 import { SizeControl as SizeControl3 } from "@elementor/editor-controls";
 import { SideBottomIcon as SideBottomIcon2, SideLeftIcon as SideLeftIcon2, SideRightIcon as SideRightIcon2, SideTopIcon as SideTopIcon2 } from "@elementor/icons";
-import { Grid as Grid9, Stack as Stack12, withDirection as withDirection8 } from "@elementor/ui";
+import { Grid as Grid9, Stack as Stack13, withDirection as withDirection8 } from "@elementor/ui";
 import { __ as __22 } from "@wordpress/i18n";
 var InlineStartIcon2 = withDirection8(SideLeftIcon2);
 var InlineEndIcon2 = withDirection8(SideRightIcon2);
@@ -2207,7 +2317,7 @@ var getInlineStartLabel = (isSiteRtl) => isSiteRtl ? __22("Right", "elementor")
 var getInlineEndLabel = (isSiteRtl) => isSiteRtl ? __22("Left", "elementor") : __22("Right", "elementor");
 var DimensionsField = () => {
   const { isSiteRtl } = useDirection();
-  return /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(Stack12, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-block-start", label: __22("Top", "elementor") }), /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-inline-end", label: getInlineEndLabel(isSiteRtl) })), /* @__PURE__ */ React43.createElement(Stack12, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-block-end", label: __22("Bottom", "elementor") }), /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-inline-start", label: getInlineStartLabel(isSiteRtl) })));
+  return /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(Stack13, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-block-start", label: __22("Top", "elementor") }), /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-inline-end", label: getInlineEndLabel(isSiteRtl) })), /* @__PURE__ */ React43.createElement(Stack13, { direction: "row", gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-block-end", label: __22("Bottom", "elementor") }), /* @__PURE__ */ React43.createElement(DimensionField, { side: "inset-inline-start", label: getInlineStartLabel(isSiteRtl) })));
 };
 var DimensionField = ({ side, label }) => {
   return /* @__PURE__ */ React43.createElement(Grid9, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React43.createElement(Grid9, { item: true, xs: 12 }, /* @__PURE__ */ React43.createElement(ControlLabel, null, label)), /* @__PURE__ */ React43.createElement(Grid9, { item: true, xs: 12 }, /* @__PURE__ */ React43.createElement(StylesField, { bind: side }, /* @__PURE__ */ React43.createElement(SizeControl3, { startIcon: sideIcons[side], extendedValues: ["auto"] }))));
@@ -2279,7 +2389,7 @@ var usePersistDimensions = () => {
 // src/components/style-sections/size-section/size-section.tsx
 import * as React48 from "react";
 import { SizeControl as SizeControl4 } from "@elementor/editor-controls";
-import { Grid as Grid13, Stack as Stack13 } from "@elementor/ui";
+import { Grid as Grid13, Stack as Stack14 } from "@elementor/ui";
 import { __ as __26 } from "@wordpress/i18n";
 
 // src/components/style-sections/size-section/overflow-field.tsx
@@ -2328,7 +2438,7 @@ var SizeSection = () => {
       label: __26("Min height", "elementor"),
       extendedValues: ["auto"]
     }
-  ))), /* @__PURE__ */ React48.createElement(Grid13, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React48.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React48.createElement(SizeField, { bind: "max-width", label: __26("Max width", "elementor") })), /* @__PURE__ */ React48.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React48.createElement(SizeField, { bind: "max-height", label: __26("Max height", "elementor") }))), /* @__PURE__ */ React48.createElement(PanelDivider, null), /* @__PURE__ */ React48.createElement(Stack13, null, /* @__PURE__ */ React48.createElement(OverflowField, null)));
+  ))), /* @__PURE__ */ React48.createElement(Grid13, { container: true, gap: 2, flexWrap: "nowrap" }, /* @__PURE__ */ React48.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React48.createElement(SizeField, { bind: "max-width", label: __26("Max width", "elementor") })), /* @__PURE__ */ React48.createElement(Grid13, { item: true, xs: 6 }, /* @__PURE__ */ React48.createElement(SizeField, { bind: "max-height", label: __26("Max height", "elementor") }))), /* @__PURE__ */ React48.createElement(PanelDivider, null), /* @__PURE__ */ React48.createElement(Stack14, null, /* @__PURE__ */ React48.createElement(OverflowField, null)));
 };
 var SizeField = ({ label, bind, extendedValues }) => {
   return /* @__PURE__ */ React48.createElement(StylesField, { bind }, /* @__PURE__ */ React48.createElement(Grid13, { container: true, gap: 0.75, alignItems: "center" }, /* @__PURE__ */ React48.createElement(Grid13, { item: true, xs: 12 }, /* @__PURE__ */ React48.createElement(ControlLabel, null, label)), /* @__PURE__ */ React48.createElement(Grid13, { item: true, xs: 12 }, /* @__PURE__ */ React48.createElement(SizeControl4, { extendedValues }))));
@@ -2355,15 +2465,15 @@ import * as React64 from "react";
 
 // src/components/collapsible-content.tsx
 import * as React50 from "react";
-import { useState as useState6 } from "react";
-import { Button, Collapse as Collapse3, Stack as Stack14 } from "@elementor/ui";
+import { useState as useState7 } from "react";
+import { Button, Collapse as Collapse3, Stack as Stack15 } from "@elementor/ui";
 import { __ as __28 } from "@wordpress/i18n";
 var CollapsibleContent = ({ children, defaultOpen = false }) => {
-  const [open, setOpen] = useState6(defaultOpen);
+  const [open, setOpen] = useState7(defaultOpen);
   const handleToggle = () => {
     setOpen((prevOpen) => !prevOpen);
   };
-  return /* @__PURE__ */ React50.createElement(Stack14, null, /* @__PURE__ */ React50.createElement(
+  return /* @__PURE__ */ React50.createElement(Stack15, null, /* @__PURE__ */ React50.createElement(
     Button,
     {
       fullWidth: true,
@@ -2513,13 +2623,13 @@ import { ToggleControl as ToggleControl10 } from "@elementor/editor-controls";
 import { AlignCenterIcon, AlignJustifiedIcon, AlignLeftIcon, AlignRightIcon } from "@elementor/icons";
 import { Grid as Grid20, withDirection as withDirection9 } from "@elementor/ui";
 import { __ as __36 } from "@wordpress/i18n";
-var StartIcon5 = withDirection9(AlignLeftIcon);
-var EndIcon5 = withDirection9(AlignRightIcon);
+var AlignStartIcon = withDirection9(AlignLeftIcon);
+var AlignEndIcon = withDirection9(AlignRightIcon);
 var options9 = [
   {
     value: "start",
     label: __36("Start", "elementor"),
-    renderContent: () => /* @__PURE__ */ React57.createElement(RotatedIcon, { icon: StartIcon5, size: "tiny" }),
+    renderContent: ({ size }) => /* @__PURE__ */ React57.createElement(AlignStartIcon, { fontSize: size }),
     showTooltip: true
   },
   {
@@ -2531,7 +2641,7 @@ var options9 = [
   {
     value: "end",
     label: __36("End", "elementor"),
-    renderContent: () => /* @__PURE__ */ React57.createElement(RotatedIcon, { icon: EndIcon5, size: "tiny" }),
+    renderContent: ({ size }) => /* @__PURE__ */ React57.createElement(AlignEndIcon, { fontSize: size }),
     showTooltip: true
   },
   {
@@ -2542,7 +2652,7 @@ var options9 = [
   }
 ];
 var TextAlignmentField = () => {
-  return /* @__PURE__ */ React57.createElement(StylesField, { bind: "text-align" }, /* @__PURE__ */ React57.createElement(Grid20, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React57.createElement(Grid20, { item: true, xs: 6 }, /* @__PURE__ */ React57.createElement(ControlLabel, null, __36("Alignment", "elementor"))), /* @__PURE__ */ React57.createElement(Grid20, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React57.createElement(ToggleControl10, { options: options9 }))));
+  return /* @__PURE__ */ React57.createElement(StylesField, { bind: "text-align" }, /* @__PURE__ */ React57.createElement(Grid20, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React57.createElement(Grid20, { item: true, xs: 6 }, /* @__PURE__ */ React57.createElement(ControlLabel, null, __36("Text align", "elementor"))), /* @__PURE__ */ React57.createElement(Grid20, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React57.createElement(ToggleControl10, { options: options9 }))));
 };
 
 // src/components/style-sections/typography-section/text-color-field.tsx
@@ -2706,7 +2816,7 @@ var TypographySection = () => {
 var StyleTab = () => {
   const currentClassesProp = useCurrentClassesProp();
   const [activeStyleDefId, setActiveStyleDefId] = useActiveStyleDefId(currentClassesProp);
-  const [activeStyleState, setActiveStyleState] = useState7(null);
+  const [activeStyleState, setActiveStyleState] = useState8(null);
   const breakpoint = useActiveBreakpoint();
   return /* @__PURE__ */ React65.createElement(ClassesPropProvider, { prop: currentClassesProp }, /* @__PURE__ */ React65.createElement(
     StyleProvider,
@@ -2722,17 +2832,6 @@ var StyleTab = () => {
     /* @__PURE__ */ React65.createElement(SessionStorageProvider2, { prefix: activeStyleDefId ?? "" }, /* @__PURE__ */ React65.createElement(StyleInheritanceProvider, null, /* @__PURE__ */ React65.createElement(CssClassSelector, null), /* @__PURE__ */ React65.createElement(Divider4, null), /* @__PURE__ */ React65.createElement(SectionsList, null, /* @__PURE__ */ React65.createElement(Section, { title: __43("Layout", "elementor") }, /* @__PURE__ */ React65.createElement(LayoutSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: __43("Spacing", "elementor") }, /* @__PURE__ */ React65.createElement(SpacingSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: __43("Size", "elementor") }, /* @__PURE__ */ React65.createElement(SizeSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: __43("Position", "elementor") }, /* @__PURE__ */ React65.createElement(PositionSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: __43("Typography", "elementor") }, /* @__PURE__ */ React65.createElement(TypographySection, null)), /* @__PURE__ */ React65.createElement(Section, { title: __43("Background", "elementor") }, /* @__PURE__ */ React65.createElement(BackgroundSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: __43("Border", "elementor") }, /* @__PURE__ */ React65.createElement(BorderSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: __43("Effects", "elementor") }, /* @__PURE__ */ React65.createElement(EffectsSection, null)))))
   ));
 };
-function useActiveStyleDefId(currentClassesProp) {
-  const [activeStyledDefId, setActiveStyledDefId] = useState7(null);
-  const fallback = useFirstElementStyleDef(currentClassesProp);
-  return [activeStyledDefId || fallback?.id || null, setActiveStyledDefId];
-}
-function useFirstElementStyleDef(currentClassesProp) {
-  const { element } = useElement();
-  const classesIds = useElementSetting5(element.id, currentClassesProp)?.value || [];
-  const stylesDefs = getElementStyles(element.id) ?? {};
-  return Object.values(stylesDefs).find((styleDef) => classesIds.includes(styleDef.id));
-}
 function useCurrentClassesProp() {
   const { elementType } = useElement();
   const prop = Object.entries(elementType.propsSchema).find(
@@ -2751,19 +2850,7 @@ var EditingPanelTabs = () => {
   return (
     // When switching between elements, the local states should be reset. We are using key to rerender the tabs.
     // Reference: https://react.dev/learn/preserving-and-resetting-state#resetting-a-form-with-a-key
-    /* @__PURE__ */ React66.createElement(Fragment8, { key: element.id }, /* @__PURE__ */ React66.createElement(Stack15, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React66.createElement(
-      Tabs,
-      {
-        variant: "fullWidth",
-        indicatorColor: "secondary",
-        textColor: "inherit",
-        size: "small",
-        sx: { mt: 0.5 },
-        ...getTabsProps()
-      },
-      /* @__PURE__ */ React66.createElement(Tab, { label: __44("General", "elementor"), ...getTabProps("settings") }),
-      /* @__PURE__ */ React66.createElement(Tab, { label: __44("Style", "elementor"), ...getTabProps("style") })
-    ), /* @__PURE__ */ React66.createElement(Divider5, null), /* @__PURE__ */ React66.createElement(TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React66.createElement(SettingsTab, null)), /* @__PURE__ */ React66.createElement(TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React66.createElement(StyleTab, null))))
+    /* @__PURE__ */ React66.createElement(Fragment8, { key: element.id }, /* @__PURE__ */ React66.createElement(Stack16, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React66.createElement(Tabs, { variant: "fullWidth", size: "small", sx: { mt: 0.5 }, ...getTabsProps() }, /* @__PURE__ */ React66.createElement(Tab, { label: __44("General", "elementor"), ...getTabProps("settings") }), /* @__PURE__ */ React66.createElement(Tab, { label: __44("Style", "elementor"), ...getTabProps("style") })), /* @__PURE__ */ React66.createElement(Divider5, null), /* @__PURE__ */ React66.createElement(TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React66.createElement(SettingsTab, null)), /* @__PURE__ */ React66.createElement(TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React66.createElement(StyleTab, null))))
   );
 };
 
@@ -2825,6 +2912,9 @@ var EditingPanelHooks = () => {
   return null;
 };
 
+// src/dynamics/init.ts
+import { settingsTransformersRegistry, styleTransformersRegistry } from "@elementor/editor-canvas";
+
 // src/dynamics/components/dynamic-selection-control.tsx
 import * as React71 from "react";
 import { useId as useId4 } from "react";
@@ -2839,11 +2929,11 @@ import {
   IconButton as IconButton3,
   Paper,
   Popover as Popover2,
-  Stack as Stack18,
+  Stack as Stack19,
   Tab as Tab2,
   TabPanel as TabPanel2,
   Tabs as Tabs2,
-  Typography as Typography6,
+  Typography as Typography4,
   UnstableTag as Tag,
   usePopupState as usePopupState3,
   useTabs as useTabs2
@@ -2852,8 +2942,8 @@ import { __ as __47 } from "@wordpress/i18n";
 
 // src/components/popover-content.tsx
 import * as React68 from "react";
-import { Stack as Stack16 } from "@elementor/ui";
-var PopoverContent = ({ alignItems, gap = 1.5, p, children }) => /* @__PURE__ */ React68.createElement(Stack16, { alignItems, gap, p }, children);
+import { Stack as Stack17 } from "@elementor/ui";
+var PopoverContent = ({ alignItems, gap = 1.5, p, children }) => /* @__PURE__ */ React68.createElement(Stack17, { alignItems, gap, p }, children);
 
 // src/hooks/use-persist-dynamic-value.ts
 import { useSessionStorage as useSessionStorage2 } from "@elementor/session";
@@ -2971,7 +3061,7 @@ var DynamicControl = ({ bind, children }) => {
 
 // src/dynamics/components/dynamic-selection.tsx
 import * as React70 from "react";
-import { Fragment as Fragment9, useState as useState8 } from "react";
+import { Fragment as Fragment9, useState as useState9 } from "react";
 import { useBoundProp as useBoundProp4 } from "@elementor/editor-controls";
 import { DatabaseIcon, SearchIcon } from "@elementor/icons";
 import {
@@ -2982,14 +3072,14 @@ import {
   MenuItem,
   MenuList,
   MenuSubheader as MenuSubheader2,
-  Stack as Stack17,
+  Stack as Stack18,
   TextField as TextField2,
-  Typography as Typography5
+  Typography as Typography3
 } from "@elementor/ui";
 import { __ as __46 } from "@wordpress/i18n";
 var SIZE3 = "tiny";
 var DynamicSelection = ({ onSelect }) => {
-  const [searchValue, setSearchValue] = useState8("");
+  const [searchValue, setSearchValue] = useState9("");
   const { groups: dynamicGroups } = getAtomicDynamicTags() || {};
   const { value: anyValue } = useBoundProp4();
   const { bind, value: dynamicValue, setValue } = useBoundProp4(dynamicPropTypeUtil);
@@ -3007,7 +3097,7 @@ var DynamicSelection = ({ onSelect }) => {
     setValue({ name: value, settings: { label } });
     onSelect?.();
   };
-  return /* @__PURE__ */ React70.createElement(Stack17, null, hasNoDynamicTags ? /* @__PURE__ */ React70.createElement(NoDynamicTags, null) : /* @__PURE__ */ React70.createElement(Fragment9, null, /* @__PURE__ */ React70.createElement(Box4, { px: 1.5, pb: 1 }, /* @__PURE__ */ React70.createElement(
+  return /* @__PURE__ */ React70.createElement(Stack18, null, hasNoDynamicTags ? /* @__PURE__ */ React70.createElement(NoDynamicTags, null) : /* @__PURE__ */ React70.createElement(Fragment9, null, /* @__PURE__ */ React70.createElement(Box4, { px: 1.5, pb: 1 }, /* @__PURE__ */ React70.createElement(
     TextField2,
     {
       fullWidth: true,
@@ -3041,7 +3131,7 @@ var DynamicSelection = ({ onSelect }) => {
   })))) : /* @__PURE__ */ React70.createElement(NoResults, { searchValue, onClear: () => setSearchValue("") }))));
 };
 var NoResults = ({ searchValue, onClear }) => /* @__PURE__ */ React70.createElement(
-  Stack17,
+  Stack18,
   {
     gap: 1,
     alignItems: "center",
@@ -3052,11 +3142,11 @@ var NoResults = ({ searchValue, onClear }) => /* @__PURE__ */ React70.createElem
     sx: { pb: 3.5 }
   },
   /* @__PURE__ */ React70.createElement(DatabaseIcon, { fontSize: "large" }),
-  /* @__PURE__ */ React70.createElement(Typography5, { align: "center", variant: "subtitle2" }, __46("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React70.createElement("br", null), "\u201C", searchValue, "\u201D."),
-  /* @__PURE__ */ React70.createElement(Typography5, { align: "center", variant: "caption" }, __46("Try something else.", "elementor"), "\xA0", /* @__PURE__ */ React70.createElement(Link, { color: "text.secondary", variant: "caption", component: "button", onClick: onClear }, __46("Clear & try again", "elementor")))
+  /* @__PURE__ */ React70.createElement(Typography3, { align: "center", variant: "subtitle2" }, __46("Sorry, nothing matched", "elementor"), /* @__PURE__ */ React70.createElement("br", null), "\u201C", searchValue, "\u201D."),
+  /* @__PURE__ */ React70.createElement(Typography3, { align: "center", variant: "caption" }, __46("Try something else.", "elementor"), "\xA0", /* @__PURE__ */ React70.createElement(Link, { color: "text.secondary", variant: "caption", component: "button", onClick: onClear }, __46("Clear & try again", "elementor")))
 );
 var NoDynamicTags = () => /* @__PURE__ */ React70.createElement(Box4, { sx: { overflowY: "hidden", height: 297, width: 220 } }, /* @__PURE__ */ React70.createElement(Divider6, null), /* @__PURE__ */ React70.createElement(
-  Stack17,
+  Stack18,
   {
     gap: 1,
     alignItems: "center",
@@ -3067,8 +3157,8 @@ var NoDynamicTags = () => /* @__PURE__ */ React70.createElement(Box4, { sx: { ov
     sx: { pb: 3.5 }
   },
   /* @__PURE__ */ React70.createElement(DatabaseIcon, { fontSize: "large" }),
-  /* @__PURE__ */ React70.createElement(Typography5, { align: "center", variant: "subtitle2" }, __46("Streamline your workflow with dynamic tags", "elementor")),
-  /* @__PURE__ */ React70.createElement(Typography5, { align: "center", variant: "caption" }, __46("You\u2019ll need Elementor Pro to use this feature.", "elementor"))
+  /* @__PURE__ */ React70.createElement(Typography3, { align: "center", variant: "subtitle2" }, __46("Streamline your workflow with dynamic tags", "elementor")),
+  /* @__PURE__ */ React70.createElement(Typography3, { align: "center", variant: "caption" }, __46("You\u2019ll need Elementor Pro to use this feature.", "elementor"))
 ));
 var useFilteredOptions = (searchValue) => {
   const dynamicTags = usePropDynamicTags();
@@ -3128,7 +3218,7 @@ var DynamicSelectionControl = () => {
       anchorOrigin: { vertical: "bottom", horizontal: "left" },
       ...bindPopover2(selectionPopoverState)
     },
-    /* @__PURE__ */ React71.createElement(Stack18, null, /* @__PURE__ */ React71.createElement(Stack18, { direction: "row", alignItems: "center", pl: 1.5, pr: 0.5, py: 1.5 }, /* @__PURE__ */ React71.createElement(DatabaseIcon2, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React71.createElement(Typography6, { variant: "subtitle2" }, __47("Dynamic tags", "elementor")), /* @__PURE__ */ React71.createElement(IconButton3, { size: SIZE4, sx: { ml: "auto" }, onClick: selectionPopoverState.close }, /* @__PURE__ */ React71.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React71.createElement(DynamicSelection, { onSelect: selectionPopoverState.close }))
+    /* @__PURE__ */ React71.createElement(Stack19, null, /* @__PURE__ */ React71.createElement(Stack19, { direction: "row", alignItems: "center", pl: 1.5, pr: 0.5, py: 1.5 }, /* @__PURE__ */ React71.createElement(DatabaseIcon2, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React71.createElement(Typography4, { variant: "subtitle2" }, __47("Dynamic tags", "elementor")), /* @__PURE__ */ React71.createElement(IconButton3, { size: SIZE4, sx: { ml: "auto" }, onClick: selectionPopoverState.close }, /* @__PURE__ */ React71.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React71.createElement(DynamicSelection, { onSelect: selectionPopoverState.close }))
   ));
 };
 var DynamicSettingsPopover = ({ dynamicTag }) => {
@@ -3153,7 +3243,7 @@ var DynamicSettingsPopover = ({ dynamicTag }) => {
       anchorOrigin: { vertical: "bottom", horizontal: "center" },
       ...bindPopover2(settingsPopupState)
     },
-    /* @__PURE__ */ React71.createElement(Paper, { component: Stack18, sx: { minHeight: "300px", width: "220px" } }, /* @__PURE__ */ React71.createElement(Stack18, { direction: "row", alignItems: "center", px: 1.5, pt: 2, pb: 1 }, /* @__PURE__ */ React71.createElement(DatabaseIcon2, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React71.createElement(Typography6, { variant: "subtitle2" }, dynamicTag.label), /* @__PURE__ */ React71.createElement(IconButton3, { sx: { ml: "auto" }, size: SIZE4, onClick: settingsPopupState.close }, /* @__PURE__ */ React71.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React71.createElement(DynamicSettings, { controls: dynamicTag.atomic_controls }))
+    /* @__PURE__ */ React71.createElement(Paper, { component: Stack19, sx: { minHeight: "300px", width: "220px" } }, /* @__PURE__ */ React71.createElement(Stack19, { direction: "row", alignItems: "center", px: 1.5, pt: 2, pb: 1 }, /* @__PURE__ */ React71.createElement(DatabaseIcon2, { fontSize: SIZE4, sx: { mr: 0.5 } }), /* @__PURE__ */ React71.createElement(Typography4, { variant: "subtitle2" }, dynamicTag.label), /* @__PURE__ */ React71.createElement(IconButton3, { sx: { ml: "auto" }, size: SIZE4, onClick: settingsPopupState.close }, /* @__PURE__ */ React71.createElement(XIcon2, { fontSize: SIZE4 }))), /* @__PURE__ */ React71.createElement(DynamicSettings, { controls: dynamicTag.atomic_controls }))
   ));
 };
 var DynamicSettings = ({ controls }) => {
@@ -3178,6 +3268,55 @@ var Control3 = ({ control }) => {
   return /* @__PURE__ */ React71.createElement(DynamicControl, { bind: control.bind }, /* @__PURE__ */ React71.createElement(Grid26, { container: true, gap: 0.75 }, control.label ? /* @__PURE__ */ React71.createElement(Grid26, { item: true, xs: 12 }, /* @__PURE__ */ React71.createElement(ControlFormLabel5, null, control.label)) : null, /* @__PURE__ */ React71.createElement(Grid26, { item: true, xs: 12 }, /* @__PURE__ */ React71.createElement(Control, { type: control.type, props: control.props }))));
 };
 
+// src/dynamics/dynamic-transformer.ts
+import { createTransformer } from "@elementor/editor-canvas";
+import { isTransformable as isTransformable2 } from "@elementor/editor-props";
+
+// src/dynamics/errors.ts
+import { createError as createError2 } from "@elementor/utils";
+var DynamicTagsManagerNotFoundError = createError2({
+  code: "dynamic_tags_manager_not_found",
+  message: "Dynamic tags manager not found"
+});
+
+// src/dynamics/dynamic-transformer.ts
+var dynamicTransformer = createTransformer((value) => {
+  if (!value.name) {
+    return null;
+  }
+  return getDynamicValue(value.name, simpleTransform(value.settings ?? {}));
+});
+function simpleTransform(props) {
+  const transformed = Object.entries(props).map(([settingKey, settingValue]) => {
+    const value = isTransformable2(settingValue) ? settingValue.value : settingValue;
+    return [settingKey, value];
+  });
+  return Object.fromEntries(transformed);
+}
+function getDynamicValue(name, settings) {
+  const extendedWindow = window;
+  const { dynamicTags } = extendedWindow.elementor ?? {};
+  if (!dynamicTags) {
+    throw new DynamicTagsManagerNotFoundError();
+  }
+  const getTagValue = () => {
+    const tag = dynamicTags.createTag("v4-dynamic-tag", name, settings);
+    if (!tag) {
+      return null;
+    }
+    return dynamicTags.loadTagDataFromCache(tag) ?? null;
+  };
+  const tagValue = getTagValue();
+  if (tagValue !== null) {
+    return tagValue;
+  }
+  return new Promise((resolve) => {
+    dynamicTags.refreshCacheFromServer(() => {
+      resolve(getTagValue());
+    });
+  });
+}
+
 // src/dynamics/hooks/use-prop-dynamic-action.tsx
 import * as React72 from "react";
 import { useBoundProp as useBoundProp6 } from "@elementor/editor-controls";
@@ -3205,6 +3344,8 @@ var init = () => {
     id: "dynamic-tags",
     useProps: usePropDynamicAction
   });
+  styleTransformersRegistry.register("dynamic", dynamicTransformer);
+  settingsTransformersRegistry.register("dynamic", dynamicTransformer);
 };
 
 // src/init.ts
@@ -3227,10 +3368,8 @@ var blockV1Panel = () => {
     condition: isAtomicWidgetSelected
   });
 };
-
-// src/index.ts
-init2();
 export {
+  init2 as init,
   injectIntoClassSelectorActions,
   replaceControl,
   useBoundProp7 as useBoundProp,