@uniformdev/mesh-sdk-react 19.135.1-alpha.10 → 19.135.1-alpha.11

package/dist/index.esm.js

@@ -966,7 +966,8 @@ var searchRowContainer = css6`
   cursor: pointer;
   padding: var(--spacing-sm);
   position: relative;
-  transition: background-color var(--duration-fast) var(--timing-ease-out),
+  transition:
+    background-color var(--duration-fast) var(--timing-ease-out),
     color var(--duration-fast) var(--timing-ease-out);
 `;
 var searchRowContainerWithPopover = css6`
@@ -1651,8 +1652,7 @@ var EntrySearch = ({
   const handleCancelClick = (e) => {
     e.preventDefault();
     setListOpen(false);
-    if (onCancel)
-      onCancel();
+    if (onCancel) onCancel();
   };
   const handleLoadMoreClick = () => {
     search(textInput, {
@@ -1957,7 +1957,8 @@ var productSearchRowContainer = css12`
   padding: var(--spacing-sm) 0;
   margin-right: var(--spacing-sm);
   position: relative;
-  transition: background-color var(--duration-fast) var(--timing-ease-out),
+  transition:
+    background-color var(--duration-fast) var(--timing-ease-out),
     color var(--duration-fast) var(--timing-ease-out);
 `;
 var productSearchRowContent = css12`
@@ -2796,18 +2797,58 @@ import { ParameterShellContext, useParameterShell } from "@uniformdev/design-sys
 
 // src/components/Variables/composer/ControlledValuePlugin.tsx
 import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
-import { dequal } from "dequal/lite";
-import { useEffect as useEffect5, useRef as useRef8 } from "react";
+import { useEffect as useEffect5 } from "react";
+
+// src/components/Variables/util/serializeVariablesEditorState.ts
+import { createVariableReference } from "@uniformdev/canvas";
+import {
+  LineBreakNode,
+  TextNode
+} from "lexical";
+
+// src/components/Variables/util/variableExpression.ts
+var variablePrefix = "${";
+var variableSuffix = "}";
+
+// src/components/Variables/util/serializeVariablesEditorState.ts
+function serializeVariablesEditorState(editorState) {
+  return serializeVariablesEditorSerializedState(editorState.toJSON().root);
+}
+function serializeVariablesEditorSerializedState(serializedEditorState) {
+  const buf = [];
+  serializeRecursive(serializedEditorState, buf);
+  const result = buf.join("");
+  return result.length > 0 ? result : void 0;
+}
+function serializeRecursive(node, buffer) {
+  if (node.type === TextNode.getType()) {
+    buffer.push(node.text.replace(variablePrefix, "\\${"));
+  }
+  if (node.type === VariableNode.getType()) {
+    buffer.push(createVariableReference(node.reference));
+  }
+  if (node.type === LineBreakNode.getType()) {
+    buffer.push("\n");
+  }
+  if ("children" in node && node.children) {
+    for (const child of node.children) {
+      serializeRecursive(child, buffer);
+    }
+  }
+}
+
+// src/components/Variables/util/setVariablesEditorValue.ts
+import { emptyRichTextValue } from "@uniformdev/richtext";
 
 // src/components/Variables/util/deserializeVariablesEditorState.ts
 import { parseVariableExpression } from "@uniformdev/canvas";
-import { TextNode } from "lexical";
+import { TextNode as TextNode2 } from "lexical";
 function deserializeVariablesEditorState(serialized) {
   const result = [];
   parseVariableExpression(serialized != null ? serialized : "", (token, type) => {
     if (type === "text") {
       const node = {
-        type: TextNode.getType(),
+        type: TextNode2.getType(),
         text: token,
         mode: "normal",
         version: 1,
@@ -2861,14 +2902,18 @@ function refreshVariableNodeMetadata(editor) {
 }
 
 // src/components/Variables/util/setVariablesEditorValue.ts
-function setVariablesEditorValue(editor, newValue) {
+function setVariablesEditorValue(editor, newValue, tag) {
   if (typeof newValue === "undefined" || typeof newValue === "string") {
     const parsedState = editor.parseEditorState(deserializeVariablesEditorState(newValue));
-    editor.setEditorState(parsedState);
+    editor.setEditorState(parsedState.clone(null), {
+      tag
+    });
   } else {
     try {
       const parsedState = editor.parseEditorState(newValue);
-      editor.setEditorState(parsedState);
+      editor.setEditorState(parsedState.clone(null), {
+        tag
+      });
     } catch (e) {
       console.warn(
         "Tried to set invalid Lexical state, probably invalidly formatted state object - falling back to empty state. Invalid state attempted:",
@@ -2876,26 +2921,10 @@ function setVariablesEditorValue(editor, newValue) {
         "Error:",
         e
       );
-      const parsedState = editor.parseEditorState({
-        root: {
-          type: "root",
-          version: 1,
-          direction: null,
-          format: "",
-          indent: 0,
-          children: [
-            {
-              type: "paragraph",
-              version: 1,
-              format: "start",
-              indent: 0,
-              direction: null,
-              children: []
-            }
-          ]
-        }
+      const parsedState = editor.parseEditorState(emptyRichTextValue);
+      editor.setEditorState(parsedState.clone(null), {
+        tag
       });
-      editor.setEditorState(parsedState);
     }
   }
   refreshVariableNodeMetadata(editor);
@@ -2908,17 +2937,18 @@ function ControlledValuePlugin({
   extraDependencies
 }) {
   const [editor] = useLexicalComposerContext();
-  const lastValueRef = useRef8(value);
   useEffect5(() => {
+    var _a, _b;
     if (!enabled) {
       return;
     }
-    if (dequal(lastValueRef.current, value)) {
+    const currentValue = (_a = serializeVariablesEditorState(editor.getEditorState())) != null ? _a : "";
+    const newValue = (_b = value !== void 0 && typeof value !== "string" ? serializeVariablesEditorSerializedState(value.root) : value) != null ? _b : "";
+    if (currentValue === newValue) {
       return;
     }
     setTimeout(() => {
       if (editor) {
-        lastValueRef.current = value;
         setVariablesEditorValue(editor, value);
       }
     });
@@ -2926,36 +2956,6 @@ function ControlledValuePlugin({
   return null;
 }
 
-// src/components/Variables/composer/VariableNode.tsx
-import { useLexicalComposerContext as useLexicalComposerContext3 } from "@lexical/react/LexicalComposerContext";
-import { useLexicalNodeSelection } from "@lexical/react/useLexicalNodeSelection";
-import { $moveCharacter, $shouldOverrideDefaultCharacterSelection } from "@lexical/selection";
-import { mergeRegister as mergeRegister2 } from "@lexical/utils";
-import { createVariableReference as createVariableReference2 } from "@uniformdev/canvas";
-import { LoadingIndicator as LoadingIndicator2 } from "@uniformdev/design-system";
-import {
-  $getNearestNodeFromDOMNode,
-  $getNodeByKey as $getNodeByKey2,
-  $getSelection as $getSelection2,
-  $isDecoratorNode,
-  $isNodeSelection as $isNodeSelection2,
-  $isRangeSelection,
-  COMMAND_PRIORITY_EDITOR,
-  COMMAND_PRIORITY_LOW,
-  DecoratorNode,
-  KEY_ARROW_LEFT_COMMAND,
-  KEY_ARROW_RIGHT_COMMAND,
-  KEY_BACKSPACE_COMMAND,
-  KEY_DELETE_COMMAND
-} from "lexical";
-import { useCallback as useCallback3, useEffect as useEffect9 } from "react";
-
-// src/components/Variables/util/prettifyBindExpression.tsx
-function prettifyBindExpression(bindExpression) {
-  const [, expression] = bindExpression.split(":");
-  return expression;
-}
-
 // src/components/Variables/composer/VariableChip.tsx
 import { MultilineChip, Tooltip, VerticalRhythm } from "@uniformdev/design-system";
 import { Fragment as Fragment5 } from "react";
@@ -2969,12 +2969,13 @@ function VariableChip({
   clickToEdit,
   isFresh,
   selected,
-  disabled
+  disabled,
+  errorMessage = `${reference} is not defined.`
 }) {
   const hasClickEvent = !!onClick;
   const referenceIsValidFr = isFresh ? true : referenceIsValid;
   const Wrapper = referenceIsValidFr === "warning" ? WarningVariableReference : referenceIsValidFr === "info" ? InfoVariableReference : referenceIsValidFr ? Fragment5 : UndefinedVariableReference;
-  const extraTitle = !referenceIsValidFr ? `${reference} is not defined.` : hasClickEvent && clickToEdit ? "Click to edit" : void 0;
+  const extraTitle = !referenceIsValidFr ? errorMessage : hasClickEvent && clickToEdit ? "Click to edit" : void 0;
   const chippy = /* @__PURE__ */ jsx30(MultilineChip, { onClick, "aria-selected": selected ? true : void 0, "aria-disabled": disabled, children: /* @__PURE__ */ jsx30(Wrapper, { children: displayName || reference }) });
   if (tooltip) {
     const tip = tooltip ? `${tooltip}${extraTitle ? `
@@ -3031,6 +3032,36 @@ function WarningVariableReference({ children }) {
   );
 }
 
+// src/components/Variables/composer/VariableNode.tsx
+import { useLexicalComposerContext as useLexicalComposerContext3 } from "@lexical/react/LexicalComposerContext";
+import { useLexicalNodeSelection } from "@lexical/react/useLexicalNodeSelection";
+import { $moveCharacter, $shouldOverrideDefaultCharacterSelection } from "@lexical/selection";
+import { mergeRegister as mergeRegister2 } from "@lexical/utils";
+import { createVariableReference as createVariableReference3 } from "@uniformdev/canvas";
+import { LoadingIndicator as LoadingIndicator2 } from "@uniformdev/design-system";
+import {
+  $getNearestNodeFromDOMNode,
+  $getNodeByKey as $getNodeByKey2,
+  $getSelection as $getSelection2,
+  $isDecoratorNode,
+  $isNodeSelection as $isNodeSelection2,
+  $isRangeSelection,
+  COMMAND_PRIORITY_EDITOR,
+  COMMAND_PRIORITY_LOW,
+  DecoratorNode,
+  KEY_ARROW_LEFT_COMMAND,
+  KEY_ARROW_RIGHT_COMMAND,
+  KEY_BACKSPACE_COMMAND,
+  KEY_DELETE_COMMAND
+} from "lexical";
+import { useCallback as useCallback3, useEffect as useEffect9 } from "react";
+
+// src/components/Variables/util/prettifyBindExpression.tsx
+function prettifyBindExpression(bindExpression) {
+  const [, expression] = bindExpression.split(":");
+  return expression;
+}
+
 // src/components/Variables/composer/VariablesPlugin.tsx
 import { css as css20 } from "@emotion/react";
 import { useLexicalComposerContext as useLexicalComposerContext2 } from "@lexical/react/LexicalComposerContext";
@@ -3040,12 +3071,14 @@ import {
 } from "@lexical/react/LexicalTypeaheadMenuPlugin";
 import { mergeRegister } from "@lexical/utils";
 import { AiFillPlusCircle } from "@react-icons/all-files/ai/AiFillPlusCircle";
-import { createVariableReference } from "@uniformdev/canvas";
+import { createVariableReference as createVariableReference2 } from "@uniformdev/canvas";
 import { HorizontalRhythm as HorizontalRhythm2, MenuGroup, MenuItemInner, MenuItemSeparator } from "@uniformdev/design-system";
-import { dequal as dequal2 } from "dequal/lite";
+import { dequal } from "dequal/lite";
 import {
+  $createParagraphNode,
   $createTextNode,
   $getNodeByKey,
+  $getRoot,
   $getSelection,
   $insertNodes,
   $isNodeSelection,
@@ -3054,7 +3087,7 @@ import {
   COMMAND_PRIORITY_NORMAL,
   createCommand
 } from "lexical";
-import { useCallback as useCallback2, useEffect as useEffect8, useMemo as useMemo8, useRef as useRef10, useState as useState10 } from "react";
+import { useCallback as useCallback2, useEffect as useEffect8, useMemo as useMemo8, useRef as useRef9, useState as useState10 } from "react";
 import { createPortal } from "react-dom";
 
 // src/components/Variables/toolbox/SelectVariableMenu.styles.ts
@@ -3140,7 +3173,7 @@ function useVariableEditTransaction({
 // src/components/Variables/VariableEditor.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button as Button2, Callout as Callout3, HorizontalRhythm, Input as Input2, useShortcut } from "@uniformdev/design-system";
-import { useLayoutEffect, useRef as useRef9 } from "react";
+import { useLayoutEffect, useRef as useRef8 } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 
@@ -3199,7 +3232,7 @@ function VariableEditor({
     },
     activeWhenEditing: true
   });
-  const nameRef = useRef9(null);
+  const nameRef = useRef8(null);
   const { ref, ...nameRegister } = register("name");
   useLayoutEffect(() => {
     if (nameRef.current && !nameRef.current.value) {
@@ -3583,7 +3616,7 @@ function useVariablesMenu({
           var _a;
           const targetVariable = variables[value];
           if (overwriteExistingValue) {
-            setVariablesEditorValue(editor, createVariableReference(value));
+            setVariablesEditorValue(editor, createVariableReference2(value));
             return true;
           }
           const variableNode = $createVariableNode(value, {
@@ -3616,7 +3649,7 @@ function VariablesPlugin({
 }) {
   const [editor] = useLexicalComposerContext2();
   const { variables, dispatch, isEditing, canDispatch, readOnly, knownUndefinedValues, isLoading } = useVariables(true);
-  const variablesRef = useRef10({ variables, knownUndefinedValues, isLoading });
+  const variablesRef = useRef9({ variables, knownUndefinedValues, isLoading });
   variablesRef.current = { variables, knownUndefinedValues, isLoading };
   const canEditVariable = useCallback2(
     (name, variable) => (
@@ -3761,18 +3794,24 @@ function VariablesPlugin({
           var _a, _b;
           if (!disableVariables) {
             const targetVariable = variablesRef.current.variables[reference];
-            if (overwriteExistingValue) {
-              setVariablesEditorValue(editor, createVariableReference(reference));
-              return true;
-            }
             const variableNode = $createVariableNode(reference, {
-              displayName: initialDisplayName != null ? initialDisplayName : (targetVariable == null ? void 0 : targetVariable.displayName) || reference,
+              displayName: initialDisplayName != null ? initialDisplayName : (targetVariable == null ? void 0 : targetVariable.displayName) || prettifyBindExpression(reference),
               hasClickEvent: canEditVariable(reference, targetVariable),
               referenceIsValid: true,
               tooltip: (_a = targetVariable == null ? void 0 : targetVariable.tooltip) != null ? _a : targetVariable == null ? void 0 : targetVariable.helpText,
               isFresh: true,
               isLoading: false
             });
+            if (overwriteExistingValue) {
+              const pNode = $createParagraphNode();
+              pNode.append(variableNode);
+              editor.update(() => {
+                const root = $getRoot();
+                root.clear();
+                root.append(pNode);
+              });
+              return true;
+            }
             if (targetKey) {
               (_b = $getNodeByKey(targetKey)) == null ? void 0 : _b.replace(variableNode);
             } else {
@@ -3808,14 +3847,14 @@ function VariablesPlugin({
       const tooltip = (_d = (_c = (_b = (_a = targetVar == null ? void 0 : targetVar.tooltip) != null ? _a : targetVar == null ? void 0 : targetVar.helpText) != null ? _b : targetUndefinedVar == null ? void 0 : targetUndefinedVar.error) != null ? _c : targetUndefinedVar == null ? void 0 : targetUndefinedVar.warning) != null ? _d : targetUndefinedVar == null ? void 0 : targetUndefinedVar.info;
       const newState = {
         ...currentState,
-        displayName: (targetVar == null ? void 0 : targetVar.displayName) || (targetUndefinedVar == null ? void 0 : targetUndefinedVar.displayName) || variableNode.reference,
+        displayName: (targetVar == null ? void 0 : targetVar.displayName) || (targetUndefinedVar == null ? void 0 : targetUndefinedVar.displayName) || prettifyBindExpression(variableNode.reference),
         isLoading: isLoadingVariables && !targetVar && !(targetUndefinedVar == null ? void 0 : targetUndefinedVar.info),
         hasClickEvent: canEditVariable(variableNode.reference, targetVar),
         referenceIsValid: (targetUndefinedVar == null ? void 0 : targetUndefinedVar.error) ? false : (targetUndefinedVar == null ? void 0 : targetUndefinedVar.warning) ? "warning" : (targetUndefinedVar == null ? void 0 : targetUndefinedVar.info) ? "info" : isLoadingVariables ? true : Boolean(targetVar),
         tooltip,
         isFresh: false
       };
-      if (!dequal2(currentState, newState)) {
+      if (!dequal(currentState, newState)) {
         variableNode.setState(newState);
       }
     },
@@ -3962,7 +4001,7 @@ var VariableNode = class _VariableNode extends DecoratorNode {
    * (albeit it won't get the fancy chip-node)
    */
   getTextContent() {
-    return createVariableReference2(this.reference);
+    return createVariableReference3(this.reference);
   }
   /** Creates the DOM wrapper that hosts the node */
   createDOM() {
@@ -4173,9 +4212,11 @@ var input = css21`
   min-height: 50px;
   width: 100%;
   position: relative;
-  transition: background var(--duration-fast) var(--timing-ease-out),
+  transition:
+    background var(--duration-fast) var(--timing-ease-out),
     border-color var(--duration-fast) var(--timing-ease-out),
-    color var(--duration-fast) var(--timing-ease-out), box-shadow var(--duration-fast) var(--timing-ease-out);
+    color var(--duration-fast) var(--timing-ease-out),
+    box-shadow var(--duration-fast) var(--timing-ease-out);
 
   &::placeholder {
     color: var(--gray-400);
@@ -4239,7 +4280,8 @@ var variableBindButton = css22`
   display: flex;
   height: 1.2rem;
   padding: var(--spacing-2xs);
-  transition: background var(--duration-fast) var(--timing-ease-out),
+  transition:
+    background var(--duration-fast) var(--timing-ease-out),
     color var(--duration-fast) var(--timing-ease-out);
   width: 1.2rem;
 
@@ -4322,23 +4364,9 @@ var inputMultiLine = (lines) => css22`
 `;
 
 // src/components/Variables/toolbox/InputVariablesProvider.tsx
+import { hasReferencedVariables } from "@uniformdev/canvas";
 import * as React10 from "react";
 import { useMemo as useMemo9 } from "react";
-
-// src/components/Variables/util/hasReferencedVariables.ts
-import { parseVariableExpression as parseVariableExpression2 } from "@uniformdev/canvas";
-function hasReferencedVariables(value) {
-  let result = false;
-  parseVariableExpression2(value, (token, type) => {
-    if (type === "variable") {
-      result = true;
-      return false;
-    }
-  });
-  return result;
-}
-
-// src/components/Variables/toolbox/InputVariablesProvider.tsx
 function useInputVariablesState({
   value,
   onChange,
@@ -4349,23 +4377,24 @@ function useInputVariablesState({
   valueToResetTo = void 0,
   menuTooltip,
   id,
-  filterVariable
+  filterVariable,
+  renderMenuInPortal
 }) {
   const { variables } = useVariables(true);
-  const hasVariablesInValue = hasReferencedVariables(value != null ? value : "");
+  const variableReferenceCountInValue = hasReferencedVariables(value != null ? value : "");
   const [lastKnownId] = React10.useState(id);
-  const [hadVariablesInValue, setHadVariablesInValue] = React10.useState(hasVariablesInValue);
+  const [hadVariablesInValue, setHadVariablesInValue] = React10.useState(variableReferenceCountInValue > 0);
   React10.useEffect(() => {
-    if (hasVariablesInValue) {
+    if (variableReferenceCountInValue) {
       setHadVariablesInValue(true);
     }
-  }, [hasVariablesInValue]);
+  }, [variableReferenceCountInValue]);
   React10.useEffect(() => {
     if (id !== lastKnownId) {
-      setHadVariablesInValue(hasVariablesInValue);
+      setHadVariablesInValue(variableReferenceCountInValue > 0);
     }
-  }, [hasVariablesInValue, id, lastKnownId]);
-  const hadVariablesInValueForReals = inputWhenNoVariables ? hadVariablesInValue : hasVariablesInValue;
+  }, [variableReferenceCountInValue, id, lastKnownId]);
+  const hadVariablesInValueForReals = inputWhenNoVariables ? hadVariablesInValue : variableReferenceCountInValue > 0;
   const disableVariablesForReals = disableVariables || Object.keys(variables).length === 0 && !showAddVariableMenuOption;
   const disableResetForReals = !inputWhenNoVariables || !hadVariablesInValueForReals;
   const sharedMenuProps = useMemo9(
@@ -4377,7 +4406,8 @@ function useInputVariablesState({
         onChange(valueToResetTo);
       },
       getEditorContext,
-      filterVariable
+      filterVariable,
+      portal: renderMenuInPortal
     }),
     [
       disableResetForReals,
@@ -4386,13 +4416,14 @@ function useInputVariablesState({
       menuTooltip,
       onChange,
       showAddVariableMenuOption,
-      valueToResetTo
+      valueToResetTo,
+      renderMenuInPortal
     ]
   );
   return {
     sharedMenuProps,
     disableVariablesForReals,
-    hasVariablesInValue,
+    hasVariablesInValue: variableReferenceCountInValue > 0,
     hadVariablesInValue: hadVariablesInValueForReals,
     setHadVariablesInValue
   };
@@ -4415,7 +4446,8 @@ var variableBindButton2 = css23`
   display: flex;
   height: 1.2rem;
   padding: var(--spacing-2xs);
-  transition: background var(--duration-fast) var(--timing-ease-out),
+  transition:
+    background var(--duration-fast) var(--timing-ease-out),
     color var(--duration-fast) var(--timing-ease-out);
   width: 1.2rem;
 
@@ -4439,7 +4471,7 @@ import { CLEAR_EDITOR_COMMAND } from "lexical";
 import { BsFillPlusCircleFill } from "@react-icons/all-files/bs/BsFillPlusCircleFill";
 import { CgUsbC } from "@react-icons/all-files/cg/CgUsbC";
 import { HorizontalRhythm as HorizontalRhythm3, Menu as Menu2, MenuGroup as MenuGroup2, MenuItem as MenuItem2, MenuItemSeparator as MenuItemSeparator2 } from "@uniformdev/design-system";
-import { useRef as useRef11 } from "react";
+import { useRef as useRef10 } from "react";
 import { Fragment as Fragment7, jsx as jsx35, jsxs as jsxs19 } from "@emotion/react/jsx-runtime";
 function SelectVariableMenu({
   onSelectVariable,
@@ -4454,7 +4486,7 @@ function SelectVariableMenu({
   filterVariable
 }) {
   const { variables, canDispatch, readOnly } = useVariables(true);
-  const btnRef = useRef11(null);
+  const btnRef = useRef10(null);
   const { editVariable } = useVariableEditor();
   const variablesGroups = variablesToGroupedList(variables, filterVariable, getEditorContext == null ? void 0 : getEditorContext());
   const showAddVariableMenuOptionForReals = showAddVariableMenuOption && canDispatch && !readOnly;
@@ -4588,7 +4620,7 @@ import { AutoFocusPlugin } from "@lexical/react/LexicalAutoFocusPlugin";
 import { ClearEditorPlugin } from "@lexical/react/LexicalClearEditorPlugin";
 import { LexicalComposer } from "@lexical/react/LexicalComposer";
 import { OnChangePlugin } from "@lexical/react/LexicalOnChangePlugin";
-import { useMemo as useMemo10, useRef as useRef12, useState as useState12 } from "react";
+import { useMemo as useMemo10, useRef as useRef11, useState as useState12 } from "react";
 
 // src/components/Variables/composer/DisablePlugin.tsx
 import { useLexicalComposerContext as useLexicalComposerContext7 } from "@lexical/react/LexicalComposerContext";
@@ -4603,50 +4635,18 @@ function DisablePlugin({ disabled }) {
 
 // src/components/Variables/composer/SingleLineTextPlugin.tsx
 import { useLexicalComposerContext as useLexicalComposerContext8 } from "@lexical/react/LexicalComposerContext";
-import { LineBreakNode } from "lexical";
+import { LineBreakNode as LineBreakNode2 } from "lexical";
 import { useEffect as useEffect13 } from "react";
 function SingleLineTextPlugin() {
   const [editor] = useLexicalComposerContext8();
   useEffect13(() => {
-    editor.registerNodeTransform(LineBreakNode, (node) => {
+    editor.registerNodeTransform(LineBreakNode2, (node) => {
       node.remove();
     });
   }, [editor]);
   return null;
 }
 
-// src/components/Variables/util/serializeVariablesEditorState.ts
-import { createVariableReference as createVariableReference3 } from "@uniformdev/canvas";
-import { LineBreakNode as LineBreakNode2, TextNode as TextNode3 } from "lexical";
-
-// src/components/Variables/util/variableExpression.ts
-var variablePrefix = "${";
-var variableSuffix = "}";
-
-// src/components/Variables/util/serializeVariablesEditorState.ts
-function serializeVariablesEditorState(editorState) {
-  const buf = [];
-  serializeRecursive(editorState.toJSON().root, buf);
-  const result = buf.join("");
-  return result.length > 0 ? result : void 0;
-}
-function serializeRecursive(node, buffer) {
-  if (node.type === TextNode3.getType()) {
-    buffer.push(node.text.replace(variablePrefix, "\\${"));
-  }
-  if (node.type === VariableNode.getType()) {
-    buffer.push(createVariableReference3(node.reference));
-  }
-  if (node.type === LineBreakNode2.getType()) {
-    buffer.push("\n");
-  }
-  if ("children" in node && node.children) {
-    for (const child of node.children) {
-      serializeRecursive(child, buffer);
-    }
-  }
-}
-
 // src/components/Variables/toolbox/VariablesComposer.tsx
 import { Fragment as Fragment8, jsx as jsx38, jsxs as jsxs21 } from "@emotion/react/jsx-runtime";
 function VariablesComposer(props) {
@@ -4673,10 +4673,9 @@ function VariablesComposer(props) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  const editorState = useRef12();
-  const updateTimeout = useRef12();
-  if (typeof document === "undefined")
-    return null;
+  const editorState = useRef11();
+  const updateTimeout = useRef11();
+  if (typeof document === "undefined") return null;
   return /* @__PURE__ */ jsxs21(LexicalComposer, { initialConfig: editorConfig, children: [
     /* @__PURE__ */ jsx38(
       OnChangePlugin,
@@ -4854,7 +4853,8 @@ function InputVariables(props) {
     filterVariable,
     styleVariant = "default",
     renderMenuInPortal,
-    disableDismissEditorOnChange
+    disableDismissEditorOnChange,
+    singleTokenMode
   } = props;
   const [finalId] = useState13(id != null ? id : () => v42());
   const { dispatch, canDispatch, isEditing } = useVariables(true);
@@ -4919,7 +4919,7 @@ function InputVariables(props) {
                   buttonCss: variableBindButton,
                   tip: useInputWithNoVariables ? void 0 : "Tip: access this list by typing $$",
                   buttonProps: hadVariablesInValue ? { "aria-pressed": "true" } : void 0,
-                  replaceValueOnVariableInsert: useInputWithNoVariables
+                  replaceValueOnVariableInsert: singleTokenMode || useInputWithNoVariables
                 }
               )
             ]
@@ -4959,13 +4959,13 @@ function InputVariables(props) {
       showAddVariableMenuOption,
       enableEditingVariables: !disabled && !disableVariablesForReals && enableEditingVariables,
       getEditorContext,
-      disabled,
+      disabled: disabled || singleTokenMode,
       replaceValueOnVariableInsert: useInputWithNoVariables,
       autoFocus,
       filterVariable,
       children: [
         /* @__PURE__ */ jsx40(PasteTransformerPlugin, { transformPaste }),
-        /* @__PURE__ */ jsx40(ControlledValuePlugin, { value, enabled: useInputWithNoVariables }),
+        /* @__PURE__ */ jsx40(ControlledValuePlugin, { value, enabled: singleTokenMode || useInputWithNoVariables }),
         editorRef ? /* @__PURE__ */ jsx40(EditorRefPlugin, { editorRef }) : null,
         body
       ]
@@ -5008,7 +5008,8 @@ function ParameterConnectionIndicator({
   menuOptions,
   disabled,
   menuTooltip = "Insert variable",
-  overrideMenuButtonParentMargin
+  overrideMenuButtonParentMargin,
+  renderMenuInPortal = false
 }) {
   const hasVariablesInValue = useMemo11(() => {
     let result = false;
@@ -5022,12 +5023,12 @@ function ParameterConnectionIndicator({
     return result;
   }, [value]);
   return /* @__PURE__ */ jsxs24(HorizontalRhythm5, { align: "center", gap: "xs", css: { width: "100%" }, children: [
-    /* @__PURE__ */ jsx41("div", { css: { flex: 1 }, children }),
+    /* @__PURE__ */ jsx41("div", { css: { flex: 1, maxWidth: "100%" }, children }),
     disabled ? null : /* @__PURE__ */ jsx41(
       Menu3,
       {
         placement: "bottom-start",
-        withoutPortal: true,
+        withoutPortal: !renderMenuInPortal,
         menuTrigger: /* @__PURE__ */ jsx41(
           "div",
           {
@@ -5061,13 +5062,13 @@ import { useCallback as useCallback4 } from "react";
 import { useLexicalComposerContext as useLexicalComposerContext10 } from "@lexical/react/LexicalComposerContext";
 import { mergeRegister as mergeRegister5 } from "@lexical/utils";
 import { $getNodeByKey as $getNodeByKey3, COMMAND_PRIORITY_HIGH as COMMAND_PRIORITY_HIGH3 } from "lexical";
-import { useEffect as useEffect15, useRef as useRef13 } from "react";
+import { useEffect as useEffect15, useRef as useRef12 } from "react";
 function OnDisconnectPlugin({
   onDisconnect
 }) {
   const [editor] = useLexicalComposerContext10();
   const { variables } = useVariables(true);
-  const variablesRef = useRef13(variables);
+  const variablesRef = useRef12(variables);
   variablesRef.current = variables;
   useEffect15(() => {
     return mergeRegister5(
@@ -5141,7 +5142,7 @@ function ParameterOrSingleVariable(props) {
           editorRef ? /* @__PURE__ */ jsx42(EditorRefPlugin, { editorRef }) : null,
           /* @__PURE__ */ jsx42(ControlledValuePlugin, { enabled: true, value }),
           /* @__PURE__ */ jsxs25(HorizontalRhythm6, { align: "center", gap: "xs", css: { width: "100%" }, children: [
-            /* @__PURE__ */ jsx42("div", { css: { flex: 1 }, children: inputWhenNoVariables && !hadVariablesInValue ? inputWhenNoVariables : /* @__PURE__ */ jsx42(
+            /* @__PURE__ */ jsx42("div", { css: { flex: 1, minWidth: "0" }, children: inputWhenNoVariables && !hadVariablesInValue ? inputWhenNoVariables : /* @__PURE__ */ jsx42(
               VariablesComposerInput,
               {
                 "data-text-value": value,
@@ -5260,6 +5261,12 @@ ${prettifyBindExpression(bindExpression)}`
   };
 }
 
+// src/components/Variables/util/hasReferencedVariables.ts
+import { hasReferencedVariables as canvasHasReferencedVariables } from "@uniformdev/canvas";
+function hasReferencedVariables2(value) {
+  return canvasHasReferencedVariables(value) > 0;
+}
+
 // src/components/Variables/VariablesList.tsx
 import { css as css27 } from "@emotion/react";
 import {
@@ -6235,11 +6242,11 @@ import { LoadingIndicator as LoadingIndicator3, Theme as Theme2 } from "@uniform
 
 // src/hooks/useInitializeUniformMeshSdk.ts
 import { initializeUniformMeshSDK } from "@uniformdev/mesh-sdk";
-import { useEffect as useEffect16, useRef as useRef14, useState as useState15 } from "react";
+import { useEffect as useEffect16, useRef as useRef13, useState as useState15 } from "react";
 var useInitializeUniformMeshSdk = ({ autoResizingDisabled } = {}) => {
   const [error, setError] = useState15();
   const [sdk, setSdk] = useState15();
-  const initializationInProgress = useRef14(false);
+  const initializationInProgress = useRef13(false);
   useEffect16(
     () => {
       if (typeof window === "undefined" || sdk) {
@@ -6604,7 +6611,8 @@ var ButtonStyles = css33`
   font-size: var(--fs-sm);
   line-height: 1;
   gap: var(--spacing-xs);
-  transition: border-color var(--duration-fast) var(--timing-ease-out),
+  transition:
+    border-color var(--duration-fast) var(--timing-ease-out),
     background-color var(--duration-fast) var(--timing-ease-out);
 
   &:hover {
@@ -6906,7 +6914,7 @@ var ObjectSearchContainer = ({
   const { flatVariables } = useVariables(true);
   const inputValue = (_b = dynamicEntryId != null ? dynamicEntryId : (_a = selectedListItems[0]) == null ? void 0 : _a.id) != null ? _b : "";
   const isDynamicEntryIdAvailable = React12.useMemo(
-    () => Boolean(inputValue && hasReferencedVariables(inputValue)),
+    () => Boolean(inputValue && hasReferencedVariables2(inputValue)),
     [inputValue]
   );
   const listItems = resultList != null ? resultList : /* @__PURE__ */ jsx64(
@@ -6948,7 +6956,7 @@ var ObjectSearchContainer = ({
         id: selectedValue
       }
     ]);
-    if (hasReferencedVariables(selectedValue)) {
+    if (hasReferencedVariables2(selectedValue)) {
       onSetQuery({ ...query, dynamicEntryId: selectedValue });
     }
   };
@@ -7003,14 +7011,14 @@ function createLocationValidator(setValue, validate) {
 
 // src/utils/useContentDataResourceLocaleInfo.ts
 import { bindVariables as bindVariables2, createVariableReference as createVariableReference4, LOCALE_DYNAMIC_INPUT_NAME as LOCALE_DYNAMIC_INPUT_NAME2 } from "@uniformdev/canvas";
-import { useEffect as useEffect17, useRef as useRef15 } from "react";
+import { useEffect as useEffect17, useRef as useRef14 } from "react";
 function useContentDataResourceLocaleInfo({
   locale,
   setLocale,
   dynamicInputs
 }) {
   var _a;
-  const setLocaleRef = useRef15(setLocale);
+  const setLocaleRef = useRef14(setLocale);
   setLocaleRef.current = setLocale;
   const { flatVariables } = useVariables();
   const effectiveLocale = locale != null ? locale : dynamicInputs[LOCALE_DYNAMIC_INPUT_NAME2] ? createVariableReference4(LOCALE_DYNAMIC_INPUT_NAME2) : "";
@@ -7340,7 +7348,7 @@ function ObjectSearchListOfSearchResults() {
 }
 
 // src/components/ObjectSearch/hooks/ControlledObjectSearchProvider.tsx
-import { useCallback as useCallback6, useDeferredValue as useDeferredValue2, useEffect as useEffect19, useMemo as useMemo16, useRef as useRef16 } from "react";
+import { useCallback as useCallback6, useDeferredValue as useDeferredValue2, useEffect as useEffect19, useMemo as useMemo16, useRef as useRef15 } from "react";
 import { jsx as jsx69 } from "@emotion/react/jsx-runtime";
 var ControlledObjectSearchProvider = ({
   selectedItems,
@@ -7361,7 +7369,7 @@ var ControlledObjectSearchProvider = ({
   var _a, _b;
   const { flatVariables } = useVariables(true);
   const querySearchDeferred = useDeferredValue2(query);
-  const innerSelectedItems = useRef16(selectedItems);
+  const innerSelectedItems = useRef15(selectedItems);
   useEffect19(() => {
     if (selectedItems !== void 0) {
       innerSelectedItems.current = selectedItems;
@@ -7396,6 +7404,13 @@ var ControlledObjectSearchProvider = ({
   }, [onSelectItemsChange]);
   const list = useMemo16(() => ({ items: searchResultItems }), [searchResultItems]);
   const boundQuery = useMemo16(() => bindQuery(query, flatVariables), [query, flatVariables]);
+  const flatLocaleOptions = useMemo16(
+    () => {
+      var _a2;
+      return (_a2 = localeOptions == null ? void 0 : localeOptions.flatMap((option) => "type" in option && option.type === "group" ? option.options : option).filter((v) => !Array.isArray(v))) != null ? _a2 : [];
+    },
+    [localeOptions]
+  );
   const isLoadingInitially = Boolean(
     isManualSelection ? !((_a = innerSelectedItems.current) == null ? void 0 : _a.length) && selectedItemsLoading : selectedItemsLoading
   );
@@ -7413,7 +7428,7 @@ var ControlledObjectSearchProvider = ({
         isSelectedItemsListLoading: isLoadingInitially,
         isListLoading: searchResultListLoading,
         isMulti,
-        localeOptions,
+        localeOptions: flatLocaleOptions,
         enableFilterByLocale,
         dynamicEntryId
       },
@@ -7423,7 +7438,7 @@ var ControlledObjectSearchProvider = ({
 };
 
 // src/components/ParamTypeDynamicDataProvider.tsx
-import { useEffect as useEffect20, useMemo as useMemo17, useRef as useRef17 } from "react";
+import { useEffect as useEffect20, useMemo as useMemo17, useRef as useRef16 } from "react";
 import { jsx as jsx70 } from "@emotion/react/jsx-runtime";
 function ParamTypeDynamicDataProvider(props) {
   const { children } = props;
@@ -7445,7 +7460,7 @@ var JsonMeshVariableEditor = ({
   variable,
   context
 }) => {
-  const sillyRef = useRef17(false);
+  const sillyRef = useRef16(false);
   const { editConnectedData } = useMeshLocation("paramType");
   useEffect20(() => {
     if (sillyRef.current) {
@@ -7479,652 +7494,617 @@ var JsonMeshVariableEditor = ({
 var NUMBER_OPERATORS = [
   {
     label: "equals...",
-    symbol: "=",
     value: "eq",
-    editorType: "number"
+    editorType: "number",
+    expectedValueType: "single"
   },
   {
     label: "does not equal...",
-    symbol: "\u2260",
     value: "neq",
-    editorType: "number"
+    editorType: "number",
+    expectedValueType: "single"
   },
   {
     label: "greater than...",
-    symbol: ">",
     value: "gt",
-    editorType: "number"
+    editorType: "number",
+    expectedValueType: "single"
   },
   {
     label: "greater than or equal to...",
-    symbol: "\u2265",
     value: "gte",
-    editorType: "number"
+    editorType: "number",
+    expectedValueType: "single"
   },
   {
     label: "less than...",
-    symbol: "<",
     value: "lt",
-    editorType: "number"
+    editorType: "number",
+    expectedValueType: "single"
   },
   {
     label: "less than or equal to...",
-    symbol: "\u2264",
     value: "lte",
-    editorType: "number"
+    editorType: "number",
+    expectedValueType: "single"
   },
   {
     label: "is empty",
     value: "ndef",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "false"
   },
   {
     label: "is between...",
     value: "between",
-    editorType: "numberRange"
+    editorType: "numberRange",
+    expectedValueType: "between"
   },
   {
     label: "is not empty",
     value: "def",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 var DATE_OPERATORS = [
   {
     label: "is",
     value: "eq",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is between...",
     value: "between",
-    editorType: "dateRange"
+    editorType: "dateRange",
+    expectedValueType: "between"
   },
   {
     label: "is before...",
     value: "lt",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is after...",
     value: "gt",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is on or before...",
     value: "lte",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is on or after...",
     value: "gte",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is empty",
     value: "ndef",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "false"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is not empty",
     value: "def",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 var TEXTBOX_OPERATORS = [
   {
     label: "contains...",
     value: "match",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is",
     value: "eq",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is empty",
     value: "ndef",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "false"
   },
   {
     label: "starts with...",
     value: "starts",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is not empty",
     value: "def",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 var USER_OPERATORS = [
   {
     label: "contains...",
     value: "match",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is",
     value: "eq",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "starts with...",
     value: "starts",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   }
 ];
-var SYSTEM_DATE_OPERATORS = [
+var DATE_TIME_OPERATORS = [
   {
     label: "is",
     value: "sys-date-eq",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is between...",
     value: "sys-date-between",
-    editorType: "dateRange"
+    editorType: "dateRange",
+    expectedValueType: "between"
   },
   {
     label: "is before...",
     value: "sys-date-lt",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is after...",
     value: "sys-date-gt",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is on or before...",
     value: "sys-date-lte",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
     label: "is on or after...",
     value: "sys-date-gte",
-    editorType: "date"
+    editorType: "date",
+    expectedValueType: "single"
   },
   {
-    label: "is not",
-    value: "sys-date-neq",
-    editorType: "date"
+    label: "is empty",
+    value: "ndef",
+    editorType: "empty",
+    expectedValueType: "false"
+  },
+  {
+    label: "is not empty",
+    value: "def",
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 var RICHTEXT_OPERATORS = [
   {
     label: "contains...",
     value: "match",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is empty",
     value: "ndef",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "false"
   },
   {
     label: "starts with...",
     value: "starts",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is not empty",
     value: "def",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 var CHECKBOX_OPERATORS = [
   {
     label: "is checked",
     value: "def",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "true"
   },
   {
     label: "is not checked",
     value: "ndef",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "false"
   }
 ];
 var SYSTEM_FIELD_OPERATORS = [
   {
     label: "is",
     value: "eq",
-    editorType: "singleChoice"
+    editorType: "singleChoice",
+    expectedValueType: "single"
+  },
+  {
+    label: "is any of...",
+    value: "in",
+    editorType: "multiChoice",
+    expectedValueType: "array"
+  },
+  {
+    label: "is not",
+    value: "neq",
+    editorType: "singleChoice",
+    expectedValueType: "single"
+  },
+  {
+    label: "is none of...",
+    value: "nin",
+    editorType: "multiChoice",
+    expectedValueType: "array"
+  }
+];
+var OPTIONAL_SYSTEM_FIELD_OPERATORS = [
+  {
+    label: "is",
+    value: "eq",
+    editorType: "singleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is any of...",
     value: "in",
-    editorType: "multiChoice"
+    editorType: "multiChoice",
+    expectedValueType: "array"
+  },
+  {
+    label: "is empty",
+    value: "ndef",
+    editorType: "empty",
+    expectedValueType: "false"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "singleChoice"
+    editorType: "singleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is none of...",
     value: "nin",
-    editorType: "multiChoice"
+    editorType: "multiChoice",
+    expectedValueType: "array"
+  },
+  {
+    label: "is not empty",
+    value: "def",
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 var PUBLISH_STATUS_FIELD_OPERATORS = [
   {
     label: "is",
     value: "eq",
-    editorType: "statusSingleChoice"
+    editorType: "statusSingleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is any of...",
     value: "in",
-    editorType: "statusMultiChoice"
+    editorType: "statusMultiChoice",
+    expectedValueType: "array"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "statusSingleChoice"
+    editorType: "statusSingleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is none of...",
     value: "nin",
-    editorType: "statusMultiChoice"
+    editorType: "statusMultiChoice",
+    expectedValueType: "array"
   }
 ];
 var SELECT_OPERATORS = [
   {
     label: "is",
     value: "eq",
-    editorType: "singleChoice"
+    editorType: "singleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is any of...",
     value: "in",
-    editorType: "multiChoice"
+    editorType: "multiChoice",
+    expectedValueType: "array"
   },
   {
     label: "is empty",
     value: "ndef",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "false"
   },
   {
     label: "contains...",
     value: "match",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "starts with...",
     value: "starts",
-    editorType: "text"
+    editorType: "text",
+    expectedValueType: "single"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "singleChoice"
+    editorType: "singleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is none of...",
     value: "nin",
-    editorType: "multiChoice"
+    editorType: "multiChoice",
+    expectedValueType: "array"
   },
   {
     label: "is not empty",
     value: "def",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 var MULTI_SELECT_OPERATORS = [
   {
     label: "is",
     value: "eq",
-    editorType: "singleChoice"
+    editorType: "singleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is any of...",
     value: "in",
-    editorType: "multiChoice"
+    editorType: "multiChoice",
+    expectedValueType: "array"
   },
   {
     label: "is empty",
     value: "ndef",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "false"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "singleChoice"
+    editorType: "singleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is none of...",
     value: "nin",
-    editorType: "multiChoice"
+    editorType: "multiChoice",
+    expectedValueType: "array"
   },
   {
     label: "is not empty",
     value: "def",
-    editorType: "empty"
+    editorType: "empty",
+    expectedValueType: "true"
   }
 ];
 
-// src/components/SearchAndFilter/FilterButton.tsx
-import { Counter as Counter2, Icon as Icon6 } from "@uniformdev/design-system";
-
-// src/components/SearchAndFilter/styles/SearchAndFilter.styles.ts
-import { css as css38 } from "@emotion/react";
-import { cq, fadeInLtr } from "@uniformdev/design-system";
-var SearchAndFilterControlsWrapper = (gridColumns) => css38`
-  align-items: stretch;
-  display: grid;
-  grid-template-columns: ${gridColumns};
-  gap: var(--spacing-sm);
-`;
-var SearchAndFilterOutterControlWrapper = (gridColumns) => css38`
-  align-items: stretch;
-  display: grid;
-  grid-template-columns: ${gridColumns};
-  gap: var(--spacing-sm);
-`;
-var ConditionalFilterRow = css38`
-  display: grid;
-  grid-template-columns: 35px 1fr;
-  gap: var(--spacing-sm);
-  margin-left: var(--spacing-base);
+// src/components/SearchAndFilter/editors/DateEditor.tsx
+import { Input as Input6 } from "@uniformdev/design-system";
+import { useState as useState19 } from "react";
+import { useDebounce as useDebounce5 } from "react-use";
+import { jsx as jsx71 } from "@emotion/react/jsx-runtime";
+var DateEditor = ({
+  onChange,
+  ariaLabel,
+  disabled,
+  value,
+  readOnly,
+  valueTestId
+}) => {
+  const [innerValue, setInnerValue] = useState19(value != null ? value : "");
+  useDebounce5(() => onChange(innerValue), 500, [innerValue]);
+  return /* @__PURE__ */ jsx71(
+    Input6,
+    {
+      type: "date",
+      label: ariaLabel,
+      showLabel: false,
+      onChange: (e) => setInnerValue(e.currentTarget.value),
+      disabled,
+      value: innerValue,
+      readOnly,
+      "data-testid": valueTestId
+    }
+  );
+};
 
-  ${cq("380px")} {
-    align-items: center;
+// src/components/SearchAndFilter/editors/DateRangeEditor.tsx
+import { Input as Input7 } from "@uniformdev/design-system";
+import { useEffect as useEffect21, useState as useState20 } from "react";
+import { useDebounce as useDebounce6 } from "react-use";
 
-    &: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;
+// src/components/SearchAndFilter/editors/shared/ErrorContainer.tsx
+import { FieldMessage } from "@uniformdev/design-system";
+import { jsx as jsx72 } from "@emotion/react/jsx-runtime";
+var ErrorContainer = ({ errorMessage }) => {
+  return /* @__PURE__ */ jsx72(
+    "div",
+    {
+      css: {
+        gridColumn: "span 6",
+        order: 6
+      },
+      children: /* @__PURE__ */ jsx72(FieldMessage, { errorMessage })
     }
-  }
+  );
+};
 
-  &:nth-of-type(2) {
-    margin-left: 0;
-    grid-template-columns: 50px 1fr;
-  }
+// src/components/SearchAndFilter/editors/shared/twoColumnGrid.tsx
+var twoColumnGrid = {
+  display: "grid",
+  gridTemplateColumns: "1fr 1fr",
+  gap: "var(--spacing-sm);"
+};
 
-  ${cq("580px")} {
-    &:after {
-      display: none;
+// src/components/SearchAndFilter/editors/DateRangeEditor.tsx
+import { Fragment as Fragment15, jsx as jsx73, jsxs as jsxs42 } from "@emotion/react/jsx-runtime";
+var DateRangeEditor = ({
+  ariaLabel,
+  onChange,
+  disabled,
+  value,
+  readOnly,
+  valueTestId
+}) => {
+  const [minDateValue, setMinDateValue] = useState20(value ? value[0] : "");
+  const [maxDateValue, setMaxDateValue] = useState20(value ? value[1] : "");
+  const [error, setError] = useState20("");
+  useDebounce6(
+    () => {
+      if (minDateValue && maxDateValue && !error) {
+        onChange([minDateValue, maxDateValue]);
+      } else {
+        onChange([]);
+      }
+    },
+    500,
+    [minDateValue, maxDateValue]
+  );
+  useEffect21(() => {
+    if (!minDateValue || !maxDateValue) {
+      return;
     }
-  }
-
-  @media (prefers-reduced-motion: no-preference) {
-    animation: ${fadeInLtr} var(--duration-fast) var(--timing-ease-out);
-  }
-`;
-var ConditionalInputRow = css38`
-  display: flex;
-  gap: var(--spacing-sm);
-  flex-wrap: wrap;
-
-  ${cq("380px")} {
-    & > div:nth-child(-n + 2) {
-      width: calc(50% - var(--spacing-sm));
+    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;
     }
-
-    & > div:nth-child(n + 3) {
-      width: calc(100% - 48px);
+    if (maxDate && !minDate) {
+      setError("Please enter both a low and high date");
+      return;
     }
-  }
-  ${cq("764px")} {
-    display: grid;
-    grid-template-columns: 200px 160px 1fr 32px;
-
-    & > div:nth-child(n) {
-      width: auto;
+    const minDateString = minDate.toDateString();
+    const maxDateString = maxDate.toDateString();
+    if (minDateString === maxDateString || maxDateString === minDateString) {
+      setError("The min and max date cannot be the same");
+      return;
     }
-  }
-`;
-var SearchInput = css38`
-  max-height: 40px;
-  min-height: unset;
-`;
-var BindableKeywordSearchInputStyles = css38`
-  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 = css38`
-  align-items: center;
-  display: flex;
-  position: absolute;
-  inset: 0 var(--spacing-lg) 0 auto;
-`;
-var ClearSearchButtonStyles = css38`
-  background: none;
-  border: none;
-  padding: 0;
-  pointer-events: all;
-`;
-var FilterButton = css38`
-  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);
+    if (minDate > maxDate) {
+      setError("The min date cannot be higher than the max date");
+      return;
     }
-  }
-
-  &:disabled {
-    opacity: var(--opacity-50);
-  }
-`;
-var FilterButtonText = css38`
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 14ch;
-`;
-var FilterButtonSelected = css38`
-  background: var(--gray-100);
-  border-color: var(--gray-300);
-
-  svg {
-    color: var(--accent-dark);
-  }
-`;
-var FilterButtonWithOptions = css38`
-  :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);
+    if (error) {
+      setError("");
     }
-  }
-`;
-var SearchIcon = css38`
-  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 = css38`
-  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;
+    if (minDate && maxDate) {
+      setMinDateValue(minDateValue);
+      setMaxDateValue(maxDateValue);
+    } else {
+      setMinDateValue("");
+      setMaxDateValue("");
+    }
+  }, [minDateValue, maxDateValue, setError]);
+  return /* @__PURE__ */ jsxs42(Fragment15, { children: [
+    /* @__PURE__ */ jsxs42("div", { css: twoColumnGrid, "data-testid": valueTestId, children: [
+      /* @__PURE__ */ jsx73(
+        Input7,
+        {
+          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__ */ jsx73(
+        Input7,
+        {
+          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__ */ jsx73(ErrorContainer, { errorMessage: error })
+  ] });
+};
 
-  &:hover,
-  &:focus {
-    color: var(--primary-action-hover);
-  }
+// src/components/SearchAndFilter/editors/FilterMultiChoiceEditor.tsx
+import {
+  convertComboBoxGroupsToSelectableGroups,
+  getComboBoxSelectedSelectableGroups,
+  InputComboBox
+} from "@uniformdev/design-system";
+import { useMemo as useMemo18 } from "react";
 
-  &:disabled {
-    color: var(--gray-400);
-  }
-`;
-var Title = css38`
-  color: var(--typography-light);
+// src/components/SearchAndFilter/editors/shared/readOnlyAttributes.tsx
+var readOnlyAttributes = {
+  isSearchable: false,
+  menuIsOpen: false,
+  isClearable: false
+};
 
-  &:focus {
-    outline: none;
-  }
-`;
-var ResetConditionsBtn = css38`
-  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 = css38`
-  background: transparent;
-  border: none;
-  padding: var(--spacing-sm);
-`;
-var SearchAndFilterOptionsContainer = css38`
-  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 = css38`
-  display: flex;
-  flex-direction: column;
-  gap: var(--spacing-sm);
-  padding-inline: var(--spacing-md);
-`;
-var SearchAndFilterButtonGroup = css38`
-  margin-top: var(--spacing-xs);
-  margin-left: calc(56px + var(--spacing-md));
-`;
-
-// src/components/SearchAndFilter/FilterButton.tsx
-import { jsx as jsx71, jsxs as jsxs42 } from "@emotion/react/jsx-runtime";
-var FilterButton2 = ({
-  text = "Filters",
-  icon = "filter-add",
-  filterCount,
-  hasSelectedValue,
-  dataTestId,
-  ...props
-}) => {
-  return /* @__PURE__ */ jsxs42(
-    "button",
-    {
-      type: "button",
-      css: [
-        FilterButton,
-        hasSelectedValue ? FilterButtonSelected : void 0,
-        filterCount ? [FilterButtonWithOptions, FilterButtonSelected] : void 0
-      ],
-      ...props,
-      "data-testid": dataTestId,
-      children: [
-        /* @__PURE__ */ jsx71(Icon6, { icon, iconColor: "currentColor", size: "1rem" }),
-        /* @__PURE__ */ jsx71("span", { css: FilterButtonText, children: text }),
-        filterCount ? /* @__PURE__ */ jsx71(Counter2, { count: filterCount, bgColor: "var(--white)" }) : null
-      ]
-    }
-  );
-};
-
-// src/components/SearchAndFilter/FilterControls.tsx
-import { CgClose as CgClose5 } from "@react-icons/all-files/cg/CgClose";
-import { Icon as Icon7, InputKeywordSearch as InputKeywordSearch2 } from "@uniformdev/design-system";
-import { CLEAR_EDITOR_COMMAND as CLEAR_EDITOR_COMMAND2 } from "lexical";
-import { useEffect as useEffect23, useRef as useRef18, useState as useState21 } from "react";
-import { useDebounce as useDebounce6 } from "react-use";
-import { v4 as v43 } from "uuid";
-
-// src/components/SearchAndFilter/hooks/useSearchAndFilter.tsx
-import { VerticalRhythm as VerticalRhythm6 } from "@uniformdev/design-system";
-import {
-  createContext as createContext7,
-  useCallback as useCallback7,
-  useContext as useContext9,
-  useDeferredValue as useDeferredValue3,
-  useEffect as useEffect22,
-  useMemo as useMemo18,
-  useState as useState20
-} from "react";
-
-// src/components/SearchAndFilter/FilterEditor.tsx
-import { FieldMessage, Input as Input6, InputComboBox, StatusBullet } from "@uniformdev/design-system";
-import { useEffect as useEffect21, useState as useState19 } from "react";
-import { useDebounce as useDebounce5 } from "react-use";
-import { Fragment as Fragment15, jsx as jsx72, jsxs as jsxs43 } from "@emotion/react/jsx-runtime";
-var readOnlyAttributes = {
-  isSearchable: false,
-  menuIsOpen: false,
-  isClearable: false
-};
+// src/components/SearchAndFilter/editors/FilterMultiChoiceEditor.tsx
+import { jsx as jsx74 } from "@emotion/react/jsx-runtime";
 var FilterMultiChoiceEditor = ({
   value,
   options,
@@ -8135,20 +8115,24 @@ var FilterMultiChoiceEditor = ({
 }) => {
   const readOnlyProps = readOnly ? readOnlyAttributes : {};
   const isClearable = !readOnly || !disabled;
-  return /* @__PURE__ */ jsx72("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx72(
+  const { groupedOptions, selectedOptions } = useMemo18(
+    () => convertComboBoxGroupsToSelectableGroups({ options: options != null ? options : [], selectedItems: new Set(value) }),
+    [options, value]
+  );
+  return /* @__PURE__ */ jsx74("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx74(
     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 = 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) {
@@ -8162,6 +8146,14 @@ var FilterMultiChoiceEditor = ({
     }
   ) });
 };
+
+// src/components/SearchAndFilter/editors/FilterSingleChoiceEditor.tsx
+import {
+  convertComboBoxGroupsToSelectableGroups as convertComboBoxGroupsToSelectableGroups2,
+  InputComboBox as InputComboBox2
+} from "@uniformdev/design-system";
+import { useMemo as useMemo19 } from "react";
+import { jsx as jsx75 } from "@emotion/react/jsx-runtime";
 var FilterSingleChoiceEditor = ({
   options,
   value,
@@ -8170,91 +8162,30 @@ var FilterSingleChoiceEditor = ({
   onChange,
   valueTestId
 }) => {
-  var _a;
   const readOnlyProps = readOnly ? readOnlyAttributes : {};
-  return /* @__PURE__ */ jsx72("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx72(
-    InputComboBox,
+  const { groupedOptions, selectedOptions } = useMemo19(
+    () => convertComboBoxGroupsToSelectableGroups2({
+      options: options != null ? options : [],
+      selectedItems: new Set(value ? [value] : void 0),
+      selectionMode: "single"
+    }),
+    [options, value]
+  );
+  return /* @__PURE__ */ jsx75("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx75(
+    InputComboBox2,
     {
       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__ */ jsx72(StatusBullet, { status: label, message: value });
-};
-var StatusMultiEditor = ({
-  options,
-  value,
-  disabled,
-  readOnly,
-  onChange,
-  valueTestId
-}) => {
-  const readOnlyProps = readOnly ? readOnlyAttributes : {};
-  return /* @__PURE__ */ jsx72("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx72(
-    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__ */ jsx72("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx72(
-    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 {
@@ -8267,28 +8198,43 @@ var StatusSingleEditor = ({
     }
   ) });
 };
-var TextEditor = ({
-  onChange,
+
+// src/components/SearchAndFilter/editors/NumberEditor.tsx
+import { Input as Input8 } from "@uniformdev/design-system";
+import { useState as useState21 } from "react";
+import { useDebounce as useDebounce7 } from "react-use";
+import { jsx as jsx76 } from "@emotion/react/jsx-runtime";
+var NumberEditor = ({
   ariaLabel,
+  onChange,
+  disabled,
   value,
   readOnly,
   valueTestId
 }) => {
-  const [innerValue, setInnerValue] = useState19(value != null ? value : "");
-  useDebounce5(() => onChange(innerValue), 500, [innerValue]);
-  return /* @__PURE__ */ jsx72(
-    Input6,
+  const [innerValue, setInnerValue] = useState21(value != null ? value : "");
+  useDebounce7(() => onChange(innerValue), 500, [innerValue]);
+  return /* @__PURE__ */ jsx76(
+    Input8,
     {
-      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
+import { Input as Input9 } from "@uniformdev/design-system";
+import { useEffect as useEffect22, useState as useState22 } from "react";
+import { useDebounce as useDebounce8 } from "react-use";
+import { Fragment as Fragment16, jsx as jsx77, jsxs as jsxs43 } from "@emotion/react/jsx-runtime";
 var NumberRangeEditor = ({
   onChange,
   disabled,
@@ -8297,10 +8243,10 @@ var NumberRangeEditor = ({
   readOnly,
   valueTestId
 }) => {
-  const [minValue, setMinValue] = useState19("");
-  const [maxValue, setMaxValue] = useState19("");
-  const [error, setError] = useState19("");
-  useDebounce5(
+  const [minValue, setMinValue] = useState22("");
+  const [maxValue, setMaxValue] = useState22("");
+  const [error, setError] = useState22("");
+  useDebounce8(
     () => {
       if (minValue && maxValue && !error) {
         onChange([minValue, maxValue]);
@@ -8311,7 +8257,7 @@ var NumberRangeEditor = ({
     500,
     [minValue, maxValue]
   );
-  useEffect21(() => {
+  useEffect22(() => {
     if (!maxValue && !minValue) {
       return;
     }
@@ -8333,10 +8279,10 @@ var NumberRangeEditor = ({
       setMaxValue(maxValue);
     }
   }, [maxValue, minValue, setError]);
-  return /* @__PURE__ */ jsxs43(Fragment15, { children: [
+  return /* @__PURE__ */ jsxs43(Fragment16, { children: [
     /* @__PURE__ */ jsxs43("div", { css: twoColumnGrid, "data-testid": valueTestId, children: [
-      /* @__PURE__ */ jsx72(
-        Input6,
+      /* @__PURE__ */ jsx77(
+        Input9,
         {
           label: `${ariaLabel}-min`,
           type: "number",
@@ -8351,8 +8297,8 @@ var NumberRangeEditor = ({
           "data-testid": "value-low"
         }
       ),
-      /* @__PURE__ */ jsx72(
-        Input6,
+      /* @__PURE__ */ jsx77(
+        Input9,
         {
           type: "number",
           label: `${ariaLabel}-max`,
@@ -8368,159 +8314,513 @@ var NumberRangeEditor = ({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx72(ErrorContainer, { errorMessage: error })
+    /* @__PURE__ */ jsx77(ErrorContainer, { errorMessage: error })
   ] });
 };
-var NumberEditor = ({
-  ariaLabel,
-  onChange,
-  disabled,
-  value,
-  readOnly,
-  valueTestId
-}) => {
-  const [innerValue, setInnerValue] = useState19(value != null ? value : "");
-  useDebounce5(() => onChange(innerValue), 500, [innerValue]);
-  return /* @__PURE__ */ jsx72(
-    Input6,
+
+// src/components/SearchAndFilter/editors/StatusMultiEditor.tsx
+import {
+  convertComboBoxGroupsToSelectableGroups as convertComboBoxGroupsToSelectableGroups3,
+  getComboBoxSelectedSelectableGroups as getComboBoxSelectedSelectableGroups2,
+  InputComboBox as InputComboBox3
+} from "@uniformdev/design-system";
+import { useMemo as useMemo20 } from "react";
+
+// src/components/SearchAndFilter/editors/shared/CustomOptions.tsx
+import { StatusBullet } from "@uniformdev/design-system";
+import { jsx as jsx78 } from "@emotion/react/jsx-runtime";
+var CustomOptions = ({ label, value }) => {
+  return /* @__PURE__ */ jsx78(
+    StatusBullet,
     {
-      label: ariaLabel,
-      type: "number",
-      showLabel: false,
-      min: 0,
-      onChange: (e) => setInnerValue(e.currentTarget.value),
-      disabled,
-      value: innerValue,
-      readOnly,
-      "data-testid": valueTestId
+      status: label,
+      message: Array.isArray(value) ? value.join(",") : value
     }
   );
 };
-var DateEditor = ({
-  onChange,
-  ariaLabel,
-  disabled,
+
+// src/components/SearchAndFilter/editors/StatusMultiEditor.tsx
+import { jsx as jsx79 } from "@emotion/react/jsx-runtime";
+var StatusMultiEditor = ({
+  options,
   value,
+  disabled,
   readOnly,
+  onChange,
   valueTestId
 }) => {
-  const [innerValue, setInnerValue] = useState19(value != null ? value : "");
-  useDebounce5(() => onChange(innerValue), 500, [innerValue]);
-  return /* @__PURE__ */ jsx72(
-    Input6,
+  const readOnlyProps = readOnly ? readOnlyAttributes : {};
+  const { groupedOptions, selectedOptions } = useMemo20(
+    () => convertComboBoxGroupsToSelectableGroups3({ options: options != null ? options : [], selectedItems: new Set(value) }),
+    [options, value]
+  );
+  return /* @__PURE__ */ jsx79("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx79(
+    InputComboBox3,
     {
-      type: "date",
-      label: ariaLabel,
-      showLabel: false,
-      onChange: (e) => setInnerValue(e.currentTarget.value),
-      disabled,
-      value: innerValue,
-      readOnly,
-      "data-testid": valueTestId
+      options: groupedOptions != null ? groupedOptions : [],
+      isMulti: true,
+      onChange: (e) => {
+        const selectedValues = getComboBoxSelectedSelectableGroups2(e);
+        return onChange([...selectedValues]);
+      },
+      formatOptionLabel: CustomOptions,
+      "aria-readonly": readOnly,
+      value: selectedOptions,
+      isDisabled: disabled,
+      styles: {
+        menu(base) {
+          return {
+            ...base,
+            minWidth: "max-content"
+          };
+        }
+      },
+      ...readOnlyProps
     }
-  );
+  ) });
 };
-var DateRangeEditor = ({
-  ariaLabel,
-  onChange,
-  disabled,
+
+// src/components/SearchAndFilter/editors/StatusSingleEditor.tsx
+import {
+  convertComboBoxGroupsToSelectableGroups as convertComboBoxGroupsToSelectableGroups4,
+  InputComboBox as InputComboBox4
+} from "@uniformdev/design-system";
+import { useMemo as useMemo21 } from "react";
+import { jsx as jsx80 } from "@emotion/react/jsx-runtime";
+var StatusSingleEditor = ({
+  options,
   value,
+  disabled,
   readOnly,
+  onChange,
   valueTestId
 }) => {
-  const [minDateValue, setMinDateValue] = useState19(value ? value[0] : "");
-  const [maxDateValue, setMaxDateValue] = useState19(value ? value[1] : "");
-  const [error, setError] = useState19("");
-  useDebounce5(
-    () => {
-      if (minDateValue && maxDateValue && !error) {
-        onChange([minDateValue, maxDateValue]);
-      } else {
-        onChange([]);
-      }
-    },
-    500,
-    [minDateValue, maxDateValue]
+  const readOnlyProps = readOnly ? readOnlyAttributes : {};
+  const { groupedOptions, selectedOptions } = useMemo21(
+    () => convertComboBoxGroupsToSelectableGroups4({
+      options: options != null ? options : [],
+      selectedItems: new Set(value ? [value] : void 0),
+      selectionMode: "single"
+    }),
+    [options, value]
   );
-  useEffect21(() => {
-    if (!minDateValue || !maxDateValue) {
-      return;
+  return /* @__PURE__ */ jsx80("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx80(
+    InputComboBox4,
+    {
+      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
     }
-    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;
+  ) });
+};
+
+// src/components/SearchAndFilter/editors/TextEditor.tsx
+import { Input as Input10 } from "@uniformdev/design-system";
+import { useState as useState23 } from "react";
+import { useDebounce as useDebounce9 } from "react-use";
+import { jsx as jsx81 } from "@emotion/react/jsx-runtime";
+var TextEditor = ({
+  onChange,
+  ariaLabel,
+  value,
+  readOnly,
+  valueTestId
+}) => {
+  const [innerValue, setInnerValue] = useState23(value != null ? value : "");
+  useDebounce9(() => onChange(innerValue), 500, [innerValue]);
+  return /* @__PURE__ */ jsx81(
+    Input10,
+    {
+      showLabel: false,
+      label: ariaLabel,
+      onChange: (e) => setInnerValue(e.currentTarget.value),
+      placeholder: "Enter phrase to search\u2026",
+      value: innerValue,
+      readOnly,
+      "data-testid": valueTestId
     }
-    if (maxDate && !minDate) {
-      setError("Please enter both a low and high date");
-      return;
+  );
+};
+
+// src/components/SearchAndFilter/editors/TextMultiChoiceEditor.tsx
+import {
+  convertComboBoxGroupsToSelectableGroups as convertComboBoxGroupsToSelectableGroups5,
+  getComboBoxSelectedSelectableGroups as getComboBoxSelectedSelectableGroups3,
+  InputCreatableComboBox
+} from "@uniformdev/design-system";
+import { useMemo as useMemo22 } from "react";
+import { jsx as jsx82 } from "@emotion/react/jsx-runtime";
+var TextMultiChoiceEditor = ({
+  value,
+  disabled,
+  readOnly,
+  valueTestId,
+  ...props
+}) => {
+  const readOnlyProps = readOnly ? readOnlyAttributes : {};
+  const isClearable = !readOnly || !disabled;
+  const { groupedOptions, selectedOptions } = useMemo22(() => {
+    var _a;
+    const coercedValue = typeof value === "string" ? [value] : value != null ? value : [];
+    const options = (_a = coercedValue.map((v) => ({ label: v, value: v }))) != null ? _a : [];
+    return convertComboBoxGroupsToSelectableGroups5({ options, selectedItems: new Set(value) });
+  }, [value]);
+  return /* @__PURE__ */ jsx82("div", { "data-testid": valueTestId, children: /* @__PURE__ */ jsx82(
+    InputCreatableComboBox,
+    {
+      ...props,
+      placeholder: "Type a value\u2026",
+      noOptionsMessage: () => "Type to create a new value",
+      options: groupedOptions,
+      isMulti: true,
+      isClearable,
+      isDisabled: disabled,
+      onChange: (e) => {
+        const selectedValues = getComboBoxSelectedSelectableGroups3(e);
+        return props.onChange([...selectedValues]);
+      },
+      value: selectedOptions,
+      "aria-readonly": readOnly,
+      styles: {
+        menu(base) {
+          return {
+            ...base,
+            minWidth: "max-content"
+          };
+        }
+      },
+      ...readOnlyProps
     }
-    const minDateString = minDate.toDateString();
-    const maxDateString = maxDate.toDateString();
-    if (minDateString === maxDateString || maxDateString === minDateString) {
-      setError("The min and max date cannot be the same");
-      return;
+  ) });
+};
+
+// src/components/SearchAndFilter/FilterButton.tsx
+import { Counter as Counter2, Icon as Icon6 } from "@uniformdev/design-system";
+
+// src/components/SearchAndFilter/styles/SearchAndFilter.styles.ts
+import { css as css38 } from "@emotion/react";
+import { cq, fadeInLtr } from "@uniformdev/design-system";
+var SearchAndFilterControlsWrapper = (gridColumns) => css38`
+  align-items: stretch;
+  display: grid;
+  grid-template-columns: ${gridColumns};
+  gap: var(--spacing-sm);
+`;
+var SearchAndFilterOutterControlWrapper = (gridColumns) => css38`
+  align-items: stretch;
+  display: grid;
+  grid-template-columns: ${gridColumns};
+  gap: var(--spacing-sm);
+`;
+var ConditionalFilterRow = css38`
+  align-items: baseline;
+  display: grid;
+  grid-template-columns: 35px 1fr;
+  gap: var(--spacing-sm);
+  margin-left: var(--spacing-base);
+
+  ${cq("380px")} {
+    &:after {
+      content: '';
+      display: block;
+      height: 1px;
+      background: var(--gray-300);
+      width: calc(100% - var(--spacing-base));
+      margin-left: var(--spacing-base);
     }
-    if (minDate > maxDate) {
-      setError("The min date cannot be higher than the max date");
-      return;
+    &:last-of-type:after {
+      display: none;
     }
-    if (error) {
-      setError("");
+  }
+
+  &:nth-of-type(2) {
+    margin-left: 0;
+    grid-template-columns: 50px 1fr;
+  }
+
+  ${cq("580px")} {
+    &:after {
+      display: none;
     }
-    if (minDate && maxDate) {
-      setMinDateValue(minDateValue);
-      setMaxDateValue(maxDateValue);
-    } else {
-      setMinDateValue("");
-      setMaxDateValue("");
+  }
+
+  @media (prefers-reduced-motion: no-preference) {
+    animation: ${fadeInLtr} var(--duration-fast) var(--timing-ease-out);
+  }
+`;
+var ConditionalInputRow = css38`
+  display: flex;
+  gap: var(--spacing-sm);
+  flex-wrap: wrap;
+
+  ${cq("380px")} {
+    & > div:nth-child(-n + 2) {
+      width: calc(50% - var(--spacing-sm));
+    }
+
+    & > div:nth-child(n + 3) {
+      width: calc(100% - 48px);
+    }
+  }
+  ${cq("764px")} {
+    align-items: flex-start;
+    display: grid;
+    grid-template-columns: 250px 160px 1fr 32px;
+
+    & > div:nth-child(n) {
+      width: auto;
+    }
+  }
+`;
+var SearchInput = css38`
+  max-height: 40px;
+  min-height: unset;
+`;
+var BindableKeywordSearchInputStyles = css38`
+  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 = css38`
+  align-items: center;
+  display: flex;
+  position: absolute;
+  inset: 0 var(--spacing-lg) 0 auto;
+`;
+var ClearSearchButtonStyles = css38`
+  background: none;
+  border: none;
+  padding: 0;
+  pointer-events: all;
+`;
+var FilterButton = css38`
+  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 = css38`
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 14ch;
+`;
+var FilterButtonSelected = css38`
+  background: var(--gray-100);
+  border-color: var(--gray-300);
+
+  svg {
+    color: var(--accent-dark);
+  }
+`;
+var FilterButtonWithOptions = css38`
+  :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 = css38`
+  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 = css38`
+  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 = css38`
+  color: var(--typography-light);
+
+  &:focus {
+    outline: none;
+  }
+`;
+var ResetConditionsBtn = css38`
+  background: transparent;
+  border: none;
+  color: var(--action-destructive-default);
+  transition: color var(--duration-fast) var(--timing-ease-out);
+  padding: 0 var(--spacing-sm) 0 0;
+
+  &:hover,
+  &:focus {
+    color: var(--action-destructive-hover);
+  }
+  &:disabled {
+    color: var(--gray-400);
+  }
+`;
+var IconBtn = css38`
+  align-self: center;
+  background: transparent;
+  border: none;
+  padding: var(--spacing-sm);
+`;
+var SearchAndFilterOptionsContainer = css38`
+  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: 2;
+`;
+var SearchAndFilterOptionsInnerContainer = css38`
+  display: flex;
+  flex-direction: column;
+  gap: var(--spacing-sm);
+  padding-inline: var(--spacing-md);
+`;
+var SearchAndFilterButtonGroup = css38`
+  margin-top: var(--spacing-xs);
+  margin-left: calc(56px + var(--spacing-md));
+`;
+
+// src/components/SearchAndFilter/FilterButton.tsx
+import { jsx as jsx83, jsxs as jsxs44 } from "@emotion/react/jsx-runtime";
+var FilterButton2 = ({
+  text = "Filters",
+  icon = "filter-add",
+  filterCount,
+  hasSelectedValue,
+  dataTestId,
+  ...props
+}) => {
+  return /* @__PURE__ */ jsxs44(
+    "button",
+    {
+      type: "button",
+      css: [
+        FilterButton,
+        hasSelectedValue ? FilterButtonSelected : void 0,
+        filterCount ? [FilterButtonWithOptions, FilterButtonSelected] : void 0
+      ],
+      ...props,
+      "data-testid": dataTestId,
+      children: [
+        /* @__PURE__ */ jsx83(Icon6, { icon, iconColor: "currentColor", size: "1rem" }),
+        /* @__PURE__ */ jsx83("span", { css: FilterButtonText, children: text }),
+        filterCount ? /* @__PURE__ */ jsx83(Counter2, { count: filterCount, bgColor: "var(--white)" }) : null
+      ]
     }
-  }, [minDateValue, maxDateValue, setError]);
-  return /* @__PURE__ */ jsxs43(Fragment15, { children: [
-    /* @__PURE__ */ jsxs43("div", { css: twoColumnGrid, "data-testid": valueTestId, children: [
-      /* @__PURE__ */ jsx72(
-        Input6,
-        {
-          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__ */ jsx72(
-        Input6,
-        {
-          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__ */ jsx72(ErrorContainer, { errorMessage: error })
-  ] });
+  );
 };
+
+// src/components/SearchAndFilter/FilterControls.tsx
+import { CgClose as CgClose5 } from "@react-icons/all-files/cg/CgClose";
+import { hasReferencedVariables as hasReferencedVariables3 } from "@uniformdev/canvas";
+import { Icon as Icon7, InputKeywordSearch as InputKeywordSearch2 } from "@uniformdev/design-system";
+import { CLEAR_EDITOR_COMMAND as CLEAR_EDITOR_COMMAND2 } from "lexical";
+import { useEffect as useEffect24, useRef as useRef17, useState as useState25 } from "react";
+import { useDebounce as useDebounce10 } from "react-use";
+import { v4 as v43 } from "uuid";
+
+// src/components/SearchAndFilter/hooks/useSearchAndFilter.tsx
+import { VerticalRhythm as VerticalRhythm6 } from "@uniformdev/design-system";
+import {
+  createContext as createContext7,
+  useCallback as useCallback7,
+  useContext as useContext9,
+  useDeferredValue as useDeferredValue3,
+  useEffect as useEffect23,
+  useMemo as useMemo23,
+  useState as useState24
+} from "react";
+
+// src/components/SearchAndFilter/FilterEditor.tsx
+import { jsx as jsx84 } from "@emotion/react/jsx-runtime";
 var FilterEditorRenderer = ({ editorType, ...props }) => {
   const { filterMapper: contextFilterMapper } = useSearchAndFilter();
   const Editor = contextFilterMapper == null ? void 0 : contextFilterMapper[editorType];
-  if (!Editor) {
-    return null;
-  }
-  if (editorType === "empty") {
-    return null;
+  if (!Editor || editorType === "empty") {
+    return /* @__PURE__ */ jsx84("span", {});
   }
-  return /* @__PURE__ */ jsx72(Editor, { ...props });
+  return /* @__PURE__ */ jsx84(Editor, { ...props });
 };
 var filterMapper = {
   multiChoice: FilterMultiChoiceEditor,
@@ -8528,18 +8828,19 @@ var filterMapper = {
   date: DateEditor,
   dateRange: DateRangeEditor,
   text: TextEditor,
+  textMultiChoice: TextMultiChoiceEditor,
   numberRange: NumberRangeEditor,
   number: NumberEditor,
   statusMultiChoice: StatusMultiEditor,
   statusSingleChoice: StatusSingleEditor,
   empty: null
 };
-function withInputVariables(WrappedComponent) {
+function withInputVariables(WrappedComponent, noSwapping = false) {
   const WithInputVariables = (props) => {
     if (Array.isArray(props.value) || !props.bindable || props.disabled || props.readOnly) {
-      return /* @__PURE__ */ jsx72(WrappedComponent, { ...props });
+      return /* @__PURE__ */ jsx84(WrappedComponent, { ...props });
     }
-    return /* @__PURE__ */ jsx72(
+    return /* @__PURE__ */ jsx84(
       InputVariables,
       {
         disableInlineMenu: true,
@@ -8547,7 +8848,7 @@ function withInputVariables(WrappedComponent) {
         onChange: (newValue) => props.onChange(newValue != null ? newValue : ""),
         value: props.value,
         disabled: props.disabled,
-        inputWhenNoVariables: /* @__PURE__ */ jsx72(WrappedComponent, { ...props })
+        inputWhenNoVariables: noSwapping ? void 0 : /* @__PURE__ */ jsx84(WrappedComponent, { ...props })
       }
     );
   };
@@ -8557,16 +8858,16 @@ function withInputVariablesForMultiValue(WrappedComponent) {
   const WithInputVariables = (props) => {
     var _a;
     if (!props.bindable || props.disabled || props.readOnly) {
-      return /* @__PURE__ */ jsx72(WrappedComponent, { ...props });
+      return /* @__PURE__ */ jsx84(WrappedComponent, { ...props });
     }
-    return /* @__PURE__ */ jsx72(
+    return /* @__PURE__ */ jsx84(
       InputVariables,
       {
         disableInlineMenu: true,
         showMenuPosition: "inline-right",
         onChange: (newValue) => props.onChange(newValue ? [newValue] : []),
         value: (_a = props.value) == null ? void 0 : _a[0],
-        inputWhenNoVariables: /* @__PURE__ */ jsx72(WrappedComponent, { ...props })
+        inputWhenNoVariables: /* @__PURE__ */ jsx84(WrappedComponent, { ...props })
       }
     );
   };
@@ -8577,29 +8878,12 @@ var bindableFiltersMapper = {
   multiChoice: withInputVariablesForMultiValue(FilterMultiChoiceEditor),
   singleChoice: withInputVariables(FilterSingleChoiceEditor),
   date: withInputVariables(DateEditor),
-  text: withInputVariables(TextEditor),
+  text: withInputVariables(TextEditor, true),
   number: withInputVariables(NumberEditor)
 };
-var ErrorContainer = ({ errorMessage }) => {
-  return /* @__PURE__ */ jsx72(
-    "div",
-    {
-      css: {
-        gridColumn: "span 6",
-        order: 6
-      },
-      children: /* @__PURE__ */ jsx72(FieldMessage, { errorMessage })
-    }
-  );
-};
-var twoColumnGrid = {
-  display: "grid",
-  gridTemplateColumns: "1fr 1fr",
-  gap: "var(--spacing-sm);"
-};
 
 // src/components/SearchAndFilter/hooks/useSearchAndFilter.tsx
-import { jsx as jsx73 } from "@emotion/react/jsx-runtime";
+import { jsx as jsx85 } from "@emotion/react/jsx-runtime";
 var SearchAndFilterContext = createContext7({
   searchTerm: "",
   setSearchTerm: () => {
@@ -8626,6 +8910,7 @@ var SearchAndFilterProvider = ({
   filters,
   filterOptions,
   filterVisible = false,
+  alwaysVisible = false,
   defaultSearchTerm = "",
   onSearchChange,
   onChange,
@@ -8635,9 +8920,9 @@ var SearchAndFilterProvider = ({
   children,
   allowBindingSearchTerm
 }) => {
-  const [searchTerm, setSearchTerm] = useState20(defaultSearchTerm);
+  const [searchTerm, setSearchTerm] = useState24(defaultSearchTerm);
   const deferredSearchTerm = useDeferredValue3(searchTerm);
-  const [filterVisibility, setFilterVisibility] = useState20(filterVisible);
+  const [filterVisibility, setFilterVisibility] = useState24(alwaysVisible || filterVisible);
   const handleSearchTerm = useCallback7(
     (term) => {
       setSearchTerm(term);
@@ -8646,8 +8931,13 @@ var SearchAndFilterProvider = ({
     [setSearchTerm, onSearchChange]
   );
   const handleToggleFilterVisibility = useCallback7(
-    (visible) => setFilterVisibility(visible),
-    [setFilterVisibility]
+    (visible) => {
+      if (alwaysVisible) {
+        return;
+      }
+      setFilterVisibility(visible);
+    },
+    [alwaysVisible]
   );
   const handleAddFilter = useCallback7(() => {
     onChange([...filters, { field: "", operator: "", value: "" }]);
@@ -8663,17 +8953,17 @@ var SearchAndFilterProvider = ({
     },
     [filters, onChange]
   );
-  const validFilterQuery = useMemo18(() => {
+  const validFilterQuery = useMemo23(() => {
     const hasValidFilters = filters.every((f) => f.field && f.operator && f.value);
     if (hasValidFilters) {
       return filters;
     }
   }, [filters]);
-  useEffect22(() => {
+  useEffect23(() => {
     if (filterVisibility) {
       const handleEscKeyFilterClose = (e) => {
         if (e.key === "Escape") {
-          setFilterVisibility(false);
+          handleToggleFilterVisibility(false);
         }
       };
       document.addEventListener("keydown", (e) => handleEscKeyFilterClose(e));
@@ -8681,8 +8971,8 @@ var SearchAndFilterProvider = ({
         document.removeEventListener("keydown", (e) => handleEscKeyFilterClose(e));
       };
     }
-  }, [filterVisibility]);
-  return /* @__PURE__ */ jsx73(
+  }, [filterVisibility, handleToggleFilterVisibility]);
+  return /* @__PURE__ */ jsx85(
     SearchAndFilterContext.Provider,
     {
       value: {
@@ -8701,7 +8991,7 @@ var SearchAndFilterProvider = ({
         filterMapper: filterMapper2,
         allowBindingSearchTerm
       },
-      children: /* @__PURE__ */ jsx73(VerticalRhythm6, { children })
+      children: /* @__PURE__ */ jsx85(VerticalRhythm6, { children })
     }
   );
 };
@@ -8711,7 +9001,7 @@ var useSearchAndFilter = () => {
 };
 
 // src/components/SearchAndFilter/FilterControls.tsx
-import { Fragment as Fragment16, jsx as jsx74, jsxs as jsxs44 } from "@emotion/react/jsx-runtime";
+import { Fragment as Fragment17, jsx as jsx86, jsxs as jsxs45 } from "@emotion/react/jsx-runtime";
 var FilterControls = ({
   children,
   hideSearchInput
@@ -8724,25 +9014,25 @@ var FilterControls = ({
     searchTerm,
     allowBindingSearchTerm
   } = useSearchAndFilter();
-  const editorRef = useRef18(null);
-  const hasVariableInSearchTerm = hasReferencedVariables(searchTerm);
-  const [idToResetInputVariables, setIdToResetInputVariables] = useState21("data-resource-search-term-input");
-  const [localeSearchTerm, setLocaleSearchTerm] = useState21(searchTerm);
-  useDebounce6(
+  const editorRef = useRef17(null);
+  const variableRefernceCountInSearchTerm = hasReferencedVariables3(searchTerm);
+  const [idToResetInputVariables, setIdToResetInputVariables] = useState25("data-resource-search-term-input");
+  const [localeSearchTerm, setLocaleSearchTerm] = useState25(searchTerm);
+  useDebounce10(
     () => {
       setSearchTerm(localeSearchTerm);
     },
     300,
     [localeSearchTerm]
   );
-  useEffect23(() => {
+  useEffect24(() => {
     if (searchTerm === "") {
       setLocaleSearchTerm("");
       setIdToResetInputVariables(`data-resource-search-term-input-${v43()}`);
     }
   }, [searchTerm]);
-  return /* @__PURE__ */ jsxs44(Fragment16, { children: [
-    /* @__PURE__ */ jsx74(
+  return /* @__PURE__ */ jsxs45(Fragment17, { children: [
+    /* @__PURE__ */ jsx86(
       FilterButton2,
       {
         "aria-controls": "search-and-filter-options",
@@ -8755,8 +9045,8 @@ var FilterControls = ({
         dataTestId: "filters-button"
       }
     ),
-    hideSearchInput ? null : /* @__PURE__ */ jsxs44("div", { css: BindableKeywordSearchInputStyles, children: [
-      /* @__PURE__ */ jsx74(
+    hideSearchInput ? null : /* @__PURE__ */ jsxs45("div", { css: BindableKeywordSearchInputStyles, children: [
+      /* @__PURE__ */ jsx86(
         InputVariables,
         {
           label: "",
@@ -8766,7 +9056,7 @@ var FilterControls = ({
           value: localeSearchTerm,
           onChange: (value) => setLocaleSearchTerm(value != null ? value : ""),
           disableVariables: !allowBindingSearchTerm,
-          inputWhenNoVariables: /* @__PURE__ */ jsx74(
+          inputWhenNoVariables: /* @__PURE__ */ jsx86(
             InputKeywordSearch2,
             {
               placeholder: "Search...",
@@ -8779,7 +9069,7 @@ var FilterControls = ({
           )
         }
       ),
-      hasVariableInSearchTerm ? /* @__PURE__ */ jsx74("div", { css: ClearSearchButtonContainer, children: /* @__PURE__ */ jsx74(
+      variableRefernceCountInSearchTerm ? /* @__PURE__ */ jsx86("div", { css: ClearSearchButtonContainer, children: /* @__PURE__ */ jsx86(
         "button",
         {
           css: ClearSearchButtonStyles,
@@ -8793,7 +9083,7 @@ var FilterControls = ({
           },
           type: "button",
           "data-testid": "keyword-search-clear-button",
-          children: /* @__PURE__ */ jsx74(Icon7, { icon: CgClose5, iconColor: "red", size: "1rem" })
+          children: /* @__PURE__ */ jsx86(Icon7, { icon: CgClose5, iconColor: "red", size: "1rem" })
         }
       ) }) : null
     ] }),
@@ -8802,88 +9092,27 @@ var FilterControls = ({
 };
 
 // src/components/SearchAndFilter/FilterItem.tsx
-import { Icon as Icon8, InputComboBox as InputComboBox2 } from "@uniformdev/design-system";
-import { useMemo as useMemo19 } from "react";
+import { Icon as Icon8, InputComboBox as InputComboBox5 } from "@uniformdev/design-system";
+import { useMemo as useMemo24 } from "react";
 
-// src/components/SearchAndFilter/FilterMenu.tsx
-import { HorizontalRhythm as HorizontalRhythm8, VerticalRhythm as VerticalRhythm7 } from "@uniformdev/design-system";
-import React14, { useEffect as useEffect24 } from "react";
-import { jsx as jsx75, jsxs as jsxs45 } from "@emotion/react/jsx-runtime";
-var SearchAndFilterOptionsContainer2 = ({
-  buttonRow,
-  additionalFiltersContainer,
-  children
-}) => {
-  return /* @__PURE__ */ jsxs45("div", { css: SearchAndFilterOptionsContainer, children: [
-    /* @__PURE__ */ jsx75("div", { css: SearchAndFilterOptionsInnerContainer, children }),
-    buttonRow ? /* @__PURE__ */ jsx75(
-      HorizontalRhythm8,
-      {
-        css: SearchAndFilterButtonGroup,
-        gap: "sm",
-        align: "center",
-        justify: "space-between",
-        children: buttonRow
-      }
-    ) : null,
-    additionalFiltersContainer ? /* @__PURE__ */ jsx75("div", { children: additionalFiltersContainer }) : null
-  ] });
-};
-var FilterMenu = ({
-  id,
-  filterTitle = "Show results",
-  menuControls,
-  additionalFiltersContainer,
-  children,
-  dataTestId,
-  resetButtonText = "reset"
-}) => {
-  const { filterVisibility, setFilterVisibility, handleResetFilters, filters } = useSearchAndFilter();
-  const innerMenuRef = React14.useRef(null);
-  useEffect24(() => {
-    var _a;
-    if (filterVisibility) {
-      (_a = innerMenuRef.current) == null ? void 0 : _a.focus();
-    }
-  }, [filterVisibility]);
-  return /* @__PURE__ */ jsx75(VerticalRhythm7, { gap: "sm", "aria-haspopup": "true", id, "data-testid": dataTestId, children: filterVisibility ? /* @__PURE__ */ jsxs45(
-    SearchAndFilterOptionsContainer2,
-    {
-      buttonRow: menuControls,
-      additionalFiltersContainer,
-      children: [
-        /* @__PURE__ */ jsxs45(HorizontalRhythm8, { gap: "sm", align: "center", justify: "space-between", children: [
-          /* @__PURE__ */ jsx75("span", { css: Title, ref: innerMenuRef, tabIndex: 0, children: filterTitle }),
-          (filters == null ? void 0 : filters.length) ? /* @__PURE__ */ jsx75(
-            "button",
-            {
-              type: "button",
-              css: ResetConditionsBtn,
-              onClick: () => {
-                handleResetFilters();
-                setFilterVisibility(false);
-              },
-              "data-testid": "reset-filters",
-              children: resetButtonText
-            }
-          ) : null
-        ] }),
-        children
-      ]
-    }
-  ) : null });
-};
+// src/components/SearchAndFilter/util/isFilterBindable.ts
+function isFilterBindable(filter, operator) {
+  var _a, _b;
+  return (_b = (_a = operator == null ? void 0 : operator.bindable) != null ? _a : filter == null ? void 0 : filter.bindable) != null ? _b : false;
+}
 
 // src/components/SearchAndFilter/FilterItem.tsx
-import { jsx as jsx76, jsxs as jsxs46 } from "@emotion/react/jsx-runtime";
+import { jsx as jsx87, jsxs as jsxs46 } from "@emotion/react/jsx-runtime";
 var FilterItem = ({
   index,
-  paramOptions,
   operatorOptions,
   valueOptions,
-  onParamChange,
+  onFilterOptionChange,
+  onFilterDynamicChange,
   onOperatorChange,
-  onValueChange
+  onValueChange,
+  initialCriteriaTitle = "Where",
+  criteriaGroupOperator = "and"
 }) => {
   var _a, _b;
   const { filters, handleDeleteFilter, filterOptions } = useSearchAndFilter();
@@ -8891,25 +9120,26 @@ 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 } = useMemo19(() => {
+  const { selectedFieldValue, selectedOperatorValue, selectedMetaValue, readOnly, bindable } = useMemo24(() => {
     var _a2;
-    const currentSelectedFilter = filterOptions.find((item) => {
+    const currentSelectedFilterGroup = filterOptions.find((item) => {
       var _a3;
       return (_a3 = item.options) == null ? void 0 : _a3.find((op) => op.value === filters[index].field);
     });
-    const selectedFieldValue2 = (_a2 = currentSelectedFilter == null ? void 0 : currentSelectedFilter.options) == null ? void 0 : _a2.find((item) => {
+    const selectedFilterOption = (_a2 = currentSelectedFilterGroup == null ? void 0 : currentSelectedFilterGroup.options) == null ? void 0 : _a2.find((item) => {
       return filters[index].field === item.value;
     });
-    const isCurrentFieldReadOnly = selectedFieldValue2 == null ? void 0 : selectedFieldValue2.readOnly;
+    const isCurrentFieldReadOnly = selectedFilterOption == null ? void 0 : selectedFilterOption.readOnly;
     const selectedOperatorValue2 = operatorOptions == null ? void 0 : operatorOptions.find((item) => {
       return filters[index].operator === item.value;
     });
+    const bindable2 = isFilterBindable(selectedFilterOption, selectedOperatorValue2);
     return {
-      selectedFieldValue: selectedFieldValue2,
+      selectedFieldValue: selectedFilterOption,
       selectedOperatorValue: selectedOperatorValue2 != null ? selectedOperatorValue2 : void 0,
       selectedMetaValue: filters[index].value,
       readOnly: isCurrentFieldReadOnly,
-      bindable: selectedFieldValue2 == null ? void 0 : selectedFieldValue2.bindable
+      bindable: bindable2
     };
   }, [filters, filterOptions, index, operatorOptions]);
   const readOnlyProps = readOnly ? {
@@ -8918,17 +9148,28 @@ var FilterItem = ({
     menuIsOpen: false,
     isClearable: false
   } : {};
+  const CustomLeftHandComponent = selectedFieldValue == null ? void 0 : selectedFieldValue.leftHandSideComponentWhenSelected;
   return /* @__PURE__ */ jsxs46("div", { css: ConditionalFilterRow, "data-testid": "filter-item", children: [
-    /* @__PURE__ */ jsx76("span", { children: index === 0 ? "Where" : "and" }),
+    /* @__PURE__ */ jsx87("span", { children: index === 0 ? initialCriteriaTitle : criteriaGroupOperator }),
     /* @__PURE__ */ jsxs46("div", { css: ConditionalInputRow, children: [
-      /* @__PURE__ */ jsx76(
-        InputComboBox2,
+      CustomLeftHandComponent ? /* @__PURE__ */ jsx87(
+        CustomLeftHandComponent,
+        {
+          filterOption: selectedFieldValue,
+          filter: filters[index],
+          setFilterDynamicValue: onFilterDynamicChange,
+          deselectFilterOption: () => {
+            onFilterOptionChange("");
+          }
+        }
+      ) : /* @__PURE__ */ jsx87(
+        InputComboBox5,
         {
           "aria-label": label,
-          options: paramOptions,
+          options: filterOptions,
           onChange: (e) => {
             var _a2;
-            onParamChange((_a2 = e == null ? void 0 : e.value) != null ? _a2 : "");
+            onFilterOptionChange((_a2 = e == null ? void 0 : e.value) != null ? _a2 : "");
           },
           isOptionDisabled: (option) => {
             var _a2;
@@ -8948,8 +9189,8 @@ var FilterItem = ({
           name: `filter-field-${index}`
         }
       ),
-      /* @__PURE__ */ jsx76(
-        InputComboBox2,
+      /* @__PURE__ */ jsx87(
+        InputComboBox5,
         {
           "aria-label": operatorLabel,
           options: operatorOptions,
@@ -8972,7 +9213,7 @@ var FilterItem = ({
           name: `filter-operator-${index}`
         }
       ),
-      /* @__PURE__ */ jsx76(
+      /* @__PURE__ */ jsx87(
         FilterEditorRenderer,
         {
           "aria-label": metaDataLabel,
@@ -8986,7 +9227,7 @@ var FilterItem = ({
           valueTestId: "filter-value"
         }
       ),
-      readOnly || index === 0 ? null : /* @__PURE__ */ jsx76(
+      readOnly ? null : /* @__PURE__ */ jsx87(
         "button",
         {
           type: "button",
@@ -8994,15 +9235,185 @@ var FilterItem = ({
           "aria-label": "delete filter",
           css: IconBtn,
           "data-testid": "delete-filter",
-          children: /* @__PURE__ */ jsx76(Icon8, { icon: "trash", iconColor: "red", size: "1rem" })
+          disabled: filters.length === 1,
+          children: /* @__PURE__ */ jsx87(Icon8, { icon: "trash", iconColor: filters.length === 1 ? "gray" : "red", size: "1rem" })
         }
       )
     ] })
   ] });
 };
+
+// src/components/SearchAndFilter/FilterItems.tsx
+import { Icon as Icon9 } from "@uniformdev/design-system";
+
+// src/components/SearchAndFilter/FilterMenu.tsx
+import { HorizontalRhythm as HorizontalRhythm8, VerticalRhythm as VerticalRhythm7 } from "@uniformdev/design-system";
+import React14, { useEffect as useEffect25 } from "react";
+import { jsx as jsx88, jsxs as jsxs47 } from "@emotion/react/jsx-runtime";
+var SearchAndFilterOptionsContainer2 = ({
+  buttonRow,
+  additionalFiltersContainer,
+  children
+}) => {
+  return /* @__PURE__ */ jsxs47("div", { css: SearchAndFilterOptionsContainer, children: [
+    /* @__PURE__ */ jsx88("div", { css: SearchAndFilterOptionsInnerContainer, children }),
+    buttonRow ? /* @__PURE__ */ jsx88(
+      HorizontalRhythm8,
+      {
+        css: SearchAndFilterButtonGroup,
+        gap: "sm",
+        align: "center",
+        justify: "space-between",
+        children: buttonRow
+      }
+    ) : null,
+    additionalFiltersContainer ? /* @__PURE__ */ jsx88("div", { children: additionalFiltersContainer }) : null
+  ] });
+};
+var FilterMenu = ({
+  id,
+  filterTitle = "Show results",
+  menuControls,
+  additionalFiltersContainer,
+  children,
+  dataTestId,
+  resetButtonText = "reset"
+}) => {
+  const { filterVisibility, setFilterVisibility, handleResetFilters, filters } = useSearchAndFilter();
+  const innerMenuRef = React14.useRef(null);
+  useEffect25(() => {
+    var _a;
+    if (filterVisibility) {
+      (_a = innerMenuRef.current) == null ? void 0 : _a.focus();
+    }
+  }, [filterVisibility]);
+  return /* @__PURE__ */ jsx88(VerticalRhythm7, { gap: "sm", "aria-haspopup": "true", id, "data-testid": dataTestId, children: filterVisibility ? /* @__PURE__ */ jsxs47(
+    SearchAndFilterOptionsContainer2,
+    {
+      buttonRow: menuControls,
+      additionalFiltersContainer,
+      children: [
+        /* @__PURE__ */ jsxs47(HorizontalRhythm8, { gap: "sm", align: "center", justify: "space-between", children: [
+          filterTitle ? /* @__PURE__ */ jsx88("span", { css: Title, ref: innerMenuRef, tabIndex: 0, children: filterTitle }) : null,
+          (filters == null ? void 0 : filters.length) && resetButtonText ? /* @__PURE__ */ jsx88(
+            "button",
+            {
+              type: "button",
+              css: ResetConditionsBtn,
+              disabled: filters.every((f) => !f.field),
+              onClick: () => {
+                handleResetFilters();
+                setFilterVisibility(false);
+              },
+              "data-testid": "reset-filters",
+              children: resetButtonText
+            }
+          ) : null
+        ] }),
+        children
+      ]
+    }
+  ) : null });
+};
+
+// src/components/SearchAndFilter/util/getNewFilterValueAfterOperatorChange.ts
+import { hasReferencedVariables as hasReferencedVariables4 } from "@uniformdev/canvas";
+function getNewFilterValueAfterOperatorChange({
+  newOperatorId,
+  currentFilter,
+  filterOptions
+}) {
+  var _a, _b, _c;
+  if (Array.isArray(newOperatorId)) {
+    throw new Error("Operator value must be a single string");
+  }
+  const result = {
+    ...currentFilter,
+    operator: newOperatorId,
+    value: ""
+  };
+  const currentOperatorId = currentFilter.operator;
+  let currentValue = currentFilter.value;
+  const currentFieldDefinition = filterOptions.flatMap((group) => {
+    var _a2;
+    return (_a2 = group.options) != null ? _a2 : [];
+  }).find((filter) => filter.value === currentFilter.field);
+  const currentOperator = (_a = currentFieldDefinition == null ? void 0 : currentFieldDefinition.operatorOptions) == null ? void 0 : _a.find(
+    (op) => op.value === currentOperatorId
+  );
+  const newOperator = (_b = currentFieldDefinition == null ? void 0 : currentFieldDefinition.operatorOptions) == null ? void 0 : _b.find((op) => op.value === newOperatorId);
+  if (!currentOperator || !newOperator) {
+    result.value = "";
+    return result;
+  } else {
+    const currentOperatorValueType = currentOperator.expectedValueType;
+    const newOperatorValueType = newOperator.expectedValueType;
+    if (!isFilterBindable(currentFieldDefinition, newOperator) && hasBindings(currentValue)) {
+      currentValue = "";
+    }
+    if (isHardcodedOperatorValue(currentOperatorValueType)) {
+      result.value = isHardcodedOperatorValue(newOperatorValueType) ? newOperatorValueType : "";
+      return result;
+    }
+    switch (newOperatorValueType) {
+      case "single":
+        if (Array.isArray(currentValue)) {
+          if (currentOperatorValueType === "between") {
+            result.value = "";
+          } else {
+            result.value = (_c = currentValue[0]) != null ? _c : "";
+          }
+        } else {
+          result.value = currentValue;
+        }
+        return result;
+      case "array":
+        if (currentOperatorValueType === "between") {
+          result.value = "";
+        } else if (Array.isArray(currentValue)) {
+          result.value = currentValue;
+        } else {
+          result.value = currentValue ? [currentValue] : [];
+        }
+        return result;
+      case "between":
+        if (Array.isArray(currentValue)) {
+          result.value = "";
+        } else {
+          result.value = [currentValue, ""];
+        }
+        return result;
+      case "none":
+        result.value = "";
+        return result;
+      default:
+        result.value = newOperatorValueType;
+        return result;
+    }
+  }
+}
+function isHardcodedOperatorValue(valueType) {
+  return valueType !== void 0 && valueType !== "array" && valueType !== "between" && valueType !== "none" && valueType !== "single";
+}
+function hasBindings(currentValue) {
+  if (currentValue === void 0) {
+    return false;
+  }
+  if (Array.isArray(currentValue)) {
+    return currentValue.some((value) => hasReferencedVariables4(value));
+  }
+  return hasReferencedVariables4(currentValue) > 0;
+}
+
+// src/components/SearchAndFilter/FilterItems.tsx
+import { jsx as jsx89, jsxs as jsxs48 } from "@emotion/react/jsx-runtime";
 var FilterItems = ({
   addButtonText = "add condition",
-  additionalFiltersContainer
+  additionalFiltersContainer,
+  filterTitle,
+  resetButtonText,
+  initialCriteriaTitle,
+  criteriaGroupOperator
 }) => {
   const { filterOptions, filters, setFilters, handleAddFilter } = useSearchAndFilter();
   const handleUpdateFilter = (index, prop, value) => {
@@ -9010,21 +9421,16 @@ 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)) {
-        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) {
-        next[index].value = [next[index].value, ""];
-      }
-      if (value === "def" || value === "true") {
-        next[index].value = "true";
-      }
-      if (value === "ndef" || value === "false") {
-        next[index].value = "false";
+      const newOperatorId = value;
+      const currentFilter = next[index];
+      if (!newOperatorId) {
+        throw new Error("you bad");
       }
+      next[index] = getNewFilterValueAfterOperatorChange({
+        newOperatorId,
+        currentFilter,
+        filterOptions
+      });
     }
     if (prop === "field") {
       const firstOperatorInAvailableOperators = (_e = (_d = (_c = (_b = (_a = filterOptions.find((fo) => {
@@ -9033,15 +9439,16 @@ var FilterItems = ({
       })) == null ? void 0 : _a.options) == null ? void 0 : _b.find((op) => op.value === next[index].field)) == null ? void 0 : _c.operatorOptions) == null ? void 0 : _d[0].value) != null ? _e : "eq";
       next[index].operator = firstOperatorInAvailableOperators;
       next[index].value = "";
+      next[index].dynamicField = void 0;
     }
     setFilters(next);
   };
-  return /* @__PURE__ */ jsx76(
+  return /* @__PURE__ */ jsx89(
     FilterMenu,
     {
       id: "search-and-filter-options",
       dataTestId: "search-and-filter-options",
-      menuControls: /* @__PURE__ */ jsxs46(
+      menuControls: /* @__PURE__ */ jsxs48(
         "button",
         {
           type: "button",
@@ -9049,12 +9456,14 @@ var FilterItems = ({
           onClick: handleAddFilter,
           "data-testid": "add-filter",
           children: [
-            /* @__PURE__ */ jsx76(Icon8, { icon: "math-plus", iconColor: "currentColor", size: "1rem" }),
+            /* @__PURE__ */ jsx89(Icon9, { icon: "math-plus", iconColor: "currentColor", size: "1rem" }),
             addButtonText
           ]
         }
       ),
       additionalFiltersContainer,
+      filterTitle,
+      resetButtonText,
       children: filters.map((item, i) => {
         var _a, _b, _c, _d, _e, _f;
         const availableTypeOptions = (_b = (_a = filterOptions.find((fo) => {
@@ -9063,16 +9472,18 @@ 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__ */ jsx76(
+        return /* @__PURE__ */ jsx89(
           FilterItem,
           {
             index: i,
-            paramOptions: filterOptions,
-            onParamChange: (e) => handleUpdateFilter(i, "field", e),
+            onFilterOptionChange: (e) => handleUpdateFilter(i, "field", e),
             operatorOptions: possibleOperators,
             onOperatorChange: (e) => handleUpdateFilter(i, "operator", e),
             onValueChange: (e) => handleUpdateFilter(i, "value", e),
-            valueOptions: possibleValueOptions
+            onFilterDynamicChange: (e) => handleUpdateFilter(i, "dynamicField", e),
+            valueOptions: possibleValueOptions,
+            initialCriteriaTitle,
+            criteriaGroupOperator
           },
           i
         );
@@ -9086,7 +9497,7 @@ import { VerticalRhythm as VerticalRhythm8 } from "@uniformdev/design-system";
 
 // src/components/SearchAndFilter/SearchAndFilterResultContainer.tsx
 import { Button as Button6, Callout as Callout7, HorizontalRhythm as HorizontalRhythm9, Paragraph } from "@uniformdev/design-system";
-import { Fragment as Fragment17, jsx as jsx77, jsxs as jsxs47 } from "@emotion/react/jsx-runtime";
+import { Fragment as Fragment18, jsx as jsx90, jsxs as jsxs49 } from "@emotion/react/jsx-runtime";
 var SearchAndFilterResultContainer = ({
   buttonText,
   clearButtonLabel = "clear",
@@ -9116,31 +9527,40 @@ var SearchAndFilterResultContainer = ({
       handleResetFilters();
     }
   };
-  return /* @__PURE__ */ jsxs47(Fragment17, { children: [
-    /* @__PURE__ */ jsxs47(HorizontalRhythm9, { children: [
-      /* @__PURE__ */ jsxs47("span", { children: [
+  return /* @__PURE__ */ jsxs49(Fragment18, { children: [
+    /* @__PURE__ */ jsxs49(HorizontalRhythm9, { children: [
+      /* @__PURE__ */ jsxs49("span", { children: [
         totalResults,
         " results ",
         searchTerm ? `for "${searchTerm}"` : null
       ] }),
-      !searchTerm || hideClearButton ? null : /* @__PURE__ */ jsx77(Button6, { buttonType: "ghostDestructive", size: "zero", onClick: handleClearSearch, children: clearButtonLabel })
+      !searchTerm || hideClearButton ? null : /* @__PURE__ */ jsx90(Button6, { buttonType: "ghostDestructive", size: "zero", onClick: handleClearSearch, children: clearButtonLabel })
     ] }),
-    totalResults === 0 ? /* @__PURE__ */ jsxs47(Callout7, { title: calloutTitle != null ? calloutTitle : automateCalloutTitle(), type: "note", children: [
-      calloutText ? /* @__PURE__ */ jsx77(Paragraph, { children: calloutText }) : null,
-      hideClearButton ? null : /* @__PURE__ */ jsx77(Button6, { buttonType: "tertiaryOutline", size: "xs", onClick: handleClearSearch, children: buttonText != null ? buttonText : "Clear search" })
+    totalResults === 0 ? /* @__PURE__ */ jsxs49(Callout7, { title: calloutTitle != null ? calloutTitle : automateCalloutTitle(), type: "note", children: [
+      calloutText ? /* @__PURE__ */ jsx90(Paragraph, { children: calloutText }) : null,
+      hideClearButton ? null : /* @__PURE__ */ jsx90(
+        Button6,
+        {
+          buttonType: "tertiaryOutline",
+          size: "xs",
+          onClick: handleClearSearch,
+          "data-testid": "clear-search",
+          children: buttonText != null ? buttonText : "Clear search"
+        }
+      )
     ] }) : null
   ] });
 };
 
 // src/components/SearchAndFilter/SearchAndFilter.tsx
-import { jsx as jsx78, jsxs as jsxs48 } from "@emotion/react/jsx-runtime";
+import { jsx as jsx91, jsxs as jsxs50 } from "@emotion/react/jsx-runtime";
 var SearchAndFilter = ({
   filters,
   filterOptions,
   filterVisible,
   filterControls,
   viewSwitchControls,
-  resultsContainerView = /* @__PURE__ */ jsx78(SearchAndFilterResultContainer, {}),
+  resultsContainerView = /* @__PURE__ */ jsx91(SearchAndFilterResultContainer, {}),
   filterMapper: filterMapper2 = filterMapper,
   additionalFiltersContainer,
   onChange,
@@ -9150,7 +9570,7 @@ var SearchAndFilter = ({
   allowBindingSearchTerm = false,
   resetFilterValues = []
 }) => {
-  return /* @__PURE__ */ jsx78(
+  return /* @__PURE__ */ jsx91(
     SearchAndFilterProvider,
     {
       filters,
@@ -9163,18 +9583,18 @@ var SearchAndFilter = ({
       resetFilterValues,
       filterMapper: filterMapper2,
       allowBindingSearchTerm,
-      children: /* @__PURE__ */ jsxs48(VerticalRhythm8, { "data-testid": "search-and-filter", children: [
-        /* @__PURE__ */ jsxs48("div", { css: SearchAndFilterOutterControlWrapper(viewSwitchControls ? "1fr auto" : "1fr"), children: [
-          /* @__PURE__ */ jsx78(
+      children: /* @__PURE__ */ jsxs50(VerticalRhythm8, { "data-testid": "search-and-filter", children: [
+        /* @__PURE__ */ jsxs50("div", { css: SearchAndFilterOutterControlWrapper(viewSwitchControls ? "1fr auto" : "1fr"), children: [
+          /* @__PURE__ */ jsx91(
             "div",
             {
               css: SearchAndFilterControlsWrapper(viewSwitchControls ? "auto 1fr 0.05fr" : "auto 1fr"),
-              children: !filterControls ? /* @__PURE__ */ jsx78(FilterControls, { hideSearchInput: !onSearchChange }) : filterControls
+              children: !filterControls ? /* @__PURE__ */ jsx91(FilterControls, { hideSearchInput: !onSearchChange }) : filterControls
             }
           ),
           viewSwitchControls
         ] }),
-        /* @__PURE__ */ jsx78(FilterItems, { additionalFiltersContainer }),
+        /* @__PURE__ */ jsx91(FilterItems, { additionalFiltersContainer }),
         resultsContainerView
       ] })
     }
@@ -9183,9 +9603,9 @@ var SearchAndFilter = ({
 
 // src/components/SearchAndFilter/SearchOnlyFilter.tsx
 import { InputKeywordSearch as InputKeywordSearch3 } from "@uniformdev/design-system";
-import { createContext as createContext8, useState as useState22 } from "react";
-import { useDebounce as useDebounce7 } from "react-use";
-import { jsx as jsx79 } from "@emotion/react/jsx-runtime";
+import { createContext as createContext8, useState as useState26 } from "react";
+import { useDebounce as useDebounce11 } from "react-use";
+import { jsx as jsx92 } from "@emotion/react/jsx-runtime";
 var SearchOnlyContext = createContext8({
   searchTerm: "",
   setSearchTerm: () => {
@@ -9193,8 +9613,8 @@ var SearchOnlyContext = createContext8({
 });
 var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
   const { searchTerm, setSearchTerm } = useSearchAndFilter();
-  const [localeSearchTerm, setLocaleSearchTerm] = useState22("");
-  useDebounce7(
+  const [localeSearchTerm, setLocaleSearchTerm] = useState26("");
+  useDebounce11(
     () => {
       setSearchTerm(localeSearchTerm);
       onSearchChange == null ? void 0 : onSearchChange(localeSearchTerm);
@@ -9202,14 +9622,14 @@ var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
     300,
     [localeSearchTerm]
   );
-  return /* @__PURE__ */ jsx79(
+  return /* @__PURE__ */ jsx92(
     SearchOnlyContext.Provider,
     {
       value: {
         searchTerm,
         setSearchTerm: setLocaleSearchTerm
       },
-      children: /* @__PURE__ */ jsx79("div", { css: { maxWidth: maxWidth != null ? maxWidth : "712px" }, children: /* @__PURE__ */ jsx79(
+      children: /* @__PURE__ */ jsx92("div", { css: { maxWidth: maxWidth != null ? maxWidth : "712px" }, children: /* @__PURE__ */ jsx92(
         InputKeywordSearch3,
         {
           placeholder: "Search...",
@@ -9224,7 +9644,7 @@ var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
 };
 
 // src/components/SearchAndFilter/SortItems.tsx
-import { InputComboBox as InputComboBox3, InputSelect as InputSelect8, SegmentedControl, VerticalRhythm as VerticalRhythm9 } from "@uniformdev/design-system";
+import { InputComboBox as InputComboBox6, InputSelect as InputSelect8, SegmentedControl, VerticalRhythm as VerticalRhythm9 } from "@uniformdev/design-system";
 
 // src/components/SearchAndFilter/styles/SortItems.styles.ts
 import { css as css39 } from "@emotion/react";
@@ -9304,7 +9724,8 @@ var FilterButton3 = css39`
   gap: var(--spacing-sm);
   padding: var(--spacing-sm) var(--spacing-base);
   max-height: 40px;
-  transition: color var(--duration-fast) var(--timing-ease-out),
+  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);
@@ -9460,7 +9881,7 @@ var InputVariableWrapper = css39`
 `;
 
 // src/components/SearchAndFilter/SortItems.tsx
-import { jsx as jsx80, jsxs as jsxs49 } from "@emotion/react/jsx-runtime";
+import { jsx as jsx93, jsxs as jsxs51 } from "@emotion/react/jsx-runtime";
 var SortItems = ({
   sortByLabel = "Sort by",
   localeLabel = "Show locale",
@@ -9482,11 +9903,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__ */ jsxs49("div", { css: [SortFilterWrapper(hideLocaleOptions)], "data-testid": "sorting-options", children: [
-    /* @__PURE__ */ jsxs49(VerticalRhythm9, { gap: "xs", children: [
-      /* @__PURE__ */ jsx80("span", { css: Title2, children: sortByLabel }),
-      /* @__PURE__ */ jsxs49("div", { css: SortFilterInputRow, children: [
-        /* @__PURE__ */ jsx80(
+  return /* @__PURE__ */ jsxs51("div", { css: [SortFilterWrapper(hideLocaleOptions)], "data-testid": "sorting-options", children: [
+    /* @__PURE__ */ jsxs51(VerticalRhythm9, { gap: "xs", children: [
+      /* @__PURE__ */ jsx93("span", { css: Title2, children: sortByLabel }),
+      /* @__PURE__ */ jsxs51("div", { css: SortFilterInputRow, children: [
+        /* @__PURE__ */ jsx93(
           InputVariables,
           {
             disableInlineMenu: disableSortBinding,
@@ -9494,8 +9915,8 @@ var SortItems = ({
             value: sortField,
             valueToResetTo: "created_at",
             onChange: (e) => onSortChange(`${e}_${sortDirection}`),
-            inputWhenNoVariables: /* @__PURE__ */ jsx80(
-              InputComboBox3,
+            inputWhenNoVariables: /* @__PURE__ */ jsx93(
+              InputComboBox6,
               {
                 id: "sort-by-field",
                 "aria-label": "Sort by",
@@ -9517,7 +9938,7 @@ var SortItems = ({
             )
           }
         ),
-        /* @__PURE__ */ jsx80(
+        /* @__PURE__ */ jsx93(
           InputVariables,
           {
             disableInlineMenu: disableSortBinding,
@@ -9525,7 +9946,7 @@ var SortItems = ({
             valueToResetTo: "DESC",
             showMenuPosition: disableSortBinding ? void 0 : "inline-right",
             onChange: (e) => onSortChange(`${sortField}_${e}`),
-            inputWhenNoVariables: /* @__PURE__ */ jsx80(
+            inputWhenNoVariables: /* @__PURE__ */ jsx93(
               SegmentedControl,
               {
                 noCheckmark: true,
@@ -9557,14 +9978,14 @@ var SortItems = ({
         )
       ] })
     ] }),
-    hideLocaleOptions ? null : /* @__PURE__ */ jsx80(VerticalRhythm9, { gap: "xs", css: InputVariableWrapper, children: /* @__PURE__ */ jsx80(
+    hideLocaleOptions ? null : /* @__PURE__ */ jsx93(VerticalRhythm9, { gap: "xs", css: InputVariableWrapper, children: /* @__PURE__ */ jsx93(
       InputVariables,
       {
         label: localeLabelValue,
         value: localeValue,
         showMenuPosition: "inline-right",
         onChange: (e) => onLocaleChange(e != null ? e : ""),
-        inputWhenNoVariables: /* @__PURE__ */ jsx80(
+        inputWhenNoVariables: /* @__PURE__ */ jsx93(
           InputSelect8,
           {
             name: "localeReturned",
@@ -9592,8 +10013,8 @@ import {
   Callout as Callout8,
   DrawerContent,
   Heading,
-  Input as Input7,
-  InputComboBox as InputComboBox4,
+  Input as Input11,
+  InputComboBox as InputComboBox7,
   InputKeywordSearch as InputKeywordSearch4,
   InputSelect as InputSelect9,
   InputToggle as InputToggle3,
@@ -9634,6 +10055,7 @@ export {
   ControlledObjectSearchProvider,
   ControlledValuePlugin,
   DATE_OPERATORS,
+  DATE_TIME_OPERATORS,
   DISCONNECT_VARIABLE_COMMAND,
   DamSelectedItem,
   DataRefreshButton,
@@ -9661,8 +10083,8 @@ export {
   Heading,
   INSERT_VARIABLE_COMMAND,
   icons_exports as Icons,
-  Input7 as Input,
-  InputComboBox4 as InputComboBox,
+  Input11 as Input,
+  InputComboBox7 as InputComboBox,
   InputKeywordSearch4 as InputKeywordSearch,
   InputSelect9 as InputSelect,
   InputToggle3 as InputToggle,
@@ -9679,6 +10101,7 @@ export {
   NumberEditor,
   NumberRangeEditor,
   OPEN_INSERT_VARIABLE_COMMAND,
+  OPTIONAL_SYSTEM_FIELD_OPERATORS,
   ObjectSearchContainer,
   ObjectSearchContext,
   ObjectSearchFilter,
@@ -9729,7 +10152,6 @@ export {
   RequestUrlInput,
   ResolvableLoadingValue,
   SELECT_OPERATORS,
-  SYSTEM_DATE_OPERATORS,
   SYSTEM_FIELD_OPERATORS,
   ScrollableList2 as ScrollableList,
   ScrollableListItem,
@@ -9747,10 +10169,12 @@ export {
   Switch,
   TEXTBOX_OPERATORS,
   TextEditor,
+  TextMultiChoiceEditor,
   TextVariableRenderer,
   Textarea,
   Theme3 as Theme,
   USER_OPERATORS,
+  VariableChip,
   VariableEditor,
   VariableNode,
   VariablesList,
@@ -9790,7 +10214,7 @@ export {
   entrySearchSelectOption,
   entrySearchWrapper,
   filterMapper,
-  hasReferencedVariables,
+  hasReferencedVariables2 as hasReferencedVariables,
   prettifyBindExpression,
   productSearchRowActiveIcon,
   productSearchRowCategory,
@@ -9825,6 +10249,7 @@ export {
   selectedItemIcon,
   selectedItemInner,
   selectedItemTitle,
+  serializeVariablesEditorSerializedState,
   serializeVariablesEditorState,
   setVariablesEditorValue,
   urlEncodeRequestParameter,