@elementor/editor-editing-panel 1.38.0 → 1.38.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 1.38.1
+
+### Patch Changes
+
+- 27c4c1f: Added a separated style inheritance indicator to background-color
+- Updated dependencies [7c8df3b]
+- Updated dependencies [15450a8]
+- Updated dependencies [89dfaf2]
+- Updated dependencies [97fbdf0]
+- Updated dependencies [27c4c1f]
+  - @elementor/editor-controls@0.31.0
+  - @elementor/editor-styles-repository@0.9.0
+  - @elementor/editor-canvas@0.22.0
+  - @elementor/editor-current-user@0.4.0
+  - @elementor/editor-props@0.12.1
+  - @elementor/editor-elements@0.8.4
+  - @elementor/editor-styles@0.6.8
+
 ## 1.38.0
 
 ### Minor Changes

package/dist/index.js

@@ -1242,7 +1242,7 @@ var Control2 = ({ control }) => {
 // src/components/style-tab.tsx
 var React72 = __toESM(require("react"));
 var import_react25 = require("react");
-var import_editor_props7 = require("@elementor/editor-props");
+var import_editor_props9 = require("@elementor/editor-props");
 var import_editor_responsive2 = require("@elementor/editor-responsive");
 var import_session4 = require("@elementor/session");
 var import_ui60 = require("@elementor/ui");
@@ -1252,7 +1252,7 @@ var import_i18n48 = require("@wordpress/i18n");
 var React17 = __toESM(require("react"));
 var import_react14 = require("react");
 var import_editor_elements4 = require("@elementor/editor-elements");
-var import_editor_props3 = require("@elementor/editor-props");
+var import_editor_props4 = require("@elementor/editor-props");
 var import_editor_responsive = require("@elementor/editor-responsive");
 var import_editor_styles_repository5 = require("@elementor/editor-styles-repository");
 
@@ -1264,6 +1264,9 @@ var useStylesRerender = () => {
   (0, import_react13.useEffect)(() => provider?.subscribe(reRender), [provider]);
 };
 
+// src/styles-inheritance/create-styles-inheritance.ts
+var import_editor_props3 = require("@elementor/editor-props");
+
 // src/styles-inheritance/create-snapshots-manager.ts
 var import_editor_props2 = require("@elementor/editor-props");
 
@@ -1393,7 +1396,20 @@ function mergeSnapshots(snapshots) {
 function createStylesInheritance(styleDefs, breakpointsRoot) {
   const styleVariantsByMeta = buildStyleVariantsByMetaMapping(styleDefs);
   const getStyles = ({ breakpoint, state }) => styleVariantsByMeta?.[getBreakpointKey(breakpoint)]?.[getStateKey(state)] ?? [];
-  return createSnapshotsManager(getStyles, breakpointsRoot);
+  return {
+    getSnapshot: createSnapshotsManager(getStyles, breakpointsRoot),
+    getInheritanceChain: (snapshot, path) => {
+      const [field, ...nextFields] = path;
+      let inheritanceChain = snapshot[field] ?? [];
+      if (nextFields.length > 0) {
+        inheritanceChain = inheritanceChain.map(({ value: styleValue, ...rest }) => ({
+          ...rest,
+          value: getValueByPath(styleValue, nextFields)
+        })).filter(({ value: styleValue }) => !(0, import_editor_props3.isEmpty)(styleValue));
+      }
+      return inheritanceChain;
+    }
+  };
 }
 function buildStyleVariantsByMetaMapping(styleDefs) {
   const breakpointStateSlots = {};
@@ -1420,32 +1436,53 @@ function buildStyleVariantsByMetaMapping(styleDefs) {
   });
   return breakpointStateSlots;
 }
+function getValueByPath(value, path) {
+  if (!value || typeof value !== "object") {
+    return null;
+  }
+  return path.reduce((currentScope, key) => {
+    if (!currentScope) {
+      return null;
+    }
+    if ((0, import_editor_props3.isTransformable)(currentScope)) {
+      return currentScope.value?.[key];
+    }
+    if (typeof currentScope === "object") {
+      return currentScope[key];
+    }
+    return null;
+  }, value);
+}
 
 // src/contexts/styles-inheritance-context.tsx
 var Context4 = (0, import_react14.createContext)(null);
 function StyleInheritanceProvider({ children }) {
   const styleDefs = useAppliedStyles();
   const breakpointsTree = (0, import_editor_responsive.getBreakpointsTree)();
-  const getSnapshot = createStylesInheritance(styleDefs, breakpointsTree);
-  return /* @__PURE__ */ React17.createElement(Context4.Provider, { value: { getSnapshot } }, children);
+  const { getSnapshot, getInheritanceChain } = createStylesInheritance(styleDefs, breakpointsTree);
+  return /* @__PURE__ */ React17.createElement(Context4.Provider, { value: { getSnapshot, getInheritanceChain } }, children);
 }
-function useStylesInheritanceFields(fields) {
+function useStylesInheritanceSnapshot() {
   const context = (0, import_react14.useContext)(Context4);
   const { meta } = useStyle();
   if (!context) {
-    throw new Error("useStylesInheritanceFields must be used within a StyleInheritanceProvider");
+    throw new Error("useStylesInheritanceSnapshot must be used within a StyleInheritanceProvider");
   }
   if (!meta) {
     return null;
   }
-  const snapshot = context.getSnapshot(meta);
-  return fields.reduce(
-    (acc, key) => ({ ...acc, [key]: snapshot?.[key] ?? [] }),
-    {}
-  );
+  return context.getSnapshot(meta) ?? null;
 }
-function useStylesInheritanceField(field) {
-  return useStylesInheritanceFields([field])?.[field] ?? [];
+function useStylesInheritanceChain(path) {
+  const context = (0, import_react14.useContext)(Context4);
+  if (!context) {
+    throw new Error("useStylesInheritanceChain must be used within a StyleInheritanceProvider");
+  }
+  const snapshot = useStylesInheritanceSnapshot();
+  if (!snapshot) {
+    return [];
+  }
+  return context.getInheritanceChain(snapshot, path);
 }
 var useAppliedStyles = () => {
   const { element } = useElement();
@@ -1453,7 +1490,7 @@ var useAppliedStyles = () => {
   const baseStyles = useBaseStyles();
   useStylesRerender();
   const classesProp = (0, import_editor_elements4.useElementSetting)(element.id, currentClassesProp);
-  const appliedStyles = import_editor_props3.classesPropTypeUtil.extract(classesProp);
+  const appliedStyles = import_editor_props4.classesPropTypeUtil.extract(classesProp);
   return import_editor_styles_repository5.stylesRepository.all().filter((style) => appliedStyles?.includes(style.id)).concat(baseStyles);
 };
 var useBaseStyles = () => {
@@ -1494,7 +1531,7 @@ var import_editor_controls7 = require("@elementor/editor-controls");
 // src/controls-registry/styles-field.tsx
 var React20 = __toESM(require("react"));
 var import_editor_controls6 = require("@elementor/editor-controls");
-var import_editor_styles3 = require("@elementor/editor-styles");
+var import_editor_styles2 = require("@elementor/editor-styles");
 
 // src/hooks/use-styles-fields.ts
 var import_react16 = require("react");
@@ -1636,6 +1673,7 @@ function useStylesField(propName) {
 var React19 = __toESM(require("react"));
 var import_react19 = require("react");
 var import_editor_controls5 = require("@elementor/editor-controls");
+var import_editor_props5 = require("@elementor/editor-props");
 var import_editor_styles_repository7 = require("@elementor/editor-styles-repository");
 var import_editor_v1_adapters3 = require("@elementor/editor-v1-adapters");
 var import_ui16 = require("@elementor/ui");
@@ -1645,7 +1683,6 @@ var import_i18n5 = require("@wordpress/i18n");
 var React18 = __toESM(require("react"));
 var import_react18 = require("react");
 var import_editor_canvas = require("@elementor/editor-canvas");
-var import_editor_styles2 = require("@elementor/editor-styles");
 var import_ui15 = require("@elementor/ui");
 
 // src/hooks/use-normalized-inheritance-chain-items.tsx
@@ -1689,15 +1726,15 @@ var getTransformedValue = async (item, bind, resolve) => {
 };
 
 // src/styles-inheritance/styles-inheritance-infotip.tsx
-var StyleIndicatorInfotip = ({ inheritanceChain, bind }) => {
+var StyleIndicatorInfotip = ({ inheritanceChain, propType, path }) => {
+  const key = path.join(".");
   const resolve = (0, import_react18.useMemo)(() => {
-    const stylesSchema = (0, import_editor_styles2.getStylesSchema)();
     return (0, import_editor_canvas.createPropsResolver)({
       transformers: import_editor_canvas.styleTransformersRegistry,
-      schema: { [bind]: stylesSchema[bind] }
+      schema: { [key]: propType }
     });
-  }, [bind]);
-  const items3 = useNormalizedInheritanceChainItems(inheritanceChain, bind, resolve);
+  }, [key, propType]);
+  const items3 = useNormalizedInheritanceChainItems(inheritanceChain, key, resolve);
   return /* @__PURE__ */ React18.createElement(import_ui15.Card, { elevation: 0, sx: { maxWidth: 320 } }, /* @__PURE__ */ React18.createElement(import_ui15.CardContent, { sx: { p: 1.5, pb: 2.5 } }, /* @__PURE__ */ React18.createElement(import_ui15.List, null, items3.map((item) => /* @__PURE__ */ React18.createElement(import_ui15.ListItem, { key: item.id }, /* @__PURE__ */ React18.createElement(
     import_ui15.ListItemText,
     {
@@ -1709,10 +1746,11 @@ var StyleIndicatorInfotip = ({ inheritanceChain, bind }) => {
 // src/styles-inheritance/styles-inheritance-indicator.tsx
 var StylesInheritanceIndicator = () => {
   const [open, setOpen] = (0, import_react19.useState)(false);
-  const { value, path } = (0, import_editor_controls5.useBoundProp)();
+  const { value, path, propType } = (0, import_editor_controls5.useBoundProp)();
   const { id: currentStyleId, provider: currentStyleProvider, meta: currentStyleMeta } = useStyle();
-  const [bind] = path;
-  const inheritanceChain = useStylesInheritanceField(bind);
+  const isUsingNestedProps = (0, import_editor_v1_adapters3.isExperimentActive)("e_v_3_30");
+  const finalPath = isUsingNestedProps ? path : path.slice(0, 1);
+  const inheritanceChain = useStylesInheritanceChain(finalPath);
   if (!inheritanceChain.length) {
     return null;
   }
@@ -1722,7 +1760,7 @@ var StylesInheritanceIndicator = () => {
   }
   const { breakpoint, state } = variant.meta;
   const isFinalValue = style.id === currentStyleId && breakpoint === currentStyleMeta.breakpoint && state === currentStyleMeta.state;
-  const hasValue = value !== null && value !== void 0;
+  const hasValue = !(0, import_editor_props5.isEmpty)(value);
   const label = getLabel({ isFinalValue, hasValue });
   const variantType = getVariant({ isFinalValue, hasValue, currentStyleProvider });
   const eIndicationsPopover = (0, import_editor_v1_adapters3.isExperimentActive)("e_indications_popover");
@@ -1734,7 +1772,7 @@ var StylesInheritanceIndicator = () => {
     import_ui16.Infotip,
     {
       placement: "top",
-      content: /* @__PURE__ */ React19.createElement(StyleIndicatorInfotip, { inheritanceChain, bind }),
+      content: /* @__PURE__ */ React19.createElement(StyleIndicatorInfotip, { inheritanceChain, path: finalPath, propType }),
       open,
       onClose: () => setOpen(false),
       trigger: "manual"
@@ -1768,7 +1806,7 @@ var getVariant = ({
 // src/controls-registry/styles-field.tsx
 var StylesField = ({ bind, placeholder, children }) => {
   const [value, setValue] = useStylesField(bind);
-  const stylesSchema = (0, import_editor_styles3.getStylesSchema)();
+  const stylesSchema = (0, import_editor_styles2.getStylesSchema)();
   const propType = createTopLevelOjectType({ schema: stylesSchema });
   const values = { [bind]: value };
   const placeholderValues = { [bind]: placeholder };
@@ -1883,7 +1921,7 @@ var BorderStyleField = () => {
 // src/components/style-sections/border-section/border-width-field.tsx
 var React28 = __toESM(require("react"));
 var import_editor_controls11 = require("@elementor/editor-controls");
-var import_editor_props4 = require("@elementor/editor-props");
+var import_editor_props6 = require("@elementor/editor-props");
 var import_icons6 = require("@elementor/icons");
 var import_ui24 = require("@elementor/ui");
 var import_i18n8 = require("@wordpress/i18n");
@@ -1942,7 +1980,7 @@ var BorderWidthField = () => {
       label: (0, import_i18n8.__)("Border width", "elementor"),
       icon: /* @__PURE__ */ React28.createElement(import_icons6.SideAllIcon, { fontSize: "tiny" }),
       tooltipLabel: (0, import_i18n8.__)("Adjust borders", "elementor"),
-      multiSizePropTypeUtil: import_editor_props4.borderWidthPropTypeUtil
+      multiSizePropTypeUtil: import_editor_props6.borderWidthPropTypeUtil
     }
   ));
 };
@@ -1983,7 +2021,7 @@ var BorderField = () => {
 // src/components/style-sections/border-section/border-radius-field.tsx
 var React30 = __toESM(require("react"));
 var import_editor_controls12 = require("@elementor/editor-controls");
-var import_editor_props5 = require("@elementor/editor-props");
+var import_editor_props7 = require("@elementor/editor-props");
 var import_icons7 = require("@elementor/icons");
 var import_ui25 = require("@elementor/ui");
 var import_i18n10 = require("@wordpress/i18n");
@@ -2026,7 +2064,7 @@ var BorderRadiusField = () => {
       label: (0, import_i18n10.__)("Border radius", "elementor"),
       icon: /* @__PURE__ */ React30.createElement(import_icons7.BorderCornersIcon, { fontSize: "tiny" }),
       tooltipLabel: (0, import_i18n10.__)("Adjust corners", "elementor"),
-      multiSizePropTypeUtil: import_editor_props5.borderRadiusPropTypeUtil
+      multiSizePropTypeUtil: import_editor_props7.borderRadiusPropTypeUtil
     }
   ));
 };
@@ -2342,7 +2380,7 @@ var DisplayField = () => {
   const placeholder = useDisplayPlaceholderValue();
   return /* @__PURE__ */ React37.createElement(StylesField, { bind: "display", placeholder }, /* @__PURE__ */ React37.createElement(import_ui30.Stack, { gap: 0.75 }, /* @__PURE__ */ React37.createElement(ControlLabel, null, (0, import_i18n14.__)("Display", "elementor")), /* @__PURE__ */ React37.createElement(import_editor_controls17.ToggleControl, { options: items3, maxItems: 4, fullWidth: true })));
 };
-var useDisplayPlaceholderValue = () => useStylesInheritanceField("display")[0]?.value ?? void 0;
+var useDisplayPlaceholderValue = () => useStylesInheritanceChain(["display"])[0]?.value ?? void 0;
 
 // src/components/style-sections/layout-section/flex-direction-field.tsx
 var React38 = __toESM(require("react"));
@@ -2465,7 +2503,7 @@ var getGroupControlValue = (order) => {
 var React40 = __toESM(require("react"));
 var import_react22 = require("react");
 var import_editor_controls20 = require("@elementor/editor-controls");
-var import_editor_props6 = require("@elementor/editor-props");
+var import_editor_props8 = require("@elementor/editor-props");
 var import_icons13 = require("@elementor/icons");
 var import_ui33 = require("@elementor/ui");
 var import_i18n17 = require("@wordpress/i18n");
@@ -2510,7 +2548,7 @@ var FlexSizeField = () => {
     if (group === "flex-grow") {
       setFields({
         "flex-basis": null,
-        "flex-grow": import_editor_props6.numberPropTypeUtil.create(DEFAULT),
+        "flex-grow": import_editor_props8.numberPropTypeUtil.create(DEFAULT),
         "flex-shrink": null
       });
       return;
@@ -2518,7 +2556,7 @@ var FlexSizeField = () => {
     setFields({
       "flex-basis": null,
       "flex-grow": null,
-      "flex-shrink": import_editor_props6.numberPropTypeUtil.create(DEFAULT)
+      "flex-shrink": import_editor_props8.numberPropTypeUtil.create(DEFAULT)
     });
   };
   return /* @__PURE__ */ React40.createElement(import_ui33.DirectionProvider, { rtl: isSiteRtl }, /* @__PURE__ */ React40.createElement(import_ui33.ThemeProvider, null, /* @__PURE__ */ React40.createElement(SectionContent, null, /* @__PURE__ */ React40.createElement(import_ui33.Grid, { container: true, gap: 2, alignItems: "center", flexWrap: "nowrap" }, /* @__PURE__ */ React40.createElement(import_ui33.Grid, { item: true, xs: 6 }, /* @__PURE__ */ React40.createElement(StylesField, { bind: activeGroup ?? "" }, /* @__PURE__ */ React40.createElement(ControlLabel, null, (0, import_i18n17.__)("Size", "elementor")))), /* @__PURE__ */ React40.createElement(import_ui33.Grid, { item: true, xs: 6, sx: { display: "flex", justifyContent: "end" } }, /* @__PURE__ */ React40.createElement(
@@ -3296,7 +3334,7 @@ function ClassesHeader({ children }) {
 function useCurrentClassesProp() {
   const { elementType } = useElement();
   const prop = Object.entries(elementType.propsSchema).find(
-    ([, propType]) => propType.kind === "plain" && propType.key === import_editor_props7.CLASSES_PROP_KEY
+    ([, propType]) => propType.kind === "plain" && propType.key === import_editor_props9.CLASSES_PROP_KEY
   );
   if (!prop) {
     throw new Error("Element does not have a classes prop");
@@ -3445,7 +3483,7 @@ var getAtomicDynamicTags = () => {
 };
 
 // src/dynamics/utils.ts
-var import_editor_props8 = require("@elementor/editor-props");
+var import_editor_props10 = 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;
@@ -3454,12 +3492,12 @@ var getDynamicPropType = (propType) => {
   return dynamicPropType && isDynamicPropType(dynamicPropType) ? dynamicPropType : null;
 };
 var isDynamicPropValue = (prop) => {
-  return (0, import_editor_props8.isTransformable)(prop) && prop.$$type === DYNAMIC_PROP_TYPE_KEY;
+  return (0, import_editor_props10.isTransformable)(prop) && prop.$$type === DYNAMIC_PROP_TYPE_KEY;
 };
 var supportsDynamic = (propType) => {
   return !!getDynamicPropType(propType);
 };
-var dynamicPropTypeUtil = (0, import_editor_props8.createPropUtils)(
+var dynamicPropTypeUtil = (0, import_editor_props10.createPropUtils)(
   DYNAMIC_PROP_TYPE_KEY,
   import_schema.z.strictObject({
     name: import_schema.z.string(),
@@ -3709,7 +3747,7 @@ var Control3 = ({ control }) => {
 
 // src/dynamics/dynamic-transformer.ts
 var import_editor_canvas2 = require("@elementor/editor-canvas");
-var import_editor_props9 = require("@elementor/editor-props");
+var import_editor_props11 = require("@elementor/editor-props");
 
 // src/dynamics/errors.ts
 var import_utils8 = require("@elementor/utils");
@@ -3727,7 +3765,7 @@ var dynamicTransformer = (0, import_editor_canvas2.createTransformer)((value) =>
 });
 function simpleTransform(props) {
   const transformed = Object.entries(props).map(([settingKey, settingValue]) => {
-    const value = (0, import_editor_props9.isTransformable)(settingValue) ? settingValue.value : settingValue;
+    const value = (0, import_editor_props11.isTransformable)(settingValue) ? settingValue.value : settingValue;
     return [settingKey, value];
   });
   return Object.fromEntries(transformed);