improve types, add missing render prop arguments

tailwindlabs · Jul 15, 2022 · b4d9ce7 · b4d9ce7
1 parent 1cdddae
commit b4d9ce7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/@headlessui-react/src/components/combobox/combobox.tsx b/packages/@headlessui-react/src/components/combobox/combobox.tsx
@@ -302,6 +302,7 @@ interface ComboboxRenderPropArg<T> {
   disabled: boolean
   activeIndex: number | null
   activeOption: T | null
+  value: T
 }
 
 let ComboboxRoot = forwardRefWithAs(function Combobox<

diff --git a/packages/@headlessui-react/src/components/listbox/listbox.tsx b/packages/@headlessui-react/src/components/listbox/listbox.tsx
@@ -299,9 +299,10 @@ function stateReducer(state: StateDefinition, action: Actions) {
 // ---
 
 let DEFAULT_LISTBOX_TAG = Fragment
-interface ListboxRenderPropArg {
+interface ListboxRenderPropArg<TType> {
   open: boolean
   disabled: boolean
+  value: TType
 }
 
 let ListboxRoot = forwardRefWithAs(function Listbox<
@@ -311,7 +312,7 @@ let ListboxRoot = forwardRefWithAs(function Listbox<
 >(
   props: Props<
     TTag,
-    ListboxRenderPropArg,
+    ListboxRenderPropArg<TType>,
     'value' | 'defaultValue' | 'onChange' | 'by' | 'disabled' | 'horizontal' | 'name' | 'multiple'
   > & {
     value?: TType
@@ -414,7 +415,7 @@ let ListboxRoot = forwardRefWithAs(function Listbox<
     listboxState === ListboxStates.Open
   )
 
-  let slot = useMemo<ListboxRenderPropArg>(
+  let slot = useMemo<ListboxRenderPropArg<TType>>(
     () => ({ open: listboxState === ListboxStates.Open, disabled, value }),
     [listboxState, disabled, value]
   )