261023_01_ENH: 프로젝트·필터 선택 옵션 전체 제목 툴팁 복원

This commit is contained in:
2026-10-23 11:52:59 +09:00
parent 642350bc6c
commit 6f1b7423ec
8 changed files with 107 additions and 5 deletions

View File

@@ -3,9 +3,9 @@
import * as React from 'react'
import { cn } from '@/lib/utils'
import { MultiSelect } from '@/components/common/multi-select'
import type { MultiSelectOption, MultiSelectRef } from '@/components/common/multi-select'
import type { MultiSelectOption, MultiSelectOptionTooltip, MultiSelectRef } from '@/components/common/multi-select'
export type { MultiSelectOption, MultiSelectRef } from '@/components/common/multi-select'
export type { MultiSelectOption, MultiSelectOptionTooltip, MultiSelectRef } from '@/components/common/multi-select'
export interface KriAutoCompleteBaseProps<T> {
items: T[]
@@ -26,6 +26,8 @@ export interface KriAutoCompleteBaseProps<T> {
disabled?: boolean
'aria-invalid'?: boolean
modalPopover?: boolean
optionTooltip?: MultiSelectOptionTooltip
optionTooltipClassName?: string
}
export interface KriMultiSelectProps<T = unknown> extends KriAutoCompleteBaseProps<T> {
@@ -77,6 +79,8 @@ export function KriMultiSelect<T = unknown>({
disabled,
'aria-invalid': ariaInvalid,
modalPopover = true,
optionTooltip,
optionTooltipClassName,
}: KriMultiSelectProps<T>) {
const options = React.useMemo(
() => toOptions(items, getValue, getLabel, withInfo),
@@ -110,6 +114,8 @@ export function KriMultiSelect<T = unknown>({
disabled={disabled}
aria-invalid={ariaInvalid}
modalPopover={modalPopover}
optionTooltip={optionTooltip}
optionTooltipClassName={optionTooltipClassName}
/>
</div>
)
@@ -157,6 +163,8 @@ function KriSingleSelectInner<T>({
disabled,
'aria-invalid': ariaInvalid,
modalPopover = true,
optionTooltip,
optionTooltipClassName,
}: KriSingleSelectProps<T>, forwardedRef: React.ForwardedRef<MultiSelectRef>) {
const ref = React.useRef<MultiSelectRef>(null)
React.useImperativeHandle(
@@ -227,6 +235,8 @@ function KriSingleSelectInner<T>({
aria-invalid={ariaInvalid}
title={showSelectedTooltip ? selectedLabel ?? value : undefined}
modalPopover={modalPopover}
optionTooltip={optionTooltip}
optionTooltipClassName={optionTooltipClassName}
/>
</div>
)

View File

@@ -46,6 +46,8 @@ function MultiSelectInner<T>(
closeOnSelect = false,
preventDeselect = false,
hideOptionCheck = false,
optionTooltip,
optionTooltipClassName,
style,
...buttonProps
}: MultiSelectProps<T>,
@@ -205,6 +207,8 @@ function MultiSelectInner<T>(
onSearchValueChange={handleSearchChange}
hideSelectAll={hideSelectAll}
hideOptionCheck={hideOptionCheck}
optionTooltip={optionTooltip}
optionTooltipClassName={optionTooltipClassName}
selectionMode={selectionMode}
emptyIndicator={emptyIndicator}
onToggleOption={toggleOption}

View File

@@ -11,8 +11,9 @@ import {
CommandList,
CommandSeparator,
} from '@/components/ui/command'
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
import { cn } from '@/lib/utils'
import type { MultiSelectGroup, MultiSelectOption, MultiSelectOptions } from './types'
import type { MultiSelectGroup, MultiSelectOption, MultiSelectOptionTooltip, MultiSelectOptions } from './types'
import { isGroupedOptions } from './utils'
interface MultiSelectContentProps<T> {
@@ -25,25 +26,57 @@ interface MultiSelectContentProps<T> {
onSearchValueChange: (value: string) => void
hideSelectAll: boolean
hideOptionCheck: boolean
optionTooltip?: MultiSelectOptionTooltip
optionTooltipClassName?: string
selectionMode: 'single' | 'multiple'
emptyIndicator: React.ReactNode
onToggleOption: (option: MultiSelectOption<T>) => void
onToggleAll: () => void
}
interface OptionTooltipSettings {
mode: MultiSelectOptionTooltip
className?: string
}
function OptionItem<T>({
option,
selected,
hideOptionCheck,
tooltip,
onToggle,
}: {
option: MultiSelectOption<T>
selected: boolean
hideOptionCheck: boolean
tooltip?: OptionTooltipSettings
onToggle: () => void
}) {
const Icon = option.icon
// cmdk's CommandItem overrides onPointerMove, so the label (not the item) is the tooltip trigger.
const label = tooltip ? (
<Tooltip>
<TooltipTrigger asChild>
<span className="min-w-0 flex-1 truncate">{option.label}</span>
</TooltipTrigger>
<TooltipContent
side="right"
className={cn(
'break-words',
tooltip.mode === 'wrap'
? 'max-w-[min(28rem,var(--radix-tooltip-content-available-width))]'
: 'max-w-[var(--radix-tooltip-content-available-width)]',
tooltip.className,
)}
>
{option.label}
</TooltipContent>
</Tooltip>
) : (
<span className="truncate">{option.label}</span>
)
return (
<CommandItem
value={`${option.label} ${option.value}`}
@@ -62,7 +95,7 @@ function OptionItem<T>({
</span>
) : null}
{Icon ? <Icon className="size-4" style={{ color: option.style?.iconColor }} /> : null}
<span className="truncate">{option.label}</span>
{label}
</CommandItem>
)
}
@@ -71,11 +104,13 @@ function OptionsGroup<T>({
group,
selectedValues,
hideOptionCheck,
tooltip,
onToggleOption,
}: {
group: MultiSelectGroup<T>
selectedValues: string[]
hideOptionCheck: boolean
tooltip?: OptionTooltipSettings
onToggleOption: (option: MultiSelectOption<T>) => void
}) {
return (
@@ -86,6 +121,7 @@ function OptionsGroup<T>({
option={option}
selected={selectedValues.includes(option.value)}
hideOptionCheck={hideOptionCheck}
tooltip={tooltip}
onToggle={() => onToggleOption(option)}
/>
))}
@@ -103,6 +139,8 @@ export function MultiSelectContent<T>({
onSearchValueChange,
hideSelectAll,
hideOptionCheck,
optionTooltip,
optionTooltipClassName,
selectionMode,
emptyIndicator,
onToggleOption,
@@ -123,8 +161,9 @@ export function MultiSelectContent<T>({
const flatOptions = grouped ? options.flatMap((group) => group.options) : options
const selectableOptions = flatOptions.filter((option) => !option.disabled)
const allSelected = selectableOptions.length > 0 && selectableOptions.every((option) => selectedValues.includes(option.value))
const tooltip = optionTooltip ? { mode: optionTooltip, className: optionTooltipClassName } : undefined
return (
const content = (
<Command shouldFilter={searchMode === 'filter'}>
{searchable ? (
<CommandInput
@@ -161,6 +200,7 @@ export function MultiSelectContent<T>({
group={group}
selectedValues={selectedValues}
hideOptionCheck={hideOptionCheck}
tooltip={tooltip}
onToggleOption={onToggleOption}
/>
))
@@ -172,6 +212,7 @@ export function MultiSelectContent<T>({
option={option}
selected={selectedValues.includes(option.value)}
hideOptionCheck={hideOptionCheck}
tooltip={tooltip}
onToggle={() => onToggleOption(option)}
/>
))}
@@ -180,4 +221,6 @@ export function MultiSelectContent<T>({
</CommandList>
</Command>
)
return tooltip ? <TooltipProvider delayDuration={0}>{content}</TooltipProvider> : content
}

View File

@@ -3,6 +3,7 @@ export type {
AnimationConfig,
MultiSelectGroup,
MultiSelectOption,
MultiSelectOptionTooltip,
MultiSelectOptions,
MultiSelectProps,
MultiSelectRef,

View File

@@ -29,6 +29,7 @@ export interface MultiSelectGroup<T = unknown> {
export type MultiSelectOptions<T = unknown> = MultiSelectOption<T>[] | MultiSelectGroup<T>[]
export type MultiSelectSelectionMode = 'single' | 'multiple'
export type MultiSelectVariant = 'default' | 'secondary' | 'destructive' | 'inverted'
export type MultiSelectOptionTooltip = 'singleLine' | 'wrap'
export interface MultiSelectResponsiveSettings {
maxCount?: number
@@ -79,6 +80,8 @@ export interface MultiSelectProps<T = unknown>
closeOnSelect?: boolean
preventDeselect?: boolean
hideOptionCheck?: boolean
optionTooltip?: MultiSelectOptionTooltip
optionTooltipClassName?: string
}
export interface MultiSelectRef {

View File

@@ -50,6 +50,9 @@ export function ProjectSelector() {
spanClassName="text-sm [&_span]:text-kart-text"
searchable
resetScrollOnSearch
// Legacy react-tooltip: full "(pkey) title" on hover, right side, 65% opacity.
optionTooltip="singleLine"
optionTooltipClassName="opacity-65"
preventDeselect
hideOptionCheck
disabled={projects.isPending}

View File

@@ -245,6 +245,9 @@ function FilterLineRow({
searchable
preventDeselect
hideOptionCheck
// Legacy QuestionSelect tooltip: full title on hover.
optionTooltip="singleLine"
optionTooltipClassName="opacity-65"
onChange={(qid) => {
const selected = questions.find((item) => item.qid === qid);
if (!selected) return;
@@ -302,6 +305,9 @@ function FilterLineRow({
badgeClassName="text-xs"
maxSelected={multi ? undefined : 1}
hideSelectAll={!multi}
// Legacy ValueSelect tooltip: full label on hover.
optionTooltip="singleLine"
optionTooltipClassName="opacity-65"
onChange={(next) => {
// Legacy keeps codes sorted and comma-joined.
const value = [...next].sort().join(",");