Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,13 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
fieldNames,
// Search
showSearch,
searchValue: legacySearchValue,
onSearch: legacyOnSearch,
autoClearSearchValue: legacyAutoClearSearchValue,
filterOption: legacyFilterOption,
optionFilterProp: legacyOptionFilterProp,
filterSort: legacyFilterSort,

// Select
onSelect,
onDeselect,
Expand Down Expand Up @@ -223,7 +230,15 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
...restProps
} = props;

const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, props);
const searchProps = {
searchValue: legacySearchValue,
onSearch: legacyOnSearch,
autoClearSearchValue: legacyAutoClearSearchValue,
filterOption: legacyFilterOption,
optionFilterProp: legacyOptionFilterProp,
filterSort: legacyFilterSort,
};
const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, searchProps);
const {
filterOption,
searchValue,
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useSearchConfig.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { SearchConfig, DefaultOptionType, SelectProps } from '@/Select';
import type { SearchConfig, DefaultOptionType } from '@/Select';
import * as React from 'react';

// Convert `showSearch` to unique config
export default function useSearchConfig(
showSearch: boolean | SearchConfig<DefaultOptionType> | undefined,
props: SelectProps,
props: SearchConfig<DefaultOptionType>,
) {
const {
filterOption,
Expand Down
Loading