@uniformdev/mesh-sdk-react 19.179.1-alpha.1 → 19.179.2-alpha.25

package/dist/index.js

@@ -33,12 +33,13 @@ var src_exports = {};
 __export(src_exports, {
   $createVariableNode: () => $createVariableNode,
   $isVariableNode: () => $isVariableNode,
-  AddListButton: () => import_design_system64.AddListButton,
-  Button: () => import_design_system64.Button,
+  AddListButton: () => import_design_system65.AddListButton,
+  Button: () => import_design_system65.Button,
   CHECKBOX_OPERATORS: () => CHECKBOX_OPERATORS,
-  Callout: () => import_design_system64.Callout,
+  Callout: () => import_design_system65.Callout,
   ControlledValuePlugin: () => ControlledValuePlugin,
   DATE_OPERATORS: () => DATE_OPERATORS,
+  DATE_TIME_OPERATORS: () => DATE_TIME_OPERATORS,
   DISCONNECT_VARIABLE_COMMAND: () => DISCONNECT_VARIABLE_COMMAND,
   DamSelectedItem: () => DamSelectedItem,
   DataRefreshButton: () => DataRefreshButton,
@@ -51,7 +52,7 @@ __export(src_exports, {
   DateRangeEditor: () => DateRangeEditor,
   DefaultSearchRow: () => DefaultSearchRow,
   DefaultSelectedItem: () => DefaultSelectedItem,
-  DrawerContent: () => import_design_system64.DrawerContent,
+  DrawerContent: () => import_design_system65.DrawerContent,
   EDIT_VARIABLE_COMMAND: () => EDIT_VARIABLE_COMMAND,
   EntrySearch: () => EntrySearch,
   FilterButton: () => FilterButton2,
@@ -62,22 +63,22 @@ __export(src_exports, {
   FilterMenu: () => FilterMenu,
   FilterMultiChoiceEditor: () => FilterMultiChoiceEditor,
   FilterSingleChoiceEditor: () => FilterSingleChoiceEditor,
-  Heading: () => import_design_system64.Heading,
+  Heading: () => import_design_system65.Heading,
   INSERT_VARIABLE_COMMAND: () => INSERT_VARIABLE_COMMAND,
   Icons: () => icons_exports,
-  Input: () => import_design_system64.Input,
-  InputComboBox: () => import_design_system64.InputComboBox,
-  InputKeywordSearch: () => import_design_system64.InputKeywordSearch,
-  InputSelect: () => import_design_system64.InputSelect,
-  InputToggle: () => import_design_system64.InputToggle,
+  Input: () => import_design_system65.Input,
+  InputComboBox: () => import_design_system65.InputComboBox,
+  InputKeywordSearch: () => import_design_system65.InputKeywordSearch,
+  InputSelect: () => import_design_system65.InputSelect,
+  InputToggle: () => import_design_system65.InputToggle,
   InputVariables: () => InputVariables,
-  Label: () => import_design_system64.Label,
+  Label: () => import_design_system65.Label,
   LinkButton: () => LinkButton,
-  LoadingIndicator: () => import_design_system64.LoadingIndicator,
-  LoadingOverlay: () => import_design_system64.LoadingOverlay,
+  LoadingIndicator: () => import_design_system65.LoadingIndicator,
+  LoadingOverlay: () => import_design_system65.LoadingOverlay,
   MULTI_SELECT_OPERATORS: () => MULTI_SELECT_OPERATORS,
-  Menu: () => import_design_system64.Menu,
-  MenuItem: () => import_design_system64.MenuItem,
+  Menu: () => import_design_system65.Menu,
+  MenuItem: () => import_design_system65.MenuItem,
   MeshApp: () => MeshApp,
   NUMBER_OPERATORS: () => NUMBER_OPERATORS,
   NumberEditor: () => NumberEditor,
@@ -96,22 +97,22 @@ __export(src_exports, {
   PUBLISH_STATUS_FIELD_OPERATORS: () => PUBLISH_STATUS_FIELD_OPERATORS,
   ParamTypeDynamicDataProvider: () => ParamTypeDynamicDataProvider,
   ParameterConnectionIndicator: () => ParameterConnectionIndicator,
-  ParameterGroup: () => import_design_system64.ParameterGroup,
-  ParameterImage: () => import_design_system64.ParameterImage,
-  ParameterImageInner: () => import_design_system64.ParameterImageInner,
-  ParameterInput: () => import_design_system64.ParameterInput,
-  ParameterInputInner: () => import_design_system64.ParameterInputInner,
-  ParameterLabel: () => import_design_system64.ParameterLabel,
-  ParameterMenuButton: () => import_design_system64.ParameterMenuButton,
+  ParameterGroup: () => import_design_system65.ParameterGroup,
+  ParameterImage: () => import_design_system65.ParameterImage,
+  ParameterImageInner: () => import_design_system65.ParameterImageInner,
+  ParameterInput: () => import_design_system65.ParameterInput,
+  ParameterInputInner: () => import_design_system65.ParameterInputInner,
+  ParameterLabel: () => import_design_system65.ParameterLabel,
+  ParameterMenuButton: () => import_design_system65.ParameterMenuButton,
   ParameterOrSingleVariable: () => ParameterOrSingleVariable,
-  ParameterSelect: () => import_design_system64.ParameterSelect,
-  ParameterSelectInner: () => import_design_system64.ParameterSelectInner,
-  ParameterShell: () => import_design_system64.ParameterShell,
+  ParameterSelect: () => import_design_system65.ParameterSelect,
+  ParameterSelectInner: () => import_design_system65.ParameterSelectInner,
+  ParameterShell: () => import_design_system65.ParameterShell,
   ParameterShellContext: () => import_design_system14.ParameterShellContext,
-  ParameterTextarea: () => import_design_system64.ParameterTextarea,
-  ParameterTextareaInner: () => import_design_system64.ParameterTextareaInner,
-  ParameterToggle: () => import_design_system64.ParameterToggle,
-  ParameterToggleInner: () => import_design_system64.ParameterToggleInner,
+  ParameterTextarea: () => import_design_system65.ParameterTextarea,
+  ParameterTextareaInner: () => import_design_system65.ParameterTextareaInner,
+  ParameterToggle: () => import_design_system65.ParameterToggle,
+  ParameterToggleInner: () => import_design_system65.ParameterToggleInner,
   ParameterVariables: () => ParameterVariables,
   ProductPreviewList: () => ProductPreviewList,
   ProductQuery: () => ProductQuery,
@@ -132,10 +133,9 @@ __export(src_exports, {
   RequestUrlInput: () => RequestUrlInput,
   ResolvableLoadingValue: () => ResolvableLoadingValue,
   SELECT_OPERATORS: () => SELECT_OPERATORS,
-  SYSTEM_DATE_OPERATORS: () => SYSTEM_DATE_OPERATORS,
   SYSTEM_FIELD_OPERATORS: () => SYSTEM_FIELD_OPERATORS,
-  ScrollableList: () => import_design_system64.ScrollableList,
-  ScrollableListItem: () => import_design_system64.ScrollableListItem,
+  ScrollableList: () => import_design_system65.ScrollableList,
+  ScrollableListItem: () => import_design_system65.ScrollableListItem,
   SearchAndFilter: () => SearchAndFilter,
   SearchAndFilterContext: () => SearchAndFilterContext,
   SearchAndFilterOptionsContainer: () => SearchAndFilterOptionsContainer2,
@@ -147,13 +147,13 @@ __export(src_exports, {
   SortItems: () => SortItems,
   StatusMultiEditor: () => StatusMultiEditor,
   StatusSingleEditor: () => StatusSingleEditor,
-  Switch: () => import_design_system64.Switch,
+  Switch: () => import_design_system65.Switch,
   TEXTBOX_OPERATORS: () => TEXTBOX_OPERATORS,
   TextEditor: () => TextEditor,
   TextMultiChoiceEditor: () => TextMultiChoiceEditor,
   TextVariableRenderer: () => TextVariableRenderer,
-  Textarea: () => import_design_system64.Textarea,
-  Theme: () => import_design_system64.Theme,
+  Textarea: () => import_design_system65.Textarea,
+  Theme: () => import_design_system65.Theme,
   USER_OPERATORS: () => USER_OPERATORS,
   VariableChip: () => VariableChip,
   VariableEditor: () => VariableEditor,
@@ -194,7 +194,7 @@ __export(src_exports, {
   entrySearchSelectOption: () => entrySearchSelectOption,
   entrySearchWrapper: () => entrySearchWrapper,
   filterMapper: () => filterMapper,
-  hasReferencedVariables: () => hasReferencedVariables,
+  hasReferencedVariables: () => hasReferencedVariables2,
   prettifyBindExpression: () => prettifyBindExpression,
   productSearchRowActiveIcon: () => productSearchRowActiveIcon,
   productSearchRowCategory: () => productSearchRowCategory,
@@ -229,6 +229,7 @@ __export(src_exports, {
   selectedItemIcon: () => selectedItemIcon,
   selectedItemInner: () => selectedItemInner,
   selectedItemTitle: () => selectedItemTitle,
+  serializeVariablesEditorSerializedState: () => serializeVariablesEditorSerializedState,
   serializeVariablesEditorState: () => serializeVariablesEditorState,
   setVariablesEditorValue: () => setVariablesEditorValue,
   urlEncodeRequestParameter: () => urlEncodeRequestParameter,
@@ -249,7 +250,7 @@ __export(src_exports, {
   useVariableEditor: () => useVariableEditor,
   useVariables: () => useVariables,
   useVariablesMenu: () => useVariablesMenu,
-  utilityColors: () => import_design_system64.utilityColors,
+  utilityColors: () => import_design_system65.utilityColors,
   variableDefaultTextValue: () => variableDefaultTextValue,
   variablePrefix: () => variablePrefix,
   variableSuffix: () => variableSuffix,
@@ -1220,7 +1221,8 @@ var searchRowContainer = import_react8.css`
   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 = import_react8.css`
@@ -2200,7 +2202,8 @@ var productSearchRowContainer = import_react18.css`
   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 = import_react18.css`
@@ -3036,18 +3039,52 @@ var import_design_system14 = require("@uniformdev/design-system");
 
 // src/components/Variables/composer/ControlledValuePlugin.tsx
 var import_LexicalComposerContext = require("@lexical/react/LexicalComposerContext");
-var import_lite = require("dequal/lite");
 var import_react31 = require("react");
 
-// src/components/Variables/util/deserializeVariablesEditorState.ts
+// src/components/Variables/util/serializeVariablesEditorState.ts
 var import_canvas2 = require("@uniformdev/canvas");
 var import_lexical = require("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 === import_lexical.TextNode.getType()) {
+    buffer.push(node.text.replace(variablePrefix, "\\${"));
+  }
+  if (node.type === VariableNode.getType()) {
+    buffer.push((0, import_canvas2.createVariableReference)(node.reference));
+  }
+  if (node.type === import_lexical.LineBreakNode.getType()) {
+    buffer.push("\n");
+  }
+  if ("children" in node && node.children) {
+    for (const child of node.children) {
+      serializeRecursive(child, buffer);
+    }
+  }
+}
+
+// src/components/Variables/util/deserializeVariablesEditorState.ts
+var import_canvas3 = require("@uniformdev/canvas");
+var import_lexical2 = require("lexical");
 function deserializeVariablesEditorState(serialized) {
   const result = [];
-  (0, import_canvas2.parseVariableExpression)(serialized != null ? serialized : "", (token, type) => {
+  (0, import_canvas3.parseVariableExpression)(serialized != null ? serialized : "", (token, type) => {
     if (type === "text") {
       const node = {
-        type: import_lexical.TextNode.getType(),
+        type: import_lexical2.TextNode.getType(),
         text: token,
         mode: "normal",
         version: 1,
@@ -3089,11 +3126,11 @@ function deserializeVariablesEditorState(serialized) {
 }
 
 // src/components/Variables/util/refreshVariableNodeMetadata.ts
-var import_lexical2 = require("lexical");
+var import_lexical3 = require("lexical");
 function refreshVariableNodeMetadata(editor) {
   setTimeout(() => {
     editor.update(() => {
-      (0, import_lexical2.$nodesOfType)(VariableNode).forEach((variableNode) => {
+      (0, import_lexical3.$nodesOfType)(VariableNode).forEach((variableNode) => {
         variableNode.markDirty();
       });
     });
@@ -3131,7 +3168,8 @@ function setVariablesEditorValue(editor, newValue) {
               indent: 0,
               direction: null,
               children: [],
-              textFormat: 0
+              textFormat: 0,
+              textStyle: ""
             }
           ]
         }
@@ -3149,17 +3187,18 @@ function ControlledValuePlugin({
   extraDependencies
 }) {
   const [editor] = (0, import_LexicalComposerContext.useLexicalComposerContext)();
-  const lastValueRef = (0, import_react31.useRef)(value);
   (0, import_react31.useEffect)(() => {
+    var _a, _b;
     if (!enabled) {
       return;
     }
-    if ((0, import_lite.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);
       }
     });
@@ -3248,9 +3287,9 @@ var import_LexicalComposerContext3 = require("@lexical/react/LexicalComposerCont
 var import_useLexicalNodeSelection = require("@lexical/react/useLexicalNodeSelection");
 var import_selection = require("@lexical/selection");
 var import_utils2 = require("@lexical/utils");
-var import_canvas4 = require("@uniformdev/canvas");
+var import_canvas5 = require("@uniformdev/canvas");
 var import_design_system18 = require("@uniformdev/design-system");
-var import_lexical4 = require("lexical");
+var import_lexical5 = require("lexical");
 var import_react40 = require("react");
 
 // src/components/Variables/util/prettifyBindExpression.tsx
@@ -3265,10 +3304,10 @@ var import_LexicalComposerContext2 = require("@lexical/react/LexicalComposerCont
 var import_LexicalTypeaheadMenuPlugin = require("@lexical/react/LexicalTypeaheadMenuPlugin");
 var import_utils = require("@lexical/utils");
 var import_AiFillPlusCircle = require("@react-icons/all-files/ai/AiFillPlusCircle");
-var import_canvas3 = require("@uniformdev/canvas");
+var import_canvas4 = require("@uniformdev/canvas");
 var import_design_system17 = require("@uniformdev/design-system");
-var import_lite2 = require("dequal/lite");
-var import_lexical3 = require("lexical");
+var import_lite = require("dequal/lite");
+var import_lexical4 = require("lexical");
 var import_react39 = require("react");
 var import_react_dom = require("react-dom");
 
@@ -3723,12 +3762,12 @@ function variablesToGroupedList(variables, filterFn, context) {
 
 // src/components/Variables/composer/VariablesPlugin.tsx
 var import_jsx_runtime33 = require("@emotion/react/jsx-runtime");
-var OPEN_INSERT_VARIABLE_COMMAND = (0, import_lexical3.createCommand)("uniform:open-insert-variable");
-var EDIT_VARIABLE_COMMAND = (0, import_lexical3.createCommand)("uniform:edit-variable");
-var DISCONNECT_VARIABLE_COMMAND = (0, import_lexical3.createCommand)(
+var OPEN_INSERT_VARIABLE_COMMAND = (0, import_lexical4.createCommand)("uniform:open-insert-variable");
+var EDIT_VARIABLE_COMMAND = (0, import_lexical4.createCommand)("uniform:edit-variable");
+var DISCONNECT_VARIABLE_COMMAND = (0, import_lexical4.createCommand)(
   "uniform:disconnect-variable"
 );
-var INSERT_VARIABLE_COMMAND = (0, import_lexical3.createCommand)("uniform:insert-variable");
+var INSERT_VARIABLE_COMMAND = (0, import_lexical4.createCommand)("uniform:insert-variable");
 var TRIGGER = "\\$\\$";
 var LENGTH_LIMIT = 20;
 var DollarSignVariablesRegex = new RegExp(`(^.*)(${TRIGGER}(.{0,${LENGTH_LIMIT}}))$`);
@@ -3798,7 +3837,7 @@ function useVariablesMenu({
           var _a;
           const targetVariable = variables[value];
           if (overwriteExistingValue) {
-            setVariablesEditorValue(editor, (0, import_canvas3.createVariableReference)(value));
+            setVariablesEditorValue(editor, (0, import_canvas4.createVariableReference)(value));
             return true;
           }
           const variableNode = $createVariableNode(value, {
@@ -3812,7 +3851,7 @@ function useVariablesMenu({
           if (nodeToReplace) {
             nodeToReplace.replace(variableNode);
           } else {
-            (0, import_lexical3.$insertNodes)([variableNode]);
+            (0, import_lexical4.$insertNodes)([variableNode]);
           }
         });
       }
@@ -3895,11 +3934,11 @@ function VariablesPlugin({
                   return;
                 }
                 editor.update(() => {
-                  const selection = (0, import_lexical3.$getSelection)();
-                  if ((0, import_lexical3.$isNodeSelection)(selection)) {
+                  const selection = (0, import_lexical4.$getSelection)();
+                  if ((0, import_lexical4.$isNodeSelection)(selection)) {
                     const selectedNodes = selection.getNodes();
                     if (selectedNodes.every((node) => $isVariableNode(node))) {
-                      (0, import_lexical3.$setSelection)(null);
+                      (0, import_lexical4.$setSelection)(null);
                     }
                   }
                 });
@@ -3915,7 +3954,7 @@ function VariablesPlugin({
           }
           return true;
         },
-        import_lexical3.COMMAND_PRIORITY_NORMAL
+        import_lexical4.COMMAND_PRIORITY_NORMAL
       ),
       // disconnects a variable node from its variable value and leaves the variable's default value
       // as a string literal in its place. Note that single-valued binding UIs override this so that it
@@ -3925,17 +3964,17 @@ function VariablesPlugin({
         ({ sourceKey }) => {
           editor.update(() => {
             var _a;
-            const currentNode = (0, import_lexical3.$getNodeByKey)(sourceKey);
+            const currentNode = (0, import_lexical4.$getNodeByKey)(sourceKey);
             if (!$isVariableNode(currentNode)) {
               throw new Error("Cannot disconnect a non-variable node");
             }
             const currentVariableDefinition = variablesRef.current.variables[currentNode.reference];
-            const variableTextNode = (0, import_lexical3.$createTextNode)(
+            const variableTextNode = (0, import_lexical4.$createTextNode)(
               variableDefaultTextValue(
                 (_a = currentVariableDefinition == null ? void 0 : currentVariableDefinition.default) != null ? _a : currentNode.getState().displayName
               )
             );
-            const variableNode = (0, import_lexical3.$getNodeByKey)(sourceKey);
+            const variableNode = (0, import_lexical4.$getNodeByKey)(sourceKey);
             if (!variableNode) {
               console.error("Disconnected from unknown node.");
               return true;
@@ -3945,7 +3984,7 @@ function VariablesPlugin({
           });
           return true;
         },
-        import_lexical3.COMMAND_PRIORITY_NORMAL
+        import_lexical4.COMMAND_PRIORITY_NORMAL
       ),
       editor.registerCommand(
         OPEN_INSERT_VARIABLE_COMMAND,
@@ -3965,7 +4004,7 @@ function VariablesPlugin({
           }
           return true;
         },
-        import_lexical3.COMMAND_PRIORITY_NORMAL
+        import_lexical4.COMMAND_PRIORITY_NORMAL
       ),
       // register the insert variable command, used to handle inserting
       // a variable reference from non-autocomplete menus at the current selection,
@@ -3976,27 +4015,33 @@ function VariablesPlugin({
           var _a, _b;
           if (!disableVariables) {
             const targetVariable = variablesRef.current.variables[reference];
-            if (overwriteExistingValue) {
-              setVariablesEditorValue(editor, (0, import_canvas3.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 = (0, import_lexical4.$createParagraphNode)();
+              pNode.append(variableNode);
+              editor.update(() => {
+                const root = (0, import_lexical4.$getRoot)();
+                root.clear();
+                root.append(pNode);
+              });
+              return true;
+            }
             if (targetKey) {
-              (_b = (0, import_lexical3.$getNodeByKey)(targetKey)) == null ? void 0 : _b.replace(variableNode);
+              (_b = (0, import_lexical4.$getNodeByKey)(targetKey)) == null ? void 0 : _b.replace(variableNode);
             } else {
-              (0, import_lexical3.$insertNodes)([variableNode]);
+              (0, import_lexical4.$insertNodes)([variableNode]);
             }
           }
           return true;
         },
-        import_lexical3.COMMAND_PRIORITY_NORMAL
+        import_lexical4.COMMAND_PRIORITY_NORMAL
       )
     );
   }, [
@@ -4023,14 +4068,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 (!(0, import_lite2.dequal)(currentState, newState)) {
+      if (!(0, import_lite.dequal)(currentState, newState)) {
         variableNode.setState(newState);
       }
     },
@@ -4038,7 +4083,7 @@ function VariablesPlugin({
   );
   (0, import_react39.useEffect)(() => {
     editor.update(() => {
-      (0, import_lexical3.$nodesOfType)(VariableNode).forEach((variableNode) => {
+      (0, import_lexical4.$nodesOfType)(VariableNode).forEach((variableNode) => {
         updateExistingNodeIfChanged(variableNode);
       });
     });
@@ -4128,7 +4173,7 @@ function VariablesPlugin({
 
 // src/components/Variables/composer/VariableNode.tsx
 var import_jsx_runtime34 = require("@emotion/react/jsx-runtime");
-var VariableNode = class _VariableNode extends import_lexical4.DecoratorNode {
+var VariableNode = class _VariableNode extends import_lexical5.DecoratorNode {
   constructor(reference, state, key) {
     super(key);
     this.reference = reference;
@@ -4177,7 +4222,7 @@ var VariableNode = class _VariableNode extends import_lexical4.DecoratorNode {
    * (albeit it won't get the fancy chip-node)
    */
   getTextContent() {
-    return (0, import_canvas4.createVariableReference)(this.reference);
+    return (0, import_canvas5.createVariableReference)(this.reference);
   }
   /** Creates the DOM wrapper that hosts the node */
   createDOM() {
@@ -4211,9 +4256,9 @@ function VariableNodeComponent({
   const readOnly = !editor.isEditable();
   const onDelete = (0, import_react40.useCallback)(
     (event) => {
-      if (isSelected && (0, import_lexical4.$isNodeSelection)((0, import_lexical4.$getSelection)())) {
+      if (isSelected && (0, import_lexical5.$isNodeSelection)((0, import_lexical5.$getSelection)())) {
         event.preventDefault();
-        const node = (0, import_lexical4.$getNodeByKey)(nodeKey);
+        const node = (0, import_lexical5.$getNodeByKey)(nodeKey);
         if ($isVariableNode(node)) {
           node.remove();
         }
@@ -4224,18 +4269,18 @@ function VariableNodeComponent({
   );
   (0, import_react40.useEffect)(() => {
     return (0, import_utils2.mergeRegister)(
-      editor.registerCommand(import_lexical4.KEY_DELETE_COMMAND, onDelete, import_lexical4.COMMAND_PRIORITY_LOW),
-      editor.registerCommand(import_lexical4.KEY_BACKSPACE_COMMAND, onDelete, import_lexical4.COMMAND_PRIORITY_LOW),
+      editor.registerCommand(import_lexical5.KEY_DELETE_COMMAND, onDelete, import_lexical5.COMMAND_PRIORITY_LOW),
+      editor.registerCommand(import_lexical5.KEY_BACKSPACE_COMMAND, onDelete, import_lexical5.COMMAND_PRIORITY_LOW),
       // HACK: see https://github.com/facebook/lexical/issues/4214
       // Copied from https://github.com/facebook/lexical/blob/d4b192289d3714b34614b411d40e513d1f86f413/packages/lexical-rich-text/src/index.ts#L775
       // Fixes selection moving into and out of this node with arrow keys and plain text plugin.
       // If the above bug is fixed this may be removable. It's been tested when this is used within the RTE,
       // and seems to work ok there. It should also unregister itself when not in the context of the node. I think?
       editor.registerCommand(
-        import_lexical4.KEY_ARROW_LEFT_COMMAND,
+        import_lexical5.KEY_ARROW_LEFT_COMMAND,
         (event) => {
-          const selection = (0, import_lexical4.$getSelection)();
-          if ((0, import_lexical4.$isNodeSelection)(selection)) {
+          const selection = (0, import_lexical5.$getSelection)();
+          if ((0, import_lexical5.$isNodeSelection)(selection)) {
             const nodes = selection.getNodes();
             if (nodes.length > 0) {
               event.preventDefault();
@@ -4243,7 +4288,7 @@ function VariableNodeComponent({
               return true;
             }
           }
-          if (!(0, import_lexical4.$isRangeSelection)(selection)) {
+          if (!(0, import_lexical5.$isRangeSelection)(selection)) {
             return false;
           }
           if ((0, import_selection.$shouldOverrideDefaultCharacterSelection)(selection, true)) {
@@ -4254,15 +4299,15 @@ function VariableNodeComponent({
           }
           return false;
         },
-        import_lexical4.COMMAND_PRIORITY_EDITOR
+        import_lexical5.COMMAND_PRIORITY_EDITOR
       ),
       // HACK: as above
       // Source: https://github.com/facebook/lexical/blob/d4b192289d3714b34614b411d40e513d1f86f413/packages/lexical-rich-text/src/index.ts#L802C5-L831C7
       editor.registerCommand(
-        import_lexical4.KEY_ARROW_RIGHT_COMMAND,
+        import_lexical5.KEY_ARROW_RIGHT_COMMAND,
         (event) => {
-          const selection = (0, import_lexical4.$getSelection)();
-          if ((0, import_lexical4.$isNodeSelection)(selection) && !$isTargetWithinDecorator(event.target)) {
+          const selection = (0, import_lexical5.$getSelection)();
+          if ((0, import_lexical5.$isNodeSelection)(selection) && !$isTargetWithinDecorator(event.target)) {
             const nodes = selection.getNodes();
             if (nodes.length > 0) {
               event.preventDefault();
@@ -4270,7 +4315,7 @@ function VariableNodeComponent({
               return true;
             }
           }
-          if (!(0, import_lexical4.$isRangeSelection)(selection)) {
+          if (!(0, import_lexical5.$isRangeSelection)(selection)) {
             return false;
           }
           const isHoldingShift = event.shiftKey;
@@ -4281,7 +4326,7 @@ function VariableNodeComponent({
           }
           return false;
         },
-        import_lexical4.COMMAND_PRIORITY_EDITOR
+        import_lexical5.COMMAND_PRIORITY_EDITOR
       )
     );
   }, [clearSelection, editor, isSelected, nodeKey, onDelete, setSelected]);
@@ -4305,8 +4350,8 @@ function VariableNodeComponent({
   );
 }
 function $isTargetWithinDecorator(target) {
-  const node = (0, import_lexical4.$getNearestNodeFromDOMNode)(target);
-  return (0, import_lexical4.$isDecoratorNode)(node);
+  const node = (0, import_lexical5.$getNearestNodeFromDOMNode)(target);
+  return (0, import_lexical5.$isDecoratorNode)(node);
 }
 
 // src/components/Variables/InputVariables.tsx
@@ -4332,19 +4377,19 @@ function EditorRefPlugin({
 // src/components/Variables/composer/PasteTransformerPlugin.tsx
 var import_LexicalComposerContext5 = require("@lexical/react/LexicalComposerContext");
 var import_utils3 = require("@lexical/utils");
-var import_lexical5 = require("lexical");
+var import_lexical6 = require("lexical");
 var import_react41 = require("react");
 function PasteTransformerPlugin({ transformPaste }) {
   const [editor] = (0, import_LexicalComposerContext5.useLexicalComposerContext)();
   (0, import_react41.useEffect)(() => {
     return (0, import_utils3.mergeRegister)(
       editor.registerCommand(
-        import_lexical5.PASTE_COMMAND,
+        import_lexical6.PASTE_COMMAND,
         (event) => {
           var _a;
-          const selection = (0, import_lexical5.$getSelection)();
+          const selection = (0, import_lexical6.$getSelection)();
           const pastedText = (_a = event.clipboardData) == null ? void 0 : _a.getData("text/plain");
-          if (pastedText && transformPaste && (0, import_lexical5.$isRangeSelection)(selection)) {
+          if (pastedText && transformPaste && (0, import_lexical6.$isRangeSelection)(selection)) {
             const result = transformPaste(pastedText);
             if (result !== void 0) {
               selection.insertText(result);
@@ -4353,7 +4398,7 @@ function PasteTransformerPlugin({ transformPaste }) {
           }
           return false;
         },
-        import_lexical5.COMMAND_PRIORITY_HIGH
+        import_lexical6.COMMAND_PRIORITY_HIGH
       )
     );
   }, [editor, transformPaste]);
@@ -4382,9 +4427,11 @@ var input = import_react42.css`
   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);
@@ -4448,7 +4495,8 @@ var variableBindButton = import_react43.css`
   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;
 
@@ -4531,23 +4579,9 @@ var inputMultiLine = (lines) => import_react43.css`
 `;
 
 // src/components/Variables/toolbox/InputVariablesProvider.tsx
+var import_canvas6 = require("@uniformdev/canvas");
 var React10 = __toESM(require("react"));
 var import_react44 = require("react");
-
-// src/components/Variables/util/hasReferencedVariables.ts
-var import_canvas5 = require("@uniformdev/canvas");
-function hasReferencedVariables(value) {
-  let result = false;
-  (0, import_canvas5.parseVariableExpression)(value, (token, type) => {
-    if (type === "variable") {
-      result = true;
-      return false;
-    }
-  });
-  return result;
-}
-
-// src/components/Variables/toolbox/InputVariablesProvider.tsx
 function useInputVariablesState({
   value,
   onChange,
@@ -4562,20 +4596,20 @@ function useInputVariablesState({
   renderMenuInPortal
 }) {
   const { variables } = useVariables(true);
-  const hasVariablesInValue = hasReferencedVariables(value != null ? value : "");
+  const variableReferenceCountInValue = (0, import_canvas6.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 = (0, import_react44.useMemo)(
@@ -4604,7 +4638,7 @@ function useInputVariablesState({
   return {
     sharedMenuProps,
     disableVariablesForReals,
-    hasVariablesInValue,
+    hasVariablesInValue: variableReferenceCountInValue > 0,
     hadVariablesInValue: hadVariablesInValueForReals,
     setHadVariablesInValue
   };
@@ -4627,7 +4661,8 @@ var variableBindButton2 = import_react45.css`
   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;
 
@@ -4645,7 +4680,7 @@ var variableBindButton2 = import_react45.css`
 
 // src/components/Variables/toolbox/VariablesComposerVariableMenu.tsx
 var import_LexicalComposerContext6 = require("@lexical/react/LexicalComposerContext");
-var import_lexical6 = require("lexical");
+var import_lexical7 = require("lexical");
 
 // src/components/Variables/toolbox/SelectVariableMenu.tsx
 var import_BsFillPlusCircleFill = require("@react-icons/all-files/bs/BsFillPlusCircleFill");
@@ -4753,7 +4788,7 @@ function VariablesComposerVariableMenu(props) {
   };
   const onResetVariable = () => {
     var _a;
-    editor.dispatchCommand(import_lexical6.CLEAR_EDITOR_COMMAND, void 0);
+    editor.dispatchCommand(import_lexical7.CLEAR_EDITOR_COMMAND, void 0);
     (_a = props.onResetVariables) == null ? void 0 : _a.call(props);
   };
   return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
@@ -4815,50 +4850,18 @@ function DisablePlugin({ disabled }) {
 
 // src/components/Variables/composer/SingleLineTextPlugin.tsx
 var import_LexicalComposerContext8 = require("@lexical/react/LexicalComposerContext");
-var import_lexical7 = require("lexical");
+var import_lexical8 = require("lexical");
 var import_react48 = require("react");
 function SingleLineTextPlugin() {
   const [editor] = (0, import_LexicalComposerContext8.useLexicalComposerContext)();
   (0, import_react48.useEffect)(() => {
-    editor.registerNodeTransform(import_lexical7.LineBreakNode, (node) => {
+    editor.registerNodeTransform(import_lexical8.LineBreakNode, (node) => {
       node.remove();
     });
   }, [editor]);
   return null;
 }
 
-// src/components/Variables/util/serializeVariablesEditorState.ts
-var import_canvas6 = require("@uniformdev/canvas");
-var import_lexical8 = require("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 === import_lexical8.TextNode.getType()) {
-    buffer.push(node.text.replace(variablePrefix, "\\${"));
-  }
-  if (node.type === VariableNode.getType()) {
-    buffer.push((0, import_canvas6.createVariableReference)(node.reference));
-  }
-  if (node.type === import_lexical8.LineBreakNode.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
 var import_jsx_runtime38 = require("@emotion/react/jsx-runtime");
 function VariablesComposer(props) {
@@ -5053,7 +5056,8 @@ function InputVariables(props) {
     filterVariable,
     styleVariant = "default",
     renderMenuInPortal,
-    disableDismissEditorOnChange
+    disableDismissEditorOnChange,
+    singleTokenMode
   } = props;
   const [finalId] = (0, import_react52.useState)(id != null ? id : () => (0, import_uuid2.v4)());
   const { dispatch, canDispatch, isEditing } = useVariables(true);
@@ -5118,7 +5122,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
                 }
               )
             ]
@@ -5158,13 +5162,13 @@ function InputVariables(props) {
       showAddVariableMenuOption,
       enableEditingVariables: !disabled && !disableVariablesForReals && enableEditingVariables,
       getEditorContext,
-      disabled,
+      disabled: disabled || singleTokenMode,
       replaceValueOnVariableInsert: useInputWithNoVariables,
       autoFocus,
       filterVariable,
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(PasteTransformerPlugin, { transformPaste }),
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(ControlledValuePlugin, { value, enabled: useInputWithNoVariables }),
+        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(ControlledValuePlugin, { value, enabled: singleTokenMode || useInputWithNoVariables }),
         editorRef ? /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(EditorRefPlugin, { editorRef }) : null,
         body
       ]
@@ -5460,6 +5464,12 @@ ${prettifyBindExpression(bindExpression)}`
   };
 }
 
+// src/components/Variables/util/hasReferencedVariables.ts
+var import_canvas8 = require("@uniformdev/canvas");
+function hasReferencedVariables2(value) {
+  return (0, import_canvas8.hasReferencedVariables)(value) > 0;
+}
+
 // src/components/Variables/VariablesList.tsx
 var import_react58 = require("@emotion/react");
 var import_design_system25 = require("@uniformdev/design-system");
@@ -6488,11 +6498,11 @@ var DataRefreshButton = ({
 
 // src/components/ObjectSearch/ObjectSearchContainer.tsx
 var import_react68 = require("@emotion/react");
-var import_canvas9 = require("@uniformdev/canvas");
+var import_canvas10 = require("@uniformdev/canvas");
 var import_design_system35 = require("@uniformdev/design-system");
 
 // src/components/ObjectSearch/hooks/ObjectSearchContext.tsx
-var import_canvas8 = require("@uniformdev/canvas");
+var import_canvas9 = require("@uniformdev/canvas");
 var import_react66 = require("react");
 var import_jsx_runtime59 = require("@emotion/react/jsx-runtime");
 var ObjectSearchContext = (0, import_react66.createContext)({
@@ -6591,7 +6601,7 @@ function useObjectSearchContext() {
   return (0, import_react66.useContext)(ObjectSearchContext);
 }
 function bindQuery(query, inputs) {
-  const { result, errors } = (0, import_canvas8.bindVariablesToObject)({
+  const { result, errors } = (0, import_canvas9.bindVariablesToObject)({
     value: query,
     variables: inputs,
     errorPrefix: "Dynamic input"
@@ -6780,7 +6790,7 @@ var ObjectSearchContainer = ({
       onSelectItem([]);
       return;
     }
-    const { result, errors } = (0, import_canvas9.bindVariables)({
+    const { result, errors } = (0, import_canvas10.bindVariables)({
       value: selectedValue,
       variables: flatVariables,
       errorPrefix: "Dynamic input"
@@ -6947,7 +6957,8 @@ var ButtonStyles = import_react71.css`
   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 {
@@ -7463,371 +7474,445 @@ 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 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"
+    editorType: "multiChoice",
+    expectedValueType: "array"
   },
   {
     label: "is not",
     value: "neq",
-    editorType: "singleChoice"
+    editorType: "singleChoice",
+    expectedValueType: "single"
   },
   {
     label: "is none of...",
     value: "nin",
-    editorType: "multiChoice"
+    editorType: "multiChoice",
+    expectedValueType: "array"
   }
 ];
 var OPTIONAL_SYSTEM_FIELD_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"
   }
 ];
 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"
   }
 ];
 
@@ -8459,7 +8544,7 @@ var ConditionalInputRow = import_react86.css`
   ${(0, import_design_system53.cq)("764px")} {
     align-items: flex-start;
     display: grid;
-    grid-template-columns: 200px 160px 1fr 32px;
+    grid-template-columns: 250px 160px 1fr 32px;
 
     & > div:nth-child(n) {
       width: auto;
@@ -8508,7 +8593,8 @@ var FilterButton = import_react86.css`
   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);
@@ -8603,6 +8689,9 @@ var ResetConditionsBtn = import_react86.css`
   &:focus {
     color: var(--action-destructive-hover);
   }
+  &:disabled {
+    color: var(--gray-400);
+  }
 `;
 var IconBtn = import_react86.css`
   align-self: center;
@@ -8666,6 +8755,7 @@ var FilterButton2 = ({
 
 // src/components/SearchAndFilter/FilterControls.tsx
 var import_CgClose5 = require("@react-icons/all-files/cg/CgClose");
+var import_canvas11 = require("@uniformdev/canvas");
 var import_design_system56 = require("@uniformdev/design-system");
 var import_lexical11 = require("lexical");
 var import_react88 = require("react");
@@ -8699,7 +8789,7 @@ var filterMapper = {
   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__ */ (0, import_jsx_runtime82.jsx)(WrappedComponent, { ...props });
@@ -8712,7 +8802,7 @@ function withInputVariables(WrappedComponent) {
         onChange: (newValue) => props.onChange(newValue != null ? newValue : ""),
         value: props.value,
         disabled: props.disabled,
-        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(WrappedComponent, { ...props })
+        inputWhenNoVariables: noSwapping ? void 0 : /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(WrappedComponent, { ...props })
       }
     );
   };
@@ -8742,7 +8832,7 @@ var bindableFiltersMapper = {
   multiChoice: withInputVariablesForMultiValue(FilterMultiChoiceEditor),
   singleChoice: withInputVariables(FilterSingleChoiceEditor),
   date: withInputVariables(DateEditor),
-  text: withInputVariables(TextEditor),
+  text: withInputVariables(TextEditor, true),
   number: withInputVariables(NumberEditor)
 };
 
@@ -8774,6 +8864,7 @@ var SearchAndFilterProvider = ({
   filters,
   filterOptions,
   filterVisible = false,
+  alwaysVisible = false,
   defaultSearchTerm = "",
   onSearchChange,
   onChange,
@@ -8785,7 +8876,7 @@ var SearchAndFilterProvider = ({
 }) => {
   const [searchTerm, setSearchTerm] = (0, import_react87.useState)(defaultSearchTerm);
   const deferredSearchTerm = (0, import_react87.useDeferredValue)(searchTerm);
-  const [filterVisibility, setFilterVisibility] = (0, import_react87.useState)(filterVisible);
+  const [filterVisibility, setFilterVisibility] = (0, import_react87.useState)(alwaysVisible || filterVisible);
   const handleSearchTerm = (0, import_react87.useCallback)(
     (term) => {
       setSearchTerm(term);
@@ -8794,8 +8885,13 @@ var SearchAndFilterProvider = ({
     [setSearchTerm, onSearchChange]
   );
   const handleToggleFilterVisibility = (0, import_react87.useCallback)(
-    (visible) => setFilterVisibility(visible),
-    [setFilterVisibility]
+    (visible) => {
+      if (alwaysVisible) {
+        return;
+      }
+      setFilterVisibility(visible);
+    },
+    [alwaysVisible]
   );
   const handleAddFilter = (0, import_react87.useCallback)(() => {
     onChange([...filters, { field: "", operator: "", value: "" }]);
@@ -8821,7 +8917,7 @@ var SearchAndFilterProvider = ({
     if (filterVisibility) {
       const handleEscKeyFilterClose = (e) => {
         if (e.key === "Escape") {
-          setFilterVisibility(false);
+          handleToggleFilterVisibility(false);
         }
       };
       document.addEventListener("keydown", (e) => handleEscKeyFilterClose(e));
@@ -8829,7 +8925,7 @@ var SearchAndFilterProvider = ({
         document.removeEventListener("keydown", (e) => handleEscKeyFilterClose(e));
       };
     }
-  }, [filterVisibility]);
+  }, [filterVisibility, handleToggleFilterVisibility]);
   return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
     SearchAndFilterContext.Provider,
     {
@@ -8873,7 +8969,7 @@ var FilterControls = ({
     allowBindingSearchTerm
   } = useSearchAndFilter();
   const editorRef = (0, import_react88.useRef)(null);
-  const hasVariableInSearchTerm = hasReferencedVariables(searchTerm);
+  const variableRefernceCountInSearchTerm = (0, import_canvas11.hasReferencedVariables)(searchTerm);
   const [idToResetInputVariables, setIdToResetInputVariables] = (0, import_react88.useState)("data-resource-search-term-input");
   const [localeSearchTerm, setLocaleSearchTerm] = (0, import_react88.useState)(searchTerm);
   (0, import_react_use10.useDebounce)(
@@ -8927,7 +9023,7 @@ var FilterControls = ({
           )
         }
       ),
-      hasVariableInSearchTerm ? /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("div", { css: ClearSearchButtonContainer, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
+      variableRefernceCountInSearchTerm ? /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("div", { css: ClearSearchButtonContainer, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(
         "button",
         {
           css: ClearSearchButtonStyles,
@@ -8950,89 +9046,27 @@ var FilterControls = ({
 };
 
 // src/components/SearchAndFilter/FilterItem.tsx
-var import_design_system58 = require("@uniformdev/design-system");
-var import_react90 = require("react");
-
-// src/components/SearchAndFilter/FilterMenu.tsx
 var import_design_system57 = require("@uniformdev/design-system");
-var import_react89 = __toESM(require("react"));
-var import_jsx_runtime85 = require("@emotion/react/jsx-runtime");
-var SearchAndFilterOptionsContainer2 = ({
-  buttonRow,
-  additionalFiltersContainer,
-  children
-}) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { css: SearchAndFilterOptionsContainer, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("div", { css: SearchAndFilterOptionsInnerContainer, children }),
-    buttonRow ? /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
-      import_design_system57.HorizontalRhythm,
-      {
-        css: SearchAndFilterButtonGroup,
-        gap: "sm",
-        align: "center",
-        justify: "space-between",
-        children: buttonRow
-      }
-    ) : null,
-    additionalFiltersContainer ? /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("div", { children: additionalFiltersContainer }) : null
-  ] });
-};
-var FilterMenu = ({
-  id,
-  filterTitle = "Show results",
-  menuControls,
-  additionalFiltersContainer,
-  children,
-  dataTestId,
-  resetButtonText = "reset"
-}) => {
-  const { filterVisibility, setFilterVisibility, handleResetFilters, filters } = useSearchAndFilter();
-  const innerMenuRef = import_react89.default.useRef(null);
-  (0, import_react89.useEffect)(() => {
-    var _a;
-    if (filterVisibility) {
-      (_a = innerMenuRef.current) == null ? void 0 : _a.focus();
-    }
-  }, [filterVisibility]);
-  return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_design_system57.VerticalRhythm, { gap: "sm", "aria-haspopup": "true", id, "data-testid": dataTestId, children: filterVisibility ? /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(
-    SearchAndFilterOptionsContainer2,
-    {
-      buttonRow: menuControls,
-      additionalFiltersContainer,
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(import_design_system57.HorizontalRhythm, { gap: "sm", align: "center", justify: "space-between", children: [
-          filterTitle ? /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { css: Title, ref: innerMenuRef, tabIndex: 0, children: filterTitle }) : null,
-          (filters == null ? void 0 : filters.length) && resetButtonText ? /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
-            "button",
-            {
-              type: "button",
-              css: ResetConditionsBtn,
-              onClick: () => {
-                handleResetFilters();
-                setFilterVisibility(false);
-              },
-              "data-testid": "reset-filters",
-              children: resetButtonText
-            }
-          ) : null
-        ] }),
-        children
-      ]
-    }
-  ) : null });
-};
+var import_react89 = require("react");
+
+// 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
-var import_jsx_runtime86 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime85 = require("@emotion/react/jsx-runtime");
 var FilterItem = ({
   index,
-  paramOptions,
   operatorOptions,
   valueOptions,
-  onParamChange,
+  onFilterOptionChange,
+  onFilterDynamicChange,
   onOperatorChange,
   onValueChange,
-  initialCriteriaTitle = "Where"
+  initialCriteriaTitle = "Where",
+  criteriaGroupOperator = "and"
 }) => {
   var _a, _b;
   const { filters, handleDeleteFilter, filterOptions } = useSearchAndFilter();
@@ -9040,25 +9074,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 } = (0, import_react90.useMemo)(() => {
+  const { selectedFieldValue, selectedOperatorValue, selectedMetaValue, readOnly, bindable } = (0, import_react89.useMemo)(() => {
     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 ? {
@@ -9067,17 +9102,28 @@ var FilterItem = ({
     menuIsOpen: false,
     isClearable: false
   } : {};
-  return /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)("div", { css: ConditionalFilterRow, "data-testid": "filter-item", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime86.jsx)("span", { children: index === 0 ? initialCriteriaTitle : "and" }),
-    /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)("div", { css: ConditionalInputRow, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
-        import_design_system58.InputComboBox,
+  const CustomLeftHandComponent = selectedFieldValue == null ? void 0 : selectedFieldValue.leftHandSideComponentWhenSelected;
+  return /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { css: ConditionalFilterRow, "data-testid": "filter-item", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime85.jsx)("span", { children: index === 0 ? initialCriteriaTitle : criteriaGroupOperator }),
+    /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)("div", { css: ConditionalInputRow, children: [
+      CustomLeftHandComponent ? /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        CustomLeftHandComponent,
+        {
+          filterOption: selectedFieldValue,
+          filter: filters[index],
+          setFilterDynamicValue: onFilterDynamicChange,
+          deselectFilterOption: () => {
+            onFilterOptionChange("");
+          }
+        }
+      ) : /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        import_design_system57.InputComboBox,
         {
           "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;
@@ -9097,8 +9143,8 @@ var FilterItem = ({
           name: `filter-field-${index}`
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
-        import_design_system58.InputComboBox,
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        import_design_system57.InputComboBox,
         {
           "aria-label": operatorLabel,
           options: operatorOptions,
@@ -9121,7 +9167,7 @@ var FilterItem = ({
           name: `filter-operator-${index}`
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
         FilterEditorRenderer,
         {
           "aria-label": metaDataLabel,
@@ -9135,7 +9181,7 @@ var FilterItem = ({
           valueTestId: "filter-value"
         }
       ),
-      readOnly ? null : /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+      readOnly ? null : /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
         "button",
         {
           type: "button",
@@ -9144,35 +9190,184 @@ var FilterItem = ({
           css: IconBtn,
           "data-testid": "delete-filter",
           disabled: filters.length === 1,
-          children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_design_system58.Icon, { icon: "trash", iconColor: filters.length === 1 ? "gray" : "red", size: "1rem" })
+          children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_design_system57.Icon, { icon: "trash", iconColor: filters.length === 1 ? "gray" : "red", size: "1rem" })
         }
       )
     ] })
   ] });
 };
-var singleValuedOperators = /* @__PURE__ */ new Set([
-  "eq",
-  "neq",
-  "lt",
-  "gt",
-  "is",
-  "!is",
-  "has",
-  "!has",
-  "startswith",
-  "!startswith",
-  "endswith",
-  "!endswith"
-]);
-var arrayValuedOperators = /* @__PURE__ */ new Set(["in", "nin", "is$", "!is$"]);
-var clearValueOnChangeAwayFromOperators = /* @__PURE__ */ new Set(["def", "ndef", "empty", "!empty", "between"]);
-var noValueOperators = /* @__PURE__ */ new Set(["empty", "!empty"]);
+
+// src/components/SearchAndFilter/FilterItems.tsx
+var import_design_system59 = require("@uniformdev/design-system");
+
+// src/components/SearchAndFilter/FilterMenu.tsx
+var import_design_system58 = require("@uniformdev/design-system");
+var import_react90 = __toESM(require("react"));
+var import_jsx_runtime86 = require("@emotion/react/jsx-runtime");
+var SearchAndFilterOptionsContainer2 = ({
+  buttonRow,
+  additionalFiltersContainer,
+  children
+}) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)("div", { css: SearchAndFilterOptionsContainer, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime86.jsx)("div", { css: SearchAndFilterOptionsInnerContainer, children }),
+    buttonRow ? /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+      import_design_system58.HorizontalRhythm,
+      {
+        css: SearchAndFilterButtonGroup,
+        gap: "sm",
+        align: "center",
+        justify: "space-between",
+        children: buttonRow
+      }
+    ) : null,
+    additionalFiltersContainer ? /* @__PURE__ */ (0, import_jsx_runtime86.jsx)("div", { children: additionalFiltersContainer }) : null
+  ] });
+};
+var FilterMenu = ({
+  id,
+  filterTitle = "Show results",
+  menuControls,
+  additionalFiltersContainer,
+  children,
+  dataTestId,
+  resetButtonText = "reset"
+}) => {
+  const { filterVisibility, setFilterVisibility, handleResetFilters, filters } = useSearchAndFilter();
+  const innerMenuRef = import_react90.default.useRef(null);
+  (0, import_react90.useEffect)(() => {
+    var _a;
+    if (filterVisibility) {
+      (_a = innerMenuRef.current) == null ? void 0 : _a.focus();
+    }
+  }, [filterVisibility]);
+  return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_design_system58.VerticalRhythm, { gap: "sm", "aria-haspopup": "true", id, "data-testid": dataTestId, children: filterVisibility ? /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(
+    SearchAndFilterOptionsContainer2,
+    {
+      buttonRow: menuControls,
+      additionalFiltersContainer,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(import_design_system58.HorizontalRhythm, { gap: "sm", align: "center", justify: "space-between", children: [
+          filterTitle ? /* @__PURE__ */ (0, import_jsx_runtime86.jsx)("span", { css: Title, ref: innerMenuRef, tabIndex: 0, children: filterTitle }) : null,
+          (filters == null ? void 0 : filters.length) && resetButtonText ? /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+            "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
+var import_canvas12 = require("@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) => (0, import_canvas12.hasReferencedVariables)(value));
+  }
+  return (0, import_canvas12.hasReferencedVariables)(currentValue) > 0;
+}
+
+// src/components/SearchAndFilter/FilterItems.tsx
+var import_jsx_runtime87 = require("@emotion/react/jsx-runtime");
 var FilterItems = ({
   addButtonText = "add condition",
   additionalFiltersContainer,
   filterTitle,
   resetButtonText,
-  initialCriteriaTitle
+  initialCriteriaTitle,
+  criteriaGroupOperator
 }) => {
   const { filterOptions, filters, setFilters, handleAddFilter } = useSearchAndFilter();
   const handleUpdateFilter = (index, prop, value) => {
@@ -9180,32 +9375,16 @@ var FilterItems = ({
     const next = [...filters];
     next[index] = { ...next[index], [prop]: value };
     if (prop === "operator") {
-      const newOperator = value;
-      const currentValue = next[index].value;
-      if (Array.isArray(newOperator)) {
-        throw new Error("Operator value must be a single string");
-      }
-      if (singleValuedOperators.has(newOperator) && Array.isArray(currentValue)) {
-        next[index].value = next[index].value[0];
-      }
-      if (arrayValuedOperators.has(newOperator) && Array.isArray(currentValue) === false) {
-        next[index].value = currentValue ? [currentValue] : [];
-      }
-      if (clearValueOnChangeAwayFromOperators.has(filters[index].operator)) {
-        next[index].value = "";
-      }
-      if (noValueOperators.has(newOperator)) {
-        next[index].value = "";
-      }
-      if (newOperator === "between" && Array.isArray(currentValue) === false) {
-        next[index].value = [currentValue, ""];
-      }
-      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) => {
@@ -9214,15 +9393,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__ */ (0, import_jsx_runtime86.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
     FilterMenu,
     {
       id: "search-and-filter-options",
       dataTestId: "search-and-filter-options",
-      menuControls: /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(
+      menuControls: /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(
         "button",
         {
           type: "button",
@@ -9230,7 +9410,7 @@ var FilterItems = ({
           onClick: handleAddFilter,
           "data-testid": "add-filter",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_design_system58.Icon, { icon: "math-plus", iconColor: "currentColor", size: "1rem" }),
+            /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(import_design_system59.Icon, { icon: "math-plus", iconColor: "currentColor", size: "1rem" }),
             addButtonText
           ]
         }
@@ -9246,17 +9426,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__ */ (0, import_jsx_runtime86.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
           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),
+            onFilterDynamicChange: (e) => handleUpdateFilter(i, "dynamicField", e),
             valueOptions: possibleValueOptions,
-            initialCriteriaTitle
+            initialCriteriaTitle,
+            criteriaGroupOperator
           },
           i
         );
@@ -9266,11 +9447,11 @@ var FilterItems = ({
 };
 
 // src/components/SearchAndFilter/SearchAndFilter.tsx
-var import_design_system60 = require("@uniformdev/design-system");
+var import_design_system61 = require("@uniformdev/design-system");
 
 // src/components/SearchAndFilter/SearchAndFilterResultContainer.tsx
-var import_design_system59 = require("@uniformdev/design-system");
-var import_jsx_runtime87 = require("@emotion/react/jsx-runtime");
+var import_design_system60 = require("@uniformdev/design-system");
+var import_jsx_runtime88 = require("@emotion/react/jsx-runtime");
 var SearchAndFilterResultContainer = ({
   buttonText,
   clearButtonLabel = "clear",
@@ -9300,19 +9481,19 @@ var SearchAndFilterResultContainer = ({
       handleResetFilters();
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(import_jsx_runtime87.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(import_design_system59.HorizontalRhythm, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)("span", { children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(import_jsx_runtime88.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(import_design_system60.HorizontalRhythm, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)("span", { children: [
         totalResults,
         " results ",
         searchTerm ? `for "${searchTerm}"` : null
       ] }),
-      !searchTerm || hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(import_design_system59.Button, { buttonType: "ghostDestructive", size: "zero", onClick: handleClearSearch, children: clearButtonLabel })
+      !searchTerm || hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(import_design_system60.Button, { buttonType: "ghostDestructive", size: "zero", onClick: handleClearSearch, children: clearButtonLabel })
     ] }),
-    totalResults === 0 ? /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(import_design_system59.Callout, { title: calloutTitle != null ? calloutTitle : automateCalloutTitle(), type: "note", children: [
-      calloutText ? /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(import_design_system59.Paragraph, { children: calloutText }) : null,
-      hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
-        import_design_system59.Button,
+    totalResults === 0 ? /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(import_design_system60.Callout, { title: calloutTitle != null ? calloutTitle : automateCalloutTitle(), type: "note", children: [
+      calloutText ? /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(import_design_system60.Paragraph, { children: calloutText }) : null,
+      hideClearButton ? null : /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(
+        import_design_system60.Button,
         {
           buttonType: "tertiaryOutline",
           size: "xs",
@@ -9326,14 +9507,14 @@ var SearchAndFilterResultContainer = ({
 };
 
 // src/components/SearchAndFilter/SearchAndFilter.tsx
-var import_jsx_runtime88 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime89 = require("@emotion/react/jsx-runtime");
 var SearchAndFilter = ({
   filters,
   filterOptions,
   filterVisible,
   filterControls,
   viewSwitchControls,
-  resultsContainerView = /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(SearchAndFilterResultContainer, {}),
+  resultsContainerView = /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(SearchAndFilterResultContainer, {}),
   filterMapper: filterMapper2 = filterMapper,
   additionalFiltersContainer,
   onChange,
@@ -9343,7 +9524,7 @@ var SearchAndFilter = ({
   allowBindingSearchTerm = false,
   resetFilterValues = []
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
     SearchAndFilterProvider,
     {
       filters,
@@ -9356,18 +9537,18 @@ var SearchAndFilter = ({
       resetFilterValues,
       filterMapper: filterMapper2,
       allowBindingSearchTerm,
-      children: /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(import_design_system60.VerticalRhythm, { "data-testid": "search-and-filter", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)("div", { css: SearchAndFilterOutterControlWrapper(viewSwitchControls ? "1fr auto" : "1fr"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(import_design_system61.VerticalRhythm, { "data-testid": "search-and-filter", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)("div", { css: SearchAndFilterOutterControlWrapper(viewSwitchControls ? "1fr auto" : "1fr"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
             "div",
             {
               css: SearchAndFilterControlsWrapper(viewSwitchControls ? "auto 1fr 0.05fr" : "auto 1fr"),
-              children: !filterControls ? /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(FilterControls, { hideSearchInput: !onSearchChange }) : filterControls
+              children: !filterControls ? /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(FilterControls, { hideSearchInput: !onSearchChange }) : filterControls
             }
           ),
           viewSwitchControls
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(FilterItems, { additionalFiltersContainer }),
+        /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(FilterItems, { additionalFiltersContainer }),
         resultsContainerView
       ] })
     }
@@ -9375,10 +9556,10 @@ var SearchAndFilter = ({
 };
 
 // src/components/SearchAndFilter/SearchOnlyFilter.tsx
-var import_design_system61 = require("@uniformdev/design-system");
+var import_design_system62 = require("@uniformdev/design-system");
 var import_react91 = require("react");
 var import_react_use11 = require("react-use");
-var import_jsx_runtime89 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime90 = require("@emotion/react/jsx-runtime");
 var SearchOnlyContext = (0, import_react91.createContext)({
   searchTerm: "",
   setSearchTerm: () => {
@@ -9395,15 +9576,15 @@ var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
     300,
     [localeSearchTerm]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
     SearchOnlyContext.Provider,
     {
       value: {
         searchTerm,
         setSearchTerm: setLocaleSearchTerm
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)("div", { css: { maxWidth: maxWidth != null ? maxWidth : "712px" }, children: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
-        import_design_system61.InputKeywordSearch,
+      children: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("div", { css: { maxWidth: maxWidth != null ? maxWidth : "712px" }, children: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
+        import_design_system62.InputKeywordSearch,
         {
           placeholder: "Search...",
           onSearchTextChanged: (e) => setLocaleSearchTerm(e),
@@ -9417,18 +9598,18 @@ var SearchOnlyFilter = ({ onSearchChange, maxWidth }) => {
 };
 
 // src/components/SearchAndFilter/SortItems.tsx
-var import_design_system63 = require("@uniformdev/design-system");
+var import_design_system64 = require("@uniformdev/design-system");
 
 // src/components/SearchAndFilter/styles/SortItems.styles.ts
 var import_react92 = require("@emotion/react");
-var import_design_system62 = require("@uniformdev/design-system");
+var import_design_system63 = require("@uniformdev/design-system");
 var ConditionalFilterRow2 = import_react92.css`
   display: grid;
   grid-template-columns: 35px 1fr;
   gap: var(--spacing-sm);
   margin-left: var(--spacing-base);
 
-  ${(0, import_design_system62.cq)("380px")} {
+  ${(0, import_design_system63.cq)("380px")} {
     align-items: center;
 
     &:after {
@@ -9449,14 +9630,14 @@ var ConditionalFilterRow2 = import_react92.css`
     grid-template-columns: 50px 1fr;
   }
 
-  ${(0, import_design_system62.cq)("580px")} {
+  ${(0, import_design_system63.cq)("580px")} {
     &:after {
       display: none;
     }
   }
 
   @media (prefers-reduced-motion: no-preference) {
-    animation: ${import_design_system62.fadeInLtr} var(--duration-fast) var(--timing-ease-out);
+    animation: ${import_design_system63.fadeInLtr} var(--duration-fast) var(--timing-ease-out);
   }
 `;
 var ConditionalInputRow2 = import_react92.css`
@@ -9464,7 +9645,7 @@ var ConditionalInputRow2 = import_react92.css`
   gap: var(--spacing-sm);
   flex-wrap: wrap;
 
-  ${(0, import_design_system62.cq)("380px")} {
+  ${(0, import_design_system63.cq)("380px")} {
     & > div:nth-child(-n + 2) {
       width: calc(50% - var(--spacing-sm));
     }
@@ -9473,7 +9654,7 @@ var ConditionalInputRow2 = import_react92.css`
       width: calc(100% - 48px);
     }
   }
-  ${(0, import_design_system62.cq)("580px")} {
+  ${(0, import_design_system63.cq)("580px")} {
     display: grid;
     grid-template-columns: 200px 160px 1fr 32px;
 
@@ -9497,7 +9678,8 @@ var FilterButton3 = import_react92.css`
   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);
@@ -9631,7 +9813,7 @@ var SortFilterWrapper = (hiddenLocaleInput) => import_react92.css`
   position: relative;
   z-index: 0;
 
-  ${(0, import_design_system62.cq)("420px")} {
+  ${(0, import_design_system63.cq)("420px")} {
     display: grid;
     grid-template-columns: ${hiddenLocaleInput ? "1fr" : "1fr minmax(140px, 0.25fr)"};
   }
@@ -9653,7 +9835,7 @@ var InputVariableWrapper = import_react92.css`
 `;
 
 // src/components/SearchAndFilter/SortItems.tsx
-var import_jsx_runtime90 = require("@emotion/react/jsx-runtime");
+var import_jsx_runtime91 = require("@emotion/react/jsx-runtime");
 var SortItems = ({
   sortByLabel = "Sort by",
   localeLabel = "Show locale",
@@ -9675,11 +9857,11 @@ var SortItems = ({
     return (_a2 = item.options) == null ? void 0 : _a2.find((option) => option.value === sortField);
   })) == null ? void 0 : _a.options) == null ? void 0 : _b.find((nestedOption) => nestedOption.value === sortField);
   const localeLabelValue = sortOptions.length > 1 ? localeLabel : `${localeLabel}s`;
-  return /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)("div", { css: [SortFilterWrapper(hideLocaleOptions)], "data-testid": "sorting-options", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(import_design_system63.VerticalRhythm, { gap: "xs", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("span", { css: Title2, children: sortByLabel }),
-      /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)("div", { css: SortFilterInputRow, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)("div", { css: [SortFilterWrapper(hideLocaleOptions)], "data-testid": "sorting-options", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(import_design_system64.VerticalRhythm, { gap: "xs", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)("span", { css: Title2, children: sortByLabel }),
+      /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)("div", { css: SortFilterInputRow, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
           InputVariables,
           {
             disableInlineMenu: disableSortBinding,
@@ -9687,8 +9869,8 @@ var SortItems = ({
             value: sortField,
             valueToResetTo: "created_at",
             onChange: (e) => onSortChange(`${e}_${sortDirection}`),
-            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
-              import_design_system63.InputComboBox,
+            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+              import_design_system64.InputComboBox,
               {
                 id: "sort-by-field",
                 "aria-label": "Sort by",
@@ -9710,7 +9892,7 @@ var SortItems = ({
             )
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
           InputVariables,
           {
             disableInlineMenu: disableSortBinding,
@@ -9718,8 +9900,8 @@ var SortItems = ({
             valueToResetTo: "DESC",
             showMenuPosition: disableSortBinding ? void 0 : "inline-right",
             onChange: (e) => onSortChange(`${sortField}_${e}`),
-            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
-              import_design_system63.SegmentedControl,
+            inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+              import_design_system64.SegmentedControl,
               {
                 noCheckmark: true,
                 name: "sortBy",
@@ -9750,15 +9932,15 @@ var SortItems = ({
         )
       ] })
     ] }),
-    hideLocaleOptions ? null : /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(import_design_system63.VerticalRhythm, { gap: "xs", css: InputVariableWrapper, children: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
+    hideLocaleOptions ? null : /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(import_design_system64.VerticalRhythm, { gap: "xs", css: InputVariableWrapper, children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
       InputVariables,
       {
         label: localeLabelValue,
         value: localeValue,
         showMenuPosition: "inline-right",
         onChange: (e) => onLocaleChange(e != null ? e : ""),
-        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
-          import_design_system63.InputSelect,
+        inputWhenNoVariables: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          import_design_system64.InputSelect,
           {
             name: "localeReturned",
             "aria-label": localeLabelValue,
@@ -9787,7 +9969,7 @@ function createLocationValidator(setValue, validate) {
 }
 
 // src/utils/useContentDataResourceLocaleInfo.ts
-var import_canvas10 = require("@uniformdev/canvas");
+var import_canvas13 = require("@uniformdev/canvas");
 var import_react93 = require("react");
 function useContentDataResourceLocaleInfo({
   locale,
@@ -9798,18 +9980,18 @@ function useContentDataResourceLocaleInfo({
   const setLocaleRef = (0, import_react93.useRef)(setLocale);
   setLocaleRef.current = setLocale;
   const { flatVariables } = useVariables();
-  const effectiveLocale = locale != null ? locale : dynamicInputs[import_canvas10.LOCALE_DYNAMIC_INPUT_NAME] ? (0, import_canvas10.createVariableReference)(import_canvas10.LOCALE_DYNAMIC_INPUT_NAME) : "";
-  const boundLocale = (_a = (0, import_canvas10.bindVariables)({ variables: flatVariables, value: effectiveLocale }).result) != null ? _a : effectiveLocale;
+  const effectiveLocale = locale != null ? locale : dynamicInputs[import_canvas13.LOCALE_DYNAMIC_INPUT_NAME] ? (0, import_canvas13.createVariableReference)(import_canvas13.LOCALE_DYNAMIC_INPUT_NAME) : "";
+  const boundLocale = (_a = (0, import_canvas13.bindVariables)({ variables: flatVariables, value: effectiveLocale }).result) != null ? _a : effectiveLocale;
   (0, import_react93.useEffect)(() => {
     if (locale === void 0 && effectiveLocale && setLocaleRef.current) {
-      setLocaleRef.current((0, import_canvas10.createVariableReference)(import_canvas10.LOCALE_DYNAMIC_INPUT_NAME));
+      setLocaleRef.current((0, import_canvas13.createVariableReference)(import_canvas13.LOCALE_DYNAMIC_INPUT_NAME));
     }
   }, [locale, effectiveLocale]);
   return { effectiveLocale, boundLocale: boundLocale ? boundLocale : void 0 };
 }
 
 // src/index.ts
-var import_design_system64 = require("@uniformdev/design-system");
+var import_design_system65 = require("@uniformdev/design-system");
 __reExport(src_exports, require("@uniformdev/mesh-sdk"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -9821,6 +10003,7 @@ __reExport(src_exports, require("@uniformdev/mesh-sdk"), module.exports);
   Callout,
   ControlledValuePlugin,
   DATE_OPERATORS,
+  DATE_TIME_OPERATORS,
   DISCONNECT_VARIABLE_COMMAND,
   DamSelectedItem,
   DataRefreshButton,
@@ -9914,7 +10097,6 @@ __reExport(src_exports, require("@uniformdev/mesh-sdk"), module.exports);
   RequestUrlInput,
   ResolvableLoadingValue,
   SELECT_OPERATORS,
-  SYSTEM_DATE_OPERATORS,
   SYSTEM_FIELD_OPERATORS,
   ScrollableList,
   ScrollableListItem,
@@ -10011,6 +10193,7 @@ __reExport(src_exports, require("@uniformdev/mesh-sdk"), module.exports);
   selectedItemIcon,
   selectedItemInner,
   selectedItemTitle,
+  serializeVariablesEditorSerializedState,
   serializeVariablesEditorState,
   setVariablesEditorValue,
   urlEncodeRequestParameter,