@uniformdev/mesh-sdk-react 19.157.1-alpha.6 → 19.159.0

package/dist/index.js

@@ -33,10 +33,10 @@ var src_exports = {};
 __export(src_exports, {
   $createVariableNode: () => $createVariableNode,
   $isVariableNode: () => $isVariableNode,
-  AddListButton: () => import_design_system53.AddListButton,
-  Button: () => import_design_system53.Button,
+  AddListButton: () => import_design_system63.AddListButton,
+  Button: () => import_design_system63.Button,
   CHECKBOX_OPERATORS: () => CHECKBOX_OPERATORS,
-  Callout: () => import_design_system53.Callout,
+  Callout: () => import_design_system63.Callout,
   ControlledValuePlugin: () => ControlledValuePlugin,
   DATE_OPERATORS: () => DATE_OPERATORS,
   DISCONNECT_VARIABLE_COMMAND: () => DISCONNECT_VARIABLE_COMMAND,
@@ -51,7 +51,7 @@ __export(src_exports, {
   DateRangeEditor: () => DateRangeEditor,
   DefaultSearchRow: () => DefaultSearchRow,
   DefaultSelectedItem: () => DefaultSelectedItem,
-  DrawerContent: () => import_design_system53.DrawerContent,
+  DrawerContent: () => import_design_system63.DrawerContent,
   EDIT_VARIABLE_COMMAND: () => EDIT_VARIABLE_COMMAND,
   EntrySearch: () => EntrySearch,
   FilterButton: () => FilterButton2,
@@ -62,22 +62,22 @@ __export(src_exports, {
   FilterMenu: () => FilterMenu,
   FilterMultiChoiceEditor: () => FilterMultiChoiceEditor,
   FilterSingleChoiceEditor: () => FilterSingleChoiceEditor,
-  Heading: () => import_design_system53.Heading,
+  Heading: () => import_design_system63.Heading,
   INSERT_VARIABLE_COMMAND: () => INSERT_VARIABLE_COMMAND,
   Icons: () => icons_exports,
-  Input: () => import_design_system53.Input,
-  InputComboBox: () => import_design_system53.InputComboBox,
-  InputKeywordSearch: () => import_design_system53.InputKeywordSearch,
-  InputSelect: () => import_design_system53.InputSelect,
-  InputToggle: () => import_design_system53.InputToggle,
+  Input: () => import_design_system63.Input,
+  InputComboBox: () => import_design_system63.InputComboBox,
+  InputKeywordSearch: () => import_design_system63.InputKeywordSearch,
+  InputSelect: () => import_design_system63.InputSelect,
+  InputToggle: () => import_design_system63.InputToggle,
   InputVariables: () => InputVariables,
-  Label: () => import_design_system53.Label,
+  Label: () => import_design_system63.Label,
   LinkButton: () => LinkButton,
-  LoadingIndicator: () => import_design_system53.LoadingIndicator,
-  LoadingOverlay: () => import_design_system53.LoadingOverlay,
+  LoadingIndicator: () => import_design_system63.LoadingIndicator,
+  LoadingOverlay: () => import_design_system63.LoadingOverlay,
   MULTI_SELECT_OPERATORS: () => MULTI_SELECT_OPERATORS,
-  Menu: () => import_design_system53.Menu,
-  MenuItem: () => import_design_system53.MenuItem,
+  Menu: () => import_design_system63.Menu,
+  MenuItem: () => import_design_system63.MenuItem,
   MeshApp: () => MeshApp,
   NUMBER_OPERATORS: () => NUMBER_OPERATORS,
   NumberEditor: () => NumberEditor,
@@ -95,22 +95,22 @@ __export(src_exports, {
   PUBLISH_STATUS_FIELD_OPERATORS: () => PUBLISH_STATUS_FIELD_OPERATORS,
   ParamTypeDynamicDataProvider: () => ParamTypeDynamicDataProvider,
   ParameterConnectionIndicator: () => ParameterConnectionIndicator,
-  ParameterGroup: () => import_design_system53.ParameterGroup,
-  ParameterImage: () => import_design_system53.ParameterImage,
-  ParameterImageInner: () => import_design_system53.ParameterImageInner,
-  ParameterInput: () => import_design_system53.ParameterInput,
-  ParameterInputInner: () => import_design_system53.ParameterInputInner,
-  ParameterLabel: () => import_design_system53.ParameterLabel,
-  ParameterMenuButton: () => import_design_system53.ParameterMenuButton,
+  ParameterGroup: () => import_design_system63.ParameterGroup,
+  ParameterImage: () => import_design_system63.ParameterImage,
+  ParameterImageInner: () => import_design_system63.ParameterImageInner,
+  ParameterInput: () => import_design_system63.ParameterInput,
+  ParameterInputInner: () => import_design_system63.ParameterInputInner,
+  ParameterLabel: () => import_design_system63.ParameterLabel,
+  ParameterMenuButton: () => import_design_system63.ParameterMenuButton,
   ParameterOrSingleVariable: () => ParameterOrSingleVariable,
-  ParameterSelect: () => import_design_system53.ParameterSelect,
-  ParameterSelectInner: () => import_design_system53.ParameterSelectInner,
-  ParameterShell: () => import_design_system53.ParameterShell,
+  ParameterSelect: () => import_design_system63.ParameterSelect,
+  ParameterSelectInner: () => import_design_system63.ParameterSelectInner,
+  ParameterShell: () => import_design_system63.ParameterShell,
   ParameterShellContext: () => import_design_system14.ParameterShellContext,
-  ParameterTextarea: () => import_design_system53.ParameterTextarea,
-  ParameterTextareaInner: () => import_design_system53.ParameterTextareaInner,
-  ParameterToggle: () => import_design_system53.ParameterToggle,
-  ParameterToggleInner: () => import_design_system53.ParameterToggleInner,
+  ParameterTextarea: () => import_design_system63.ParameterTextarea,
+  ParameterTextareaInner: () => import_design_system63.ParameterTextareaInner,
+  ParameterToggle: () => import_design_system63.ParameterToggle,
+  ParameterToggleInner: () => import_design_system63.ParameterToggleInner,
   ParameterVariables: () => ParameterVariables,
   ProductPreviewList: () => ProductPreviewList,
   ProductQuery: () => ProductQuery,
@@ -133,8 +133,8 @@ __export(src_exports, {
   SELECT_OPERATORS: () => SELECT_OPERATORS,
   SYSTEM_DATE_OPERATORS: () => SYSTEM_DATE_OPERATORS,
   SYSTEM_FIELD_OPERATORS: () => SYSTEM_FIELD_OPERATORS,
-  ScrollableList: () => import_design_system53.ScrollableList,
-  ScrollableListItem: () => import_design_system53.ScrollableListItem,
+  ScrollableList: () => import_design_system63.ScrollableList,
+  ScrollableListItem: () => import_design_system63.ScrollableListItem,
   SearchAndFilter: () => SearchAndFilter,
   SearchAndFilterContext: () => SearchAndFilterContext,
   SearchAndFilterOptionsContainer: () => SearchAndFilterOptionsContainer2,
@@ -146,12 +146,12 @@ __export(src_exports, {
   SortItems: () => SortItems,
   StatusMultiEditor: () => StatusMultiEditor,
   StatusSingleEditor: () => StatusSingleEditor,
-  Switch: () => import_design_system53.Switch,
+  Switch: () => import_design_system63.Switch,
   TEXTBOX_OPERATORS: () => TEXTBOX_OPERATORS,
   TextEditor: () => TextEditor,
   TextVariableRenderer: () => TextVariableRenderer,
-  Textarea: () => import_design_system53.Textarea,
-  Theme: () => import_design_system53.Theme,
+  Textarea: () => import_design_system63.Textarea,
+  Theme: () => import_design_system63.Theme,
   USER_OPERATORS: () => USER_OPERATORS,
   VariableEditor: () => VariableEditor,
   VariableNode: () => VariableNode,
@@ -246,7 +246,7 @@ __export(src_exports, {
   useVariableEditor: () => useVariableEditor,
   useVariables: () => useVariables,
   useVariablesMenu: () => useVariablesMenu,
-  utilityColors: () => import_design_system53.utilityColors,
+  utilityColors: () => import_design_system63.utilityColors,
   variableDefaultTextValue: () => variableDefaultTextValue,
   variablePrefix: () => variablePrefix,
   variableSuffix: () => variableSuffix,
@@ -7637,11 +7637,6 @@ var SYSTEM_DATE_OPERATORS = [
     label: "is on or after...",
     value: "sys-date-gte",
     editorType: "date"
-  },
-  {
-    label: "is not",
-    value: "sys-date-neq",
-    editorType: "date"
   }
 ];
 var RICHTEXT_OPERATORS = [
@@ -7797,303 +7792,171 @@ var MULTI_SELECT_OPERATORS = [
   }
 ];
 
-// src/components/SearchAndFilter/FilterButton.tsx
-var import_design_system42 = require("@uniformdev/design-system");
-
-// src/components/SearchAndFilter/styles/SearchAndFilter.styles.ts
-var import_react76 = require("@emotion/react");
+// src/components/SearchAndFilter/editors/DateEditor.tsx
 var import_design_system41 = require("@uniformdev/design-system");
-var SearchAndFilterControlsWrapper = (gridColumns) => import_react76.css`
-  align-items: stretch;
-  display: grid;
-  grid-template-columns: ${gridColumns};
-  gap: var(--spacing-sm);
-`;
-var SearchAndFilterOutterControlWrapper = (gridColumns) => import_react76.css`
-  align-items: stretch;
-  display: grid;
-  grid-template-columns: ${gridColumns};
-  gap: var(--spacing-sm);
-`;
-var ConditionalFilterRow = import_react76.css`
-  display: grid;
-  grid-template-columns: 35px 1fr;
-  gap: var(--spacing-sm);
-  margin-left: var(--spacing-base);
-
-  ${(0, import_design_system41.cq)("380px")} {
-    align-items: center;
-
-    &:after {
-      content: '';
-      display: block;
-      height: 1px;
-      background: var(--gray-300);
-      width: calc(100% - var(--spacing-base));
-      margin-left: var(--spacing-base);
-    }
-    &:last-of-type:after {
-      display: none;
+var import_react76 = require("react");
+var import_react_use5 = require("react-use");
+var import_jsx_runtime69 = require("@emotion/react/jsx-runtime");
+var DateEditor = ({
+  onChange,
+  ariaLabel,
+  disabled,
+  value,
+  readOnly,
+  valueTestId
+}) => {
+  const [innerValue, setInnerValue] = (0, import_react76.useState)(value != null ? value : "");
+  (0, import_react_use5.useDebounce)(() => onChange(innerValue), 500, [innerValue]);
+  return /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
+    import_design_system41.Input,
+    {
+      type: "date",
+      label: ariaLabel,
+      showLabel: false,
+      onChange: (e) => setInnerValue(e.currentTarget.value),
+      disabled,
+      value: innerValue,
+      readOnly,
+      "data-testid": valueTestId
     }
-  }
+  );
+};
 
-  &:nth-of-type(2) {
-    margin-left: 0;
-    grid-template-columns: 50px 1fr;
-  }
+// src/components/SearchAndFilter/editors/DateRangeEditor.tsx
+var import_design_system43 = require("@uniformdev/design-system");
+var import_react77 = require("react");
+var import_react_use6 = require("react-use");
 
-  ${(0, import_design_system41.cq)("580px")} {
-    &:after {
-      display: none;
+// src/components/SearchAndFilter/editors/shared/ErrorContainer.tsx
+var import_design_system42 = require("@uniformdev/design-system");
+var import_jsx_runtime70 = require("@emotion/react/jsx-runtime");
+var ErrorContainer = ({ errorMessage }) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
+    "div",
+    {
+      css: {
+        gridColumn: "span 6",
+        order: 6
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(import_design_system42.FieldMessage, { errorMessage })
     }
-  }
+  );
+};
 
-  @media (prefers-reduced-motion: no-preference) {
-    animation: ${import_design_system41.fadeInLtr} var(--duration-fast) var(--timing-ease-out);
-  }
-`;
-var ConditionalInputRow = import_react76.css`
-  display: flex;
-  gap: var(--spacing-sm);
-  flex-wrap: wrap;
+// src/components/SearchAndFilter/editors/shared/twoColumnGrid.tsx
+var twoColumnGrid = {
+  display: "grid",
+  gridTemplateColumns: "1fr 1fr",
+  gap: "var(--spacing-sm);"
+};
 
-  ${(0, import_design_system41.cq)("380px")} {
-    & > div:nth-child(-n + 2) {
-      width: calc(50% - var(--spacing-sm));
+// src/components/SearchAndFilter/editors/DateRangeEditor.tsx
+var import_jsx_runtime71 = require("@emotion/react/jsx-runtime");
+var DateRangeEditor = ({
+  ariaLabel,
+  onChange,
+  disabled,
+  value,
+  readOnly,
+  valueTestId
+}) => {
+  const [minDateValue, setMinDateValue] = (0, import_react77.useState)(value ? value[0] : "");
+  const [maxDateValue, setMaxDateValue] = (0, import_react77.useState)(value ? value[1] : "");
+  const [error, setError] = (0, import_react77.useState)("");
+  (0, import_react_use6.useDebounce)(
+    () => {
+      if (minDateValue && maxDateValue && !error) {
+        onChange([minDateValue, maxDateValue]);
+      } else {
+        onChange([]);
+      }
+    },
+    500,
+    [minDateValue, maxDateValue]
+  );
+  (0, import_react77.useEffect)(() => {
+    if (!minDateValue || !maxDateValue) {
+      return;
     }
-
-    & > div:nth-child(n + 3) {
-      width: calc(100% - 48px);
+    const minDate = new Date(minDateValue);
+    const maxDate = new Date(maxDateValue);
+    if (maxDate < minDate) {
+      setError("The max date cannot be lower than the min date");
+      return;
     }
-  }
-  ${(0, import_design_system41.cq)("764px")} {
-    display: grid;
-    grid-template-columns: 200px 160px 1fr 32px;
-
-    & > div:nth-child(n) {
-      width: auto;
+    if (maxDate && !minDate) {
+      setError("Please enter both a low and high date");
+      return;
     }
-  }
-`;
-var SearchInput = import_react76.css`
-  max-height: 40px;
-  min-height: unset;
-`;
-var BindableKeywordSearchInputStyles = import_react76.css`
-  position: relative;
-  width: 100%;
-
-  & [data-lexical-editor='true'] {
-    padding: var(--spacing-sm) var(--spacing-lg) var(--spacing-sm) var(--spacing-base);
-    font-size: var(--fs-sm);
-    border-radius: var(--rounded-full);
-    max-height: 40px;
-    min-height: unset;
-    width: 100%;
-    position: relative;
-    white-space: nowrap;
-  }
-`;
-var ClearSearchButtonContainer = import_react76.css`
-  align-items: center;
-  display: flex;
-  position: absolute;
-  inset: 0 var(--spacing-lg) 0 auto;
-`;
-var ClearSearchButtonStyles = import_react76.css`
-  background: none;
-  border: none;
-  padding: 0;
-  pointer-events: all;
-`;
-var FilterButton = import_react76.css`
-  align-items: center;
-  background: var(--white);
-  border: 1px solid var(--gray-300);
-  border-radius: var(--rounded-full);
-  color: var(--typography-base);
-  display: flex;
-  font-size: var(--fs-sm);
-  gap: var(--spacing-sm);
-  padding: var(--spacing-sm) var(--spacing-base);
-  max-height: 40px;
-  transition: color var(--duration-fast) var(--timing-ease-out),
-    background-color var(--duration-fast) var(--timing-ease-out),
-    border-color var(--duration-fast) var(--timing-ease-out),
-    box-shadow var(--duration-fast) var(--timing-ease-out);
-
-  svg {
-    color: var(--gray-300);
-    transition: color var(--duration-fast) var(--timing-ease-out);
-  }
-
-  &:hover,
-  :where([aria-expanded='true']) {
-    outline: none;
-    background: var(--gray-200);
-    border-color: var(--gray-300);
-
-    svg {
-      color: var(--typography-base);
+    const minDateString = minDate.toDateString();
+    const maxDateString = maxDate.toDateString();
+    if (minDateString === maxDateString || maxDateString === minDateString) {
+      setError("The min and max date cannot be the same");
+      return;
     }
-  }
+    if (minDate > maxDate) {
+      setError("The min date cannot be higher than the max date");
+      return;
+    }
+    if (error) {
+      setError("");
+    }
+    if (minDate && maxDate) {
+      setMinDateValue(minDateValue);
+      setMaxDateValue(maxDateValue);
+    } else {
+      setMinDateValue("");
+      setMaxDateValue("");
+    }
+  }, [minDateValue, maxDateValue, setError]);
+  return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(import_jsx_runtime71.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { css: twoColumnGrid, "data-testid": valueTestId, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+        import_design_system43.Input,
+        {
+          label: `${ariaLabel}-min-date`,
+          type: "date",
+          showLabel: false,
+          value: minDateValue,
+          onChange: (e) => setMinDateValue(e.currentTarget.value),
+          "aria-invalid": !error ? false : true,
+          disabled,
+          readOnly,
+          "data-testid": "value-low"
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+        import_design_system43.Input,
+        {
+          label: `${ariaLabel}-max-date`,
+          type: "date",
+          showLabel: false,
+          value: maxDateValue,
+          onChange: (e) => setMaxDateValue(e.currentTarget.value),
+          "aria-invalid": !error ? false : true,
+          disabled,
+          readOnly,
+          "data-testid": "value-high"
+        }
+      )
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(ErrorContainer, { errorMessage: error })
+  ] });
+};
 
-  &:disabled {
-    opacity: var(--opacity-50);
-  }
-`;
-var FilterButtonText = import_react76.css`
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 14ch;
-`;
-var FilterButtonSelected = import_react76.css`
-  background: var(--gray-100);
-  border-color: var(--gray-300);
+// src/components/SearchAndFilter/editors/FilterMultiChoiceEditor.tsx
+var import_design_system44 = require("@uniformdev/design-system");
+var import_react78 = require("react");
 
-  svg {
-    color: var(--accent-dark);
-  }
-`;
-var FilterButtonWithOptions = import_react76.css`
-  :where([aria-expanded='true']) {
-    background: var(--purple-rain-100);
-    border-color: var(--accent-light);
-    color: var(--typography-base);
-    box-shadow: var(--elevation-100);
-
-    svg {
-      color: var(--accent-dark);
-    }
-  }
-`;
-var SearchIcon = import_react76.css`
-  color: var(--icon-color);
-  position: absolute;
-  inset: 0 var(--spacing-base) 0 auto;
-  margin: auto;
-  transition: color var(--duration-fast) var(--timing-ease-out);
-`;
-var AddConditionalBtn = import_react76.css`
-  align-items: center;
-  background: transparent;
-  border: none;
-  color: var(--primary-action-default);
-  display: flex;
-  gap: var(--spacing-sm);
-  transition: color var(--duration-fast) var(--timing-ease-out);
-  padding: 0;
-
-  &:hover,
-  &:focus {
-    color: var(--primary-action-hover);
-  }
-
-  &:disabled {
-    color: var(--gray-400);
-  }
-`;
-var Title = import_react76.css`
-  color: var(--typography-light);
-
-  &:focus {
-    outline: none;
-  }
-`;
-var ResetConditionsBtn = import_react76.css`
-  background: transparent;
-  border: none;
-  color: var(--action-destructive-default);
-  transition: color var(--duration-fast) var(--timing-ease-out);
-  padding: 0;
-
-  &:hover,
-  &:focus {
-    color: var(--action-destructive-hover);
-  }
-`;
-var IconBtn = import_react76.css`
-  background: transparent;
-  border: none;
-  padding: var(--spacing-sm);
-`;
-var SearchAndFilterOptionsContainer = import_react76.css`
-  background: var(--gray-50);
-  border: 1px solid var(--gray-300);
-  border-radius: var(--rounded-base);
-  container-type: inline-size;
-  display: flex;
-  flex-direction: column;
-  gap: var(--spacing-sm);
-  padding: var(--spacing-md) 0 var(--spacing-base);
-  will-change: height;
-  position: relative;
-  z-index: 1;
-`;
-var SearchAndFilterOptionsInnerContainer = import_react76.css`
-  display: flex;
-  flex-direction: column;
-  gap: var(--spacing-sm);
-  padding-inline: var(--spacing-md);
-`;
-var SearchAndFilterButtonGroup = import_react76.css`
-  margin-top: var(--spacing-xs);
-  margin-left: calc(56px + var(--spacing-md));
-`;
-
-// src/components/SearchAndFilter/FilterButton.tsx
-var import_jsx_runtime69 = require("@emotion/react/jsx-runtime");
-var FilterButton2 = ({
-  text = "Filters",
-  icon = "filter-add",
-  filterCount,
-  hasSelectedValue,
-  dataTestId,
-  ...props
-}) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(
-    "button",
-    {
-      type: "button",
-      css: [
-        FilterButton,
-        hasSelectedValue ? FilterButtonSelected : void 0,
-        filterCount ? [FilterButtonWithOptions, FilterButtonSelected] : void 0
-      ],
-      ...props,
-      "data-testid": dataTestId,
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(import_design_system42.Icon, { icon, iconColor: "currentColor", size: "1rem" }),
-        /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("span", { css: FilterButtonText, children: text }),
-        filterCount ? /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(import_design_system42.Counter, { count: filterCount, bgColor: "var(--white)" }) : null
-      ]
-    }
-  );
-};
-
-// src/components/SearchAndFilter/FilterControls.tsx
-var import_CgClose5 = require("@react-icons/all-files/cg/CgClose");
-var import_design_system45 = require("@uniformdev/design-system");
-var import_lexical11 = require("lexical");
-var import_react79 = require("react");
-var import_react_use6 = require("react-use");
-var import_uuid3 = require("uuid");
-
-// src/components/SearchAndFilter/hooks/useSearchAndFilter.tsx
-var import_design_system44 = require("@uniformdev/design-system");
-var import_react78 = require("react");
-
-// src/components/SearchAndFilter/FilterEditor.tsx
-var import_design_system43 = require("@uniformdev/design-system");
-var import_react77 = require("react");
-var import_react_use5 = require("react-use");
-var import_jsx_runtime70 = require("@emotion/react/jsx-runtime");
+// src/components/SearchAndFilter/editors/shared/readOnlyAttributes.tsx
 var readOnlyAttributes = {
   isSearchable: false,
   menuIsOpen: false,
   isClearable: false
 };
+
+// src/components/SearchAndFilter/editors/FilterMultiChoiceEditor.tsx
+var import_jsx_runtime72 = require("@emotion/react/jsx-runtime");
 var FilterMultiChoiceEditor = ({
   value,
   options,
@@ -8104,20 +7967,24 @@ var FilterMultiChoiceEditor = ({
 }) => {
   const readOnlyProps = readOnly ? readOnlyAttributes : {};
   const isClearable = !readOnly || !disabled;
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    import_design_system43.InputComboBox,
+  const { groupedOptions, selectedOptions } = (0, import_react78.useMemo)(
+    () => (0, import_design_system44.convertComboBoxGroupsToSelectableGroups)({ options: options != null ? options : [], selectedItems: new Set(value) }),
+    [options, value]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime72.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
+    import_design_system44.InputComboBox,
     {
       ...props,
       placeholder: "Type to search...",
-      options,
+      options: groupedOptions,
       isMulti: true,
       isClearable,
       isDisabled: disabled,
       onChange: (e) => {
-        var _a;
-        return props.onChange((_a = e == null ? void 0 : e.map((option) => option.value)) != null ? _a : []);
+        const selectedValues = (0, import_design_system44.getComboBoxSelectedSelectableGroups)(e);
+        return props.onChange([...selectedValues]);
       },
-      value: options == null ? void 0 : options.filter((option) => value == null ? void 0 : value.includes(option.value)),
+      value: selectedOptions,
       "aria-readonly": readOnly,
       styles: {
         menu(base) {
@@ -8131,6 +7998,11 @@ var FilterMultiChoiceEditor = ({
     }
   ) });
 };
+
+// src/components/SearchAndFilter/editors/FilterSingleChoiceEditor.tsx
+var import_design_system45 = require("@uniformdev/design-system");
+var import_react79 = require("react");
+var import_jsx_runtime73 = require("@emotion/react/jsx-runtime");
 var FilterSingleChoiceEditor = ({
   options,
   value,
@@ -8139,91 +8011,30 @@ var FilterSingleChoiceEditor = ({
   onChange,
   valueTestId
 }) => {
-  var _a;
   const readOnlyProps = readOnly ? readOnlyAttributes : {};
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    import_design_system43.InputComboBox,
+  const { groupedOptions, selectedOptions } = (0, import_react79.useMemo)(
+    () => (0, import_design_system45.convertComboBoxGroupsToSelectableGroups)({
+      options: options != null ? options : [],
+      selectedItems: new Set(value ? [value] : void 0),
+      selectionMode: "single"
+    }),
+    [options, value]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+    import_design_system45.InputComboBox,
     {
       placeholder: "Type to search...",
-      options,
+      options: groupedOptions,
       isClearable: true,
       onChange: (e) => {
-        var _a2;
-        return onChange((_a2 = e == null ? void 0 : e.value) != null ? _a2 : "");
-      },
-      isDisabled: disabled,
-      value: (_a = options == null ? void 0 : options.find((option) => option.value === value)) != null ? _a : null,
-      "aria-readonly": readOnly,
-      styles: {
-        menu(base) {
-          return {
-            ...base,
-            minWidth: "max-content"
-          };
+        if (Array.isArray(e == null ? void 0 : e.value)) {
+          return;
         }
+        return onChange(e == null ? void 0 : e.value);
       },
-      ...readOnlyProps
-    }
-  ) });
-};
-var CustomOptions = ({ label, value }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(import_design_system43.StatusBullet, { status: label, message: value });
-};
-var StatusMultiEditor = ({
-  options,
-  value,
-  disabled,
-  readOnly,
-  onChange,
-  valueTestId
-}) => {
-  const readOnlyProps = readOnly ? readOnlyAttributes : {};
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    import_design_system43.InputComboBox,
-    {
-      options,
-      isMulti: true,
-      onChange: (e) => {
-        var _a;
-        return onChange((_a = e.map((item) => item.value)) != null ? _a : []);
-      },
-      formatOptionLabel: CustomOptions,
-      "aria-readonly": readOnly,
-      value: options == null ? void 0 : options.filter((option) => value == null ? void 0 : value.includes(option.value)),
       isDisabled: disabled,
-      styles: {
-        menu(base) {
-          return {
-            ...base,
-            minWidth: "max-content"
-          };
-        }
-      },
-      ...readOnlyProps
-    }
-  ) });
-};
-var StatusSingleEditor = ({
-  options,
-  value,
-  disabled,
-  readOnly,
-  onChange,
-  valueTestId
-}) => {
-  const readOnlyProps = readOnly ? readOnlyAttributes : {};
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    import_design_system43.InputComboBox,
-    {
-      options,
-      onChange: (e) => {
-        var _a;
-        return onChange((_a = e == null ? void 0 : e.value) != null ? _a : "");
-      },
-      formatOptionLabel: CustomOptions,
+      value: selectedOptions,
       "aria-readonly": readOnly,
-      value: options == null ? void 0 : options.find((option) => option.value === value),
-      isDisabled: disabled,
       styles: {
         menu(base) {
           return {
@@ -8236,28 +8047,43 @@ var StatusSingleEditor = ({
     }
   ) });
 };
-var TextEditor = ({
-  onChange,
+
+// src/components/SearchAndFilter/editors/NumberEditor.tsx
+var import_design_system46 = require("@uniformdev/design-system");
+var import_react80 = require("react");
+var import_react_use7 = require("react-use");
+var import_jsx_runtime74 = require("@emotion/react/jsx-runtime");
+var NumberEditor = ({
   ariaLabel,
+  onChange,
+  disabled,
   value,
   readOnly,
   valueTestId
 }) => {
-  const [innerValue, setInnerValue] = (0, import_react77.useState)(value != null ? value : "");
-  (0, import_react_use5.useDebounce)(() => onChange(innerValue), 500, [innerValue]);
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    import_design_system43.Input,
+  const [innerValue, setInnerValue] = (0, import_react80.useState)(value != null ? value : "");
+  (0, import_react_use7.useDebounce)(() => onChange(innerValue), 500, [innerValue]);
+  return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
+    import_design_system46.Input,
     {
-      showLabel: false,
       label: ariaLabel,
+      type: "number",
+      showLabel: false,
+      min: 0,
       onChange: (e) => setInnerValue(e.currentTarget.value),
-      placeholder: "Enter phrase to search\u2026",
+      disabled,
       value: innerValue,
       readOnly,
       "data-testid": valueTestId
     }
   );
 };
+
+// src/components/SearchAndFilter/editors/NumberRangeEditor.tsx
+var import_design_system47 = require("@uniformdev/design-system");
+var import_react81 = require("react");
+var import_react_use8 = require("react-use");
+var import_jsx_runtime75 = require("@emotion/react/jsx-runtime");
 var NumberRangeEditor = ({
   onChange,
   disabled,
@@ -8266,10 +8092,10 @@ var NumberRangeEditor = ({
   readOnly,
   valueTestId
 }) => {
-  const [minValue, setMinValue] = (0, import_react77.useState)("");
-  const [maxValue, setMaxValue] = (0, import_react77.useState)("");
-  const [error, setError] = (0, import_react77.useState)("");
-  (0, import_react_use5.useDebounce)(
+  const [minValue, setMinValue] = (0, import_react81.useState)("");
+  const [maxValue, setMaxValue] = (0, import_react81.useState)("");
+  const [error, setError] = (0, import_react81.useState)("");
+  (0, import_react_use8.useDebounce)(
     () => {
       if (minValue && maxValue && !error) {
         onChange([minValue, maxValue]);
@@ -8280,7 +8106,7 @@ var NumberRangeEditor = ({
     500,
     [minValue, maxValue]
   );
-  (0, import_react77.useEffect)(() => {
+  (0, import_react81.useEffect)(() => {
     if (!maxValue && !minValue) {
       return;
     }
@@ -8302,10 +8128,10 @@ var NumberRangeEditor = ({
       setMaxValue(maxValue);
     }
   }, [maxValue, minValue, setError]);
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsxs)(import_jsx_runtime70.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime70.jsxs)("div", { css: twoColumnGrid, "data-testid": valueTestId, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-        import_design_system43.Input,
+  return /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(import_jsx_runtime75.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)("div", { css: twoColumnGrid, "data-testid": valueTestId, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(
+        import_design_system47.Input,
         {
           label: `${ariaLabel}-min`,
           type: "number",
@@ -8320,8 +8146,8 @@ var NumberRangeEditor = ({
           "data-testid": "value-low"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-        import_design_system43.Input,
+      /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(
+        import_design_system47.Input,
         {
           type: "number",
           label: `${ariaLabel}-max`,
@@ -8337,149 +8163,433 @@ var NumberRangeEditor = ({
         }
       )
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(ErrorContainer, { errorMessage: error })
+    /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(ErrorContainer, { errorMessage: error })
   ] });
 };
-var NumberEditor = ({
-  ariaLabel,
+
+// src/components/SearchAndFilter/editors/StatusMultiEditor.tsx
+var import_design_system49 = require("@uniformdev/design-system");
+var import_react82 = require("react");
+
+// src/components/SearchAndFilter/editors/shared/CustomOptions.tsx
+var import_design_system48 = require("@uniformdev/design-system");
+var import_jsx_runtime76 = require("@emotion/react/jsx-runtime");
+var CustomOptions = ({ label, value }) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
+    import_design_system48.StatusBullet,
+    {
+      status: label,
+      message: Array.isArray(value) ? value.join(",") : value
+    }
+  );
+};
+
+// src/components/SearchAndFilter/editors/StatusMultiEditor.tsx
+var import_jsx_runtime77 = require("@emotion/react/jsx-runtime");
+var StatusMultiEditor = ({
+  options,
+  value,
+  disabled,
+  readOnly,
   onChange,
+  valueTestId
+}) => {
+  const readOnlyProps = readOnly ? readOnlyAttributes : {};
+  const { groupedOptions, selectedOptions } = (0, import_react82.useMemo)(
+    () => (0, import_design_system49.convertComboBoxGroupsToSelectableGroups)({ options: options != null ? options : [], selectedItems: new Set(value) }),
+    [options, value]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime77.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(
+    import_design_system49.InputComboBox,
+    {
+      options: groupedOptions != null ? groupedOptions : [],
+      isMulti: true,
+      onChange: (e) => {
+        const selectedValues = (0, import_design_system49.getComboBoxSelectedSelectableGroups)(e);
+        return onChange([...selectedValues]);
+      },
+      formatOptionLabel: CustomOptions,
+      "aria-readonly": readOnly,
+      value: selectedOptions,
+      isDisabled: disabled,
+      styles: {
+        menu(base) {
+          return {
+            ...base,
+            minWidth: "max-content"
+          };
+        }
+      },
+      ...readOnlyProps
+    }
+  ) });
+};
+
+// src/components/SearchAndFilter/editors/StatusSingleEditor.tsx
+var import_design_system50 = require("@uniformdev/design-system");
+var import_react83 = require("react");
+var import_jsx_runtime78 = require("@emotion/react/jsx-runtime");
+var StatusSingleEditor = ({
+  options,
+  value,
   disabled,
+  readOnly,
+  onChange,
+  valueTestId
+}) => {
+  const readOnlyProps = readOnly ? readOnlyAttributes : {};
+  const { groupedOptions, selectedOptions } = (0, import_react83.useMemo)(
+    () => (0, import_design_system50.convertComboBoxGroupsToSelectableGroups)({
+      options: options != null ? options : [],
+      selectedItems: new Set(value ? [value] : void 0),
+      selectionMode: "single"
+    }),
+    [options, value]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime78.jsx)("div", { "data-testid": valueTestId, children: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
+    import_design_system50.InputComboBox,
+    {
+      options: groupedOptions,
+      onChange: (e) => {
+        if (Array.isArray(e == null ? void 0 : e.value)) {
+          return;
+        }
+        return onChange(e == null ? void 0 : e.value);
+      },
+      formatOptionLabel: CustomOptions,
+      "aria-readonly": readOnly,
+      value: selectedOptions,
+      isDisabled: disabled,
+      styles: {
+        menu(base) {
+          return {
+            ...base,
+            minWidth: "max-content"
+          };
+        }
+      },
+      ...readOnlyProps
+    }
+  ) });
+};
+
+// src/components/SearchAndFilter/editors/TextEditor.tsx
+var import_design_system51 = require("@uniformdev/design-system");
+var import_react84 = require("react");
+var import_react_use9 = require("react-use");
+var import_jsx_runtime79 = require("@emotion/react/jsx-runtime");
+var TextEditor = ({
+  onChange,
+  ariaLabel,
   value,
   readOnly,
   valueTestId
 }) => {
-  const [innerValue, setInnerValue] = (0, import_react77.useState)(value != null ? value : "");
-  (0, import_react_use5.useDebounce)(() => onChange(innerValue), 500, [innerValue]);
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    import_design_system43.Input,
+  const [innerValue, setInnerValue] = (0, import_react84.useState)(value != null ? value : "");
+  (0, import_react_use9.useDebounce)(() => onChange(innerValue), 500, [innerValue]);
+  return /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+    import_design_system51.Input,
     {
-      label: ariaLabel,
-      type: "number",
       showLabel: false,
-      min: 0,
+      label: ariaLabel,
       onChange: (e) => setInnerValue(e.currentTarget.value),
-      disabled,
+      placeholder: "Enter phrase to search\u2026",
       value: innerValue,
       readOnly,
       "data-testid": valueTestId
     }
-  );
-};
-var DateEditor = ({
-  onChange,
-  ariaLabel,
-  disabled,
-  value,
-  readOnly,
-  valueTestId
+  );
+};
+
+// src/components/SearchAndFilter/FilterButton.tsx
+var import_design_system53 = require("@uniformdev/design-system");
+
+// src/components/SearchAndFilter/styles/SearchAndFilter.styles.ts
+var import_react85 = require("@emotion/react");
+var import_design_system52 = require("@uniformdev/design-system");
+var SearchAndFilterControlsWrapper = (gridColumns) => import_react85.css`
+  align-items: stretch;
+  display: grid;
+  grid-template-columns: ${gridColumns};
+  gap: var(--spacing-sm);
+`;
+var SearchAndFilterOutterControlWrapper = (gridColumns) => import_react85.css`
+  align-items: stretch;
+  display: grid;
+  grid-template-columns: ${gridColumns};
+  gap: var(--spacing-sm);
+`;
+var ConditionalFilterRow = import_react85.css`
+  align-items: baseline;
+  display: grid;
+  grid-template-columns: 35px 1fr;
+  gap: var(--spacing-sm);
+  margin-left: var(--spacing-base);
+
+  ${(0, import_design_system52.cq)("380px")} {
+    &:after {
+      content: '';
+      display: block;
+      height: 1px;
+      background: var(--gray-300);
+      width: calc(100% - var(--spacing-base));
+      margin-left: var(--spacing-base);
+    }
+    &:last-of-type:after {
+      display: none;
+    }
+  }
+
+  &:nth-of-type(2) {
+    margin-left: 0;
+    grid-template-columns: 50px 1fr;
+  }
+
+  ${(0, import_design_system52.cq)("580px")} {
+    &:after {
+      display: none;
+    }
+  }
+
+  @media (prefers-reduced-motion: no-preference) {
+    animation: ${import_design_system52.fadeInLtr} var(--duration-fast) var(--timing-ease-out);
+  }
+`;
+var ConditionalInputRow = import_react85.css`
+  display: flex;
+  gap: var(--spacing-sm);
+  flex-wrap: wrap;
+
+  ${(0, import_design_system52.cq)("380px")} {
+    & > div:nth-child(-n + 2) {
+      width: calc(50% - var(--spacing-sm));
+    }
+
+    & > div:nth-child(n + 3) {
+      width: calc(100% - 48px);
+    }
+  }
+  ${(0, import_design_system52.cq)("764px")} {
+    align-items: flex-start;
+    display: grid;
+    grid-template-columns: 200px 160px 1fr 32px;
+
+    & > div:nth-child(n) {
+      width: auto;
+    }
+  }
+`;
+var SearchInput = import_react85.css`
+  max-height: 40px;
+  min-height: unset;
+`;
+var BindableKeywordSearchInputStyles = import_react85.css`
+  position: relative;
+  width: 100%;
+
+  & [data-lexical-editor='true'] {
+    padding: var(--spacing-sm) var(--spacing-lg) var(--spacing-sm) var(--spacing-base);
+    font-size: var(--fs-sm);
+    border-radius: var(--rounded-full);
+    max-height: 40px;
+    min-height: unset;
+    width: 100%;
+    position: relative;
+    white-space: nowrap;
+  }
+`;
+var ClearSearchButtonContainer = import_react85.css`
+  align-items: center;
+  display: flex;
+  position: absolute;
+  inset: 0 var(--spacing-lg) 0 auto;
+`;
+var ClearSearchButtonStyles = import_react85.css`
+  background: none;
+  border: none;
+  padding: 0;
+  pointer-events: all;
+`;
+var FilterButton = import_react85.css`
+  align-items: center;
+  background: var(--white);
+  border: 1px solid var(--gray-300);
+  border-radius: var(--rounded-full);
+  color: var(--typography-base);
+  display: flex;
+  font-size: var(--fs-sm);
+  gap: var(--spacing-sm);
+  padding: var(--spacing-sm) var(--spacing-base);
+  max-height: 40px;
+  transition: color var(--duration-fast) var(--timing-ease-out),
+    background-color var(--duration-fast) var(--timing-ease-out),
+    border-color var(--duration-fast) var(--timing-ease-out),
+    box-shadow var(--duration-fast) var(--timing-ease-out);
+
+  svg {
+    color: var(--gray-300);
+    transition: color var(--duration-fast) var(--timing-ease-out);
+  }
+
+  &:hover,
+  :where([aria-expanded='true']) {
+    outline: none;
+    background: var(--gray-200);
+    border-color: var(--gray-300);
+
+    svg {
+      color: var(--typography-base);
+    }
+  }
+
+  &:disabled {
+    opacity: var(--opacity-50);
+  }
+`;
+var FilterButtonText = import_react85.css`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 14ch;
+`;
+var FilterButtonSelected = import_react85.css`
+  background: var(--gray-100);
+  border-color: var(--gray-300);
+
+  svg {
+    color: var(--accent-dark);
+  }
+`;
+var FilterButtonWithOptions = import_react85.css`
+  :where([aria-expanded='true']) {
+    background: var(--purple-rain-100);
+    border-color: var(--accent-light);
+    color: var(--typography-base);
+    box-shadow: var(--elevation-100);
+
+    svg {
+      color: var(--accent-dark);
+    }
+  }
+`;
+var SearchIcon = import_react85.css`
+  color: var(--icon-color);
+  position: absolute;
+  inset: 0 var(--spacing-base) 0 auto;
+  margin: auto;
+  transition: color var(--duration-fast) var(--timing-ease-out);
+`;
+var AddConditionalBtn = import_react85.css`
+  align-items: center;
+  background: transparent;
+  border: none;
+  color: var(--primary-action-default);
+  display: flex;
+  gap: var(--spacing-sm);
+  transition: color var(--duration-fast) var(--timing-ease-out);
+  padding: 0;
+
+  &:hover,
+  &:focus {
+    color: var(--primary-action-hover);
+  }
+
+  &:disabled {
+    color: var(--gray-400);
+  }
+`;
+var Title = import_react85.css`
+  color: var(--typography-light);
+
+  &:focus {
+    outline: none;
+  }
+`;
+var ResetConditionsBtn = import_react85.css`
+  background: transparent;
+  border: none;
+  color: var(--action-destructive-default);
+  transition: color var(--duration-fast) var(--timing-ease-out);
+  padding: 0;
+
+  &:hover,
+  &:focus {
+    color: var(--action-destructive-hover);
+  }
+`;
+var IconBtn = import_react85.css`
+  background: transparent;
+  border: none;
+  padding: var(--spacing-sm);
+`;
+var SearchAndFilterOptionsContainer = import_react85.css`
+  background: var(--gray-50);
+  border: 1px solid var(--gray-300);
+  border-radius: var(--rounded-base);
+  container-type: inline-size;
+  display: flex;
+  flex-direction: column;
+  gap: var(--spacing-sm);
+  padding: var(--spacing-md) 0 var(--spacing-base);
+  will-change: height;
+  position: relative;
+  z-index: 1;
+`;
+var SearchAndFilterOptionsInnerContainer = import_react85.css`
+  display: flex;
+  flex-direction: column;
+  gap: var(--spacing-sm);
+  padding-inline: var(--spacing-md);
+`;
+var SearchAndFilterButtonGroup = import_react85.css`
+  margin-top: var(--spacing-xs);
+  margin-left: calc(56px + var(--spacing-md));
+`;
+
+// src/components/SearchAndFilter/FilterButton.tsx
+var import_jsx_runtime80 = require("@emotion/react/jsx-runtime");
+var FilterButton2 = ({
+  text = "Filters",
+  icon = "filter-add",
+  filterCount,
+  hasSelectedValue,
+  dataTestId,
+  ...props
 }) => {
-  const [innerValue, setInnerValue] = (0, import_react77.useState)(value != null ? value : "");
-  (0, import_react_use5.useDebounce)(() => onChange(innerValue), 500, [innerValue]);
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    import_design_system43.Input,
+  return /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)(
+    "button",
     {
-      type: "date",
-      label: ariaLabel,
-      showLabel: false,
-      onChange: (e) => setInnerValue(e.currentTarget.value),
-      disabled,
-      value: innerValue,
-      readOnly,
-      "data-testid": valueTestId
+      type: "button",
+      css: [
+        FilterButton,
+        hasSelectedValue ? FilterButtonSelected : void 0,
+        filterCount ? [FilterButtonWithOptions, FilterButtonSelected] : void 0
+      ],
+      ...props,
+      "data-testid": dataTestId,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(import_design_system53.Icon, { icon, iconColor: "currentColor", size: "1rem" }),
+        /* @__PURE__ */ (0, import_jsx_runtime80.jsx)("span", { css: FilterButtonText, children: text }),
+        filterCount ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(import_design_system53.Counter, { count: filterCount, bgColor: "var(--white)" }) : null
+      ]
     }
   );
 };
-var DateRangeEditor = ({
-  ariaLabel,
-  onChange,
-  disabled,
-  value,
-  readOnly,
-  valueTestId
-}) => {
-  const [minDateValue, setMinDateValue] = (0, import_react77.useState)(value ? value[0] : "");
-  const [maxDateValue, setMaxDateValue] = (0, import_react77.useState)(value ? value[1] : "");
-  const [error, setError] = (0, import_react77.useState)("");
-  (0, import_react_use5.useDebounce)(
-    () => {
-      if (minDateValue && maxDateValue && !error) {
-        onChange([minDateValue, maxDateValue]);
-      } else {
-        onChange([]);
-      }
-    },
-    500,
-    [minDateValue, maxDateValue]
-  );
-  (0, import_react77.useEffect)(() => {
-    if (!minDateValue || !maxDateValue) {
-      return;
-    }
-    const minDate = new Date(minDateValue);
-    const maxDate = new Date(maxDateValue);
-    if (maxDate < minDate) {
-      setError("The max date cannot be lower than the min date");
-      return;
-    }
-    if (maxDate && !minDate) {
-      setError("Please enter both a low and high date");
-      return;
-    }
-    const minDateString = minDate.toDateString();
-    const maxDateString = maxDate.toDateString();
-    if (minDateString === maxDateString || maxDateString === minDateString) {
-      setError("The min and max date cannot be the same");
-      return;
-    }
-    if (minDate > maxDate) {
-      setError("The min date cannot be higher than the max date");
-      return;
-    }
-    if (error) {
-      setError("");
-    }
-    if (minDate && maxDate) {
-      setMinDateValue(minDateValue);
-      setMaxDateValue(maxDateValue);
-    } else {
-      setMinDateValue("");
-      setMaxDateValue("");
-    }
-  }, [minDateValue, maxDateValue, setError]);
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsxs)(import_jsx_runtime70.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime70.jsxs)("div", { css: twoColumnGrid, "data-testid": valueTestId, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-        import_design_system43.Input,
-        {
-          label: `${ariaLabel}-min-date`,
-          type: "date",
-          showLabel: false,
-          value: minDateValue,
-          onChange: (e) => setMinDateValue(e.currentTarget.value),
-          "aria-invalid": !error ? false : true,
-          disabled,
-          readOnly,
-          "data-testid": "value-low"
-        }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-        import_design_system43.Input,
-        {
-          label: `${ariaLabel}-max-date`,
-          type: "date",
-          showLabel: false,
-          value: maxDateValue,
-          onChange: (e) => setMaxDateValue(e.currentTarget.value),
-          "aria-invalid": !error ? false : true,
-          disabled,
-          readOnly,
-          "data-testid": "value-high"
-        }
-      )
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(ErrorContainer, { errorMessage: error })
-  ] });
-};
+
+// src/components/SearchAndFilter/FilterControls.tsx
+var import_CgClose5 = require("@react-icons/all-files/cg/CgClose");
+var import_design_system55 = require("@uniformdev/design-system");
+var import_lexical11 = require("lexical");
+var import_react87 = require("react");
+var import_react_use10 = require("react-use");
+var import_uuid3 = require("uuid");
+
+// src/components/SearchAndFilter/hooks/useSearchAndFilter.tsx
+var import_design_system54 = require("@uniformdev/design-system");
+var import_react86 = require("react");
+
+// src/components/SearchAndFilter/FilterEditor.tsx
+var import_jsx_runtime81 = require("@emotion/react/jsx-runtime");
 var FilterEditorRenderer = ({ editorType, ...props }) => {
   const { filterMapper: contextFilterMapper } = useSearchAndFilter();
   const Editor = contextFilterMapper == null ? void 0 : contextFilterMapper[editorType];
@@ -8489,7 +8599,7 @@ var FilterEditorRenderer = ({ editorType, ...props }) => {
   if (editorType === "empty") {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(Editor, { ...props });
+  return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(Editor, { ...props });
 };
 var filterMapper = {
   multiChoice: FilterMultiChoiceEditor,
@@ -8506,9 +8616,9 @@ var filterMapper = {
 function withInputVariables(WrappedComponent) {
   const WithInputVariables = (props) => {
     if (Array.isArray(props.value) || !props.bindable || props.disabled || props.readOnly) {
-      return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(WrappedComponent, { ...props });
+      return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(WrappedComponent, { ...props });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(
       InputVariables,
       {
         disableInlineMenu: true,
@@ -8516,7 +8626,7 @@ function withInputVariables(WrappedComponent) {
         onChange: (newValue) => props.onChange(newValue != null ? newValue : ""),
         value: props.value,
         disabled: props.disabled,
-        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(WrappedComponent, { ...props })
+        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(WrappedComponent, { ...props })
       }
     );
   };
@@ -8526,16 +8636,16 @@ function withInputVariablesForMultiValue(WrappedComponent) {
   const WithInputVariables = (props) => {
     var _a;
     if (!props.bindable || props.disabled || props.readOnly) {
-      return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(WrappedComponent, { ...props });
+      return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(WrappedComponent, { ...props });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(
       InputVariables,
       {
         disableInlineMenu: true,
         showMenuPosition: "inline-right",
         onChange: (newValue) => props.onChange(newValue ? [newValue] : []),
         value: (_a = props.value) == null ? void 0 : _a[0],
-        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(WrappedComponent, { ...props })
+        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(WrappedComponent, { ...props })
       }
     );
   };
@@ -8549,27 +8659,10 @@ var bindableFiltersMapper = {
   text: withInputVariables(TextEditor),
   number: withInputVariables(NumberEditor)
 };
-var ErrorContainer = ({ errorMessage }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-    "div",
-    {
-      css: {
-        gridColumn: "span 6",
-        order: 6
-      },
-      children: /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(import_design_system43.FieldMessage, { errorMessage })
-    }
-  );
-};
-var twoColumnGrid = {
-  display: "grid",
-  gridTemplateColumns: "1fr 1fr",
-  gap: "var(--spacing-sm);"
-};
 
 // src/components/SearchAndFilter/hooks/useSearchAndFilter.tsx
-var import_jsx_runtime71 = require("@emotion/react/jsx-runtime");
-var SearchAndFilterContext = (0, import_react78.createContext)({
+var import_jsx_runtime82 = require("@emotion/react/jsx-runtime");
+var SearchAndFilterContext = (0, import_react86.createContext)({
   searchTerm: "",
   setSearchTerm: () => {
   },
@@ -8604,41 +8697,41 @@ var SearchAndFilterProvider = ({
   children,
   allowBindingSearchTerm
 }) => {
-  const [searchTerm, setSearchTerm] = (0, import_react78.useState)(defaultSearchTerm);
-  const deferredSearchTerm = (0, import_react78.useDeferredValue)(searchTerm);
-  const [filterVisibility, setFilterVisibility] = (0, import_react78.useState)(filterVisible);
-  const handleSearchTerm = (0, import_react78.useCallback)(
+  const [searchTerm, setSearchTerm] = (0, import_react86.useState)(defaultSearchTerm);
+  const deferredSearchTerm = (0, import_react86.useDeferredValue)(searchTerm);
+  const [filterVisibility, setFilterVisibility] = (0, import_react86.useState)(filterVisible);
+  const handleSearchTerm = (0, import_react86.useCallback)(
     (term) => {
       setSearchTerm(term);
       onSearchChange == null ? void 0 : onSearchChange(term);
     },
     [setSearchTerm, onSearchChange]
   );
-  const handleToggleFilterVisibility = (0, import_react78.useCallback)(
+  const handleToggleFilterVisibility = (0, import_react86.useCallback)(
     (visible) => setFilterVisibility(visible),
     [setFilterVisibility]
   );
-  const handleAddFilter = (0, import_react78.useCallback)(() => {
+  const handleAddFilter = (0, import_react86.useCallback)(() => {
     onChange([...filters, { field: "", operator: "", value: "" }]);
   }, [filters, onChange]);
-  const handleResetFilters = (0, import_react78.useCallback)(() => {
+  const handleResetFilters = (0, import_react86.useCallback)(() => {
     onSearchChange == null ? void 0 : onSearchChange("");
     onChange(resetFilterValues);
   }, [onChange, resetFilterValues, onSearchChange]);
-  const handleDeleteFilter = (0, import_react78.useCallback)(
+  const handleDeleteFilter = (0, import_react86.useCallback)(
     (index) => {
       const remainingFilters = filters.filter((_, i) => i !== index);
       onChange(remainingFilters);
     },
     [filters, onChange]
   );
-  const validFilterQuery = (0, import_react78.useMemo)(() => {
+  const validFilterQuery = (0, import_react86.useMemo)(() => {
     const hasValidFilters = filters.every((f) => f.field && f.operator && f.value);
     if (hasValidFilters) {
       return filters;
     }
   }, [filters]);
-  (0, import_react78.useEffect)(() => {
+  (0, import_react86.useEffect)(() => {
     if (filterVisibility) {
       const handleEscKeyFilterClose = (e) => {
         if (e.key === "Escape") {
@@ -8651,7 +8744,7 @@ var SearchAndFilterProvider = ({
       };
     }
   }, [filterVisibility]);
-  return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
     SearchAndFilterContext.Provider,
     {
       value: {
@@ -8670,17 +8763,17 @@ var SearchAndFilterProvider = ({
         filterMapper: filterMapper2,
         allowBindingSearchTerm
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(import_design_system44.VerticalRhythm, { children })
+      children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(import_design_system54.VerticalRhythm, { children })
     }
   );
 };
 var useSearchAndFilter = () => {
-  const value = (0, import_react78.useContext)(SearchAndFilterContext);
+  const value = (0, import_react86.useContext)(SearchAndFilterContext);
   return { ...value };
 };
 
 // src/components/SearchAndFilter/FilterControls.tsx
-var import_jsx_runtime72 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime83 = require("@emotion/react/jsx-runtime");
 var FilterControls = ({
   children,
   hideSearchInput
@@ -8693,25 +8786,25 @@ var FilterControls = ({
     searchTerm,
     allowBindingSearchTerm
   } = useSearchAndFilter();
-  const editorRef = (0, import_react79.useRef)(null);
+  const editorRef = (0, import_react87.useRef)(null);
   const hasVariableInSearchTerm = hasReferencedVariables(searchTerm);
-  const [idToResetInputVariables, setIdToResetInputVariables] = (0, import_react79.useState)("data-resource-search-term-input");
-  const [localeSearchTerm, setLocaleSearchTerm] = (0, import_react79.useState)(searchTerm);
-  (0, import_react_use6.useDebounce)(
+  const [idToResetInputVariables, setIdToResetInputVariables] = (0, import_react87.useState)("data-resource-search-term-input");
+  const [localeSearchTerm, setLocaleSearchTerm] = (0, import_react87.useState)(searchTerm);
+  (0, import_react_use10.useDebounce)(
     () => {
       setSearchTerm(localeSearchTerm);
     },
     300,
     [localeSearchTerm]
   );
-  (0, import_react79.useEffect)(() => {
+  (0, import_react87.useEffect)(() => {
     if (searchTerm === "") {
       setLocaleSearchTerm("");
       setIdToResetInputVariables(`data-resource-search-term-input-${(0, import_uuid3.v4)()}`);
     }
   }, [searchTerm]);
-  return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(import_jsx_runtime72.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(import_jsx_runtime83.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
       FilterButton2,
       {
         "aria-controls": "search-and-filter-options",
@@ -8724,8 +8817,8 @@ var FilterControls = ({
         dataTestId: "filters-button"
       }
     ),
-    hideSearchInput ? null : /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)("div", { css: BindableKeywordSearchInputStyles, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
+    hideSearchInput ? null : /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)("div", { css: BindableKeywordSearchInputStyles, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
         InputVariables,
         {
           label: "",
@@ -8735,8 +8828,8 @@ var FilterControls = ({
           value: localeSearchTerm,
           onChange: (value) => setLocaleSearchTerm(value != null ? value : ""),
           disableVariables: !allowBindingSearchTerm,
-          inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
-            import_design_system45.InputKeywordSearch,
+          inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
+            import_design_system55.InputKeywordSearch,
             {
               placeholder: "Search...",
               onSearchTextChanged: (e) => setLocaleSearchTerm(e),
@@ -8748,7 +8841,7 @@ var FilterControls = ({
           )
         }
       ),
-      hasVariableInSearchTerm ? /* @__PURE__ */ (0, import_jsx_runtime72.jsx)("div", { css: ClearSearchButtonContainer, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
+      hasVariableInSearchTerm ? /* @__PURE__ */ (0, import_jsx_runtime83.jsx)("div", { css: ClearSearchButtonContainer, children: /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
         "button",
         {
           css: ClearSearchButtonStyles,
@@ -8762,7 +8855,7 @@ var FilterControls = ({
           },
           type: "button",
           "data-testid": "keyword-search-clear-button",
-          children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(import_design_system45.Icon, { icon: import_CgClose5.CgClose, iconColor: "red", size: "1rem" })
+          children: /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(import_design_system55.Icon, { icon: import_CgClose5.CgClose, iconColor: "red", size: "1rem" })
         }
       ) }) : null
     ] }),
@@ -8771,22 +8864,22 @@ var FilterControls = ({
 };
 
 // src/components/SearchAndFilter/FilterItem.tsx
-var import_design_system47 = require("@uniformdev/design-system");
-var import_react81 = require("react");
+var import_design_system57 = require("@uniformdev/design-system");
+var import_react89 = require("react");
 
 // src/components/SearchAndFilter/FilterMenu.tsx
-var import_design_system46 = require("@uniformdev/design-system");
-var import_react80 = __toESM(require("react"));
-var import_jsx_runtime73 = require("@emotion/react/jsx-runtime");
+var import_design_system56 = require("@uniformdev/design-system");
+var import_react88 = __toESM(require("react"));
+var import_jsx_runtime84 = require("@emotion/react/jsx-runtime");
 var SearchAndFilterOptionsContainer2 = ({
   buttonRow,
   additionalFiltersContainer,
   children
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)("div", { css: SearchAndFilterOptionsContainer, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { css: SearchAndFilterOptionsInnerContainer, children }),
-    buttonRow ? /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
-      import_design_system46.HorizontalRhythm,
+  return /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)("div", { css: SearchAndFilterOptionsContainer, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("div", { css: SearchAndFilterOptionsInnerContainer, children }),
+    buttonRow ? /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
+      import_design_system56.HorizontalRhythm,
       {
         css: SearchAndFilterButtonGroup,
         gap: "sm",
@@ -8795,7 +8888,7 @@ var SearchAndFilterOptionsContainer2 = ({
         children: buttonRow
       }
     ) : null,
-    additionalFiltersContainer ? /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { children: additionalFiltersContainer }) : null
+    additionalFiltersContainer ? /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("div", { children: additionalFiltersContainer }) : null
   ] });
 };
 var FilterMenu = ({
@@ -8808,22 +8901,22 @@ var FilterMenu = ({
   resetButtonText = "reset"
 }) => {
   const { filterVisibility, setFilterVisibility, handleResetFilters, filters } = useSearchAndFilter();
-  const innerMenuRef = import_react80.default.useRef(null);
-  (0, import_react80.useEffect)(() => {
+  const innerMenuRef = import_react88.default.useRef(null);
+  (0, import_react88.useEffect)(() => {
     var _a;
     if (filterVisibility) {
       (_a = innerMenuRef.current) == null ? void 0 : _a.focus();
     }
   }, [filterVisibility]);
-  return /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_design_system46.VerticalRhythm, { gap: "sm", "aria-haspopup": "true", id, "data-testid": dataTestId, children: filterVisibility ? /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_design_system56.VerticalRhythm, { gap: "sm", "aria-haspopup": "true", id, "data-testid": dataTestId, children: filterVisibility ? /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(
     SearchAndFilterOptionsContainer2,
     {
       buttonRow: menuControls,
       additionalFiltersContainer,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(import_design_system46.HorizontalRhythm, { gap: "sm", align: "center", justify: "space-between", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("span", { css: Title, ref: innerMenuRef, tabIndex: 0, children: filterTitle }),
-          (filters == null ? void 0 : filters.length) ? /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(import_design_system56.HorizontalRhythm, { gap: "sm", align: "center", justify: "space-between", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("span", { css: Title, ref: innerMenuRef, tabIndex: 0, children: filterTitle }),
+          (filters == null ? void 0 : filters.length) ? /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
             "button",
             {
               type: "button",
@@ -8844,7 +8937,7 @@ var FilterMenu = ({
 };
 
 // src/components/SearchAndFilter/FilterItem.tsx
-var import_jsx_runtime74 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime85 = require("@emotion/react/jsx-runtime");
 var FilterItem = ({
   index,
   paramOptions,
@@ -8860,7 +8953,7 @@ var FilterItem = ({
   const operatorLabel = filters[index].operator !== "" ? `operator ${filters[index].operator}` : "unknown operator";
   const metaDataLabel = filters[index].value !== "" ? `value ${filters[index].value}` : "unknown value";
   const metaDataPossibleOptions = (_b = (_a = operatorOptions.find((op) => filters[index].operator === op.value)) == null ? void 0 : _a.editorType) != null ? _b : "singleChoice";
-  const { selectedFieldValue, selectedOperatorValue, selectedMetaValue, readOnly, bindable } = (0, import_react81.useMemo)(() => {
+  const { selectedFieldValue, selectedOperatorValue, selectedMetaValue, readOnly, bindable } = (0, import_react89.useMemo)(() => {
     var _a2;
     const currentSelectedFilter = filterOptions.find((item) => {
       var _a3;
@@ -8887,11 +8980,11 @@ var FilterItem = ({
     menuIsOpen: false,
     isClearable: false
   } : {};
-  return /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { css: ConditionalFilterRow, "data-testid": "filter-item", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("span", { children: index === 0 ? "Where" : "and" }),
-    /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)("div", { css: ConditionalInputRow, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
-        import_design_system47.InputComboBox,
+  return /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { css: ConditionalFilterRow, "data-testid": "filter-item", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { children: index === 0 ? "Where" : "and" }),
+    /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { css: ConditionalInputRow, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        import_design_system57.InputComboBox,
         {
           "aria-label": label,
           options: paramOptions,
@@ -8917,8 +9010,8 @@ var FilterItem = ({
           name: `filter-field-${index}`
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
-        import_design_system47.InputComboBox,
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        import_design_system57.InputComboBox,
         {
           "aria-label": operatorLabel,
           options: operatorOptions,
@@ -8941,7 +9034,7 @@ var FilterItem = ({
           name: `filter-operator-${index}`
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
         FilterEditorRenderer,
         {
           "aria-label": metaDataLabel,
@@ -8955,7 +9048,7 @@ var FilterItem = ({
           valueTestId: "filter-value"
         }
       ),
-      readOnly || index === 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
+      readOnly || index === 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
         "button",
         {
           type: "button",
@@ -8963,7 +9056,7 @@ var FilterItem = ({
           "aria-label": "delete filter",
           css: IconBtn,
           "data-testid": "delete-filter",
-          children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_design_system47.Icon, { icon: "trash", iconColor: "red", size: "1rem" })
+          children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_design_system57.Icon, { icon: "trash", iconColor: "red", size: "1rem" })
         }
       )
     ] })
@@ -8979,13 +9072,13 @@ var FilterItems = ({
     const next = [...filters];
     next[index] = { ...next[index], [prop]: value };
     if (prop === "operator") {
-      if (["eq", "neq", "lt", "gt"].includes(value) && Array.isArray(next[index].value)) {
+      if (!Array.isArray(value) && ["eq", "neq", "lt", "gt"].includes(value) && Array.isArray(next[index].value)) {
         next[index].value = next[index].value[0];
       }
       if (filters[index].operator === "ndef" || filters[index].operator === "def") {
         next[index].value = "";
       }
-      if (["between"].includes(value) && Array.isArray(next[index].value) === false) {
+      if (!Array.isArray(value) && ["between"].includes(value) && Array.isArray(next[index].value) === false) {
         next[index].value = [next[index].value, ""];
       }
       if (value === "def" || value === "true") {
@@ -9005,12 +9098,12 @@ var FilterItems = ({
     }
     setFilters(next);
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
     FilterMenu,
     {
       id: "search-and-filter-options",
       dataTestId: "search-and-filter-options",
-      menuControls: /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(
+      menuControls: /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(
         "button",
         {
           type: "button",
@@ -9018,7 +9111,7 @@ var FilterItems = ({
           onClick: handleAddFilter,
           "data-testid": "add-filter",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(import_design_system47.Icon, { icon: "math-plus", iconColor: "currentColor", size: "1rem" }),
+            /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_design_system57.Icon, { icon: "math-plus", iconColor: "currentColor", size: "1rem" }),
             addButtonText
           ]
         }
@@ -9032,7 +9125,7 @@ var FilterItems = ({
         })) == null ? void 0 : _a.options) != null ? _b : [];
         const possibleValueOptions = (_d = (_c = availableTypeOptions == null ? void 0 : availableTypeOptions.find((op) => op.value === item.field)) == null ? void 0 : _c.valueOptions) != null ? _d : [];
         const possibleOperators = (_f = (_e = availableTypeOptions == null ? void 0 : availableTypeOptions.find((op) => op.value === item.field)) == null ? void 0 : _e.operatorOptions) != null ? _f : [];
-        return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
           FilterItem,
           {
             index: i,
@@ -9051,11 +9144,11 @@ var FilterItems = ({
 };
 
 // src/components/SearchAndFilter/SearchAndFilter.tsx
-var import_design_system49 = require("@uniformdev/design-system");
+var import_design_system59 = require("@uniformdev/design-system");
 
 // src/components/SearchAndFilter/SearchAndFilterResultContainer.tsx
-var import_design_system48 = require("@uniformdev/design-system");
-var import_jsx_runtime75 = require("@emotion/react/jsx-runtime");
+var import_design_system58 = require("@uniformdev/design-system");
+var import_jsx_runtime86 = require("@emotion/react/jsx-runtime");
 var SearchAndFilterResultContainer = ({
   buttonText,
   clearButtonLabel = "clear",
@@ -9085,31 +9178,31 @@ var SearchAndFilterResultContainer = ({
       handleResetFilters();
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(import_jsx_runtime75.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(import_design_system48.HorizontalRhythm, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)("span", { children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(import_jsx_runtime86.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(import_design_system58.HorizontalRhythm, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)("span", { children: [
         totalResults,
         " results ",
         searchTerm ? `for "${searchTerm}"` : null
       ] }),
-      !searchTerm || hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_design_system48.Button, { buttonType: "ghostDestructive", size: "zero", onClick: handleClearSearch, children: clearButtonLabel })
+      !searchTerm || hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_design_system58.Button, { buttonType: "ghostDestructive", size: "zero", onClick: handleClearSearch, children: clearButtonLabel })
     ] }),
-    totalResults === 0 ? /* @__PURE__ */ (0, import_jsx_runtime75.jsxs)(import_design_system48.Callout, { title: calloutTitle != null ? calloutTitle : automateCalloutTitle(), type: "note", children: [
-      calloutText ? /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_design_system48.Paragraph, { children: calloutText }) : null,
-      hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(import_design_system48.Button, { buttonType: "tertiaryOutline", size: "xs", onClick: handleClearSearch, children: buttonText != null ? buttonText : "Clear search" })
+    totalResults === 0 ? /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(import_design_system58.Callout, { title: calloutTitle != null ? calloutTitle : automateCalloutTitle(), type: "note", children: [
+      calloutText ? /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_design_system58.Paragraph, { children: calloutText }) : null,
+      hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_design_system58.Button, { buttonType: "tertiaryOutline", size: "xs", onClick: handleClearSearch, children: buttonText != null ? buttonText : "Clear search" })
     ] }) : null
   ] });
 };
 
 // src/components/SearchAndFilter/SearchAndFilter.tsx
-var import_jsx_runtime76 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime87 = require("@emotion/react/jsx-runtime");
 var SearchAndFilter = ({
   filters,
   filterOptions,
   filterVisible,
   filterControls,
   viewSwitchControls,
-  resultsContainerView = /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(SearchAndFilterResultContainer, {}),
+  resultsContainerView = /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(SearchAndFilterResultContainer, {}),
   filterMapper: filterMapper2 = filterMapper,
   additionalFiltersContainer,
   onChange,
@@ -9119,7 +9212,7 @@ var SearchAndFilter = ({
   allowBindingSearchTerm = false,
   resetFilterValues = []
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
     SearchAndFilterProvider,
     {
       filters,
@@ -9132,18 +9225,18 @@ var SearchAndFilter = ({
       resetFilterValues,
       filterMapper: filterMapper2,
       allowBindingSearchTerm,
-      children: /* @__PURE__ */ (0, import_jsx_runtime76.jsxs)(import_design_system49.VerticalRhythm, { "data-testid": "search-and-filter", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime76.jsxs)("div", { css: SearchAndFilterOutterControlWrapper(viewSwitchControls ? "1fr auto" : "1fr"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(import_design_system59.VerticalRhythm, { "data-testid": "search-and-filter", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)("div", { css: SearchAndFilterOutterControlWrapper(viewSwitchControls ? "1fr auto" : "1fr"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "div",
             {
               css: SearchAndFilterControlsWrapper(viewSwitchControls ? "auto 1fr 0.05fr" : "auto 1fr"),
-              children: !filterControls ? /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(FilterControls, { hideSearchInput: !onSearchChange }) : filterControls
+              children: !filterControls ? /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(FilterControls, { hideSearchInput: !onSearchChange }) : filterControls
             }
           ),
           viewSwitchControls
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(FilterItems, { additionalFiltersContainer }),
+        /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(FilterItems, { additionalFiltersContainer }),
         resultsContainerView
       ] })
     }
@@ -9151,19 +9244,19 @@ var SearchAndFilter = ({
 };
 
 // src/components/SearchAndFilter/SearchOnlyFilter.tsx
-var import_design_system50 = require("@uniformdev/design-system");
-var import_react82 = require("react");
-var import_react_use7 = require("react-use");
-var import_jsx_runtime77 = require("@emotion/react/jsx-runtime");
-var SearchOnlyContext = (0, import_react82.createContext)({
+var import_design_system60 = require("@uniformdev/design-system");
+var import_react90 = require("react");
+var import_react_use11 = require("react-use");
+var import_jsx_runtime88 = require("@emotion/react/jsx-runtime");
+var SearchOnlyContext = (0, import_react90.createContext)({
   searchTerm: "",
   setSearchTerm: () => {
   }
 });
 var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
   const { searchTerm, setSearchTerm } = useSearchAndFilter();
-  const [localeSearchTerm, setLocaleSearchTerm] = (0, import_react82.useState)("");
-  (0, import_react_use7.useDebounce)(
+  const [localeSearchTerm, setLocaleSearchTerm] = (0, import_react90.useState)("");
+  (0, import_react_use11.useDebounce)(
     () => {
       setSearchTerm(localeSearchTerm);
       onSearchChange == null ? void 0 : onSearchChange(localeSearchTerm);
@@ -9171,15 +9264,15 @@ var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
     300,
     [localeSearchTerm]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(
     SearchOnlyContext.Provider,
     {
       value: {
         searchTerm,
         setSearchTerm: setLocaleSearchTerm
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime77.jsx)("div", { css: { maxWidth: maxWidth != null ? maxWidth : "712px" }, children: /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(
-        import_design_system50.InputKeywordSearch,
+      children: /* @__PURE__ */ (0, import_jsx_runtime88.jsx)("div", { css: { maxWidth: maxWidth != null ? maxWidth : "712px" }, children: /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(
+        import_design_system60.InputKeywordSearch,
         {
           placeholder: "Search...",
           onSearchTextChanged: (e) => setLocaleSearchTerm(e),
@@ -9193,18 +9286,18 @@ var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
 };
 
 // src/components/SearchAndFilter/SortItems.tsx
-var import_design_system52 = require("@uniformdev/design-system");
+var import_design_system62 = require("@uniformdev/design-system");
 
 // src/components/SearchAndFilter/styles/SortItems.styles.ts
-var import_react83 = require("@emotion/react");
-var import_design_system51 = require("@uniformdev/design-system");
-var ConditionalFilterRow2 = import_react83.css`
+var import_react91 = require("@emotion/react");
+var import_design_system61 = require("@uniformdev/design-system");
+var ConditionalFilterRow2 = import_react91.css`
   display: grid;
   grid-template-columns: 35px 1fr;
   gap: var(--spacing-sm);
   margin-left: var(--spacing-base);
 
-  ${(0, import_design_system51.cq)("380px")} {
+  ${(0, import_design_system61.cq)("380px")} {
     align-items: center;
 
     &:after {
@@ -9225,22 +9318,22 @@ var ConditionalFilterRow2 = import_react83.css`
     grid-template-columns: 50px 1fr;
   }
 
-  ${(0, import_design_system51.cq)("580px")} {
+  ${(0, import_design_system61.cq)("580px")} {
     &:after {
       display: none;
     }
   }
 
   @media (prefers-reduced-motion: no-preference) {
-    animation: ${import_design_system51.fadeInLtr} var(--duration-fast) var(--timing-ease-out);
+    animation: ${import_design_system61.fadeInLtr} var(--duration-fast) var(--timing-ease-out);
   }
 `;
-var ConditionalInputRow2 = import_react83.css`
+var ConditionalInputRow2 = import_react91.css`
   display: flex;
   gap: var(--spacing-sm);
   flex-wrap: wrap;
 
-  ${(0, import_design_system51.cq)("380px")} {
+  ${(0, import_design_system61.cq)("380px")} {
     & > div:nth-child(-n + 2) {
       width: calc(50% - var(--spacing-sm));
     }
@@ -9249,7 +9342,7 @@ var ConditionalInputRow2 = import_react83.css`
       width: calc(100% - 48px);
     }
   }
-  ${(0, import_design_system51.cq)("580px")} {
+  ${(0, import_design_system61.cq)("580px")} {
     display: grid;
     grid-template-columns: 200px 160px 1fr 32px;
 
@@ -9258,11 +9351,11 @@ var ConditionalInputRow2 = import_react83.css`
     }
   }
 `;
-var SearchInput2 = import_react83.css`
+var SearchInput2 = import_react91.css`
   max-height: 40px;
   min-height: unset;
 `;
-var FilterButton3 = import_react83.css`
+var FilterButton3 = import_react91.css`
   align-items: center;
   background: var(--white);
   border: 1px solid var(--gray-300);
@@ -9298,13 +9391,13 @@ var FilterButton3 = import_react83.css`
     opacity: var(--opacity-50);
   }
 `;
-var FilterButtonText2 = import_react83.css`
+var FilterButtonText2 = import_react91.css`
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   max-width: 14ch;
 `;
-var FilterButtonSelected2 = import_react83.css`
+var FilterButtonSelected2 = import_react91.css`
   background: var(--gray-100);
   border-color: var(--gray-300);
 
@@ -9312,7 +9405,7 @@ var FilterButtonSelected2 = import_react83.css`
     color: var(--accent-dark);
   }
 `;
-var FilterButtonWithOptions2 = import_react83.css`
+var FilterButtonWithOptions2 = import_react91.css`
   :where([aria-expanded='true']) {
     background: var(--purple-rain-100);
     border-color: var(--accent-light);
@@ -9324,14 +9417,14 @@ var FilterButtonWithOptions2 = import_react83.css`
     }
   }
 `;
-var SearchIcon2 = import_react83.css`
+var SearchIcon2 = import_react91.css`
   color: var(--icon-color);
   position: absolute;
   inset: 0 var(--spacing-base) 0 auto;
   margin: auto;
   transition: color var(--duration-fast) var(--timing-ease-out);
 `;
-var AddConditionalBtn2 = import_react83.css`
+var AddConditionalBtn2 = import_react91.css`
   align-items: center;
   background: transparent;
   border: none;
@@ -9350,14 +9443,14 @@ var AddConditionalBtn2 = import_react83.css`
     color: var(--gray-400);
   }
 `;
-var Title2 = import_react83.css`
+var Title2 = import_react91.css`
   color: var(--typography-light);
 
   &:focus {
     outline: none;
   }
 `;
-var ResetConditionsBtn2 = import_react83.css`
+var ResetConditionsBtn2 = import_react91.css`
   background: transparent;
   border: none;
   color: var(--action-destructive-default);
@@ -9369,12 +9462,12 @@ var ResetConditionsBtn2 = import_react83.css`
     color: var(--action-destructive-hover);
   }
 `;
-var IconBtn2 = import_react83.css`
+var IconBtn2 = import_react91.css`
   background: transparent;
   border: none;
   padding: var(--spacing-sm);
 `;
-var SearchAndFilterOptionsContainer3 = import_react83.css`
+var SearchAndFilterOptionsContainer3 = import_react91.css`
   background: var(--gray-50);
   border: 1px solid var(--gray-300);
   border-radius: var(--rounded-base);
@@ -9387,17 +9480,17 @@ var SearchAndFilterOptionsContainer3 = import_react83.css`
   position: relative;
   z-index: 1;
 `;
-var SearchAndFilterOptionsInnerContainer2 = import_react83.css`
+var SearchAndFilterOptionsInnerContainer2 = import_react91.css`
   display: flex;
   flex-direction: column;
   gap: var(--spacing-sm);
   padding-inline: var(--spacing-md);
 `;
-var SearchAndFilterButtonGroup2 = import_react83.css`
+var SearchAndFilterButtonGroup2 = import_react91.css`
   margin-top: var(--spacing-xs);
   margin-left: calc(56px + var(--spacing-md));
 `;
-var SortFilterWrapper = (hiddenLocaleInput) => import_react83.css`
+var SortFilterWrapper = (hiddenLocaleInput) => import_react91.css`
   align-items: center;
   border-top: 1px solid var(--gray-300);
   display: flex;
@@ -9407,18 +9500,18 @@ var SortFilterWrapper = (hiddenLocaleInput) => import_react83.css`
   position: relative;
   z-index: 0;
 
-  ${(0, import_design_system51.cq)("420px")} {
+  ${(0, import_design_system61.cq)("420px")} {
     display: grid;
     grid-template-columns: ${hiddenLocaleInput ? "1fr" : "1fr minmax(140px, 0.25fr)"};
   }
 `;
-var SortFilterInputRow = import_react83.css`
+var SortFilterInputRow = import_react91.css`
   align-items: center;
   display: grid;
   grid-template-columns: 1fr auto;
   gap: var(--spacing-base);
 `;
-var InputVariableWrapper = import_react83.css`
+var InputVariableWrapper = import_react91.css`
   flex-grow: 1;
 
   // we need to override label styles nested within the input variable
@@ -9429,7 +9522,7 @@ var InputVariableWrapper = import_react83.css`
 `;
 
 // src/components/SearchAndFilter/SortItems.tsx
-var import_jsx_runtime78 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime89 = require("@emotion/react/jsx-runtime");
 var SortItems = ({
   sortByLabel = "Sort by",
   localeLabel = "Show locale",
@@ -9451,11 +9544,11 @@ var SortItems = ({
     return (_a2 = item.options) == null ? void 0 : _a2.find((option) => option.value === sortField);
   })) == null ? void 0 : _a.options) == null ? void 0 : _b.find((nestedOption) => nestedOption.value === sortField);
   const localeLabelValue = sortOptions.length > 1 ? localeLabel : `${localeLabel}s`;
-  return /* @__PURE__ */ (0, import_jsx_runtime78.jsxs)("div", { css: [SortFilterWrapper(hideLocaleOptions)], "data-testid": "sorting-options", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime78.jsxs)(import_design_system52.VerticalRhythm, { gap: "xs", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime78.jsx)("span", { css: Title2, children: sortByLabel }),
-      /* @__PURE__ */ (0, import_jsx_runtime78.jsxs)("div", { css: SortFilterInputRow, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)("div", { css: [SortFilterWrapper(hideLocaleOptions)], "data-testid": "sorting-options", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(import_design_system62.VerticalRhythm, { gap: "xs", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("span", { css: Title2, children: sortByLabel }),
+      /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)("div", { css: SortFilterInputRow, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
           InputVariables,
           {
             disableInlineMenu: disableSortBinding,
@@ -9463,8 +9556,8 @@ var SortItems = ({
             value: sortField,
             valueToResetTo: "created_at",
             onChange: (e) => onSortChange(`${e}_${sortDirection}`),
-            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
-              import_design_system52.InputComboBox,
+            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
+              import_design_system62.InputComboBox,
               {
                 id: "sort-by-field",
                 "aria-label": "Sort by",
@@ -9486,7 +9579,7 @@ var SortItems = ({
             )
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
           InputVariables,
           {
             disableInlineMenu: disableSortBinding,
@@ -9494,8 +9587,8 @@ var SortItems = ({
             valueToResetTo: "DESC",
             showMenuPosition: disableSortBinding ? void 0 : "inline-right",
             onChange: (e) => onSortChange(`${sortField}_${e}`),
-            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
-              import_design_system52.SegmentedControl,
+            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
+              import_design_system62.SegmentedControl,
               {
                 noCheckmark: true,
                 name: "sortBy",
@@ -9526,15 +9619,15 @@ var SortItems = ({
         )
       ] })
     ] }),
-    hideLocaleOptions ? null : /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(import_design_system52.VerticalRhythm, { gap: "xs", css: InputVariableWrapper, children: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
+    hideLocaleOptions ? null : /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(import_design_system62.VerticalRhythm, { gap: "xs", css: InputVariableWrapper, children: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
       InputVariables,
       {
         label: localeLabelValue,
         value: localeValue,
         showMenuPosition: "inline-right",
         onChange: (e) => onLocaleChange(e != null ? e : ""),
-        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
-          import_design_system52.InputSelect,
+        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
+          import_design_system62.InputSelect,
           {
             name: "localeReturned",
             "aria-label": localeLabelValue,
@@ -9564,19 +9657,19 @@ function createLocationValidator(setValue, validate) {
 
 // src/utils/useContentDataResourceLocaleInfo.ts
 var import_canvas10 = require("@uniformdev/canvas");
-var import_react84 = require("react");
+var import_react92 = require("react");
 function useContentDataResourceLocaleInfo({
   locale,
   setLocale,
   dynamicInputs
 }) {
   var _a;
-  const setLocaleRef = (0, import_react84.useRef)(setLocale);
+  const setLocaleRef = (0, import_react92.useRef)(setLocale);
   setLocaleRef.current = setLocale;
   const { flatVariables } = useVariables();
   const effectiveLocale = locale != null ? locale : dynamicInputs[import_canvas10.LOCALE_DYNAMIC_INPUT_NAME] ? (0, import_canvas10.createVariableReference)(import_canvas10.LOCALE_DYNAMIC_INPUT_NAME) : "";
   const boundLocale = (_a = (0, import_canvas10.bindVariables)({ variables: flatVariables, value: effectiveLocale }).result) != null ? _a : effectiveLocale;
-  (0, import_react84.useEffect)(() => {
+  (0, import_react92.useEffect)(() => {
     if (locale === void 0 && effectiveLocale && setLocaleRef.current) {
       setLocaleRef.current((0, import_canvas10.createVariableReference)(import_canvas10.LOCALE_DYNAMIC_INPUT_NAME));
     }
@@ -9585,7 +9678,7 @@ function useContentDataResourceLocaleInfo({
 }
 
 // src/index.ts
-var import_design_system53 = require("@uniformdev/design-system");
+var import_design_system63 = require("@uniformdev/design-system");
 __reExport(src_exports, require("@uniformdev/mesh-sdk"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {