@elementor/editor-editing-panel 1.24.0 → 1.28.0

package/dist/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  init: () => init2,
   injectIntoClassSelectorActions: () => injectIntoClassSelectorActions,
   replaceControl: () => replaceControl,
   useBoundProp: () => import_editor_controls50.useBoundProp,
@@ -50,7 +51,7 @@ var import_editor_props = require("@elementor/editor-props");
 var import_editor_styles_repository4 = require("@elementor/editor-styles-repository");
 var import_icons2 = require("@elementor/icons");
 var import_locations = require("@elementor/locations");
-var import_ui4 = require("@elementor/ui");
+var import_ui5 = require("@elementor/ui");
 var import_i18n3 = require("@wordpress/i18n");
 
 // src/contexts/classes-prop-context.tsx
@@ -125,7 +126,7 @@ function useStyle() {
 }
 function getProviderByStyleId(styleId) {
   const styleProvider = import_editor_styles_repository.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;
 }
@@ -139,6 +140,7 @@ function MultiCombobox({
   selected,
   options: options13,
   onSelect,
+  placeholder,
   ...props
 }) {
   const filter = useFilterOptions();
@@ -161,6 +163,7 @@ function MultiCombobox({
         import_ui.TextField,
         {
           ...params,
+          placeholder,
           sx: (theme) => ({
             ".MuiAutocomplete-inputRoot.MuiInputBase-adornedStart": {
               paddingLeft: theme.spacing(0.25),
@@ -260,14 +263,14 @@ var import_react5 = require("react");
 var import_editor_styles_repository3 = require("@elementor/editor-styles-repository");
 var import_editor_ui2 = require("@elementor/editor-ui");
 var import_icons = require("@elementor/icons");
-var import_ui3 = require("@elementor/ui");
+var import_ui4 = require("@elementor/ui");
 var import_i18n2 = require("@wordpress/i18n");
 
 // src/components/css-classes/css-class-menu.tsx
 var React5 = __toESM(require("react"));
 var import_editor_styles_repository2 = require("@elementor/editor-styles-repository");
 var import_editor_ui = require("@elementor/editor-ui");
-var import_ui2 = require("@elementor/ui");
+var import_ui3 = require("@elementor/ui");
 var import_i18n = require("@wordpress/i18n");
 
 // src/hooks/use-unapply-class.ts
@@ -292,17 +295,41 @@ var useUnapplyClass = (classId) => {
   };
 };
 
+// src/components/style-indicator.tsx
+var import_ui2 = require("@elementor/ui");
+var StyleIndicator = (0, import_ui2.styled)("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 || (0, import_editor_styles_repository2.isElementsStylesProvider)(provider) ? "local" : "global";
   const handleKeyDown = (e) => {
     e.stopPropagation();
   };
   return /* @__PURE__ */ React5.createElement(
-    import_ui2.Menu,
+    import_ui3.Menu,
     {
-      MenuListProps: { dense: true },
-      ...(0, import_ui2.bindMenu)(popupState),
+      MenuListProps: { dense: true, sx: { minWidth: "160px" } },
+      ...(0, import_ui3.bindMenu)(popupState),
       anchorEl,
       anchorOrigin: {
         vertical: "bottom",
@@ -312,23 +339,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(import_ui2.MenuSubheader, { sx: { typography: "caption", color: "text.secondary", pb: 0.5, pt: 1 } }, (0, import_i18n.__)("Pseudo classes", "elementor")),
-    /* @__PURE__ */ React5.createElement(StateMenuItem, { key: "normal", state: null, styleId, closeMenu: popupState.close }),
+    /* @__PURE__ */ React5.createElement(import_ui3.MenuSubheader, { sx: { typography: "caption", color: "text.secondary", pb: 0.5, pt: 1 } }, (0, import_i18n.__)("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 = import_editor_styles_repository2.stylesRepository.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 = import_editor_styles_repository2.stylesRepository.getProviderByKey(provider);
@@ -341,19 +396,26 @@ function getMenuItemsByProvider({
   if (actions.length) {
     actions.unshift(
       /* @__PURE__ */ React5.createElement(
-        import_ui2.MenuSubheader,
+        import_ui3.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
       )
     );
-    actions.push(/* @__PURE__ */ React5.createElement(import_ui2.Divider, { key: "provider-actions-divider" }));
+    actions.push(/* @__PURE__ */ React5.createElement(import_ui3.Divider, { key: "provider-actions-divider" }));
   }
   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;
@@ -372,7 +434,7 @@ function StateMenuItem({ state, styleId, closeMenu, ...props }) {
         closeMenu();
       }
     },
-    state ? state : "Normal"
+    /* @__PURE__ */ React5.createElement(import_ui3.Stack, { gap: 0.75, direction: "row", alignItems: "center" }, isStyled && /* @__PURE__ */ React5.createElement(StyleIndicator, { "aria-label": (0, import_i18n.__)("Has style", "elementor"), variant: indicatorVariant }), state ?? "normal")
   );
 }
 function UnapplyClassMenuItem({ styleId, closeMenu, ...props }) {
@@ -411,8 +473,8 @@ function RenameClassMenuItem({
 var CHIP_SIZE = "tiny";
 function CssClassItem({
   id,
-  label,
   provider,
+  label,
   isActive,
   color: colorProp,
   icon,
@@ -421,7 +483,7 @@ function CssClassItem({
   renameLabel
 }) {
   const { meta, setMetaState } = useStyle();
-  const popupState = (0, import_ui3.usePopupState)({ variant: "popover" });
+  const popupState = (0, import_ui4.usePopupState)({ variant: "popover" });
   const [chipRef, setChipRef] = (0, import_react5.useState)(null);
   const { onDelete, ...chipGroupProps } = chipProps;
   const {
@@ -436,11 +498,11 @@ function CssClassItem({
     validation: validateLabel
   });
   const color = error ? "error" : colorProp;
-  const providerActions = import_editor_styles_repository3.stylesRepository.getProviderByKey(provider)?.actions;
+  const providerActions = provider ? import_editor_styles_repository3.stylesRepository.getProviderByKey(provider)?.actions : null;
   const allowRename = Boolean(providerActions?.update);
   const isShowingState = isActive && meta.state;
   return /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(
-    import_ui3.UnstableChipGroup,
+    import_ui4.UnstableChipGroup,
     {
       ref: setChipRef,
       ...chipGroupProps,
@@ -451,7 +513,7 @@ function CssClassItem({
       })
     },
     /* @__PURE__ */ React6.createElement(
-      import_ui3.Chip,
+      import_ui4.Chip,
       {
         size: CHIP_SIZE,
         label: isEditing ? /* @__PURE__ */ React6.createElement(import_editor_ui2.EditableField, { ref, error, ...getEditableProps() }) : /* @__PURE__ */ React6.createElement(import_editor_ui2.EllipsisWithTooltip, { maxWidth: "10ch", title: label, as: "div" }),
@@ -481,15 +543,15 @@ function CssClassItem({
       }
     ),
     !isEditing && /* @__PURE__ */ React6.createElement(
-      import_ui3.Chip,
+      import_ui4.Chip,
       {
         icon: isShowingState ? void 0 : /* @__PURE__ */ React6.createElement(import_icons.DotsVerticalIcon, { fontSize: "tiny" }),
         size: CHIP_SIZE,
-        label: isShowingState ? /* @__PURE__ */ React6.createElement(import_ui3.Stack, { direction: "row", gap: 0.5, alignItems: "center" }, /* @__PURE__ */ React6.createElement(import_ui3.Typography, { variant: "inherit" }, meta.state), /* @__PURE__ */ React6.createElement(import_icons.DotsVerticalIcon, { fontSize: "tiny" })) : void 0,
+        label: isShowingState ? /* @__PURE__ */ React6.createElement(import_ui4.Stack, { direction: "row", gap: 0.5, alignItems: "center" }, /* @__PURE__ */ React6.createElement(import_ui4.Typography, { variant: "inherit" }, meta.state), /* @__PURE__ */ React6.createElement(import_icons.DotsVerticalIcon, { fontSize: "tiny" })) : void 0,
         variant: "filled",
         shape: "rounded",
         color,
-        ...(0, import_ui3.bindTrigger)(popupState),
+        ...(0, import_ui4.bindTrigger)(popupState),
         "aria-label": (0, import_i18n2.__)("Open CSS Class Menu", "elementor"),
         sx: (theme) => ({
           borderRadius: `${theme.shape.borderRadius * 0.75}px`,
@@ -511,13 +573,11 @@ function CssClassItem({
   ));
 }
 var validateLabel = (newLabel) => {
-  if (!import_editor_styles_repository3.stylesRepository.isLabelValid(newLabel)) {
-    return (0, import_i18n2.__)("Format is not valid", "elementor");
-  }
-  if (import_editor_styles_repository3.stylesRepository.isLabelExist(newLabel)) {
-    return (0, import_i18n2.__)("Existing name", "elementor");
+  const result = (0, import_editor_styles_repository3.validateStyleLabel)(newLabel);
+  if (result.isValid) {
+    return null;
   }
-  return null;
+  return result.error;
 };
 
 // src/components/css-classes/css-class-selector.tsx
@@ -529,7 +589,7 @@ var EMPTY_OPTION = {
   fixed: true,
   color: "accent",
   icon: /* @__PURE__ */ React7.createElement(import_icons2.MapPinIcon, null),
-  provider: import_editor_styles_repository4.ELEMENTS_STYLES_PROVIDER_KEY
+  provider: null
 };
 var { Slot: ClassSelectorActionsSlot, inject: injectIntoClassSelectorActions } = (0, import_locations.createLocation)();
 function CssClassSelector() {
@@ -540,17 +600,19 @@ 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(import_ui4.Stack, { gap: 1, p: 2 }, /* @__PURE__ */ React7.createElement(import_ui4.Stack, { direction: "row", gap: 1, alignItems: "center", justifyContent: "space-between" }, /* @__PURE__ */ React7.createElement(import_ui4.Typography, { component: "label", variant: "caption", htmlFor: ID }, (0, import_i18n3.__)("CSS classes", "elementor")), /* @__PURE__ */ React7.createElement(import_ui4.Stack, { direction: "row", gap: 1 }, /* @__PURE__ */ React7.createElement(ClassSelectorActionsSlot, null))), /* @__PURE__ */ React7.createElement(
+  const showPlaceholder = applied.every(({ fixed }) => fixed);
+  return /* @__PURE__ */ React7.createElement(import_ui5.Stack, { p: 2 }, /* @__PURE__ */ React7.createElement(import_ui5.Stack, { direction: "row", gap: 1, alignItems: "center", justifyContent: "space-between" }, /* @__PURE__ */ React7.createElement(import_ui5.FormLabel, { htmlFor: ID, size: "small" }, (0, import_i18n3.__)("Classes", "elementor")), /* @__PURE__ */ React7.createElement(import_ui5.Stack, { direction: "row", gap: 1 }, /* @__PURE__ */ React7.createElement(ClassSelectorActionsSlot, null))), /* @__PURE__ */ React7.createElement(
     MultiCombobox,
     {
       id: ID,
       size: "tiny",
+      placeholder: showPlaceholder ? (0, import_i18n3.__)("Type to search/add global classes", "elementor") : void 0,
       options: options13,
       selected: applied,
       onSelect: handleApply,
       limitTags: TAGS_LIMIT,
       actions,
-      getLimitTagsText: (more) => /* @__PURE__ */ React7.createElement(import_ui4.Chip, { size: "tiny", variant: "standard", label: `+${more}`, clickable: true }),
+      getLimitTagsText: (more) => /* @__PURE__ */ React7.createElement(import_ui5.Chip, { size: "tiny", variant: "standard", label: `+${more}`, clickable: true }),
       renderTags: (values, getTagProps) => values.map((value, index) => {
         const chipProps = getTagProps({ index });
         const isActive = value.value === active?.value;
@@ -580,6 +642,9 @@ function CssClassSelector() {
   ));
 }
 var updateClassByProvider = (provider, data) => {
+  if (!provider) {
+    return;
+  }
   const providerInstance = import_editor_styles_repository4.stylesRepository.getProviderByKey(provider);
   if (!providerInstance) {
     return;
@@ -590,8 +655,8 @@ function useOptions() {
   const { element } = useElement();
   const isProviderEditable = (provider) => !!provider.actions.updateProps;
   return (0, import_editor_styles_repository4.useProviders)().filter(isProviderEditable).flatMap((provider) => {
-    const isElements = provider.key === import_editor_styles_repository4.ELEMENTS_STYLES_PROVIDER_KEY;
-    const styleDefs = provider.actions.get({ elementId: element.id });
+    const isElements = (0, import_editor_styles_repository4.isElementsStylesProvider)(provider.getKey());
+    const styleDefs = provider.actions.all({ elementId: element.id });
     if (isElements && styleDefs.length === 0) {
       return [EMPTY_OPTION];
     }
@@ -602,8 +667,9 @@ function useOptions() {
         fixed: isElements,
         color: isElements ? "accent" : "global",
         icon: isElements ? /* @__PURE__ */ React7.createElement(import_icons2.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: (0, import_i18n3.__)("Existing %s", "elementor").replace("%s", provider.labels?.plural ?? "")
       };
     });
   });
@@ -615,10 +681,10 @@ function useCreateActions({
   return (0, import_editor_styles_repository4.useCreateActionsByProvider)().map(([provider, create]) => {
     return {
       // translators: %s is the label of the new class.
-      label: (value) => (0, import_i18n3.__)('Create new "%s"', "elementor").replace("%s", value),
-      // translators: %s is the singular label of css class provider (e.g "Global CSS Class").
-      group: (0, import_i18n3.__)("Create New %s", "elementor").replace("%s", provider.labels?.singular ?? ""),
-      condition: (_, inputValue) => isLabelValid(inputValue) && !hasReachedLimit(provider),
+      label: (value) => (0, import_i18n3.__)('Create "%s"', "elementor").replace("%s", value),
+      // translators: %s is the singular label of css class provider (e.g "CSS Class").
+      group: (0, import_i18n3.__)("Create a new %s", "elementor").replace("%s", provider.labels?.singular ?? ""),
+      condition: (_, inputValue) => (0, import_editor_styles_repository4.validateStyleLabel)(inputValue).isValid && !hasReachedLimit(provider),
       apply: (label) => {
         const createdId = create(label);
         if (!createdId) {
@@ -631,18 +697,12 @@ function useCreateActions({
   });
 }
 function hasReachedLimit(provider) {
-  if (provider.limit === void 0) {
-    return false;
-  }
-  return provider.actions.get().length >= provider.limit;
-}
-function isLabelValid(newLabel) {
-  return import_editor_styles_repository4.stylesRepository.isLabelValid(newLabel) && !import_editor_styles_repository4.stylesRepository.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 === import_editor_styles_repository4.ELEMENTS_STYLES_PROVIDER_KEY
+    (option) => option.provider && (0, import_editor_styles_repository4.isElementsStylesProvider)(option.provider)
   );
   if (!hasElementsProviderStyleApplied) {
     applied.unshift(EMPTY_OPTION);
@@ -713,7 +773,7 @@ var import_menus = require("@elementor/menus");
 var React8 = __toESM(require("react"));
 var import_react6 = require("react");
 var import_icons3 = require("@elementor/icons");
-var import_ui5 = require("@elementor/ui");
+var import_ui6 = require("@elementor/ui");
 var SIZE = "tiny";
 function PopoverAction({
   title,
@@ -722,15 +782,15 @@ function PopoverAction({
   popoverContent: PopoverContent2
 }) {
   const id = (0, import_react6.useId)();
-  const popupState = (0, import_ui5.usePopupState)({
+  const popupState = (0, import_ui6.usePopupState)({
     variant: "popover",
     popupId: `elementor-popover-action-${id}`
   });
   if (!visible) {
     return null;
   }
-  return /* @__PURE__ */ React8.createElement(React8.Fragment, null, /* @__PURE__ */ React8.createElement(import_ui5.Tooltip, { placement: "top", title }, /* @__PURE__ */ React8.createElement(import_ui5.IconButton, { "aria-label": title, key: id, size: SIZE, ...(0, import_ui5.bindToggle)(popupState) }, /* @__PURE__ */ React8.createElement(Icon, { fontSize: SIZE }))), /* @__PURE__ */ React8.createElement(
-    import_ui5.Popover,
+  return /* @__PURE__ */ React8.createElement(React8.Fragment, null, /* @__PURE__ */ React8.createElement(import_ui6.Tooltip, { placement: "top", title }, /* @__PURE__ */ React8.createElement(import_ui6.IconButton, { "aria-label": title, key: id, size: SIZE, ...(0, import_ui6.bindToggle)(popupState) }, /* @__PURE__ */ React8.createElement(Icon, { fontSize: SIZE }))), /* @__PURE__ */ React8.createElement(
+    import_ui6.Popover,
     {
       disablePortal: true,
       disableScrollLock: true,
@@ -738,9 +798,9 @@ function PopoverAction({
         vertical: "bottom",
         horizontal: "center"
       },
-      ...(0, import_ui5.bindPopover)(popupState)
+      ...(0, import_ui6.bindPopover)(popupState)
     },
-    /* @__PURE__ */ React8.createElement(import_ui5.Stack, { 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(import_ui5.Typography, { variant: "subtitle2" }, title), /* @__PURE__ */ React8.createElement(import_ui5.IconButton, { sx: { ml: "auto" }, size: SIZE, onClick: popupState.close }, /* @__PURE__ */ React8.createElement(import_icons3.XIcon, { fontSize: SIZE }))),
+    /* @__PURE__ */ React8.createElement(import_ui6.Stack, { 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(import_ui6.Typography, { variant: "subtitle2" }, title), /* @__PURE__ */ React8.createElement(import_ui6.IconButton, { sx: { ml: "auto" }, size: SIZE, onClick: popupState.close }, /* @__PURE__ */ React8.createElement(import_icons3.XIcon, { fontSize: SIZE }))),
     /* @__PURE__ */ React8.createElement(PopoverContent2, { closePopover: popupState.close })
   ));
 }
@@ -754,14 +814,14 @@ var controlActionsMenu = (0, import_menus.createMenu)({
 
 // src/components/editing-panel-error-fallback.tsx
 var React9 = __toESM(require("react"));
-var import_ui6 = require("@elementor/ui");
+var import_ui7 = require("@elementor/ui");
 function EditorPanelErrorFallback() {
-  return /* @__PURE__ */ React9.createElement(import_ui6.Box, { role: "alert", sx: { minHeight: "100%", p: 2 } }, /* @__PURE__ */ React9.createElement(import_ui6.Alert, { severity: "error", sx: { mb: 2, maxWidth: 400, textAlign: "center" } }, /* @__PURE__ */ React9.createElement("strong", null, "Something went wrong")));
+  return /* @__PURE__ */ React9.createElement(import_ui7.Box, { role: "alert", sx: { minHeight: "100%", p: 2 } }, /* @__PURE__ */ React9.createElement(import_ui7.Alert, { severity: "error", sx: { mb: 2, maxWidth: 400, textAlign: "center" } }, /* @__PURE__ */ React9.createElement("strong", null, "Something went wrong")));
 }
 
 // src/components/editing-panel-tabs.tsx
 var React66 = __toESM(require("react"));
-var import_react17 = require("react");
+var import_react18 = require("react");
 var import_ui51 = require("@elementor/ui");
 var import_i18n44 = require("@wordpress/i18n");
 
@@ -802,7 +862,7 @@ var Control = ({ props, type }) => {
 
 // src/controls-registry/control-type-container.tsx
 var React11 = __toESM(require("react"));
-var import_ui7 = require("@elementor/ui");
+var import_ui8 = require("@elementor/ui");
 var ControlTypeContainer = ({
   controlType,
   children
@@ -810,7 +870,7 @@ var ControlTypeContainer = ({
   const layout = getLayoutByType(controlType);
   return /* @__PURE__ */ React11.createElement(StyledContainer, { layout }, children);
 };
-var StyledContainer = (0, import_ui7.styled)(import_ui7.Box, {
+var StyledContainer = (0, import_ui8.styled)(import_ui8.Box, {
   shouldForwardProp: (prop) => !["layout"].includes(prop)
 })(({ layout, theme }) => ({
   display: "grid",
@@ -820,8 +880,8 @@ var StyledContainer = (0, import_ui7.styled)(import_ui7.Box, {
 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]
 });
 
@@ -861,12 +921,12 @@ var SettingsField = ({ bind, children }) => {
 // src/components/section.tsx
 var React13 = __toESM(require("react"));
 var import_react7 = require("react");
-var import_ui9 = require("@elementor/ui");
+var import_ui10 = require("@elementor/ui");
 
 // src/components/collapse-icon.tsx
 var import_icons4 = require("@elementor/icons");
-var import_ui8 = require("@elementor/ui");
-var CollapseIcon = (0, import_ui8.styled)(import_icons4.ChevronDownIcon, {
+var import_ui9 = require("@elementor/ui");
+var CollapseIcon = (0, import_ui9.styled)(import_icons4.ChevronDownIcon, {
   shouldForwardProp: (prop) => prop !== "open"
 })(({ theme, open }) => ({
   transform: open ? "rotate(180deg)" : "rotate(0deg)",
@@ -882,7 +942,7 @@ function Section({ title, children, defaultExpanded = false }) {
   const labelId = `label-${id}`;
   const contentId = `content-${id}`;
   return /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(
-    import_ui9.ListItemButton,
+    import_ui10.ListItemButton,
     {
       id: labelId,
       "aria-controls": contentId,
@@ -890,21 +950,21 @@ function Section({ title, children, defaultExpanded = false }) {
       sx: { "&:hover": { backgroundColor: "transparent" } }
     },
     /* @__PURE__ */ React13.createElement(
-      import_ui9.ListItemText,
+      import_ui10.ListItemText,
       {
         secondary: title,
         secondaryTypographyProps: { color: "text.primary", variant: "caption", fontWeight: "bold" }
       }
     ),
     /* @__PURE__ */ React13.createElement(CollapseIcon, { open: isOpen, color: "secondary", fontSize: "tiny" })
-  ), /* @__PURE__ */ React13.createElement(import_ui9.Collapse, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto", unmountOnExit: true }, /* @__PURE__ */ React13.createElement(import_ui9.Stack, { gap: 2.5, p: 2 }, children)), /* @__PURE__ */ React13.createElement(import_ui9.Divider, null));
+  ), /* @__PURE__ */ React13.createElement(import_ui10.Collapse, { id: contentId, "aria-labelledby": labelId, in: isOpen, timeout: "auto", unmountOnExit: true }, /* @__PURE__ */ React13.createElement(import_ui10.Stack, { gap: 2.5, p: 2 }, children)), /* @__PURE__ */ React13.createElement(import_ui10.Divider, null));
 }
 
 // src/components/sections-list.tsx
 var React14 = __toESM(require("react"));
-var import_ui10 = require("@elementor/ui");
+var import_ui11 = require("@elementor/ui");
 function SectionsList(props) {
-  return /* @__PURE__ */ React14.createElement(import_ui10.List, { disablePadding: true, component: "div", ...props });
+  return /* @__PURE__ */ React14.createElement(import_ui11.List, { disablePadding: true, component: "div", ...props });
 }
 
 // src/components/settings-tab.tsx
@@ -934,9 +994,8 @@ var Control2 = ({ control }) => {
 
 // src/components/style-tab.tsx
 var React65 = __toESM(require("react"));
-var import_react16 = require("react");
-var import_editor_elements7 = require("@elementor/editor-elements");
-var import_editor_props5 = require("@elementor/editor-props");
+var import_react17 = require("react");
+var import_editor_props7 = require("@elementor/editor-props");
 var import_editor_responsive2 = require("@elementor/editor-responsive");
 var import_session3 = require("@elementor/session");
 var import_ui50 = require("@elementor/ui");
@@ -946,7 +1005,7 @@ var import_i18n43 = require("@wordpress/i18n");
 var React16 = __toESM(require("react"));
 var import_react9 = require("react");
 var import_editor_elements4 = require("@elementor/editor-elements");
-var import_editor_props2 = require("@elementor/editor-props");
+var import_editor_props3 = require("@elementor/editor-props");
 var import_editor_responsive = require("@elementor/editor-responsive");
 var import_editor_styles_repository5 = require("@elementor/editor-styles-repository");
 
@@ -958,6 +1017,9 @@ var useStylesRerender = () => {
   (0, import_react8.useEffect)(() => provider?.subscribe(reRender), [provider]);
 };
 
+// src/styles-inheritance/create-snapshots-manager.ts
+var import_editor_props2 = require("@elementor/editor-props");
+
 // src/styles-inheritance/utils.ts
 var DEFAULT_STATE = "normal";
 var DEFAULT_BREAKPOINT = "desktop";
@@ -1043,17 +1105,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 = (0, import_editor_props2.filterEmptyValues)(value);
+      if (filteredValue === null) {
+        return;
+      }
       if (!snapshot[key]) {
         snapshot[key] = [];
       }
       const snapshotPropValue = {
-        ...styleVariantWithId,
-        value
+        ...styleData,
+        value: filteredValue
       };
       snapshot[key].push(snapshotPropValue);
     });
@@ -1085,8 +1151,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);
@@ -1098,8 +1165,9 @@ function buildStyleVariantsByMetaMapping(styleDefs) {
         breakpointNode[stateKey] = [];
       }
       breakpointNode[stateKey].push({
-        styleId: styleDef.id,
-        styleVariant
+        style: styleDef,
+        variant,
+        provider
       });
     });
   });
@@ -1138,7 +1206,7 @@ var useAppliedStyles = () => {
   const baseStyles = useBaseStyles();
   useStylesRerender();
   const classesProp = (0, import_editor_elements4.useElementSetting)(element.id, currentClassesProp);
-  const appliedStyles = import_editor_props2.classesPropTypeUtil.extract(classesProp);
+  const appliedStyles = import_editor_props3.classesPropTypeUtil.extract(classesProp);
   return import_editor_styles_repository5.stylesRepository.all().filter((style) => appliedStyles?.includes(style.id)).concat(baseStyles);
 };
 var useBaseStyles = () => {
@@ -1148,6 +1216,30 @@ var useBaseStyles = () => {
   return Object.values(widgetCache?.base_styles ?? {});
 };
 
+// src/hooks/use-active-style-def-id.ts
+var import_react10 = require("react");
+var import_editor_elements5 = require("@elementor/editor-elements");
+function useActiveStyleDefId(classProp) {
+  const [activeStyledDefId, setActiveStyledDefId] = (0, import_react10.useState)(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 = (0, import_editor_elements5.getElementStyles)(element.id) ?? {};
+  return Object.values(stylesDefs).find((styleDef) => appliedClassesIds.includes(styleDef.id));
+}
+function useAppliedClassesIds2(classProp) {
+  const { element } = useElement();
+  return (0, import_editor_elements5.useElementSetting)(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
 var React19 = __toESM(require("react"));
 var import_editor_controls7 = require("@elementor/editor-controls");
@@ -1158,8 +1250,8 @@ var import_editor_controls6 = require("@elementor/editor-controls");
 var import_editor_styles2 = require("@elementor/editor-styles");
 
 // src/hooks/use-styles-fields.ts
-var import_react10 = require("react");
-var import_editor_elements5 = require("@elementor/editor-elements");
+var import_react11 = require("react");
+var import_editor_elements6 = require("@elementor/editor-elements");
 var import_editor_styles = require("@elementor/editor-styles");
 var import_editor_styles_repository6 = require("@elementor/editor-styles-repository");
 var import_editor_v1_adapters = require("@elementor/editor-v1-adapters");
@@ -1202,9 +1294,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 = (0, import_editor_styles.getVariantByMeta)(style, meta);
   return Object.fromEntries(
@@ -1212,44 +1304,44 @@ function getProps({ styleId, elementId, provider, meta, propNames }) {
   );
 }
 function useUndoableCreateElementStyle() {
-  return (0, import_react10.useMemo)(() => {
+  return (0, import_react11.useMemo)(() => {
     return (0, import_editor_v1_adapters.undoable)(
       {
         do: (payload) => {
-          return (0, import_editor_elements5.createElementStyle)({
+          return (0, import_editor_elements6.createElementStyle)({
             ...payload,
-            label: import_editor_styles_repository6.LOCAL_STYLES_RESERVED_LABEL
+            label: import_editor_styles_repository6.ELEMENTS_STYLES_RESERVED_LABEL
           });
         },
         undo: ({ elementId }, styleId) => {
-          (0, import_editor_elements5.deleteElementStyle)(elementId, styleId);
+          (0, import_editor_elements6.deleteElementStyle)(elementId, styleId);
         },
         redo: (payload, styleId) => {
-          return (0, import_editor_elements5.createElementStyle)({
+          return (0, import_editor_elements6.createElementStyle)({
             ...payload,
             styleId,
-            label: import_editor_styles_repository6.LOCAL_STYLES_RESERVED_LABEL
+            label: import_editor_styles_repository6.ELEMENTS_STYLES_RESERVED_LABEL
           });
         }
       },
       {
-        title: ({ elementId }) => (0, import_editor_elements5.getElementLabel)(elementId),
+        title: ({ elementId }) => (0, import_editor_elements6.getElementLabel)(elementId),
         subtitle: (0, import_i18n4.__)("Style edited", "elementor")
       }
     );
   }, []);
 }
 function useUndoableUpdateStyle() {
-  return (0, import_react10.useMemo)(() => {
+  return (0, import_react11.useMemo)(() => {
     return (0, import_editor_v1_adapters.undoable)(
       {
         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(
             {
@@ -1266,7 +1358,7 @@ function useUndoableUpdateStyle() {
         }
       },
       {
-        title: ({ elementId }) => (0, import_editor_elements5.getElementLabel)(elementId),
+        title: ({ elementId }) => (0, import_editor_elements6.getElementLabel)(elementId),
         subtitle: (0, import_i18n4.__)("Style edited", "elementor")
       }
     );
@@ -1297,27 +1389,7 @@ function useStylesField(propName) {
 var React17 = __toESM(require("react"));
 var import_editor_controls5 = require("@elementor/editor-controls");
 var import_editor_styles_repository7 = require("@elementor/editor-styles-repository");
-var import_ui11 = require("@elementor/ui");
 var import_i18n5 = require("@wordpress/i18n");
-var Circle = (0, import_ui11.styled)("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 } = (0, import_editor_controls5.useBoundProp)();
   const { id: currentStyleId, provider: currentStyleProvider, meta: currentStyleMeta } = useStyle();
@@ -1326,35 +1398,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 === import_editor_styles_repository7.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": (0, import_i18n5.__)("This is the final value", "elementor"),
-        variant: currentStyleProvider?.key === import_editor_styles_repository7.ELEMENTS_STYLES_PROVIDER_KEY ? "local-affects" : "global-affects"
+        variant: (0, import_editor_styles_repository7.isElementsStylesProvider)(currentStyleProvider?.getKey()) ? "local" : "global"
       }
     );
   }
   if (value !== null && value !== void 0) {
     return /* @__PURE__ */ React17.createElement(
-      Circle,
+      StyleIndicator,
       {
         "aria-label": (0, import_i18n5.__)("This value is overridden by another style", "elementor"),
         variant: "overridden"
       }
     );
   }
-  return /* @__PURE__ */ React17.createElement(Circle, { "aria-label": (0, import_i18n5.__)("This has value from another style", "elementor") });
+  return /* @__PURE__ */ React17.createElement(StyleIndicator, { "aria-label": (0, import_i18n5.__)("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 = (0, import_editor_styles2.getStylesSchema)();
   const propType = createTopLevelOjectType({ schema: stylesSchema });
   const values = { [bind]: value };
+  const placeholderValues = { [bind]: placeholder };
   const setValues = (newValue) => {
     setValue(newValue[bind]);
   };
@@ -1368,7 +1444,16 @@ var StylesField = ({ bind, children }) => {
         }
       ]
     },
-    /* @__PURE__ */ React18.createElement(import_editor_controls6.PropProvider, { propType, value: values, setValue: setValues }, /* @__PURE__ */ React18.createElement(import_editor_controls6.PropKeyProvider, { bind }, children))
+    /* @__PURE__ */ React18.createElement(
+      import_editor_controls6.PropProvider,
+      {
+        propType,
+        value: values,
+        setValue: setValues,
+        placeholder: placeholderValues
+      },
+      /* @__PURE__ */ React18.createElement(import_editor_controls6.PropKeyProvider, { bind }, children)
+    )
   );
 };
 
@@ -1378,7 +1463,7 @@ var BackgroundSection = () => {
 };
 
 // src/components/style-sections/border-section/border-section.tsx
-var React30 = __toESM(require("react"));
+var React29 = __toESM(require("react"));
 
 // src/components/panel-divider.tsx
 var React20 = __toESM(require("react"));
@@ -1391,7 +1476,7 @@ var import_ui13 = require("@elementor/ui");
 var SectionContent = ({ gap = 2, sx, children }) => /* @__PURE__ */ React21.createElement(import_ui13.Stack, { gap, sx: { ...sx } }, children);
 
 // src/components/style-sections/border-section/border-field.tsx
-var React28 = __toESM(require("react"));
+var React27 = __toESM(require("react"));
 var import_i18n9 = require("@wordpress/i18n");
 
 // src/components/add-or-remove-content.tsx
@@ -1454,11 +1539,11 @@ var BorderStyleField = () => {
 };
 
 // src/components/style-sections/border-section/border-width-field.tsx
-var React27 = __toESM(require("react"));
+var React26 = __toESM(require("react"));
 var import_editor_controls11 = require("@elementor/editor-controls");
-var import_editor_props3 = require("@elementor/editor-props");
+var import_editor_props4 = require("@elementor/editor-props");
 var import_icons6 = require("@elementor/icons");
-var import_ui20 = require("@elementor/ui");
+var import_ui19 = require("@elementor/ui");
 var import_i18n8 = require("@wordpress/i18n");
 
 // src/hooks/use-direction.ts
@@ -1469,84 +1554,41 @@ function useDirection() {
   return { isSiteRtl, isUiRtl };
 }
 
-// src/components/style-sections/layout-section/utils/rotated-icon.tsx
-var React26 = __toESM(require("react"));
-var import_react11 = require("react");
-var import_ui19 = require("@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 = (0, import_react11.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" === (0, import_ui19.useTheme)().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 = (0, import_ui20.withDirection)(import_icons6.SideRightIcon);
-var InlineEndIcon = (0, import_ui20.withDirection)(import_icons6.SideLeftIcon);
+var InlineStartIcon = (0, import_ui19.withDirection)(import_icons6.SideRightIcon);
+var InlineEndIcon = (0, import_ui19.withDirection)(import_icons6.SideLeftIcon);
 var getEdges = (isSiteRtl) => [
   {
     label: (0, import_i18n8.__)("Top", "elementor"),
-    icon: /* @__PURE__ */ React27.createElement(import_icons6.SideTopIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React26.createElement(import_icons6.SideTopIcon, { fontSize: "tiny" }),
     bind: "block-start"
   },
   {
     label: isSiteRtl ? (0, import_i18n8.__)("Left", "elementor") : (0, import_i18n8.__)("Right", "elementor"),
-    icon: /* @__PURE__ */ React27.createElement(RotatedIcon, { icon: InlineStartIcon, size: "tiny" }),
+    icon: /* @__PURE__ */ React26.createElement(InlineStartIcon, { fontSize: "tiny" }),
     bind: "inline-end"
   },
   {
     label: (0, import_i18n8.__)("Bottom", "elementor"),
-    icon: /* @__PURE__ */ React27.createElement(import_icons6.SideBottomIcon, { fontSize: "tiny" }),
+    icon: /* @__PURE__ */ React26.createElement(import_icons6.SideBottomIcon, { fontSize: "tiny" }),
     bind: "block-end"
   },
   {
     label: isSiteRtl ? (0, import_i18n8.__)("Right", "elementor") : (0, import_i18n8.__)("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(
     import_editor_controls11.EqualUnequalSizesControl,
     {
       items: getEdges(isSiteRtl),
       label: (0, import_i18n8.__)("Border width", "elementor"),
-      icon: /* @__PURE__ */ React27.createElement(import_icons6.SideAllIcon, { fontSize: "tiny" }),
+      icon: /* @__PURE__ */ React26.createElement(import_icons6.SideAllIcon, { fontSize: "tiny" }),
       tooltipLabel: (0, import_i18n8.__)("Adjust borders", "elementor"),
-      multiSizePropTypeUtil: import_editor_props3.borderWidthPropTypeUtil
+      multiSizePropTypeUtil: import_editor_props4.borderWidthPropTypeUtil
     }
   ));
 };
@@ -1570,7 +1612,7 @@ var BorderField = () => {
     });
   };
   const hasBorder = Object.values(border ?? {}).some(Boolean);
-  return /* @__PURE__ */ React28.createElement(
+  return /* @__PURE__ */ React27.createElement(
     AddOrRemoveContent,
     {
       label: (0, import_i18n9.__)("Border", "elementor"),
@@ -1578,23 +1620,23 @@ 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
-var React29 = __toESM(require("react"));
+var React28 = __toESM(require("react"));
 var import_editor_controls12 = require("@elementor/editor-controls");
-var import_editor_props4 = require("@elementor/editor-props");
+var import_editor_props5 = require("@elementor/editor-props");
 var import_icons7 = require("@elementor/icons");
-var import_ui21 = require("@elementor/ui");
+var import_ui20 = require("@elementor/ui");
 var import_i18n10 = require("@wordpress/i18n");
-var StartStartIcon = (0, import_ui21.withDirection)(import_icons7.RadiusTopLeftIcon);
-var StartEndIcon = (0, import_ui21.withDirection)(import_icons7.RadiusTopRightIcon);
-var EndStartIcon = (0, import_ui21.withDirection)(import_icons7.RadiusBottomLeftIcon);
-var EndEndIcon = (0, import_ui21.withDirection)(import_icons7.RadiusBottomRightIcon);
+var StartStartIcon = (0, import_ui20.withDirection)(import_icons7.RadiusTopLeftIcon);
+var StartEndIcon = (0, import_ui20.withDirection)(import_icons7.RadiusTopRightIcon);
+var EndStartIcon = (0, import_ui20.withDirection)(import_icons7.RadiusBottomLeftIcon);
+var EndEndIcon = (0, import_ui20.withDirection)(import_icons7.RadiusBottomRightIcon);
 var getStartStartLabel = (isSiteRtl) => isSiteRtl ? (0, import_i18n10.__)("Top right", "elementor") : (0, import_i18n10.__)("Top left", "elementor");
 var getStartEndLabel = (isSiteRtl) => isSiteRtl ? (0, import_i18n10.__)("Top left", "elementor") : (0, import_i18n10.__)("Top right", "elementor");
 var getEndStartLabel = (isSiteRtl) => isSiteRtl ? (0, import_i18n10.__)("Bottom right", "elementor") : (0, import_i18n10.__)("Bottom left", "elementor");
@@ -1602,53 +1644,53 @@ var getEndEndLabel = (isSiteRtl) => isSiteRtl ? (0, import_i18n10.__)("Bottom le
 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(
     import_editor_controls12.EqualUnequalSizesControl,
     {
       items: getCorners(isSiteRtl),
       label: (0, import_i18n10.__)("Border radius", "elementor"),
-      icon: /* @__PURE__ */ React29.createElement(import_icons7.BorderCornersIcon, { fontSize: "tiny" }),
+      icon: /* @__PURE__ */ React28.createElement(import_icons7.BorderCornersIcon, { fontSize: "tiny" }),
       tooltipLabel: (0, import_i18n10.__)("Adjust corners", "elementor"),
-      multiSizePropTypeUtil: import_editor_props4.borderRadiusPropTypeUtil
+      multiSizePropTypeUtil: import_editor_props5.borderRadiusPropTypeUtil
     }
   ));
 };
 
 // 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
-var React31 = __toESM(require("react"));
+var React30 = __toESM(require("react"));
 var import_editor_controls13 = require("@elementor/editor-controls");
 var EffectsSection = () => {
-  return /* @__PURE__ */ React31.createElement(SectionContent, null, /* @__PURE__ */ React31.createElement(StylesField, { bind: "box-shadow" }, /* @__PURE__ */ React31.createElement(import_editor_controls13.BoxShadowRepeaterControl, null)));
+  return /* @__PURE__ */ React30.createElement(SectionContent, null, /* @__PURE__ */ React30.createElement(StylesField, { bind: "box-shadow" }, /* @__PURE__ */ React30.createElement(import_editor_controls13.BoxShadowRepeaterControl, null)));
 };
 
 // src/components/style-sections/layout-section/layout-section.tsx
 var React42 = __toESM(require("react"));
 var import_editor_controls24 = require("@elementor/editor-controls");
-var import_editor_elements6 = require("@elementor/editor-elements");
+var import_editor_elements7 = require("@elementor/editor-elements");
 var import_i18n21 = require("@wordpress/i18n");
 
 // src/hooks/use-computed-style.ts
@@ -1682,6 +1724,51 @@ var import_editor_controls14 = require("@elementor/editor-controls");
 var import_icons8 = require("@elementor/icons");
 var import_ui22 = require("@elementor/ui");
 var import_i18n11 = require("@wordpress/i18n");
+
+// src/components/style-sections/layout-section/utils/rotated-icon.tsx
+var React31 = __toESM(require("react"));
+var import_react12 = require("react");
+var import_ui21 = require("@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 = (0, import_react12.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" === (0, import_ui21.useTheme)().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 = (0, import_ui22.withDirection)(import_icons8.JustifyTopIcon);
 var EndIcon = (0, import_ui22.withDirection)(import_icons8.JustifyBottomIcon);
 var iconProps = {
@@ -1823,35 +1910,37 @@ var React35 = __toESM(require("react"));
 var import_editor_controls17 = require("@elementor/editor-controls");
 var import_ui25 = require("@elementor/ui");
 var import_i18n14 = require("@wordpress/i18n");
+var displayFieldOptions = [
+  {
+    value: "block",
+    renderContent: () => (0, import_i18n14.__)("Block", "elementor"),
+    label: (0, import_i18n14.__)("Block", "elementor"),
+    showTooltip: true
+  },
+  {
+    value: "flex",
+    renderContent: () => (0, import_i18n14.__)("Flex", "elementor"),
+    label: (0, import_i18n14.__)("Flex", "elementor"),
+    showTooltip: true
+  },
+  {
+    value: "inline-block",
+    renderContent: () => (0, import_i18n14.__)("In-blk", "elementor"),
+    label: (0, import_i18n14.__)("Inline-block", "elementor"),
+    showTooltip: true
+  },
+  {
+    value: "inline-flex",
+    renderContent: () => (0, import_i18n14.__)("In-flx", "elementor"),
+    label: (0, import_i18n14.__)("Inline-flex", "elementor"),
+    showTooltip: true
+  }
+];
 var DisplayField = () => {
-  const options13 = [
-    {
-      value: "block",
-      renderContent: () => (0, import_i18n14.__)("Block", "elementor"),
-      label: (0, import_i18n14.__)("Block", "elementor"),
-      showTooltip: true
-    },
-    {
-      value: "flex",
-      renderContent: () => (0, import_i18n14.__)("Flex", "elementor"),
-      label: (0, import_i18n14.__)("Flex", "elementor"),
-      showTooltip: true
-    },
-    {
-      value: "inline-block",
-      renderContent: () => (0, import_i18n14.__)("In-blk", "elementor"),
-      label: (0, import_i18n14.__)("Inline-block", "elementor"),
-      showTooltip: true
-    },
-    {
-      value: "inline-flex",
-      renderContent: () => (0, import_i18n14.__)("In-flx", "elementor"),
-      label: (0, import_i18n14.__)("Inline-flex", "elementor"),
-      showTooltip: true
-    }
-  ];
-  return /* @__PURE__ */ React35.createElement(StylesField, { bind: "display" }, /* @__PURE__ */ React35.createElement(import_ui25.Stack, { gap: 0.75 }, /* @__PURE__ */ React35.createElement(ControlLabel, null, (0, import_i18n14.__)("Display", "elementor")), /* @__PURE__ */ React35.createElement(import_editor_controls17.ToggleControl, { options: options13, fullWidth: true })));
+  const placeholder = useDisplayPlaceholderValue();
+  return /* @__PURE__ */ React35.createElement(StylesField, { bind: "display", placeholder }, /* @__PURE__ */ React35.createElement(import_ui25.Stack, { gap: 0.75 }, /* @__PURE__ */ React35.createElement(ControlLabel, null, (0, import_i18n14.__)("Display", "elementor")), /* @__PURE__ */ React35.createElement(import_editor_controls17.ToggleControl, { options: displayFieldOptions, fullWidth: true })));
 };
+var useDisplayPlaceholderValue = () => useStylesInheritanceField("display")[0]?.value ?? void 0;
 
 // src/components/style-sections/layout-section/flex-direction-field.tsx
 var React36 = __toESM(require("react"));
@@ -1864,8 +1953,8 @@ var options4 = [
     value: "row",
     label: (0, import_i18n15.__)("Row", "elementor"),
     renderContent: ({ size }) => {
-      const StartIcon6 = (0, import_ui26.withDirection)(import_icons11.ArrowRightIcon);
-      return /* @__PURE__ */ React36.createElement(StartIcon6, { fontSize: size });
+      const StartIcon5 = (0, import_ui26.withDirection)(import_icons11.ArrowRightIcon);
+      return /* @__PURE__ */ React36.createElement(StartIcon5, { fontSize: size });
     },
     showTooltip: true
   },
@@ -1879,8 +1968,8 @@ var options4 = [
     value: "row-reverse",
     label: (0, import_i18n15.__)("Reversed row", "elementor"),
     renderContent: ({ size }) => {
-      const EndIcon6 = (0, import_ui26.withDirection)(import_icons11.ArrowLeftIcon);
-      return /* @__PURE__ */ React36.createElement(EndIcon6, { fontSize: size });
+      const EndIcon5 = (0, import_ui26.withDirection)(import_icons11.ArrowLeftIcon);
+      return /* @__PURE__ */ React36.createElement(EndIcon5, { fontSize: size });
     },
     showTooltip: true
   },
@@ -1898,7 +1987,7 @@ var FlexDirectionField = () => {
 
 // src/components/style-sections/layout-section/flex-order-field.tsx
 var React37 = __toESM(require("react"));
-var import_react12 = require("react");
+var import_react13 = require("react");
 var import_editor_controls19 = require("@elementor/editor-controls");
 var import_icons12 = require("@elementor/icons");
 var import_ui27 = require("@elementor/ui");
@@ -1934,7 +2023,7 @@ var items = [
 ];
 var FlexOrderField = () => {
   const { isSiteRtl } = useDirection(), [order, setOrder] = useStylesField("order");
-  const [groupControlValue, setGroupControlValue] = (0, import_react12.useState)(getGroupControlValue(order?.value || null));
+  const [groupControlValue, setGroupControlValue] = (0, import_react13.useState)(getGroupControlValue(order?.value || null));
   const handleToggleButtonChange = (group) => {
     setGroupControlValue(group);
     if (!group || group === CUSTOM) {
@@ -1972,8 +2061,9 @@ var getGroupControlValue = (order) => {
 
 // src/components/style-sections/layout-section/flex-size-field.tsx
 var React38 = __toESM(require("react"));
-var import_react13 = require("react");
+var import_react14 = require("react");
 var import_editor_controls20 = require("@elementor/editor-controls");
+var import_editor_props6 = require("@elementor/editor-props");
 var import_icons13 = require("@elementor/icons");
 var import_ui28 = require("@elementor/ui");
 var import_i18n17 = require("@wordpress/i18n");
@@ -1999,26 +2089,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 = (0, import_react13.useMemo)(() => getActiveGroup({ grow, shrink, basis }), [grow, shrink, basis]), [activeGroup, setActiveGroup] = (0, import_react13.useState)(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 = (0, import_react14.useMemo)(() => getActiveGroup({ grow, shrink, basis }), [grow, shrink, basis]), [activeGroup, setActiveGroup] = (0, import_react14.useState)(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": import_editor_props6.numberPropTypeUtil.create(DEFAULT),
+        "flex-shrink": null
+      });
       return;
     }
-    setGrowField(null);
-    setShrinkField({ $$type: "number", value: DEFAULT });
+    setFields({
+      "flex-basis": null,
+      "flex-grow": null,
+      "flex-shrink": import_editor_props6.numberPropTypeUtil.create(DEFAULT)
+    });
   };
-  return /* @__PURE__ */ React38.createElement(import_ui28.DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React38.createElement(import_ui28.ThemeProvider, null, /* @__PURE__ */ React38.createElement(SectionContent, null, /* @__PURE__ */ React38.createElement(import_ui28.Typography, { fontSize: "large" }, activeGroup), /* @__PURE__ */ React38.createElement(import_ui28.Grid, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React38.createElement(import_ui28.Grid, { item: true, xs: 6 }, /* @__PURE__ */ React38.createElement(StylesField, { bind: activeGroup ?? "" }, /* @__PURE__ */ React38.createElement(ControlLabel, null, (0, import_i18n17.__)("Size", "elementor")))), /* @__PURE__ */ React38.createElement(import_ui28.Grid, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React38.createElement(
+  return /* @__PURE__ */ React38.createElement(import_ui28.DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React38.createElement(import_ui28.ThemeProvider, null, /* @__PURE__ */ React38.createElement(SectionContent, null, /* @__PURE__ */ React38.createElement(import_ui28.Grid, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React38.createElement(import_ui28.Grid, { item: true, xs: 6 }, /* @__PURE__ */ React38.createElement(StylesField, { bind: activeGroup ?? "" }, /* @__PURE__ */ React38.createElement(ControlLabel, null, (0, import_i18n17.__)("Size", "elementor")))), /* @__PURE__ */ React38.createElement(import_ui28.Grid, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React38.createElement(
     import_editor_controls20.ControlToggleButtonGroup,
     {
       value: activeGroup,
@@ -2147,16 +2248,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 = (0, import_editor_elements6.useParentElement)(element.id);
+  const parent = (0, import_editor_elements7.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(import_editor_controls24.ControlFormLabel, null, (0, import_i18n21.__)("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
 var React46 = __toESM(require("react"));
@@ -2328,11 +2438,11 @@ var React64 = __toESM(require("react"));
 
 // src/components/collapsible-content.tsx
 var React50 = __toESM(require("react"));
-var import_react14 = require("react");
+var import_react15 = require("react");
 var import_ui37 = require("@elementor/ui");
 var import_i18n28 = require("@wordpress/i18n");
 var CollapsibleContent = ({ children, defaultOpen = false }) => {
-  const [open, setOpen] = (0, import_react14.useState)(defaultOpen);
+  const [open, setOpen] = (0, import_react15.useState)(defaultOpen);
   const handleToggle = () => {
     setOpen((prevOpen) => !prevOpen);
   };
@@ -2358,7 +2468,7 @@ var import_ui38 = require("@elementor/ui");
 var import_i18n30 = require("@wordpress/i18n");
 
 // src/components/style-sections/typography-section/hooks/use-font-families.ts
-var import_react15 = require("react");
+var import_react16 = require("react");
 var import_i18n29 = require("@wordpress/i18n");
 
 // src/sync/get-elementor-config.ts
@@ -2383,7 +2493,7 @@ var getFontFamilies = () => {
 };
 var useFontFamilies = () => {
   const fontFamilies = getFontFamilies();
-  return (0, import_react15.useMemo)(() => {
+  return (0, import_react16.useMemo)(() => {
     const categoriesOrder = ["system", "custom", "googlefonts"];
     return Object.entries(fontFamilies || {}).reduce((acc, [font, category]) => {
       if (!supportedCategories[category]) {
@@ -2486,13 +2596,13 @@ var import_editor_controls37 = require("@elementor/editor-controls");
 var import_icons19 = require("@elementor/icons");
 var import_ui44 = require("@elementor/ui");
 var import_i18n36 = require("@wordpress/i18n");
-var StartIcon5 = (0, import_ui44.withDirection)(import_icons19.AlignLeftIcon);
-var EndIcon5 = (0, import_ui44.withDirection)(import_icons19.AlignRightIcon);
+var AlignStartIcon = (0, import_ui44.withDirection)(import_icons19.AlignLeftIcon);
+var AlignEndIcon = (0, import_ui44.withDirection)(import_icons19.AlignRightIcon);
 var options9 = [
   {
     value: "start",
     label: (0, import_i18n36.__)("Start", "elementor"),
-    renderContent: () => /* @__PURE__ */ React57.createElement(RotatedIcon, { icon: StartIcon5, size: "tiny" }),
+    renderContent: ({ size }) => /* @__PURE__ */ React57.createElement(AlignStartIcon, { fontSize: size }),
     showTooltip: true
   },
   {
@@ -2504,7 +2614,7 @@ var options9 = [
   {
     value: "end",
     label: (0, import_i18n36.__)("End", "elementor"),
-    renderContent: () => /* @__PURE__ */ React57.createElement(RotatedIcon, { icon: EndIcon5, size: "tiny" }),
+    renderContent: ({ size }) => /* @__PURE__ */ React57.createElement(AlignEndIcon, { fontSize: size }),
     showTooltip: true
   },
   {
@@ -2515,7 +2625,7 @@ var options9 = [
   }
 ];
 var TextAlignmentField = () => {
-  return /* @__PURE__ */ React57.createElement(StylesField, { bind: "text-align" }, /* @__PURE__ */ React57.createElement(import_ui44.Grid, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React57.createElement(import_ui44.Grid, { item: true, xs: 6 }, /* @__PURE__ */ React57.createElement(ControlLabel, null, (0, import_i18n36.__)("Alignment", "elementor"))), /* @__PURE__ */ React57.createElement(import_ui44.Grid, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React57.createElement(import_editor_controls37.ToggleControl, { options: options9 }))));
+  return /* @__PURE__ */ React57.createElement(StylesField, { bind: "text-align" }, /* @__PURE__ */ React57.createElement(import_ui44.Grid, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React57.createElement(import_ui44.Grid, { item: true, xs: 6 }, /* @__PURE__ */ React57.createElement(ControlLabel, null, (0, import_i18n36.__)("Text align", "elementor"))), /* @__PURE__ */ React57.createElement(import_ui44.Grid, { item: true, xs: 6, display: "flex", justifyContent: "end" }, /* @__PURE__ */ React57.createElement(import_editor_controls37.ToggleControl, { options: options9 }))));
 };
 
 // src/components/style-sections/typography-section/text-color-field.tsx
@@ -2679,7 +2789,7 @@ var TypographySection = () => {
 var StyleTab = () => {
   const currentClassesProp = useCurrentClassesProp();
   const [activeStyleDefId, setActiveStyleDefId] = useActiveStyleDefId(currentClassesProp);
-  const [activeStyleState, setActiveStyleState] = (0, import_react16.useState)(null);
+  const [activeStyleState, setActiveStyleState] = (0, import_react17.useState)(null);
   const breakpoint = (0, import_editor_responsive2.useActiveBreakpoint)();
   return /* @__PURE__ */ React65.createElement(ClassesPropProvider, { prop: currentClassesProp }, /* @__PURE__ */ React65.createElement(
     StyleProvider,
@@ -2695,21 +2805,10 @@ var StyleTab = () => {
     /* @__PURE__ */ React65.createElement(import_session3.SessionStorageProvider, { prefix: activeStyleDefId ?? "" }, /* @__PURE__ */ React65.createElement(StyleInheritanceProvider, null, /* @__PURE__ */ React65.createElement(CssClassSelector, null), /* @__PURE__ */ React65.createElement(import_ui50.Divider, null), /* @__PURE__ */ React65.createElement(SectionsList, null, /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Layout", "elementor") }, /* @__PURE__ */ React65.createElement(LayoutSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Spacing", "elementor") }, /* @__PURE__ */ React65.createElement(SpacingSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Size", "elementor") }, /* @__PURE__ */ React65.createElement(SizeSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Position", "elementor") }, /* @__PURE__ */ React65.createElement(PositionSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Typography", "elementor") }, /* @__PURE__ */ React65.createElement(TypographySection, null)), /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Background", "elementor") }, /* @__PURE__ */ React65.createElement(BackgroundSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Border", "elementor") }, /* @__PURE__ */ React65.createElement(BorderSection, null)), /* @__PURE__ */ React65.createElement(Section, { title: (0, import_i18n43.__)("Effects", "elementor") }, /* @__PURE__ */ React65.createElement(EffectsSection, null)))))
   ));
 };
-function useActiveStyleDefId(currentClassesProp) {
-  const [activeStyledDefId, setActiveStyledDefId] = (0, import_react16.useState)(null);
-  const fallback = useFirstElementStyleDef(currentClassesProp);
-  return [activeStyledDefId || fallback?.id || null, setActiveStyledDefId];
-}
-function useFirstElementStyleDef(currentClassesProp) {
-  const { element } = useElement();
-  const classesIds = (0, import_editor_elements7.useElementSetting)(element.id, currentClassesProp)?.value || [];
-  const stylesDefs = (0, import_editor_elements7.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(
-    ([, propType]) => propType.kind === "plain" && propType.key === import_editor_props5.CLASSES_PROP_KEY
+    ([, propType]) => propType.kind === "plain" && propType.key === import_editor_props7.CLASSES_PROP_KEY
   );
   if (!prop) {
     throw new Error("Element does not have a classes prop");
@@ -2724,19 +2823,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(import_react17.Fragment, { key: element.id }, /* @__PURE__ */ React66.createElement(import_ui51.Stack, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React66.createElement(
-      import_ui51.Tabs,
-      {
-        variant: "fullWidth",
-        indicatorColor: "secondary",
-        textColor: "inherit",
-        size: "small",
-        sx: { mt: 0.5 },
-        ...getTabsProps()
-      },
-      /* @__PURE__ */ React66.createElement(import_ui51.Tab, { label: (0, import_i18n44.__)("General", "elementor"), ...getTabProps("settings") }),
-      /* @__PURE__ */ React66.createElement(import_ui51.Tab, { label: (0, import_i18n44.__)("Style", "elementor"), ...getTabProps("style") })
-    ), /* @__PURE__ */ React66.createElement(import_ui51.Divider, null), /* @__PURE__ */ React66.createElement(import_ui51.TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React66.createElement(SettingsTab, null)), /* @__PURE__ */ React66.createElement(import_ui51.TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React66.createElement(StyleTab, null))))
+    /* @__PURE__ */ React66.createElement(import_react18.Fragment, { key: element.id }, /* @__PURE__ */ React66.createElement(import_ui51.Stack, { direction: "column", sx: { width: "100%" } }, /* @__PURE__ */ React66.createElement(import_ui51.Tabs, { variant: "fullWidth", size: "small", sx: { mt: 0.5 }, ...getTabsProps() }, /* @__PURE__ */ React66.createElement(import_ui51.Tab, { label: (0, import_i18n44.__)("General", "elementor"), ...getTabProps("settings") }), /* @__PURE__ */ React66.createElement(import_ui51.Tab, { label: (0, import_i18n44.__)("Style", "elementor"), ...getTabProps("style") })), /* @__PURE__ */ React66.createElement(import_ui51.Divider, null), /* @__PURE__ */ React66.createElement(import_ui51.TabPanel, { ...getTabPanelProps("settings"), disablePadding: true }, /* @__PURE__ */ React66.createElement(SettingsTab, null)), /* @__PURE__ */ React66.createElement(import_ui51.TabPanel, { ...getTabPanelProps("style"), disablePadding: true }, /* @__PURE__ */ React66.createElement(StyleTab, null))))
   );
 };
 
@@ -2766,7 +2853,7 @@ var import_editor_panels3 = require("@elementor/editor-panels");
 var import_editor_v1_adapters4 = require("@elementor/editor-v1-adapters");
 
 // src/hooks/use-open-editor-panel.ts
-var import_react18 = require("react");
+var import_react19 = require("react");
 var import_editor_v1_adapters3 = require("@elementor/editor-v1-adapters");
 
 // src/sync/is-atomic-widget-selected.ts
@@ -2783,7 +2870,7 @@ var isAtomicWidgetSelected = () => {
 // src/hooks/use-open-editor-panel.ts
 var useOpenEditorPanel = () => {
   const { open } = usePanelActions();
-  (0, import_react18.useEffect)(() => {
+  (0, import_react19.useEffect)(() => {
     return (0, import_editor_v1_adapters3.__privateListenTo)((0, import_editor_v1_adapters3.commandStartEvent)("panel/editor/open"), () => {
       if (isAtomicWidgetSelected()) {
         open();
@@ -2798,9 +2885,12 @@ var EditingPanelHooks = () => {
   return null;
 };
 
+// src/dynamics/init.ts
+var import_editor_canvas2 = require("@elementor/editor-canvas");
+
 // src/dynamics/components/dynamic-selection-control.tsx
 var React71 = __toESM(require("react"));
-var import_react22 = require("react");
+var import_react23 = require("react");
 var import_editor_controls48 = require("@elementor/editor-controls");
 var import_icons25 = require("@elementor/icons");
 var import_ui55 = require("@elementor/ui");
@@ -2824,10 +2914,10 @@ var React69 = __toESM(require("react"));
 var import_editor_controls46 = require("@elementor/editor-controls");
 
 // src/dynamics/hooks/use-dynamic-tag.ts
-var import_react20 = require("react");
+var import_react21 = require("react");
 
 // src/dynamics/hooks/use-prop-dynamic-tags.ts
-var import_react19 = require("react");
+var import_react20 = require("react");
 var import_editor_controls45 = require("@elementor/editor-controls");
 
 // src/dynamics/sync/get-elementor-config.ts
@@ -2849,7 +2939,7 @@ var getAtomicDynamicTags = () => {
 };
 
 // src/dynamics/utils.ts
-var import_editor_props6 = require("@elementor/editor-props");
+var import_editor_props8 = require("@elementor/editor-props");
 var import_schema = require("@elementor/schema");
 var DYNAMIC_PROP_TYPE_KEY = "dynamic";
 var isDynamicPropType = (prop) => prop.key === DYNAMIC_PROP_TYPE_KEY;
@@ -2858,12 +2948,12 @@ var getDynamicPropType = (propType) => {
   return dynamicPropType && isDynamicPropType(dynamicPropType) ? dynamicPropType : null;
 };
 var isDynamicPropValue = (prop) => {
-  return (0, import_editor_props6.isTransformable)(prop) && prop.$$type === DYNAMIC_PROP_TYPE_KEY;
+  return (0, import_editor_props8.isTransformable)(prop) && prop.$$type === DYNAMIC_PROP_TYPE_KEY;
 };
 var supportsDynamic = (propType) => {
   return !!getDynamicPropType(propType);
 };
-var dynamicPropTypeUtil = (0, import_editor_props6.createPropUtils)(
+var dynamicPropTypeUtil = (0, import_editor_props8.createPropUtils)(
   DYNAMIC_PROP_TYPE_KEY,
   import_schema.z.strictObject({
     name: import_schema.z.string(),
@@ -2879,7 +2969,7 @@ var usePropDynamicTags = () => {
     const propDynamicType = getDynamicPropType(propType);
     categories = propDynamicType?.settings.categories || [];
   }
-  return (0, import_react19.useMemo)(() => getDynamicTagsByCategories(categories), [categories.join()]);
+  return (0, import_react20.useMemo)(() => getDynamicTagsByCategories(categories), [categories.join()]);
 };
 var getDynamicTagsByCategories = (categories) => {
   const dynamicTags = getAtomicDynamicTags();
@@ -2895,7 +2985,7 @@ var getDynamicTagsByCategories = (categories) => {
 // src/dynamics/hooks/use-dynamic-tag.ts
 var useDynamicTag = (tagName) => {
   const dynamicTags = usePropDynamicTags();
-  return (0, import_react20.useMemo)(() => dynamicTags.find((tag) => tag.name === tagName) ?? null, [dynamicTags, tagName]);
+  return (0, import_react21.useMemo)(() => dynamicTags.find((tag) => tag.name === tagName) ?? null, [dynamicTags, tagName]);
 };
 
 // src/dynamics/dynamic-control.tsx
@@ -2924,14 +3014,14 @@ var DynamicControl = ({ bind, children }) => {
 
 // src/dynamics/components/dynamic-selection.tsx
 var React70 = __toESM(require("react"));
-var import_react21 = require("react");
+var import_react22 = require("react");
 var import_editor_controls47 = require("@elementor/editor-controls");
 var import_icons24 = require("@elementor/icons");
 var import_ui54 = require("@elementor/ui");
 var import_i18n46 = require("@wordpress/i18n");
 var SIZE3 = "tiny";
 var DynamicSelection = ({ onSelect }) => {
-  const [searchValue, setSearchValue] = (0, import_react21.useState)("");
+  const [searchValue, setSearchValue] = (0, import_react22.useState)("");
   const { groups: dynamicGroups } = getAtomicDynamicTags() || {};
   const { value: anyValue } = (0, import_editor_controls47.useBoundProp)();
   const { bind, value: dynamicValue, setValue } = (0, import_editor_controls47.useBoundProp)(dynamicPropTypeUtil);
@@ -2949,7 +3039,7 @@ var DynamicSelection = ({ onSelect }) => {
     setValue({ name: value, settings: { label } });
     onSelect?.();
   };
-  return /* @__PURE__ */ React70.createElement(import_ui54.Stack, null, hasNoDynamicTags ? /* @__PURE__ */ React70.createElement(NoDynamicTags, null) : /* @__PURE__ */ React70.createElement(import_react21.Fragment, null, /* @__PURE__ */ React70.createElement(import_ui54.Box, { px: 1.5, pb: 1 }, /* @__PURE__ */ React70.createElement(
+  return /* @__PURE__ */ React70.createElement(import_ui54.Stack, null, hasNoDynamicTags ? /* @__PURE__ */ React70.createElement(NoDynamicTags, null) : /* @__PURE__ */ React70.createElement(import_react22.Fragment, null, /* @__PURE__ */ React70.createElement(import_ui54.Box, { px: 1.5, pb: 1 }, /* @__PURE__ */ React70.createElement(
     import_ui54.TextField,
     {
       fullWidth: true,
@@ -2961,7 +3051,7 @@ var DynamicSelection = ({ onSelect }) => {
         startAdornment: /* @__PURE__ */ React70.createElement(import_ui54.InputAdornment, { position: "start" }, /* @__PURE__ */ React70.createElement(import_icons24.SearchIcon, { fontSize: SIZE3 }))
       }
     }
-  )), /* @__PURE__ */ React70.createElement(import_ui54.Divider, null), /* @__PURE__ */ React70.createElement(import_ui54.Box, { sx: { overflowY: "auto", height: 260, width: 220 } }, options13.length > 0 ? /* @__PURE__ */ React70.createElement(import_ui54.MenuList, { role: "listbox", tabIndex: 0 }, options13.map(([category, items3], index) => /* @__PURE__ */ React70.createElement(import_react21.Fragment, { key: index }, /* @__PURE__ */ React70.createElement(
+  )), /* @__PURE__ */ React70.createElement(import_ui54.Divider, null), /* @__PURE__ */ React70.createElement(import_ui54.Box, { sx: { overflowY: "auto", height: 260, width: 220 } }, options13.length > 0 ? /* @__PURE__ */ React70.createElement(import_ui54.MenuList, { role: "listbox", tabIndex: 0 }, options13.map(([category, items3], index) => /* @__PURE__ */ React70.createElement(import_react22.Fragment, { key: index }, /* @__PURE__ */ React70.createElement(
     import_ui54.MenuSubheader,
     {
       sx: { px: 1.5, typography: "caption", color: "text.tertiary" }
@@ -3035,7 +3125,7 @@ var DynamicSelectionControl = () => {
   const { bind, value } = (0, import_editor_controls48.useBoundProp)(dynamicPropTypeUtil);
   const [propValueFromHistory] = usePersistDynamicValue(bind);
   const { name: tagName = "" } = value;
-  const selectionPopoverId = (0, import_react22.useId)();
+  const selectionPopoverId = (0, import_react23.useId)();
   const selectionPopoverState = (0, import_ui55.usePopupState)({ variant: "popover", popupId: selectionPopoverId });
   const dynamicTag = useDynamicTag(tagName);
   const removeDynamicTag = () => {
@@ -3074,7 +3164,7 @@ var DynamicSelectionControl = () => {
   ));
 };
 var DynamicSettingsPopover = ({ dynamicTag }) => {
-  const popupId = (0, import_react22.useId)();
+  const popupId = (0, import_react23.useId)();
   const settingsPopupState = (0, import_ui55.usePopupState)({ variant: "popover", popupId });
   const hasDynamicSettings = !!dynamicTag.atomic_controls.length;
   if (!hasDynamicSettings) {
@@ -3120,6 +3210,55 @@ var Control3 = ({ control }) => {
   return /* @__PURE__ */ React71.createElement(DynamicControl, { bind: control.bind }, /* @__PURE__ */ React71.createElement(import_ui55.Grid, { container: true, gap: 0.75 }, control.label ? /* @__PURE__ */ React71.createElement(import_ui55.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React71.createElement(import_editor_controls48.ControlFormLabel, null, control.label)) : null, /* @__PURE__ */ React71.createElement(import_ui55.Grid, { item: true, xs: 12 }, /* @__PURE__ */ React71.createElement(Control, { type: control.type, props: control.props }))));
 };
 
+// src/dynamics/dynamic-transformer.ts
+var import_editor_canvas = require("@elementor/editor-canvas");
+var import_editor_props9 = require("@elementor/editor-props");
+
+// src/dynamics/errors.ts
+var import_utils8 = require("@elementor/utils");
+var DynamicTagsManagerNotFoundError = (0, import_utils8.createError)({
+  code: "dynamic_tags_manager_not_found",
+  message: "Dynamic tags manager not found"
+});
+
+// src/dynamics/dynamic-transformer.ts
+var dynamicTransformer = (0, import_editor_canvas.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 = (0, import_editor_props9.isTransformable)(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
 var React72 = __toESM(require("react"));
 var import_editor_controls49 = require("@elementor/editor-controls");
@@ -3147,6 +3286,8 @@ var init = () => {
     id: "dynamic-tags",
     useProps: usePropDynamicAction
   });
+  import_editor_canvas2.styleTransformersRegistry.register("dynamic", dynamicTransformer);
+  import_editor_canvas2.settingsTransformersRegistry.register("dynamic", dynamicTransformer);
 };
 
 // src/init.ts
@@ -3169,11 +3310,9 @@ var blockV1Panel = () => {
     condition: isAtomicWidgetSelected
   });
 };
-
-// src/index.ts
-init2();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  init,
   injectIntoClassSelectorActions,
   replaceControl,
   useBoundProp,