Merge branch 'master' into refactor/remove-field-types

This commit is contained in:
Michael Drury 2024-01-24 17:26:36 +00:00 committed by GitHub
commit 48ea140998
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions

View File

@ -12,7 +12,7 @@
export let getOptionIcon = () => null export let getOptionIcon = () => null
export let getOptionColour = () => null export let getOptionColour = () => null
export let getOptionSubtitle = () => null export let getOptionSubtitle = () => null
export let compare = (option, value) => option === value export let compare = null
export let useOptionIconImage = false export let useOptionIconImage = false
export let isOptionEnabled export let isOptionEnabled
export let readonly = false export let readonly = false
@ -40,9 +40,10 @@
if (!options?.length) { if (!options?.length) {
return "" return ""
} }
const index = options.findIndex((option, idx) => const index = options.findIndex((option, idx) => {
compare(getOptionValue(option, idx), value) const opt = getOptionValue(option, idx)
) return typeof compare === "function" ? compare(opt, value) : opt === value
})
return index !== -1 ? getAttribute(options[index], index) : null return index !== -1 ? getAttribute(options[index], index) : null
} }