fix(combobox): disclosure

adevinta · Mar 13, 2024 · 52eb035 · 52eb035
1 parent 6b9698b
commit 52eb035
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/components/combobox/src/ComboboxDisclosure.tsx b/packages/components/combobox/src/ComboboxDisclosure.tsx
@@ -29,6 +29,7 @@ export const Disclosure = forwardRef(
     const ctx = useComboboxContext()
 
     const { ref: downshiftRef, ...downshiftDisclosureProps } = ctx.getToggleButtonProps({
+      disabled: ctx.disabled || ctx.readOnly,
       onClick: event => {
         event.stopPropagation()
       },
@@ -46,6 +47,7 @@ export const Disclosure = forwardRef(
         {...downshiftDisclosureProps}
         {...props}
         aria-label={isOpen ? openedLabel : closedLabel}
+        disabled={ctx.disabled}
       >
         <Icon>
           <Icon className="shrink-0" size="sm">

diff --git a/packages/components/combobox/src/ComboboxTrigger.tsx b/packages/components/combobox/src/ComboboxTrigger.tsx
@@ -34,7 +34,6 @@ export const Trigger = forwardRef(
     const readOnly = field.readOnly || ctx.readOnly
 
     const hasClearButton = !!clearButton && !disabled && !readOnly
-    const hasDisclosure = !!disclosure && !disabled && !readOnly
 
     return (
       <>
@@ -62,7 +61,7 @@ export const Trigger = forwardRef(
               {input}
             </div>
             {hasClearButton && clearButton}
-            {hasDisclosure && disclosure}
+            {disclosure}
           </div>
         </PopoverAnchor>
       </>