Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ export type RadioGroupProps<
TType = string,
> = Props<
TTag,
RadioGroupRenderPropArg<TType>,
RadioGroupRenderPropArg<TType | null>,
RadioGroupPropsWeControl,
{
value?: TType
value?: TType | null
defaultValue?: TType
onChange?: (value: TType) => void
onChange?: (value: NoInfer<TType>) => void
by?: ByComparator<TType>
disabled?: boolean
form?: string
Expand Down Expand Up @@ -192,7 +192,11 @@ function RadioGroupFn<TTag extends ElementType = typeof DEFAULT_RADIO_GROUP_TAG,
let radioGroupRef = useSyncRefs(internalRadioGroupRef, ref)

let defaultValue = useDefaultValue(_defaultValue)
let [value, onChange] = useControllable(controlledValue, controlledOnChange, defaultValue)
let [value, onChange] = useControllable<TType | null, TType>(
controlledValue,
controlledOnChange,
defaultValue
)

let firstOption = useMemo(
() =>
Expand Down
6 changes: 3 additions & 3 deletions packages/@headlessui-react/src/hooks/use-controllable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { useRef, useState } from 'react'
import { flushSync } from 'react-dom'
import { useEvent } from './use-event'

export function useControllable<T>(
export function useControllable<T, TValue extends T = T>(
controlledValue: T | undefined,
onChange?: (value: T) => void,
onChange?: (value: TValue) => void,
defaultValue?: T
) {
let [internalValue, setInternalValue] = useState(defaultValue)
Expand All @@ -30,7 +30,7 @@ export function useControllable<T>(

return [
(isControlled ? controlledValue : internalValue)!,
useEvent((value) => {
useEvent((value: TValue) => {
if (isControlled) {
return onChange?.(value)
} else {
Expand Down
15 changes: 15 additions & 0 deletions packages/@headlessui-react/types/radio-group.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React, { useState } from 'react'
import { Radio, RadioGroup } from '../src'

function ControlledNullableRadioGroup() {
let [selected, setSelected] = useState<string | undefined>(undefined)

return (
<RadioGroup value={selected ?? null} onChange={setSelected}>
<Radio value="startup">Startup</Radio>
<Radio value="business">Business</Radio>
</RadioGroup>
)
}

void ControlledNullableRadioGroup