feat: combine searchProps =>showSearch

Author: 刘欢

src/Select.tsx

@@ -110,16 +110,26 @@ type ArrayElementType<T> = T extends (infer E)[] ? E : T;
 
 export type SemanticName = BaseSelectSemanticName;
 export type PopupSemantic = 'listItem' | 'list';
+interface ShowSearch<OptionType> {
+  searchValue?: string;
+  autoClearSearchValue?: boolean;
+  onSearch?: (value: string) => void;
+  tokenSeparators?: string | string[];
+  filterOption?: boolean | FilterFunc<OptionType>;
+  filterSort?: (optionA: OptionType, optionB: OptionType, info: { searchValue: string }) => number;
+  optionFilterProp?: string;
+  optionLabelProp?: string;
+}
 export interface SelectProps<ValueType = any, OptionType extends BaseOptionType = DefaultOptionType>
-  extends BaseSelectPropsWithoutPrivate {
+  extends Omit<BaseSelectPropsWithoutPrivate, 'showSearch'> {
   prefixCls?: string;
   id?: string;
 
   backfill?: boolean;
 
   // >>> Field Names
   fieldNames?: FieldNames;
-
+  showSearch?: boolean | ShowSearch<OptionType>;
   searchValue?: string;
   onSearch?: (value: string) => void;
   autoClearSearchValue?: boolean;
@@ -176,22 +186,12 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       prefixCls = 'rc-select',
       backfill,
       fieldNames,
-
       // Search
-      searchValue,
-      onSearch,
-      autoClearSearchValue = true,
-
+      showSearch,
       // Select
       onSelect,
       onDeselect,
       popupMatchSelectWidth = true,
-
-      // Options
-      filterOption,
-      filterSort,
-      optionFilterProp,
-      optionLabelProp,
       options,
       optionRender,
       children,
@@ -214,6 +214,31 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       ...restProps
     } = props;
 
+    const legacySearchProps = [
+      'filterOption',
+      'searchValue',
+      'optionFilterProp',
+      'optionLabelProp',
+      'filterSort',
+      'onSearch',
+      'autoClearSearchValue',
+      'tokenSeparators',
+    ];
+    const legacyShowSearch: ShowSearch<DefaultOptionType> = {};
+    legacySearchProps.forEach((propsName) => {
+      legacyShowSearch[propsName] = restProps?.[propsName];
+    });
+    const mergedShowSearch = typeof showSearch === 'object' ? showSearch : legacyShowSearch;
+    const {
+      filterOption,
+      searchValue,
+      optionFilterProp,
+      optionLabelProp,
+      filterSort,
+      onSearch,
+      autoClearSearchValue,
+    } = mergedShowSearch;
+
     const mergedId = useId(id);
     const multiple = isMultiple(mode);
     const childrenAsData = !!(!options && children);
@@ -685,6 +710,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
           // >>> Trigger
           direction={direction}
           // >>> Search
+          showSearch={showSearch === undefined ? undefined : !!showSearch}
           searchValue={mergedSearchValue}
           onSearch={onInternalSearch}
           autoClearSearchValue={autoClearSearchValue}