mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
## Summary - Rebuild `SingleSelect` with Reka UI Select primitives (SelectRoot, SelectTrigger, SelectContent, SelectItem) - Rebuild `MultiSelect` with Reka UI Popover + Listbox (PopoverRoot, ListboxRoot with `multiple`) - Remove PrimeVue dependency from both components - Preserve existing API contract for all consumers ## TODO - [x] Re-evaluate MultiSelect implementation (ComboboxRoot with `multiple` may be cleaner than Popover+Listbox) - [x] E2E verification in actual app (AssetFilterBar, WorkflowTemplateSelectorDialog, etc.) ## Test plan - [x] Storybook visual verification for all SingleSelect/MultiSelect stories - [x] Keyboard navigation (arrow keys, Enter, Escape, typeahead) - [x] Multi-selection with badge count - [x] Search filtering in MultiSelect - [x] Clear all functionality - [x] Disabled state - [x] Invalid state (SingleSelect) - [x] Loading state (SingleSelect) ## screenshot <img width="519" height="475" alt="스크린샷 2026-03-20 오전 12 12 37" src="https://github.com/user-attachments/assets/ffc7f0b0-c88c-486b-a253-73a4da73c1de" /> <img width="842" height="554" alt="스크린샷 2026-03-20 오전 12 23 51" src="https://github.com/user-attachments/assets/410551d4-c843-4898-b305-13a6ad6978ca" /> ## video https://github.com/user-attachments/assets/2fc3a9b9-2671-4c2c-9f54-4f83598afb53 Fixes #9700 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9742-refactor-rebuild-SingleSelect-and-MultiSelect-with-Reka-UI-3206d73d36508113bee2cf160c8f2d50) by [Unito](https://www.unito.io) --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Alexander Brown <drjkl@comfy.org>
274 lines
8.4 KiB
Vue
274 lines
8.4 KiB
Vue
<template>
|
|
<ComboboxRoot
|
|
v-model="selectedItems"
|
|
multiple
|
|
by="value"
|
|
:disabled
|
|
ignore-filter
|
|
:reset-search-term-on-select="false"
|
|
>
|
|
<ComboboxAnchor as-child>
|
|
<ComboboxTrigger
|
|
v-bind="$attrs"
|
|
:aria-label="label || t('g.multiSelectDropdown')"
|
|
:class="
|
|
cn(
|
|
'relative inline-flex cursor-pointer items-center select-none',
|
|
size === 'md' ? 'h-8' : 'h-10',
|
|
'rounded-lg bg-secondary-background text-base-foreground',
|
|
'transition-all duration-200 ease-in-out',
|
|
'hover:bg-secondary-background-hover',
|
|
'border-[2.5px] border-solid border-transparent',
|
|
selectedCount > 0
|
|
? 'border-base-foreground'
|
|
: 'focus-visible:border-node-component-border data-[state=open]:border-node-component-border',
|
|
disabled &&
|
|
'cursor-default opacity-30 hover:bg-secondary-background'
|
|
)
|
|
"
|
|
>
|
|
<div
|
|
:class="
|
|
cn(
|
|
'flex flex-1 items-center overflow-hidden py-2 whitespace-nowrap',
|
|
size === 'md' ? 'pl-3' : 'pl-4'
|
|
)
|
|
"
|
|
>
|
|
<span :class="size === 'md' ? 'text-xs' : 'text-sm'">
|
|
{{ label }}
|
|
</span>
|
|
<span
|
|
v-if="selectedCount > 0"
|
|
class="pointer-events-none absolute -top-2 -right-2 z-10 flex size-5 items-center justify-center rounded-full bg-base-foreground text-xs font-semibold text-base-background"
|
|
>
|
|
{{ selectedCount }}
|
|
</span>
|
|
</div>
|
|
<div
|
|
class="flex shrink-0 cursor-pointer items-center justify-center px-3"
|
|
>
|
|
<i class="icon-[lucide--chevron-down] text-muted-foreground" />
|
|
</div>
|
|
</ComboboxTrigger>
|
|
</ComboboxAnchor>
|
|
|
|
<ComboboxPortal>
|
|
<ComboboxContent
|
|
position="popper"
|
|
:side-offset="8"
|
|
align="start"
|
|
:style="popoverStyle"
|
|
:class="
|
|
cn(
|
|
'z-3000 overflow-hidden',
|
|
'rounded-lg p-2',
|
|
'bg-base-background text-base-foreground',
|
|
'border border-solid border-border-default',
|
|
'shadow-md',
|
|
'data-[state=closed]:animate-out data-[state=open]:animate-in',
|
|
'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
|
|
'data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
|
|
'data-[side=bottom]:slide-in-from-top-2'
|
|
)
|
|
"
|
|
@focus-outside="preventFocusDismiss"
|
|
>
|
|
<div
|
|
v-if="showSearchBox || showSelectedCount || showClearButton"
|
|
class="flex flex-col px-2 pt-2 pb-0"
|
|
>
|
|
<div
|
|
v-if="showSearchBox"
|
|
:class="
|
|
cn(
|
|
'flex items-center gap-2 rounded-lg border border-solid border-border-default px-3 py-1.5',
|
|
(showSelectedCount || showClearButton) && 'mb-2'
|
|
)
|
|
"
|
|
>
|
|
<i
|
|
class="icon-[lucide--search] shrink-0 text-sm text-muted-foreground"
|
|
/>
|
|
<ComboboxInput
|
|
v-model="searchQuery"
|
|
:placeholder="searchPlaceholder ?? t('g.search')"
|
|
class="w-full border-none bg-transparent text-sm outline-none"
|
|
/>
|
|
</div>
|
|
<div
|
|
v-if="showSelectedCount || showClearButton"
|
|
class="mt-2 flex items-center justify-between"
|
|
>
|
|
<span
|
|
v-if="showSelectedCount"
|
|
class="px-1 text-sm text-base-foreground"
|
|
>
|
|
{{ $t('g.itemsSelected', { count: selectedCount }) }}
|
|
</span>
|
|
<Button
|
|
v-if="showClearButton"
|
|
variant="textonly"
|
|
size="md"
|
|
@click.stop="selectedItems = []"
|
|
>
|
|
{{ $t('g.clearAll') }}
|
|
</Button>
|
|
</div>
|
|
<div class="my-4 h-px bg-border-default" />
|
|
</div>
|
|
|
|
<ComboboxViewport
|
|
:class="
|
|
cn(
|
|
'flex flex-col gap-0 p-0 text-sm',
|
|
'scrollbar-custom overflow-y-auto',
|
|
'min-w-(--reka-combobox-trigger-width)'
|
|
)
|
|
"
|
|
:style="{ maxHeight: `min(${listMaxHeight}, 50vh)` }"
|
|
>
|
|
<ComboboxItem
|
|
v-for="opt in filteredOptions"
|
|
:key="opt.value"
|
|
:value="opt"
|
|
:class="
|
|
cn(
|
|
'group flex h-10 shrink-0 cursor-pointer items-center gap-2 rounded-lg px-2 outline-none',
|
|
'hover:bg-secondary-background-hover',
|
|
'data-highlighted:bg-secondary-background-selected data-highlighted:hover:bg-secondary-background-selected'
|
|
)
|
|
"
|
|
>
|
|
<div
|
|
class="flex size-4 shrink-0 items-center justify-center rounded-sm transition-all duration-200 group-data-[state=checked]:bg-primary-background group-data-[state=unchecked]:bg-secondary-background [&>span]:flex"
|
|
>
|
|
<ComboboxItemIndicator>
|
|
<i
|
|
class="icon-[lucide--check] text-xs font-bold text-base-foreground"
|
|
/>
|
|
</ComboboxItemIndicator>
|
|
</div>
|
|
<span>{{ opt.name }}</span>
|
|
</ComboboxItem>
|
|
<ComboboxEmpty class="px-3 pb-4 text-sm text-muted-foreground">
|
|
{{ $t('g.noResultsFound') }}
|
|
</ComboboxEmpty>
|
|
</ComboboxViewport>
|
|
</ComboboxContent>
|
|
</ComboboxPortal>
|
|
</ComboboxRoot>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { useFuse } from '@vueuse/integrations/useFuse'
|
|
import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
|
|
import type { FocusOutsideEvent } from 'reka-ui'
|
|
import {
|
|
ComboboxAnchor,
|
|
ComboboxContent,
|
|
ComboboxEmpty,
|
|
ComboboxInput,
|
|
ComboboxItem,
|
|
ComboboxItemIndicator,
|
|
ComboboxPortal,
|
|
ComboboxRoot,
|
|
ComboboxTrigger,
|
|
ComboboxViewport
|
|
} from 'reka-ui'
|
|
import { computed } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import Button from '@/components/ui/button/Button.vue'
|
|
import { usePopoverSizing } from '@/composables/usePopoverSizing'
|
|
import { cn } from '@/utils/tailwindUtil'
|
|
|
|
import type { SelectOption } from './types'
|
|
|
|
defineOptions({
|
|
inheritAttrs: false
|
|
})
|
|
|
|
const {
|
|
label,
|
|
options = [],
|
|
size = 'lg',
|
|
disabled = false,
|
|
showSearchBox = false,
|
|
showSelectedCount = false,
|
|
showClearButton = false,
|
|
searchPlaceholder,
|
|
listMaxHeight = '28rem',
|
|
popoverMinWidth,
|
|
popoverMaxWidth
|
|
} = defineProps<{
|
|
/** Input label shown on the trigger button */
|
|
label?: string
|
|
/** Available options */
|
|
options?: SelectOption[]
|
|
/** Trigger size: 'lg' (40px, Interface) or 'md' (32px, Node) */
|
|
size?: 'lg' | 'md'
|
|
/** Disable the select */
|
|
disabled?: boolean
|
|
/** Show search box in the panel header */
|
|
showSearchBox?: boolean
|
|
/** Show selected count text in the panel header */
|
|
showSelectedCount?: boolean
|
|
/** Show "Clear all" action in the panel header */
|
|
showClearButton?: boolean
|
|
/** Placeholder for the search input */
|
|
searchPlaceholder?: string
|
|
/** Maximum height of the dropdown panel (default: 28rem) */
|
|
listMaxHeight?: string
|
|
/** Minimum width of the popover (default: auto) */
|
|
popoverMinWidth?: string
|
|
/** Maximum width of the popover (default: auto) */
|
|
popoverMaxWidth?: string
|
|
}>()
|
|
|
|
const selectedItems = defineModel<SelectOption[]>({
|
|
required: true
|
|
})
|
|
const searchQuery = defineModel<string>('searchQuery', { default: '' })
|
|
|
|
const { t } = useI18n()
|
|
const selectedCount = computed(() => selectedItems.value.length)
|
|
|
|
function preventFocusDismiss(event: FocusOutsideEvent) {
|
|
event.preventDefault()
|
|
}
|
|
|
|
const popoverStyle = usePopoverSizing({
|
|
minWidth: popoverMinWidth,
|
|
maxWidth: popoverMaxWidth
|
|
})
|
|
|
|
const fuseOptions: UseFuseOptions<SelectOption> = {
|
|
fuseOptions: {
|
|
keys: ['name', 'value'],
|
|
threshold: 0.3,
|
|
includeScore: false
|
|
},
|
|
matchAllWhenSearchEmpty: true
|
|
}
|
|
|
|
const { results } = useFuse(searchQuery, () => options, fuseOptions)
|
|
|
|
const filteredOptions = computed(() => {
|
|
if (!searchQuery.value || searchQuery.value.trim() === '') {
|
|
return options
|
|
}
|
|
|
|
const searchResults = results.value.map(
|
|
(result: { item: SelectOption }) => result.item
|
|
)
|
|
|
|
const selectedButNotInResults = selectedItems.value.filter(
|
|
(item) =>
|
|
!searchResults.some((result: SelectOption) => result.value === item.value)
|
|
)
|
|
|
|
return [...selectedButNotInResults, ...searchResults]
|
|
})
|
|
</script>
|