@elementor/editor-controls 4.2.0-873 → 4.2.0-875

package/dist/index.mjs

@@ -4840,9 +4840,12 @@ function extractChips(value) {
 // src/controls/query-filter-repeater-control.tsx
 import * as React77 from "react";
 import { useMemo as useMemo12, useRef as useRef13 } from "react";
+import { useSelectedElementSettings } from "@elementor/editor-elements";
 import {
+  extractValue,
   queryFilterArrayPropTypeUtil,
   queryFilterPropTypeUtil,
+  stringArrayPropTypeUtil as stringArrayPropTypeUtil2,
   stringPropTypeUtil as stringPropTypeUtil13
 } from "@elementor/editor-props";
 import { PlusIcon as PlusIcon3 } from "@elementor/icons";
@@ -4856,20 +4859,25 @@ var QueryFilterRepeaterControl = createControl(
     chipsPlaceholder
   }) => {
     const { propType, value, setValue } = useBoundProp(queryFilterArrayPropTypeUtil);
+    const { settings } = useSelectedElementSettings();
+    const visibleKeys = useMemo12(
+      () => allowedKeys.filter((key) => isKeyVisible(keyConfig[key]?.visibleWhen, settings)),
+      [allowedKeys, keyConfig, settings]
+    );
     const usedKeys = useMemo12(() => getUsedKeys(value ?? []), [value]);
     const nextAvailableKey = useMemo12(
-      () => allowedKeys.find((key) => !usedKeys.has(key)) ?? null,
-      [allowedKeys, usedKeys]
+      () => visibleKeys.find((key) => !usedKeys.has(key)) ?? null,
+      [visibleKeys, usedKeys]
     );
     const getKeySelectOptions = useMemo12(
-      () => (currentKey) => allowedKeys.map((itemKey) => ({
+      () => (currentKey) => visibleKeys.map((itemKey) => ({
         value: itemKey,
         label: keyConfig[itemKey]?.label ?? itemKey,
         disabled: itemKey !== currentKey && usedKeys.has(itemKey)
       })),
-      [allowedKeys, keyConfig, usedKeys]
+      [visibleKeys, keyConfig, usedKeys]
     );
-    const initialFallback = useMemo12(() => createItemForKey(allowedKeys[0] ?? ""), [allowedKeys]);
+    const initialFallback = useMemo12(() => createItemForKey(visibleKeys[0] ?? ""), [visibleKeys]);
     return /* @__PURE__ */ React77.createElement(PropProvider, { propType, value, setValue }, /* @__PURE__ */ React77.createElement(ControlRepeater, { initial: initialFallback, propTypeUtil: queryFilterArrayPropTypeUtil }, /* @__PURE__ */ React77.createElement(RepeaterHeader, { label }, /* @__PURE__ */ React77.createElement(AddFilterItemAction, { nextAvailableKey, ariaLabel: label })), /* @__PURE__ */ React77.createElement(ItemsContainer, { isSortable: false }, /* @__PURE__ */ React77.createElement(
       Item,
       {
@@ -4915,7 +4923,12 @@ var ItemLabel2 = ({ value, keyConfig }) => {
   const itemKey = stringPropTypeUtil13.extract(value?.value?.key);
   const label = itemKey && keyConfig[itemKey]?.label || __28("Item", "elementor");
   const chipLabels = extractChipLabels(value?.value?.values);
-  const suffix = chipLabels.length > 0 ? `: ${chipLabels.join(", ")}` : "";
+  const taxonomyLabels = extractTaxonomyLabels(
+    value?.value?.taxonomies,
+    itemKey ? keyConfig[itemKey] : void 0
+  );
+  const allLabels = [...chipLabels, ...taxonomyLabels];
+  const suffix = allLabels.length > 0 ? `: ${allLabels.join(", ")}` : "";
   return /* @__PURE__ */ React77.createElement(Box14, { component: "span" }, label, suffix);
 };
 function extractChipLabels(chipsProp) {
@@ -4928,7 +4941,7 @@ var ItemContent = ({
   chipsPlaceholder
 }) => {
   const propContext = useBoundProp(queryFilterPropTypeUtil);
-  const valuesByKeyRef = useRef13({});
+  const snapshotsByKeyRef = useRef13({});
   const handleValueChange = (nextValue, options, meta) => {
     if (meta?.bind !== "key") {
       propContext.setValue(nextValue, options, meta);
@@ -4937,16 +4950,27 @@ var ItemContent = ({
     const previousKey = stringPropTypeUtil13.extract(propContext.value?.key);
     const newKey = stringPropTypeUtil13.extract(nextValue?.key);
     if (previousKey) {
-      valuesByKeyRef.current[previousKey] = propContext.value?.values ?? null;
+      snapshotsByKeyRef.current[previousKey] = {
+        values: propContext.value?.values ?? null,
+        taxonomies: propContext.value?.taxonomies ?? null
+      };
     }
-    const restoredValues = newKey ? valuesByKeyRef.current[newKey] ?? null : null;
-    propContext.setValue({ ...nextValue, values: restoredValues }, options, meta);
+    const restored = newKey ? snapshotsByKeyRef.current[newKey] : void 0;
+    propContext.setValue(
+      {
+        ...nextValue,
+        values: restored?.values ?? null,
+        taxonomies: restored?.taxonomies ?? null
+      },
+      options,
+      meta
+    );
   };
   const currentKey = stringPropTypeUtil13.extract(propContext.value?.key);
   const currentKeyConfig = currentKey ? keyConfig[currentKey] : void 0;
-  const hasValuesField = !!currentKeyConfig?.queryEndpoint;
+  const valueType = currentKeyConfig?.valueType ?? "chips";
   const keySelectOptions = useMemo12(() => getKeySelectOptions(currentKey), [getKeySelectOptions, currentKey]);
-  return /* @__PURE__ */ React77.createElement(PopoverContent, { p: 1.5 }, /* @__PURE__ */ React77.createElement(PropProvider, { ...propContext, setValue: handleValueChange }, /* @__PURE__ */ React77.createElement(PopoverGridContainer, { flexWrap: "wrap" }, /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(ControlFormLabel, null, __28("Type", "elementor"))), /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(PropKeyProvider, { bind: "key" }, /* @__PURE__ */ React77.createElement(SelectControl, { options: keySelectOptions })))), hasValuesField && currentKeyConfig?.queryEndpoint && /* @__PURE__ */ React77.createElement(PopoverGridContainer, { flexWrap: "wrap" }, /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(ControlFormLabel, null, currentKeyConfig.label)), /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(PropKeyProvider, { bind: "values" }, /* @__PURE__ */ React77.createElement(
+  return /* @__PURE__ */ React77.createElement(PopoverContent, { p: 1.5 }, /* @__PURE__ */ React77.createElement(PropProvider, { ...propContext, setValue: handleValueChange }, /* @__PURE__ */ React77.createElement(PopoverGridContainer, { flexWrap: "wrap" }, /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(ControlFormLabel, null, __28("Type", "elementor"))), /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(PropKeyProvider, { bind: "key" }, /* @__PURE__ */ React77.createElement(SelectControl, { options: keySelectOptions })))), valueType === "taxonomies" && currentKeyConfig?.staticOptions && /* @__PURE__ */ React77.createElement(PopoverGridContainer, { flexWrap: "wrap" }, /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(ControlFormLabel, null, currentKeyConfig.label)), /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(PropKeyProvider, { bind: "taxonomies" }, /* @__PURE__ */ React77.createElement(ChipsControl, { options: currentKeyConfig.staticOptions })))), valueType !== "taxonomies" && currentKeyConfig?.queryEndpoint && /* @__PURE__ */ React77.createElement(PopoverGridContainer, { flexWrap: "wrap" }, /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(ControlFormLabel, null, currentKeyConfig.label)), /* @__PURE__ */ React77.createElement(Grid11, { item: true, xs: 12 }, /* @__PURE__ */ React77.createElement(PropKeyProvider, { bind: "values" }, /* @__PURE__ */ React77.createElement(
     QueryChipsControl,
     {
       queryOptions: {
@@ -4957,10 +4981,29 @@ var ItemContent = ({
     }
   ))))));
 };
+function isKeyVisible(rule, settings) {
+  if (!rule) {
+    return true;
+  }
+  if (!settings) {
+    return false;
+  }
+  const extracted = stringPropTypeUtil13.extract(extractValue(rule.path, settings));
+  return extracted !== null && rule.in.includes(extracted);
+}
+function extractTaxonomyLabels(taxonomiesProp, config) {
+  const slugs = (stringArrayPropTypeUtil2.extract(taxonomiesProp) ?? []).map((item) => stringPropTypeUtil13.extract(item)).filter((slug) => !!slug);
+  if (!slugs.length) {
+    return [];
+  }
+  const options = config?.staticOptions ?? [];
+  return slugs.map((slug) => options.find((opt) => opt.value === slug)?.label ?? slug);
+}
 function createItemForKey(key) {
   return queryFilterPropTypeUtil.create({
     key: stringPropTypeUtil13.create(key),
-    values: null
+    values: null,
+    taxonomies: null
   });
 }
 function getUsedKeys(items2) {
@@ -8173,7 +8216,7 @@ function useFormFieldSuggestions(options) {
 // src/controls/email-form-action-control/email-chips-field.tsx
 import * as React116 from "react";
 import { useState as useState19 } from "react";
-import { stringArrayPropTypeUtil as stringArrayPropTypeUtil2, stringPropTypeUtil as stringPropTypeUtil22 } from "@elementor/editor-props";
+import { stringArrayPropTypeUtil as stringArrayPropTypeUtil3, stringPropTypeUtil as stringPropTypeUtil22 } from "@elementor/editor-props";
 import { Autocomplete as Autocomplete4, Grid as Grid32, TextField as TextField11 } from "@elementor/ui";
 
 // src/controls/email-form-action-control/utils.ts
@@ -8197,7 +8240,7 @@ var shouldShowMentionsInfo = () => {
 
 // src/controls/email-form-action-control/email-chips-field.tsx
 var EmailChipsField = ({ fieldLabel, placeholder }) => {
-  const { value, setValue, disabled } = useBoundProp(stringArrayPropTypeUtil2);
+  const { value, setValue, disabled } = useBoundProp(stringArrayPropTypeUtil3);
   const [inputValue, setInputValue] = useState19("");
   const items2 = value || [];
   const selectedValues = items2.map((item) => stringPropTypeUtil22.extract(item)).filter((val) => val !== null);