@uniformdev/mesh-sdk-react 20.6.2-alpha.11 → 20.7.1-alpha.102

package/dist/index.esm.js

@@ -674,6 +674,7 @@ import { createVariableReference as createVariableReference2 } from "@uniformdev
 import { HorizontalRhythm as HorizontalRhythm2, MenuGroup, MenuItemInner, MenuItemSeparator } from "@uniformdev/design-system";
 import { dequal } from "dequal/lite";
 import {
+  $addUpdateTag,
   $createParagraphNode,
   $createTextNode,
   $getNodeByKey,
@@ -773,7 +774,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { Button, Callout, HorizontalRhythm, Input, useShortcut } from "@uniformdev/design-system";
 import { useLayoutEffect, useRef as useRef2 } from "react";
 import { useForm } from "react-hook-form";
-import { z } from "zod";
+import * as z from "zod";
 
 // src/components/Variables/styles/VariableEditor.styles.ts
 import { css as css2 } from "@emotion/react";
@@ -1243,7 +1244,8 @@ function VariablesPlugin({
   enableEditingVariables,
   getEditorContext,
   replaceValueOnVariableInsert,
-  filterVariable
+  filterVariable,
+  disableVariableDisplayNames
 }) {
   const [editor] = useLexicalComposerContext2();
   const { variables, dispatch, isEditing, canDispatch, readOnly, knownUndefinedValues, isLoading } = useVariables(true);
@@ -1321,9 +1323,10 @@ function VariablesPlugin({
                 });
                 return;
               }
+              const initialDisplayName = disableVariableDisplayNames ? prettifyBindExpression(result.selectedVariable.name) : result.selectedVariable.displayName;
               editor.dispatchCommand(INSERT_VARIABLE_COMMAND, {
                 variable: result.selectedVariable.name,
-                initialDisplayName: result.selectedVariable.displayName,
+                initialDisplayName,
                 targetKey: sourceKey,
                 overwriteExistingValue: replaceValueOnVariableInsert
               });
@@ -1371,9 +1374,10 @@ function VariablesPlugin({
               if (result.canceled) {
                 return;
               }
+              const initialDisplayName = disableVariableDisplayNames ? prettifyBindExpression(result.selectedVariable.name) : result.selectedVariable.displayName;
               editor.dispatchCommand(INSERT_VARIABLE_COMMAND, {
                 variable: result.selectedVariable.name,
-                initialDisplayName: result.selectedVariable.displayName,
+                initialDisplayName,
                 targetKey: void 0,
                 overwriteExistingValue: replaceValueOnVariableInsert
               });
@@ -1392,8 +1396,9 @@ function VariablesPlugin({
           var _a, _b;
           if (!disableVariables) {
             const targetVariable = variablesRef.current.variables[reference];
+            const displayName = disableVariableDisplayNames ? prettifyBindExpression(reference) : initialDisplayName != null ? initialDisplayName : (targetVariable == null ? void 0 : targetVariable.displayName) || prettifyBindExpression(reference);
             const variableNode = $createVariableNode(reference, {
-              displayName: initialDisplayName != null ? initialDisplayName : (targetVariable == null ? void 0 : targetVariable.displayName) || prettifyBindExpression(reference),
+              displayName,
               hasClickEvent: canEditVariable(reference, targetVariable),
               referenceIsValid: true,
               tooltip: (_a = targetVariable == null ? void 0 : targetVariable.tooltip) != null ? _a : targetVariable == null ? void 0 : targetVariable.helpText,
@@ -1430,7 +1435,8 @@ function VariablesPlugin({
     readOnly,
     getEditorContext,
     editVariable,
-    replaceValueOnVariableInsert
+    replaceValueOnVariableInsert,
+    disableVariableDisplayNames
   ]);
   const updateExistingNodeIfChanged = useCallback2(
     (variableNode) => {
@@ -1443,9 +1449,10 @@ function VariablesPlugin({
         return;
       }
       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 displayName = disableVariableDisplayNames ? prettifyBindExpression(variableNode.reference) : (targetVar == null ? void 0 : targetVar.displayName) || (targetUndefinedVar == null ? void 0 : targetUndefinedVar.displayName) || prettifyBindExpression(variableNode.reference);
       const newState = {
         ...currentState,
-        displayName: (targetVar == null ? void 0 : targetVar.displayName) || (targetUndefinedVar == null ? void 0 : targetUndefinedVar.displayName) || prettifyBindExpression(variableNode.reference),
+        displayName,
         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),
@@ -1456,7 +1463,7 @@ function VariablesPlugin({
         variableNode.setState(newState);
       }
     },
-    [canEditVariable]
+    [canEditVariable, disableVariableDisplayNames]
   );
   useEffect4(() => {
     let selection;
@@ -1465,6 +1472,7 @@ function VariablesPlugin({
     });
     editor.update(() => {
       var _a;
+      $addUpdateTag("skip-dom-selection");
       $setSelection((_a = selection == null ? void 0 : selection.clone()) != null ? _a : null);
       $dfs().filter(({ node }) => $isVariableNode(node)).forEach(({ node: variableNode }) => {
         updateExistingNodeIfChanged(variableNode);
@@ -1614,6 +1622,14 @@ var VariableNode = class _VariableNode extends DecoratorNode {
   updateDOM() {
     return false;
   }
+  static importDOM() {
+    return {
+      binding: () => ({
+        conversion: $convertBindingElement,
+        priority: 0
+      })
+    };
+  }
   /**
    * Render the variable node using React.
    * NOTE: this is effectively an island of React, and you may not call hooks,
@@ -1623,6 +1639,21 @@ var VariableNode = class _VariableNode extends DecoratorNode {
     return /* @__PURE__ */ jsx22(VariableNodeComponent, { state: this.__state, reference: this.reference, nodeKey: this.__key });
   }
 };
+function $convertBindingElement(domNode) {
+  const element = domNode;
+  const reference = element.textContent.replace(variablePrefix, "").replace(variableSuffix, "");
+  const node = $createVariableNode(reference, {
+    displayName: prettifyBindExpression(reference),
+    hasClickEvent: true,
+    referenceIsValid: true,
+    tooltip: void 0,
+    isFresh: true,
+    isLoading: false
+  });
+  return {
+    node
+  };
+}
 function $createVariableNode(variableReference, state) {
   return new VariableNode(variableReference, state);
 }
@@ -1806,7 +1837,7 @@ var menuBtn2 = css4`
   transform: translateY(-50%);
 `;
 var input = css4`
-  --input-padding: 12px var(--spacing-base) 12px var(--spacing-sm);
+  --input-padding: 12px var(--spacing-lg) 12px var(--spacing-sm);
   appearance: none;
   background-color: var(--white);
   border: 1px solid var(--gray-300);
@@ -1943,6 +1974,7 @@ var input2 = css5`
   &:disabled,
   &:disabled::placeholder,
   &:disabled:hover {
+    border-color: var(--gray-200);
     border-radius: var(--rounded-sm);
     cursor: not-allowed;
     color: var(--gray-400);
@@ -1952,6 +1984,7 @@ var input2 = css5`
   &[contenteditable='false'] {
     cursor: not-allowed;
     color: var(--gray-400);
+    border-color: var(--gray-200);
   }
 
   > p {
@@ -2343,7 +2376,7 @@ function VariablesComposerInput({
     /* @__PURE__ */ jsx27(
       PlainTextPlugin,
       {
-        contentEditable: /* @__PURE__ */ jsx27(ContentEditable, { ...contentEditableProps }),
+        contentEditable: /* @__PURE__ */ jsx27(ContentEditable, { ...contentEditableProps, placeholder: null, "aria-placeholder": void 0 }),
         placeholder: placeholder ? /* @__PURE__ */ jsx27(Fragment6, { children: placeholder }) : null,
         ErrorBoundary: LexicalErrorBoundary
       }
@@ -2458,7 +2491,8 @@ function InputVariables(props) {
     styleVariant = "default",
     renderMenuInPortal,
     disableDismissEditorOnChange,
-    singleTokenMode
+    singleTokenMode,
+    disableVariableDisplayNames
   } = props;
   const [finalId] = useState7(id != null ? id : () => v4());
   const { dispatch, canDispatch, isEditing } = useVariables(true);
@@ -2481,7 +2515,7 @@ function InputVariables(props) {
             gap: "xs",
             css: css7`
           position: relative;
-          & > div:first-child {
+          & > div:first-of-type {
             flex-grow: 1;
           }
         `,
@@ -2567,6 +2601,7 @@ function InputVariables(props) {
       replaceValueOnVariableInsert: useInputWithNoVariables,
       autoFocus,
       filterVariable,
+      disableVariableDisplayNames,
       children: [
         /* @__PURE__ */ jsx28(PasteTransformerPlugin, { transformPaste }),
         /* @__PURE__ */ jsx28(ControlledValuePlugin, { value, enabled: singleTokenMode || useInputWithNoVariables }),
@@ -2945,6 +2980,8 @@ var variableValue = css9`
 
 // src/components/Variables/VariablesList.tsx
 import { Fragment as Fragment8, jsx as jsx33, jsxs as jsxs16 } from "@emotion/react/jsx-runtime";
+var DroppableHack = Droppable;
+var DraggableHack = Draggable;
 function VariablesList() {
   const { variables, dispatch, readOnly } = useVariables();
   const sorted = variablesToList(variables).filter((variable) => !variable.system);
@@ -2966,7 +3003,7 @@ function VariablesList() {
     }
   };
   return /* @__PURE__ */ jsxs16(Fragment8, { children: [
-    /* @__PURE__ */ jsx33(DragDropContext, { onDragEnd: (res) => onDragEnd(res), children: /* @__PURE__ */ jsx33(Droppable, { droppableId: "variables-table", children: (provided) => /* @__PURE__ */ jsxs16(Table, { ...provided.droppableProps, ref: provided.innerRef, children: [
+    /* @__PURE__ */ jsx33(DragDropContext, { onDragEnd: (res) => onDragEnd(res), children: /* @__PURE__ */ jsx33(DroppableHack, { droppableId: "variables-table", children: (provided) => /* @__PURE__ */ jsxs16(Table, { ...provided.droppableProps, ref: provided.innerRef, children: [
       /* @__PURE__ */ jsx33(TableHead, { children: /* @__PURE__ */ jsxs16(TableRow, { children: [
         /* @__PURE__ */ jsx33(TableCellHead, { children: "Name" }),
         /* @__PURE__ */ jsx33(TableCellHead, { children: "Default Value" }),
@@ -2977,7 +3014,7 @@ function VariablesList() {
           const text = displayName != null ? displayName : name2;
           const textValue = variableDefaultTextValue(defaultValue);
           return /* @__PURE__ */ jsx33(
-            Draggable,
+            DraggableHack,
             {
               draggableId: name2,
               index,
@@ -3592,8 +3629,8 @@ function urlEncodeRequestParameter(parameter, varValues) {
     value: decodeVariablesInUrlEncodedString(encodeURIComponent(parameter.value), varValues)
   };
 }
-function decodeVariablesInUrlEncodedString(string, varValues) {
-  return string.replace(/(\$|%24)%7B(.*?)%7D/g, (_all, _money, body) => {
+function decodeVariablesInUrlEncodedString(string2, varValues) {
+  return string2.replace(/(\$|%24)%7B(.*?)%7D/g, (_all, _money, body) => {
     var _a;
     const varName = decodeURIComponent(body);
     return ((_a = varValues == null ? void 0 : varValues[varName]) == null ? void 0 : _a.default) ? variableDefaultTextValue(varValues[varName].default) : `\${${varName}}`;
@@ -3926,7 +3963,7 @@ var DataRefreshButton = ({
   onRefreshData,
   ...props
 }) => {
-  return /* @__PURE__ */ jsxs22(Button2, { buttonType: "primaryInvert", onClick: onRefreshData, disabled: isLoading, ...props, children: [
+  return /* @__PURE__ */ jsxs22(Button2, { buttonType: "ghost", onClick: onRefreshData, disabled: isLoading, ...props, children: [
     !isLoading ? null : /* @__PURE__ */ jsx47(
       LoadingIndicator3,
       {
@@ -4200,7 +4237,7 @@ var ObjectSearchListItem = ({
         ),
         /* @__PURE__ */ jsxs23("div", { css: ObjectListItemInfoContainer, children: [
           selected ? /* @__PURE__ */ jsx49(Chip, { text: "selected", size: "xs" }) : null,
-          !popoverData ? null : /* @__PURE__ */ jsx49(Popover, { ariaLabel: title, buttonText: `See ${title} details`, iconColor: "default", children: popoverData })
+          !popoverData ? null : /* @__PURE__ */ jsx49(Popover, { ariaLabel: title, buttonText: `See ${title} details`, children: popoverData })
         ] }),
         !children ? null : /* @__PURE__ */ jsx49("div", { css: ObjectListItemUnControlledContent, children })
       ]
@@ -4230,7 +4267,6 @@ var ObjectSearchContainer = ({
       role: "list",
       css: css16`
         > div {
-          transition: max-height var(--duration-slow) var(--timing-ease-out);
           max-height: ${selectedListItems.length === 0 ? "50vh" : "184px"};
         }
       `,
@@ -4396,7 +4432,7 @@ var ObjectSearchFilterContainer2 = ({ children }) => {
 };
 
 // src/components/ObjectSearch/ObjectSearchResultItem.tsx
-import { Button as Button3, Chip as Chip2, Popover as Popover2 } from "@uniformdev/design-system";
+import { Button as Button3, Chip as Chip2, Link, Popover as Popover2 } from "@uniformdev/design-system";
 import { format as timeagoFormat } from "timeago.js";
 
 // src/components/Image/Image.tsx
@@ -4508,6 +4544,11 @@ var ObjectSearchResultItemTimeStamp = css19`
   color: var(--gray-500);
   font-size: var(--fs-xs);
 `;
+var ObjectSearchResultItemTitleLink = css19`
+  text-decoration: none;
+  color: var(--primary-action-default);
+  font-size: var(--fs-sm);
+`;
 var ObjectSearchAuthorStateGroup = css19`
   align-items: center;
   display: flex;
@@ -4542,7 +4583,8 @@ var ObjectSearchResultItem = ({
   publishedAt,
   hideRemoveButton = false,
   disableDnD = false,
-  children
+  children,
+  onClick
 }) => {
   const { onSelectItem } = useObjectSearchContext();
   const formatedContentType = Array.isArray(contentType) ? contentType.join(", ") : contentType;
@@ -4565,7 +4607,19 @@ var ObjectSearchResultItem = ({
       /* @__PURE__ */ jsxs27("div", { children: [
         /* @__PURE__ */ jsx55("span", { css: ObjectSearchResultItemSubtitle, "data-testid": "sub-title", children: formatedContentType }),
         /* @__PURE__ */ jsxs27("span", { role: "heading", css: ObjectSearchResultItemTitle, "data-testid": "title", children: [
-          title != null ? title : name,
+          onClick ? /* @__PURE__ */ jsx55(
+            Link,
+            {
+              onClick: (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                onClick();
+              },
+              href: editLink,
+              text: title != null ? title : name,
+              css: ObjectSearchResultItemTitleLink
+            }
+          ) : /* @__PURE__ */ jsx55("span", { children: title != null ? title : name }),
           !popoverData ? null : /* @__PURE__ */ jsx55(Popover2, { ariaLabel: title, buttonText: `See ${title} details`, children: popoverData })
         ] }),
         !createdAt && !publishStatus ? null : /* @__PURE__ */ jsxs27("div", { css: ObjectSearchAuthorStateGroup, children: [
@@ -4607,7 +4661,10 @@ function legacyThemeMapper(theme) {
 
 // src/components/ObjectSearch/ObjectSearchResultList.tsx
 import { Button as Button4, Counter } from "@uniformdev/design-system";
-import { Draggable as Draggable2, Droppable as Droppable2 } from "react-beautiful-dnd";
+import {
+  Draggable as Draggable2,
+  Droppable as Droppable2
+} from "react-beautiful-dnd";
 
 // src/components/ObjectSearch/styles/ObjectSearchResultList.styles.ts
 import { css as css20 } from "@emotion/react";
@@ -4636,6 +4693,8 @@ var ObjectSearchResultListTitle = css20`
 
 // src/components/ObjectSearch/ObjectSearchResultList.tsx
 import { Fragment as Fragment10, jsx as jsx56, jsxs as jsxs28 } from "@emotion/react/jsx-runtime";
+var DroppableHack2 = Droppable2;
+var DraggableHack2 = Draggable2;
 function ObjectSearchResultList({
   resultLabelText = "Selected",
   removeButtonText = "Remove all",
@@ -4707,7 +4766,7 @@ function ObjectSearchResultList({
       ] })
     ] }),
     !selectedListItems.length ? whenNothingSelected : /* @__PURE__ */ jsx56(DragDropContext, { onDragEnd: (res) => onDragEnd(res), children: /* @__PURE__ */ jsx56(
-      Droppable2,
+      DroppableHack2,
       {
         droppableId: multiSelectId != null ? multiSelectId : "canvas-multi-select",
         renderClone: getContainerForDnDReparenting ? getDraggableItem : void 0,
@@ -4715,7 +4774,7 @@ function ObjectSearchResultList({
         children: (provided) => /* @__PURE__ */ jsxs28("div", { ...provided.droppableProps, ref: provided.innerRef, children: [
           selectedListItems.map((item, i) => {
             return /* @__PURE__ */ jsx56(
-              Draggable2,
+              DraggableHack2,
               {
                 draggableId: item.id,
                 index: i,
@@ -5165,18 +5224,6 @@ var DATE_TIME_OPERATORS = [
     value: "sys-date-gte",
     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 = [
@@ -6212,8 +6259,6 @@ var SearchAndFilterOptionsContainer = css21`
   gap: var(--spacing-sm);
   padding: var(--spacing-md) 0 var(--spacing-base);
   will-change: height;
-  position: relative;
-  z-index: 2;
 `;
 var SearchAndFilterOptionsInnerContainer = css21`
   display: flex;
@@ -6232,8 +6277,6 @@ var SearchAndFilterAdditionalContainer = css21`
   flex-wrap: nowrap;
   gap: var(--spacing-base);
   padding: var(--spacing-base) var(--spacing-md) 0;
-  position: relative;
-  z-index: 0;
 `;
 
 // src/components/SearchAndFilter/FilterButton.tsx
@@ -6320,6 +6363,7 @@ function withInputVariables(WrappedComponent, noSwapping = false) {
     return /* @__PURE__ */ jsx72(
       InputVariables,
       {
+        "data-testid": "filter-value",
         disableInlineMenu: true,
         showMenuPosition: "inline-right",
         onChange: (newValue) => props.onChange(newValue != null ? newValue : ""),
@@ -6340,6 +6384,7 @@ function withInputVariablesForMultiValue(WrappedComponent) {
     return /* @__PURE__ */ jsx72(
       InputVariables,
       {
+        "data-testid": "filter-value",
         disableInlineMenu: true,
         showMenuPosition: "inline-right",
         onChange: (newValue) => props.onChange(newValue ? [newValue] : []),
@@ -6392,6 +6437,7 @@ var SearchAndFilterProvider = ({
   onSearchChange,
   onChange,
   resetFilterValues = [{ field: "", operator: "", value: "" }],
+  onResetFilterValues,
   totalResults,
   filterMapper: filterMapper2 = filterMapper,
   children,
@@ -6420,9 +6466,12 @@ var SearchAndFilterProvider = ({
     onChange([...filters, { field: "", operator: "", value: "" }]);
   }, [filters, onChange]);
   const handleResetFilters = useCallback6(() => {
+    if (onResetFilterValues) {
+      return onResetFilterValues();
+    }
     onSearchChange == null ? void 0 : onSearchChange("");
     onChange(resetFilterValues);
-  }, [onChange, resetFilterValues, onSearchChange]);
+  }, [onChange, resetFilterValues, onSearchChange, onResetFilterValues]);
   const handleDeleteFilter = useCallback6(
     (index) => {
       const remainingFilters = filters.filter((_, i) => i !== index);
@@ -6494,17 +6543,17 @@ var FilterControls = ({
   const editorRef = useRef9(null);
   const variableRefernceCountInSearchTerm = hasReferencedVariables2(searchTerm);
   const [idToResetInputVariables, setIdToResetInputVariables] = useState20("data-resource-search-term-input");
-  const [localeSearchTerm, setLocaleSearchTerm] = useState20(searchTerm);
+  const [localSearchTerm, setLocalSearchTerm] = useState20(searchTerm);
   useDebounce7(
     () => {
-      setSearchTerm(localeSearchTerm);
+      setSearchTerm(localSearchTerm);
     },
     300,
-    [localeSearchTerm]
+    [localSearchTerm]
   );
   useEffect18(() => {
     if (searchTerm === "") {
-      setLocaleSearchTerm("");
+      setLocalSearchTerm("");
       setIdToResetInputVariables(`data-resource-search-term-input-${v42()}`);
     }
   }, [searchTerm]);
@@ -6522,7 +6571,7 @@ var FilterControls = ({
         dataTestId: "filters-button"
       }
     ),
-    hideSearchInput ? null : /* @__PURE__ */ jsxs33("div", { css: BindableKeywordSearchInputStyles, children: [
+    hideSearchInput ? null : /* @__PURE__ */ jsxs33("div", { css: BindableKeywordSearchInputStyles, "data-testid": "search-container", children: [
       /* @__PURE__ */ jsx74(
         InputVariables,
         {
@@ -6530,18 +6579,24 @@ var FilterControls = ({
           id: idToResetInputVariables,
           showMenuPosition: "inline-right",
           editorRef,
-          value: localeSearchTerm,
-          onChange: (value) => setLocaleSearchTerm(value != null ? value : ""),
+          value: localSearchTerm,
+          onChange: (value) => setLocalSearchTerm(value != null ? value : ""),
           disableVariables: !allowBindingSearchTerm,
           inputWhenNoVariables: /* @__PURE__ */ jsx74(
             InputKeywordSearch,
             {
               placeholder: "Search...",
-              onSearchTextChanged: (e) => setLocaleSearchTerm(e),
-              value: localeSearchTerm,
+              onSearchTextChanged: (e) => setLocalSearchTerm(e),
+              value: localSearchTerm,
               compact: true,
               rounded: true,
-              css: SearchInput
+              css: SearchInput,
+              onKeyPress: (e) => {
+                if (e.key === "Enter") {
+                  e.preventDefault();
+                  e.stopPropagation();
+                }
+              }
             }
           )
         }
@@ -6551,7 +6606,7 @@ var FilterControls = ({
         {
           css: ClearSearchButtonStyles,
           onClick: () => {
-            setLocaleSearchTerm("");
+            setLocalSearchTerm("");
             if (editorRef.current) {
               if (editorRef.current.getRootElement() !== document.activeElement) {
                 editorRef.current.dispatchCommand(CLEAR_EDITOR_COMMAND2, void 0);
@@ -6988,15 +7043,36 @@ var SearchAndFilterResultContainer = ({
   hideClearButton
 }) => {
   const { searchTerm, totalResults, filters, handleResetFilters, setSearchTerm } = useSearchAndFilter();
-  const automateCalloutTitle = () => {
-    if (searchTerm && !filters.length) {
-      return "No search results found";
+  const emptyFilters = filters.length === 0 || filters.every((filter) => !filter.value);
+  const getTextValue = ({
+    defaultPropText,
+    searchText,
+    filterText,
+    fallbackText
+  }) => {
+    if (defaultPropText) {
+      return defaultPropText;
+    }
+    if (searchTerm && emptyFilters) {
+      return searchText;
     }
-    if (filters.length && !searchTerm) {
-      return "No results match the selected filters";
+    if (!emptyFilters && !searchTerm) {
+      return filterText;
     }
-    return "No matching results found";
+    return fallbackText;
   };
+  const clearButtonText = getTextValue({
+    defaultPropText: buttonText,
+    searchText: "Clear search",
+    filterText: "Clear filters",
+    fallbackText: "Clear results"
+  });
+  const automateCalloutTitle = getTextValue({
+    defaultPropText: calloutTitle,
+    searchText: "No search results found",
+    filterText: "No results match the selected filters",
+    fallbackText: "No matching results found"
+  });
   if (totalResults && totalResults > 0) {
     return null;
   }
@@ -7017,7 +7093,7 @@ var SearchAndFilterResultContainer = ({
       ] }),
       !searchTerm || hideClearButton ? null : /* @__PURE__ */ jsx78(Button5, { buttonType: "ghostDestructive", size: "zero", onClick: handleClearSearch, children: clearButtonLabel })
     ] }),
-    totalResults === 0 ? /* @__PURE__ */ jsxs37(Callout4, { title: calloutTitle != null ? calloutTitle : automateCalloutTitle(), type: "note", children: [
+    totalResults === 0 ? /* @__PURE__ */ jsxs37(Callout4, { title: automateCalloutTitle, type: "note", children: [
       calloutText ? /* @__PURE__ */ jsx78(Paragraph, { children: calloutText }) : null,
       hideClearButton ? null : /* @__PURE__ */ jsx78(
         Button5,
@@ -7026,7 +7102,7 @@ var SearchAndFilterResultContainer = ({
           size: "xs",
           onClick: handleClearSearch,
           "data-testid": "clear-search",
-          children: buttonText != null ? buttonText : "Clear search"
+          children: clearButtonText
         }
       )
     ] }) : null
@@ -7049,7 +7125,8 @@ var SearchAndFilter = ({
   onSearchChange,
   totalResults,
   allowBindingSearchTerm = false,
-  resetFilterValues = []
+  resetFilterValues = [],
+  onResetFilterValues
 }) => {
   return /* @__PURE__ */ jsx79(
     SearchAndFilterProvider,
@@ -7064,6 +7141,7 @@ var SearchAndFilter = ({
       resetFilterValues,
       filterMapper: filterMapper2,
       allowBindingSearchTerm,
+      onResetFilterValues,
       children: /* @__PURE__ */ jsxs38(VerticalRhythm7, { "data-testid": "search-and-filter", children: [
         /* @__PURE__ */ jsxs38("div", { css: SearchAndFilterOutterControlWrapper(viewSwitchControls ? "1fr auto" : "1fr"), children: [
           /* @__PURE__ */ jsx79(