feat: add a clear button to FilterPicker, Select, ComboBox

tenphi · tenphi · commit a5b32087dd73 · 2025-09-19T19:26:09.000+02:00
diff --git a/.changeset/modern-tigers-impress.md b/.changeset/modern-tigers-impress.md
@@ -0,0 +1,5 @@
+---
+"@cube-dev/ui-kit": patch
+---
+
+Add a clear button to FilterPicker, Select and ComboBox components. Redesign the clear button in SearchInput component.
diff --git a/src/components/content/ItemBase/ItemBase.tsx b/src/components/content/ItemBase/ItemBase.tsx
@@ -172,6 +172,8 @@ const ItemBaseElement = tasty({
       'with-icon ^ with-prefix': 'max-content 1sf max-content max-content',
       'with-icon & with-prefix':
         'max-content max-content 1sf max-content max-content',
+      '(with-icon ^ with-right-icon) & !with-description & !with-prefix & !with-suffix & !with-label':
+        'max-content',
     },
     gridRows: {
       '': 'auto auto',
@@ -461,6 +463,7 @@ const ItemBase = <T extends HTMLElement = HTMLDivElement>(
     return {
       'with-icon': !!finalIcon,
       'with-right-icon': !!finalRightIcon,
+      'with-label': !!(children || labelProps),
       'with-prefix': !!finalPrefix,
       'with-suffix': !!finalSuffix,
       'with-description': !!description,
diff --git a/src/components/fields/ComboBox/ComboBox.stories.tsx b/src/components/fields/ComboBox/ComboBox.stories.tsx
@@ -55,6 +55,14 @@ export default {
         defaultValue: { summary: false },
       },
     },
+    isClearable: {
+      control: { type: 'boolean' },
+      description:
+        'Whether the combo box is clearable using ESC keyboard button or clear button inside the input',
+      table: {
+        defaultValue: { summary: false },
+      },
+    },
 
     /* Behavior */
     menuTrigger: {
@@ -347,6 +355,13 @@ Valid.args = { selectedKey: 'yellow', validationState: 'valid' };
 export const Disabled = Template.bind({});
 Disabled.args = { selectedKey: 'yellow', isDisabled: true };
 
+export const Clearable = Template.bind({});
+Clearable.args = {
+  defaultSelectedKey: 'purple',
+  isClearable: true,
+  placeholder: 'Choose a color...',
+};
+
 export const Wide: StoryFn<CubeComboBoxProps<any>> = (
   args: CubeComboBoxProps<any>,
 ) => (
diff --git a/src/components/fields/ComboBox/ComboBox.tsx b/src/components/fields/ComboBox/ComboBox.tsx
@@ -19,7 +19,7 @@ import {
 import { Section as BaseSection, useComboBoxState } from 'react-stately';
 
 import { useEvent } from '../../../_internal/index';
-import { DownIcon, LoadingIcon } from '../../../icons';
+import { CloseIcon, DownIcon, LoadingIcon } from '../../../icons';
 import { useProviderProps } from '../../../provider';
 import { FieldBaseProps } from '../../../shared';
 import {
@@ -37,6 +37,7 @@ import {
 } from '../../../utils/react';
 import { useFocus } from '../../../utils/react/interactions';
 import { useEventBus } from '../../../utils/react/useEventBus';
+import { Button } from '../../actions';
 import { useFieldProps, useFormProps, wrapWithField } from '../../form';
 import { Item } from '../../Item';
 import { OverlayWrapper } from '../../overlays/OverlayWrapper';
@@ -70,7 +71,9 @@ const TriggerElement = tasty({
     placeContent: 'center',
     placeSelf: 'stretch',
     radius: '(1r - 1bw) right',
+    padding: '0',
     width: '3x',
+    boxSizing: 'border-box',
     color: {
       '': '#dark-02',
       hovered: '#dark-02',
@@ -90,6 +93,15 @@ const TriggerElement = tasty({
   },
 });
 
+const ClearButton = tasty(Button, {
+  icon: <CloseIcon />,
+  styles: {
+    height: '($size - 1x)',
+    width: '($size - 1x)',
+    margin: '0 .5x',
+  },
+});
+
 export interface CubeComboBoxProps<T>
   extends Omit<
       CubeSelectBaseProps<T>,
@@ -125,6 +137,8 @@ export interface CubeComboBoxProps<T>
   suffixPosition?: 'before' | 'after';
   menuTrigger?: MenuTriggerAction;
   allowsCustomValue?: boolean;
+  /** Whether the combo box is clearable using ESC keyboard button or clear button inside the input */
+  isClearable?: boolean;
 }
 
 const PROP_STYLES = [...BASE_STYLES, ...OUTER_STYLES, ...COLOR_STYLES];
@@ -201,6 +215,7 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
     labelSuffix,
     selectedKey,
     defaultSelectedKey,
+    isClearable,
     ...otherProps
   } = props;
 
@@ -306,6 +321,42 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
   let validationIcon = isInvalid ? InvalidIcon : ValidIcon;
   let validation = cloneElement(validationIcon);
 
+  // Clear button logic
+  let hasValue = props.allowsCustomValue
+    ? state.inputValue !== ''
+    : state.selectedKey != null;
+  let showClearButton =
+    isClearable && hasValue && !isDisabled && !props.isReadOnly;
+
+  // Clear function
+  let clearValue = useEvent(() => {
+    if (props.allowsCustomValue) {
+      props.onInputChange?.('');
+      // If state has a setInputValue method, use it as well
+      if (
+        'setInputValue' in state &&
+        typeof state.setInputValue === 'function'
+      ) {
+        state.setInputValue('');
+      }
+    } else {
+      props.onSelectionChange?.(null);
+      // If state has a setSelectedKey method, use it as well
+      if (
+        'setSelectedKey' in state &&
+        typeof state.setSelectedKey === 'function'
+      ) {
+        state.setSelectedKey(null);
+      }
+    }
+    // Close the popup if it's open
+    if (state.isOpen) {
+      state.close();
+    }
+    // Focus back to the input
+    inputRef.current?.focus();
+  });
+
   let comboBoxWidth = wrapperRef?.current?.offsetWidth;
 
   if (icon) {
@@ -333,6 +384,7 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
       loading: isLoading,
       prefix: !!prefix,
       suffix: true,
+      clearable: showClearButton,
     }),
     [
       isInvalid,
@@ -342,6 +394,7 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
       isFocused,
       isLoading,
       prefix,
+      showClearButton,
     ],
   );
 
@@ -453,6 +506,16 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
           </>
         ) : null}
         {suffixPosition === 'after' ? suffix : null}
+        {showClearButton && (
+          <ClearButton
+            size={size}
+            type={validationState === 'invalid' ? 'clear' : 'neutral'}
+            theme={validationState === 'invalid' ? 'danger' : undefined}
+            qa="ComboBoxClearButton"
+            data-no-trigger={hideTrigger ? '' : undefined}
+            onPress={clearValue}
+          />
+        )}
         {!hideTrigger ? (
           <TriggerElement
             data-popover-trigger
diff --git a/src/components/fields/FilterPicker/FilterPicker.stories.tsx b/src/components/fields/FilterPicker/FilterPicker.stories.tsx
@@ -74,6 +74,14 @@ const meta: Meta<typeof FilterPicker> = {
         defaultValue: { summary: false },
       },
     },
+    isClearable: {
+      control: { type: 'boolean' },
+      description:
+        'Whether the filter picker is clearable using a clear button in the rightIcon slot',
+      table: {
+        defaultValue: { summary: false },
+      },
+    },
     disallowEmptySelection: {
       control: { type: 'boolean' },
       description: 'Whether to disallow empty selection',
@@ -448,6 +456,27 @@ export const SingleSelection: Story = {
   ),
 };
 
+export const Clearable: Story = {
+  args: {
+    label: 'Clearable Filter Picker',
+    placeholder: 'Choose items...',
+    selectionMode: 'single',
+    searchPlaceholder: 'Search fruits...',
+    width: 'max 30x',
+    defaultSelectedKey: 'apple',
+    isClearable: true,
+  },
+  render: (args) => (
+    <FilterPicker {...args}>
+      {fruits.map((fruit) => (
+        <FilterPicker.Item key={fruit.key} textValue={fruit.label}>
+          {fruit.label}
+        </FilterPicker.Item>
+      ))}
+    </FilterPicker>
+  ),
+};
+
 export const MultipleSelection: Story = {
   args: {
     label: 'Select Multiple Options',
diff --git a/src/components/fields/FilterPicker/FilterPicker.tsx b/src/components/fields/FilterPicker/FilterPicker.tsx
@@ -16,8 +16,9 @@ import {
 import { FocusScope, Key, useKeyboard } from 'react-aria';
 import { Section as BaseSection, Item, ListState } from 'react-stately';
 
+import { useEvent } from '../../../_internal';
 import { useWarn } from '../../../_internal/hooks/use-warn';
-import { DirectionIcon, LoadingIcon } from '../../../icons';
+import { CloseIcon, DirectionIcon, LoadingIcon } from '../../../icons';
 import { useProviderProps } from '../../../provider';
 import {
   BASE_STYLES,
@@ -35,12 +36,11 @@ import {
 import { generateRandomId } from '../../../utils/random';
 import { mergeProps } from '../../../utils/react';
 import { useEventBus } from '../../../utils/react/useEventBus';
-import { CubeItemButtonProps, ItemButton } from '../../actions';
+import { Button, CubeItemButtonProps, ItemButton } from '../../actions';
 import { CubeItemBaseProps } from '../../content/ItemBase';
 import { Text } from '../../content/Text';
 import { useFieldProps, useFormProps, wrapWithField } from '../../form';
 import { Dialog, DialogTrigger } from '../../overlays/Dialog';
-import { CubeTooltipProviderProps } from '../../overlays/Tooltip/TooltipProvider';
 import {
   CubeFilterListBoxProps,
   FilterListBox,
@@ -117,6 +117,8 @@ export interface CubeFilterPickerProps<T>
   listStateRef?: MutableRefObject<ListState<T>>;
   /** Additional modifiers for styling the FilterPicker */
   mods?: Record<string, boolean>;
+  /** Whether the filter picker is clearable using a clear button in the rightIcon slot */
+  isClearable?: boolean;
 }
 
 const PROP_STYLES = [...BASE_STYLES, ...OUTER_STYLES, ...COLOR_STYLES];
@@ -132,6 +134,16 @@ const FilterPickerWrapper = tasty({
   },
 });
 
+const ClearButton = tasty(Button, {
+  children: <CloseIcon />,
+  type: 'neutral',
+  mods: { pressed: false },
+  styles: {
+    height: '($size - 1x)',
+    width: '($size - 1x)',
+  },
+});
+
 export const FilterPicker = forwardRef(function FilterPicker<T extends object>(
   props: CubeFilterPickerProps<T>,
   ref: ForwardedRef<HTMLElement>,
@@ -235,6 +247,7 @@ export const FilterPicker = forwardRef(function FilterPicker<T extends object>(
     shouldUseVirtualFocus,
     onEscape,
     onOptionClick,
+    isClearable,
     ...otherProps
   } = props;
 
@@ -568,6 +581,25 @@ export const FilterPicker = forwardRef(function FilterPicker<T extends object>(
   const selectedLabels = getSelectedLabels();
   const hasSelection = selectedLabels.length > 0;
 
+  // Clear button logic
+  let showClearButton =
+    isClearable && hasSelection && !isDisabled && !props.isReadOnly;
+
+  // Clear function
+  let clearValue = useEvent(() => {
+    if (selectionMode === 'multiple') {
+      if (!isControlledMultiple) {
+        setInternalSelectedKeys([]);
+      }
+      onSelectionChange?.([]);
+    } else {
+      if (!isControlledSingle) {
+        setInternalSelectedKey(null);
+      }
+      onSelectionChange?.(null);
+    }
+  });
+
   // Always keep the latest selection in a ref (with normalized keys) so that we can read it synchronously in the popover close effect.
   const latestSelectionRef = useRef<{
     single: string | null;
@@ -963,6 +995,13 @@ export const FilterPicker = forwardRef(function FilterPicker<T extends object>(
             <LoadingIcon />
           ) : rightIcon !== undefined ? (
             rightIcon
+          ) : showClearButton ? (
+            <ClearButton
+              size={size}
+              theme={validationState === 'invalid' ? 'danger' : undefined}
+              qa="FilterPickerClearButton"
+              onPress={clearValue}
+            />
           ) : (
             <DirectionIcon to={state.isOpen ? 'top' : 'bottom'} />
           )
diff --git a/src/components/fields/SearchInput/SearchInput.tsx b/src/components/fields/SearchInput/SearchInput.tsx
@@ -26,13 +26,9 @@ export interface CubeSearchInputProps
 const ClearButton = tasty(Button, {
   icon: <CloseIcon />,
   styles: {
-    radius: 'right (1r - 1bw)',
-    width: {
-      '': '3x',
-      '[data-size="large"]': '4x',
-    },
-    height: 'auto',
-    placeSelf: 'stretch',
+    height: '($size - 1x)',
+    width: '($size - 1x)',
+    margin: '0 .5x',
   },
 });
 
diff --git a/src/components/fields/Select/Select.stories.tsx b/src/components/fields/Select/Select.stories.tsx
@@ -105,6 +105,15 @@ export default {
         defaultValue: { summary: 'bottom' },
       },
     },
+    isClearable: {
+      control: { type: 'boolean' },
+      description:
+        'Whether the select is clearable using a clear button in the rightIcon slot',
+      table: {
+        type: { summary: 'boolean' },
+        defaultValue: { summary: false },
+      },
+    },
     shouldFlip: {
       control: { type: 'boolean' },
       description: 'Whether dropdown should flip to fit in viewport',
@@ -404,6 +413,13 @@ WithPlaceholder.args = { placeholder: 'Enter a value' };
 export const WithDefaultValue = Template.bind({});
 WithDefaultValue.args = { defaultSelectedKey: 'purple' };
 
+export const Clearable = Template.bind({});
+Clearable.args = {
+  defaultSelectedKey: 'blue',
+  isClearable: true,
+  placeholder: 'Choose a color...',
+};
+
 export const WithIcon = Template.bind({});
 WithIcon.args = { icon: <IconCoin /> };
 
diff --git a/src/components/fields/Select/Select.tsx b/src/components/fields/Select/Select.tsx
diff --git a/src/components/fields/TextInput/TextInputBase.tsx b/src/components/fields/TextInput/TextInputBase.tsx

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@cube-dev/ui-kit": patch
 +---
++
 +Add a clear button to FilterPicker, Select and ComboBox components. Redesign the clear button in SearchInput component.