fix(web): AutoCompleteInput — canonical shadcn Combobox, без браузерных подсказок
- переделан по документации shadcn: Button trigger + Popover + Command с CommandInput внутри (вместо нативного Input в триггере) - CommandInput с autoComplete="off" / autoCorrect="off" / spellCheck=false — браузерные подсказки больше не появляются - поддержан произвольный ввод: пункт «Использовать: <запрос>» при отсутствии совпадений Co-authored-by: Cursor <[email protected]>
This commit is contained in:
@@ -1,11 +1,12 @@
|
|||||||
import * as React from 'react'
|
import * as React from 'react'
|
||||||
import { CheckIcon, SearchIcon } from 'lucide-react'
|
import { CheckIcon, ChevronsUpDownIcon, SearchIcon } from 'lucide-react'
|
||||||
|
|
||||||
import { Input } from '@cfdm/ui/components/input'
|
import { Button } from '@cfdm/ui/components/button'
|
||||||
import {
|
import {
|
||||||
Command,
|
Command,
|
||||||
CommandEmpty,
|
CommandEmpty,
|
||||||
CommandGroup,
|
CommandGroup,
|
||||||
|
CommandInput,
|
||||||
CommandItem,
|
CommandItem,
|
||||||
CommandList,
|
CommandList,
|
||||||
} from '@cfdm/ui/components/command'
|
} from '@cfdm/ui/components/command'
|
||||||
@@ -32,8 +33,10 @@ interface AutoCompleteInputProps {
|
|||||||
searchPlaceholder?: string
|
searchPlaceholder?: string
|
||||||
emptyText?: string
|
emptyText?: string
|
||||||
className?: string
|
className?: string
|
||||||
/** Показывать ли выбранный leading в самом Input (например флаг). */
|
/** Показывать ли выбранный leading в триггере (например флаг). */
|
||||||
showLeadingInInput?: boolean
|
showLeadingInInput?: boolean
|
||||||
|
/** Разрешать ли произвольный ввод (не только из списка). По умолчанию true. */
|
||||||
|
allowFreeText?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export function AutoCompleteInput({
|
export function AutoCompleteInput({
|
||||||
@@ -41,80 +44,99 @@ export function AutoCompleteInput({
|
|||||||
value,
|
value,
|
||||||
onChange,
|
onChange,
|
||||||
options,
|
options,
|
||||||
placeholder,
|
placeholder = 'Выбрать…',
|
||||||
searchPlaceholder: _searchPlaceholder = 'Поиск…',
|
searchPlaceholder = 'Поиск…',
|
||||||
emptyText = 'Ничего не найдено',
|
emptyText = 'Ничего не найдено',
|
||||||
className,
|
className,
|
||||||
showLeadingInInput = true,
|
showLeadingInInput = true,
|
||||||
|
allowFreeText = true,
|
||||||
}: AutoCompleteInputProps) {
|
}: AutoCompleteInputProps) {
|
||||||
const [open, setOpen] = React.useState(false)
|
const [open, setOpen] = React.useState(false)
|
||||||
|
const [query, setQuery] = React.useState('')
|
||||||
|
|
||||||
const filtered = React.useMemo(() => {
|
const filtered = React.useMemo(() => {
|
||||||
const q = value.trim().toLowerCase()
|
const q = query.trim().toLowerCase()
|
||||||
if (!q) return options
|
if (!q) return options
|
||||||
return options.filter((o) => o.label.toLowerCase().includes(q) || o.value.toLowerCase().includes(q))
|
return options.filter(
|
||||||
}, [options, value])
|
(o) => o.label.toLowerCase().includes(q) || o.value.toLowerCase().includes(q),
|
||||||
|
)
|
||||||
|
}, [options, query])
|
||||||
|
|
||||||
const selected = options.find((o) => o.value.toLowerCase() === value.trim().toLowerCase())
|
const selected = options.find(
|
||||||
const leading = selected?.leading
|
(o) => o.value.toLowerCase() === value.trim().toLowerCase(),
|
||||||
|
)
|
||||||
|
const displayLabel = selected?.label ?? value
|
||||||
|
const leading = showLeadingInInput ? selected?.leading : undefined
|
||||||
|
|
||||||
|
const handleSelect = (next: string) => {
|
||||||
|
onChange(next)
|
||||||
|
setQuery('')
|
||||||
|
setOpen(false)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Popover open={open} onOpenChange={setOpen}>
|
<Popover open={open} onOpenChange={(o) => {
|
||||||
|
setOpen(o)
|
||||||
|
if (!o) setQuery('')
|
||||||
|
}}>
|
||||||
<PopoverTrigger
|
<PopoverTrigger
|
||||||
render={
|
render={
|
||||||
<div className="relative">
|
<Button
|
||||||
{showLeadingInInput && leading ? (
|
id={id}
|
||||||
<span className="pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-base leading-none">
|
variant="outline"
|
||||||
{leading}
|
role="combobox"
|
||||||
|
aria-expanded={open}
|
||||||
|
className={cn('w-full justify-between font-normal', className)}
|
||||||
|
>
|
||||||
|
<span className="flex min-w-0 items-center gap-2">
|
||||||
|
{leading ? <span className="text-base leading-none">{leading}</span> : null}
|
||||||
|
<span className={cn('truncate', !value && 'text-muted-foreground')}>
|
||||||
|
{value ? displayLabel : placeholder}
|
||||||
</span>
|
</span>
|
||||||
) : null}
|
</span>
|
||||||
<Input
|
<ChevronsUpDownIcon className="size-4 shrink-0 opacity-50" />
|
||||||
id={id}
|
</Button>
|
||||||
role="combobox"
|
|
||||||
aria-expanded={open}
|
|
||||||
placeholder={placeholder}
|
|
||||||
value={value}
|
|
||||||
onChange={(e) => {
|
|
||||||
onChange(e.target.value)
|
|
||||||
setOpen(true)
|
|
||||||
}}
|
|
||||||
onFocus={() => setOpen(true)}
|
|
||||||
className={cn(
|
|
||||||
showLeadingInInput && leading ? 'pl-8' : '',
|
|
||||||
className,
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<PopoverContent
|
<PopoverContent align="start" className="w-[--anchor-width] p-0">
|
||||||
align="start"
|
|
||||||
className="w-[--anchor-width] p-0"
|
|
||||||
initialFocus={false}
|
|
||||||
>
|
|
||||||
<Command shouldFilter={false} loop>
|
<Command shouldFilter={false} loop>
|
||||||
<div className="flex items-center gap-2 border-b px-3">
|
<CommandInput
|
||||||
<SearchIcon className="size-4 text-muted-foreground" />
|
placeholder={searchPlaceholder}
|
||||||
<span className="text-sm text-muted-foreground truncate flex-1">
|
value={query}
|
||||||
{value.trim() || 'Введите для поиска'}
|
onValueChange={setQuery}
|
||||||
</span>
|
autoComplete="off"
|
||||||
</div>
|
autoCorrect="off"
|
||||||
|
spellCheck={false}
|
||||||
|
/>
|
||||||
<CommandList>
|
<CommandList>
|
||||||
<CommandEmpty>{emptyText}</CommandEmpty>
|
<CommandEmpty>{emptyText}</CommandEmpty>
|
||||||
<CommandGroup>
|
<CommandGroup>
|
||||||
|
{allowFreeText && query.trim() && !filtered.some(
|
||||||
|
(o) => o.label.toLowerCase() === query.trim().toLowerCase(),
|
||||||
|
) ? (
|
||||||
|
<CommandItem
|
||||||
|
value={`__free__:${query.trim()}`}
|
||||||
|
onSelect={() => handleSelect(query.trim())}
|
||||||
|
className="gap-2"
|
||||||
|
>
|
||||||
|
<SearchIcon className="size-4 opacity-50" />
|
||||||
|
<span className="flex-1 truncate">
|
||||||
|
Использовать: <b>{query.trim()}</b>
|
||||||
|
</span>
|
||||||
|
</CommandItem>
|
||||||
|
) : null}
|
||||||
{filtered.map((opt) => {
|
{filtered.map((opt) => {
|
||||||
const isSelected = opt.value.toLowerCase() === value.trim().toLowerCase()
|
const isSelected = opt.value.toLowerCase() === value.trim().toLowerCase()
|
||||||
return (
|
return (
|
||||||
<CommandItem
|
<CommandItem
|
||||||
key={opt.value}
|
key={opt.value}
|
||||||
value={opt.value}
|
value={opt.value}
|
||||||
onSelect={() => {
|
onSelect={() => handleSelect(opt.value)}
|
||||||
onChange(opt.value)
|
|
||||||
setOpen(false)
|
|
||||||
}}
|
|
||||||
className="gap-2"
|
className="gap-2"
|
||||||
>
|
>
|
||||||
{opt.leading ? <span className="text-base leading-none">{opt.leading}</span> : null}
|
{opt.leading ? (
|
||||||
|
<span className="text-base leading-none">{opt.leading}</span>
|
||||||
|
) : null}
|
||||||
<span className="flex-1">{opt.label}</span>
|
<span className="flex-1">{opt.label}</span>
|
||||||
{isSelected ? <CheckIcon className="size-4 opacity-60" /> : null}
|
{isSelected ? <CheckIcon className="size-4 opacity-60" /> : null}
|
||||||
</CommandItem>
|
</CommandItem>
|
||||||
|
|||||||
Reference in New Issue
Block a user