fix: Remove optionLabelProp from showSearch

Author: 刘欢

README.md

@@ -98,6 +98,7 @@ export default () => (
 | combobox | enable combobox mode(can not set multiple at the same time) | boolean | false |
 | multiple | whether multiple select | boolean | false |
 | disabled | whether disabled select | boolean | false |
+| optionLabelProp | render option value or option children as content of select | String: 'value'/'children' | 'value' |
 | defaultValue | initial selected option(s) | String \| String[] | - |
 | value | current selected option(s) | String \| String[] \| {key:String, label:React.Node} \| {key:String, label:React.Node}[] | - |
 | labelInValue | whether to embed label in value, see above value type. Not support `combobox` mode | boolean | false |
@@ -142,7 +143,6 @@ export default () => (
 | filterOption | whether filter options by input value. default filter by option's optionFilterProp prop's value | boolean | true/Function(inputValue:string, option:Option) |
 | filterSort | Sort function for search options sorting, see [Array.sort](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort)'s compareFunction. | Function(optionA:Option, optionB: Option) | - |
 | optionFilterProp | which prop value of option will be used for filter if filterOption is true | String | 'value' |
-| optionLabelProp | render option value or option children as content of select | String: 'value'/'children' | 'value' |
 | searchValue | The current input "search" text | string | - |
 | tokenSeparators | separator used to tokenize on tag/multiple mode | string[]? |  |
 | onSearch | called when input changed | function | - |

src/Select.tsx

@@ -119,7 +119,6 @@ export interface SearchConfig<OptionType> {
   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 Omit<BaseSelectPropsWithoutPrivate, 'showSearch'> {
@@ -157,7 +156,6 @@ export interface SelectProps<ValueType = any, OptionType extends BaseOptionType
   filterSort?: SearchConfig<OptionType>['filterSort'];
   /**  @deprecated pleace use  SearchConfig.optionFilterProp */
   optionFilterProp?: string;
-  /**  @deprecated pleace use  SearchConfig.optionLabelProp */
   optionLabelProp?: string;
 
   children?: React.ReactNode;
@@ -205,6 +203,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       onDeselect,
       onActive,
       popupMatchSelectWidth = true,
+      optionLabelProp,
       options,
       optionRender,
       children,
@@ -232,7 +231,6 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       filterOption,
       searchValue,
       optionFilterProp,
-      optionLabelProp,
       filterSort,
       onSearch,
       autoClearSearchValue = true,

src/hooks/useSearchConfig.ts

@@ -4,7 +4,6 @@ const legacySearchProps = [
   'filterOption',
   'searchValue',
   'optionFilterProp',
-  'optionLabelProp',
   'filterSort',
   'onSearch',
   'autoClearSearchValue',
@@ -19,7 +18,6 @@ export default function useSearchConfig(
     filterOption,
     searchValue,
     optionFilterProp,
-    optionLabelProp,
     filterSort,
     onSearch,
     autoClearSearchValue,
@@ -45,7 +43,6 @@ export default function useSearchConfig(
     filterOption,
     searchValue,
     optionFilterProp,
-    optionLabelProp,
     filterSort,
     onSearch,
     autoClearSearchValue,

tests/Select.test.tsx

@@ -2521,23 +2521,7 @@ describe('Select.Basic', () => {
     expect(input).toHaveClass(customClassNames.input);
     expect(input).toHaveStyle(customStyle.input);
   });
-  // searchValue?: string;
-  //   autoClearSearchValue?: boolean;
-  //   onSearch?: (value: string) => void;
-  //   tokenSeparators?: string[];
-  //   filterOption?: boolean | FilterFunc<OptionType>;
-  //   filterSort?: (optionA: OptionType, optionB: OptionType, info: { searchValue: string }) => number;
-  //   optionFilterProp?: string;
-  //   optionLabelProp?: string;
-  //  const props = {
-  //   searchValue: '1',
-  //   autoClearSearchValue: false,
-  //   filterSort: (optionA, optionB) => {
-  //     return Number(optionB.value) - Number(optionA.value);
-  //   },
-  //   optionFilterProp: 'label',
-  //   optionLabelProp: 'value',
-  // };
+
   describe('combine showSearch', () => {
     let errorSpy;
 
@@ -2617,7 +2601,7 @@ describe('Select.Basic', () => {
       expect(currentInput).toHaveValue('1');
       expect(legacyInput.value).toBe(currentInput.value);
     });
-    it('option:sort,FilterProp,LabelProp ', () => {
+    it('option:sort,FilterProp ', () => {
       const { container } = render(
         <>
           <div id="test1">
@@ -2628,7 +2612,6 @@ describe('Select.Basic', () => {
                 return Number(b.label) - Number(a.label);
               }}
               optionFilterProp="label"
-              optionLabelProp="value"
             />
           </div>
           <div id="test2">
@@ -2638,7 +2621,6 @@ describe('Select.Basic', () => {
                 return Number(b.label) - Number(a.label);
               }}
               optionFilterProp="label"
-              optionLabelProp="value"
             />
           </div>
         </>,