Skip to content

Commit 5e712d1

Browse files
committed
chore: fix logic
1 parent 211f982 commit 5e712d1

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/BaseSelect/index.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
324324

325325
// ============================== MISC ==============================
326326
const multiple = isMultiple(mode);
327-
const mergedShowSearch =
328-
(showSearch !== undefined ? showSearch : multiple) || mode === 'combobox';
327+
// const mergedShowSearch =
328+
// (showSearch !== undefined ? showSearch : multiple) || mode === 'combobox';
329329

330330
const domProps = {
331331
...restProps,
@@ -739,7 +739,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
739739
open: mergedOpen,
740740
triggerOpen: mergedOpen,
741741
id,
742-
showSearch: mergedShowSearch,
742+
showSearch,
743743
multiple,
744744
toggleOpen: triggerOpen,
745745
showScrollBar,
@@ -751,7 +751,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
751751
notFoundContent,
752752
triggerOpen,
753753
id,
754-
mergedShowSearch,
754+
showSearch,
755755
multiple,
756756
mergedOpen,
757757
showScrollBar,
@@ -824,7 +824,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
824824
[`${prefixCls}-loading`]: loading,
825825
[`${prefixCls}-open`]: mergedOpen,
826826
[`${prefixCls}-customize-input`]: customizeInputElement,
827-
[`${prefixCls}-show-search`]: mergedShowSearch,
827+
[`${prefixCls}-show-search`]: showSearch,
828828
});
829829

830830
// >>> Selector

src/Select.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
238238
optionFilterProp: legacyOptionFilterProp,
239239
filterSort: legacyFilterSort,
240240
};
241-
const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, searchProps);
241+
const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, searchProps, mode);
242242
const {
243243
filterOption,
244244
searchValue,

src/hooks/useSearchConfig.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import type { SearchConfig, DefaultOptionType } from '@/Select';
1+
import type { SearchConfig, DefaultOptionType, SelectProps } from '../Select';
22
import * as React from 'react';
33

44
// Convert `showSearch` to unique config
55
export default function useSearchConfig(
66
showSearch: boolean | SearchConfig<DefaultOptionType> | undefined,
77
props: SearchConfig<DefaultOptionType>,
8+
mode: SelectProps<DefaultOptionType>['mode'],
89
) {
910
const {
1011
filterOption,
@@ -26,8 +27,9 @@ export default function useSearchConfig(
2627
...(isObject ? showSearch : {}),
2728
};
2829

29-
return [isObject ? true : showSearch, searchConfig];
30+
return [isObject || (!showSearch && mode === 'tags') ? true : showSearch, searchConfig];
3031
}, [
32+
mode,
3133
showSearch,
3234
filterOption,
3335
searchValue,

0 commit comments

Comments
 (0)