Skip to content
Open
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
13 changes: 9 additions & 4 deletions registry/default/ui/multiselect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ interface GroupOption {
interface MultipleSelectorProps {
value?: Option[]
defaultOptions?: Option[]
defaultValue?: Option[]
/** manually controlled options */
options?: Option[]
placeholder?: string
Expand Down Expand Up @@ -172,6 +173,7 @@ const MultipleSelector = ({
onChange,
placeholder,
defaultOptions: arrayDefaultOptions = [],
defaultValue,
options: arrayOptions,
delay,
onSearch,
Expand All @@ -198,7 +200,10 @@ const MultipleSelector = ({
const [isLoading, setIsLoading] = React.useState(false)
const dropdownRef = React.useRef<HTMLDivElement>(null) // Added this

const [selected, setSelected] = React.useState<Option[]>(value || [])
const isControlled = value !== undefined
const [selected, setSelected] = React.useState<Option[]>(
isControlled ? value! : defaultValue || []
)
const [options, setOptions] = React.useState<GroupOption>(
transToGroupOption(arrayDefaultOptions, groupBy)
)
Expand Down Expand Up @@ -264,10 +269,10 @@ const MultipleSelector = ({
}, [open])

useEffect(() => {
if (value) {
setSelected(value)
if (isControlled) {
setSelected(value!)
}
}, [value])
}, [value, isControlled])

useEffect(() => {
/** If `onSearch` is provided, do not trigger options updated. */
Expand Down