Skip to content

Fix(SingleSelect): Validation added to single select component #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arielsrodriguez merged 1 commit into from
Jul 24, 2025
+24 −15
Merged

Fix(SingleSelect): Validation added to single select component #330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 24 additions & 15 deletions src/components/Form/SingleSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,29 +110,28 @@ function SingleSelect({
const handleSelect = (option: ISelectOption) => {
if (option.disabled) return

const originalOption = optionsList.find((opt) => opt.value === option.value)
const originalOption = optionsList?.find(
(opt) => String(opt?.value) === String(option?.value)
)

setSelectedOption(originalOption || option)
setIsOpen(false)

onChangeSelect?.(originalOption || option)
}

const optionsWithSelected = optionsList.map((opt) => ({
const optionsWithSelected = optionsList?.map((opt) => ({
...opt,
selected: opt.value === value
selected:
String(opt?.value) === String(value) ||
String(opt?.label).toLowerCase() === String(value).toLowerCase()
}))

const getInputLabel = () => {
let inputLabel = label
if (!isFilter && !selectedOption) return ''
if (!selectedOption) return inputLabel
if (!isFilter && !selectedOption) return placeholder || label || ''
if (!selectedOption) return placeholder || label || ''

return selectedOption.value === ''
? inputLabel
: (inputLabel =
optionsList.find((opt) => opt.value === selectedOption.value)
?.label || label)
return selectedOption.label || selectedOption.value.toString()
}

useEffect(() => {
Expand All @@ -149,8 +148,19 @@ function SingleSelect({
}, [])

useEffect(() => {
const found = optionsList.find((opt) => opt.value === value)
setSelectedOption(found || null)
const found = optionsList?.find(
(opt) => String(opt?.value) === String(value)
)

const foundByLabel =
!found && value
? optionsList?.find(
(opt) =>
String(opt?.label).toLowerCase() === String(value).toLowerCase()
)
: null

setSelectedOption(found || foundByLabel || null)
}, [value, optionsList])

return (
Expand Down Expand Up @@ -224,9 +234,8 @@ function SingleSelect({
</Text>
</div>
)}
{optionsWithSelected.map((option) => {
{optionsWithSelected?.map((option) => {
const { value, label, disabled } = option

return (
<Flex
className={composeClasses(
Expand Down