From 03d3514600a525ac47d5bf516b0e679169a9b4d4 Mon Sep 17 00:00:00 2001
From: Lizzie <lizzie.lerwill@free-now.com>
Date: Tue, 18 Aug 2026 15:51:00 +0200
Subject: [PATCH] feat: add hideClearButton prop to ComboBox

Allow consumers to suppress the clear button when the input has a value.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../experimental/ComboBox/ComboBox.spec.tsx   | 20 +++++++++++++++++++
 .../experimental/ComboBox/ComboBox.tsx        |  9 ++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/experimental/ComboBox/ComboBox.spec.tsx b/src/components/experimental/ComboBox/ComboBox.spec.tsx
index c04ff163..c8a5995c 100644
--- a/src/components/experimental/ComboBox/ComboBox.spec.tsx
+++ b/src/components/experimental/ComboBox/ComboBox.spec.tsx
@@ -39,6 +39,26 @@ describe('ComboBox', () => {
         });
     });
 
+    it('hides clear button when hideClearButton is true', () => {
+        render(
+            <ComboBox label="Star Wars Character" items={mockItems} hideClearButton inputValue="Luke">
+                {item => <ListBoxItem>{item.name}</ListBoxItem>}
+            </ComboBox>
+        );
+
+        expect(screen.queryByRole('button', { name: 'Clear field' })).not.toBeInTheDocument();
+    });
+
+    it('shows clear button by default when input has value', () => {
+        render(
+            <ComboBox label="Star Wars Character" items={mockItems} inputValue="Luke">
+                {item => <ListBoxItem>{item.name}</ListBoxItem>}
+            </ComboBox>
+        );
+
+        expect(screen.getByRole('button', { name: 'Clear field' })).toBeInTheDocument();
+    });
+
     it('calls onSelectionChange when an item is selected', async () => {
         const onSelectionChange = jest.fn();
         render(
diff --git a/src/components/experimental/ComboBox/ComboBox.tsx b/src/components/experimental/ComboBox/ComboBox.tsx
index ae41f5ae..802e5ebf 100644
--- a/src/components/experimental/ComboBox/ComboBox.tsx
+++ b/src/components/experimental/ComboBox/ComboBox.tsx
@@ -30,6 +30,7 @@ const defaultAriaStrings = {
 interface ComboBoxFieldProps extends Pick<FieldProps, 'description' | 'errorMessage' | 'leadingIcon'> {
     label: string;
     placeholder?: string;
+    hideClearButton?: boolean;
     /**
      * If your project supports multiple languages,
      * it is recommended to pass translated labels to these properties
@@ -50,7 +51,7 @@ interface ComboBoxProps<T extends Record<string, unknown>>
 }
 
 const ComboBoxInput = React.forwardRef<HTMLDivElement, ComboBoxFieldProps>(
-    ({ label, placeholder, leadingIcon, ariaStrings, inputRef: externalInputRef }, forwardedRef) => {
+    ({ label, placeholder, leadingIcon, ariaStrings, hideClearButton, inputRef: externalInputRef }, forwardedRef) => {
         const state = React.useContext(ComboBoxStateContext);
         const internalInputRef = React.useRef<HTMLInputElement>(null);
 
@@ -67,7 +68,7 @@ const ComboBoxInput = React.forwardRef<HTMLDivElement, ComboBoxFieldProps>(
                     <Label $flying={Boolean(placeholder || state?.inputValue?.length > 0)}>{label}</Label>
                     <Input placeholder={placeholder} ref={combinedInputRef} />
                 </InnerWrapper>
-                {state?.inputValue?.length > 0 ? (
+                {!hideClearButton && state?.inputValue?.length > 0 ? (
                     <Button
                         // Don't inherit default Button behavior from ComboBox.
                         slot={null}
@@ -79,7 +80,7 @@ const ComboBoxInput = React.forwardRef<HTMLDivElement, ComboBoxFieldProps>(
                     >
                         <XCrossCircleIcon />
                     </Button>
-                ) : (
+                ) : state?.inputValue?.length > 0 ? null : (
                     <VisuallyHidden aria-live="polite">{ariaStrings.messageFieldIsCleared}</VisuallyHidden>
                 )}
             </FakeInput>
@@ -96,6 +97,7 @@ function ComboBoxComponent<T extends Record<string, unknown>>(
         children,
         placeholder,
         leadingIcon,
+        hideClearButton,
         ariaStrings = defaultAriaStrings,
         errorMessage,
         description,
@@ -130,6 +132,7 @@ function ComboBoxComponent<T extends Record<string, unknown>>(
                             label={label}
                             placeholder={placeholder}
                             leadingIcon={leadingIcon}
+                            hideClearButton={hideClearButton}
                             ariaStrings={ariaStrings}
                         />
                         <Footer>{isInvalid ? <FieldError>{errorMessage}</FieldError> : description}</Footer>