Merge pull request '261103_01_FIX: KriAutoComplete 기본 검색을 contains 방식으로 변경' (#70) from develop into master
Reviewed-on: #70
This commit is contained in:
@@ -3,14 +3,15 @@
|
|||||||
import * as React from 'react'
|
import * as React from 'react'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import { MultiSelect } from '@/components/common/multi-select'
|
import { MultiSelect } from '@/components/common/multi-select'
|
||||||
import type { MultiSelectOption, MultiSelectRef } from '@/components/common/multi-select'
|
import type { MultiSelectOption, MultiSelectRef, MultiSelectSearchMatch } from '@/components/common/multi-select'
|
||||||
|
|
||||||
export type { MultiSelectOption, MultiSelectRef } from '@/components/common/multi-select'
|
export type { MultiSelectOption, MultiSelectRef, MultiSelectSearchMatch } from '@/components/common/multi-select'
|
||||||
|
|
||||||
export interface KriAutoCompleteBaseProps<T> {
|
export interface KriAutoCompleteBaseProps<T> {
|
||||||
items: T[]
|
items: T[]
|
||||||
searchable?: boolean
|
searchable?: boolean
|
||||||
searchMode?: 'filter' | 'inputOnly'
|
searchMode?: 'filter' | 'inputOnly'
|
||||||
|
searchMatch?: MultiSelectSearchMatch
|
||||||
defaultSearchValue?: string
|
defaultSearchValue?: string
|
||||||
onSearchValueChange?: (value: string) => void
|
onSearchValueChange?: (value: string) => void
|
||||||
placeholder?: string
|
placeholder?: string
|
||||||
@@ -58,6 +59,7 @@ export function KriMultiSelect<T = unknown>({
|
|||||||
onChange,
|
onChange,
|
||||||
searchable = true,
|
searchable = true,
|
||||||
searchMode = 'filter',
|
searchMode = 'filter',
|
||||||
|
searchMatch = 'contains',
|
||||||
defaultSearchValue = '',
|
defaultSearchValue = '',
|
||||||
onSearchValueChange,
|
onSearchValueChange,
|
||||||
maxCount = 1,
|
maxCount = 1,
|
||||||
@@ -100,6 +102,7 @@ export function KriMultiSelect<T = unknown>({
|
|||||||
badgeLabelClassName={badgeLabelClassName}
|
badgeLabelClassName={badgeLabelClassName}
|
||||||
searchable={searchable}
|
searchable={searchable}
|
||||||
searchMode={searchMode}
|
searchMode={searchMode}
|
||||||
|
searchMatch={searchMatch}
|
||||||
defaultSearchValue={defaultSearchValue}
|
defaultSearchValue={defaultSearchValue}
|
||||||
onSearchValueChange={onSearchValueChange}
|
onSearchValueChange={onSearchValueChange}
|
||||||
maxCount={maxCount}
|
maxCount={maxCount}
|
||||||
@@ -135,6 +138,7 @@ function KriSingleSelectInner<T>(
|
|||||||
onChange,
|
onChange,
|
||||||
searchable = true,
|
searchable = true,
|
||||||
searchMode = 'filter',
|
searchMode = 'filter',
|
||||||
|
searchMatch = 'contains',
|
||||||
defaultSearchValue = '',
|
defaultSearchValue = '',
|
||||||
onSearchValueChange,
|
onSearchValueChange,
|
||||||
placeholder = '옵션을 선택하세요',
|
placeholder = '옵션을 선택하세요',
|
||||||
@@ -216,6 +220,7 @@ function KriSingleSelectInner<T>(
|
|||||||
badgeLabelClassName={badgeLabelClassName ?? 'min-w-0 flex-1'}
|
badgeLabelClassName={badgeLabelClassName ?? 'min-w-0 flex-1'}
|
||||||
searchable={searchable}
|
searchable={searchable}
|
||||||
searchMode={searchMode}
|
searchMode={searchMode}
|
||||||
|
searchMatch={searchMatch}
|
||||||
defaultSearchValue={defaultSearchValue}
|
defaultSearchValue={defaultSearchValue}
|
||||||
onSearchValueChange={onSearchValueChange}
|
onSearchValueChange={onSearchValueChange}
|
||||||
preventDeselect={preventDeselect}
|
preventDeselect={preventDeselect}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ function MultiSelectInner<T>(
|
|||||||
hideSelectAll = false,
|
hideSelectAll = false,
|
||||||
searchable = true,
|
searchable = true,
|
||||||
searchMode = 'filter',
|
searchMode = 'filter',
|
||||||
|
searchMatch = 'fuzzy',
|
||||||
defaultSearchValue = '',
|
defaultSearchValue = '',
|
||||||
onSearchValueChange,
|
onSearchValueChange,
|
||||||
emptyIndicator = '검색 결과가 없습니다.',
|
emptyIndicator = '검색 결과가 없습니다.',
|
||||||
@@ -201,6 +202,7 @@ function MultiSelectInner<T>(
|
|||||||
selectedValues={selectedValues}
|
selectedValues={selectedValues}
|
||||||
searchable={searchable}
|
searchable={searchable}
|
||||||
searchMode={searchMode}
|
searchMode={searchMode}
|
||||||
|
searchMatch={searchMatch}
|
||||||
searchValue={searchValue}
|
searchValue={searchValue}
|
||||||
onSearchValueChange={handleSearchChange}
|
onSearchValueChange={handleSearchChange}
|
||||||
hideSelectAll={hideSelectAll}
|
hideSelectAll={hideSelectAll}
|
||||||
|
|||||||
@@ -11,14 +11,19 @@ import {
|
|||||||
CommandSeparator,
|
CommandSeparator,
|
||||||
} from '@/components/ui/command'
|
} from '@/components/ui/command'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import type { MultiSelectGroup, MultiSelectOption, MultiSelectOptions } from './types'
|
import type { MultiSelectGroup, MultiSelectOption, MultiSelectOptions, MultiSelectSearchMatch } from './types'
|
||||||
import { isGroupedOptions } from './utils'
|
import { isGroupedOptions } from './utils'
|
||||||
|
|
||||||
|
function containsFilter(value: string, search: string) {
|
||||||
|
return value.toLowerCase().includes(search.toLowerCase()) ? 1 : 0
|
||||||
|
}
|
||||||
|
|
||||||
interface MultiSelectContentProps<T> {
|
interface MultiSelectContentProps<T> {
|
||||||
options: MultiSelectOptions<T>
|
options: MultiSelectOptions<T>
|
||||||
selectedValues: string[]
|
selectedValues: string[]
|
||||||
searchable: boolean
|
searchable: boolean
|
||||||
searchMode: 'filter' | 'inputOnly'
|
searchMode: 'filter' | 'inputOnly'
|
||||||
|
searchMatch?: MultiSelectSearchMatch
|
||||||
searchValue: string
|
searchValue: string
|
||||||
onSearchValueChange: (value: string) => void
|
onSearchValueChange: (value: string) => void
|
||||||
hideSelectAll: boolean
|
hideSelectAll: boolean
|
||||||
@@ -96,6 +101,7 @@ export function MultiSelectContent<T>({
|
|||||||
selectedValues,
|
selectedValues,
|
||||||
searchable,
|
searchable,
|
||||||
searchMode,
|
searchMode,
|
||||||
|
searchMatch = 'fuzzy',
|
||||||
searchValue,
|
searchValue,
|
||||||
onSearchValueChange,
|
onSearchValueChange,
|
||||||
hideSelectAll,
|
hideSelectAll,
|
||||||
@@ -111,7 +117,7 @@ export function MultiSelectContent<T>({
|
|||||||
const allSelected = selectableOptions.length > 0 && selectableOptions.every((option) => selectedValues.includes(option.value))
|
const allSelected = selectableOptions.length > 0 && selectableOptions.every((option) => selectedValues.includes(option.value))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Command shouldFilter={searchMode === 'filter'}>
|
<Command shouldFilter={searchMode === 'filter'} filter={searchMatch === 'contains' ? containsFilter : undefined}>
|
||||||
{searchable ? (
|
{searchable ? (
|
||||||
<CommandInput
|
<CommandInput
|
||||||
value={searchValue}
|
value={searchValue}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ export type {
|
|||||||
AnimationConfig,
|
AnimationConfig,
|
||||||
MultiSelectGroup,
|
MultiSelectGroup,
|
||||||
MultiSelectOption,
|
MultiSelectOption,
|
||||||
|
MultiSelectSearchMatch,
|
||||||
MultiSelectOptions,
|
MultiSelectOptions,
|
||||||
MultiSelectProps,
|
MultiSelectProps,
|
||||||
MultiSelectRef,
|
MultiSelectRef,
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export interface MultiSelectGroup<T = unknown> {
|
|||||||
|
|
||||||
export type MultiSelectOptions<T = unknown> = MultiSelectOption<T>[] | MultiSelectGroup<T>[]
|
export type MultiSelectOptions<T = unknown> = MultiSelectOption<T>[] | MultiSelectGroup<T>[]
|
||||||
export type MultiSelectSelectionMode = 'single' | 'multiple'
|
export type MultiSelectSelectionMode = 'single' | 'multiple'
|
||||||
|
export type MultiSelectSearchMatch = 'fuzzy' | 'contains'
|
||||||
export type MultiSelectVariant = 'default' | 'secondary' | 'destructive' | 'inverted'
|
export type MultiSelectVariant = 'default' | 'secondary' | 'destructive' | 'inverted'
|
||||||
|
|
||||||
export interface MultiSelectResponsiveSettings {
|
export interface MultiSelectResponsiveSettings {
|
||||||
@@ -65,6 +66,7 @@ export interface MultiSelectProps<T = unknown>
|
|||||||
hideSelectAll?: boolean
|
hideSelectAll?: boolean
|
||||||
searchable?: boolean
|
searchable?: boolean
|
||||||
searchMode?: 'filter' | 'inputOnly'
|
searchMode?: 'filter' | 'inputOnly'
|
||||||
|
searchMatch?: MultiSelectSearchMatch
|
||||||
defaultSearchValue?: string
|
defaultSearchValue?: string
|
||||||
onSearchValueChange?: (value: string) => void
|
onSearchValueChange?: (value: string) => void
|
||||||
emptyIndicator?: React.ReactNode
|
emptyIndicator?: React.ReactNode
|
||||||
|
|||||||
Reference in New Issue
Block a user