refactor: modify api

react-component · Oct 24, 2023 · ba330ec · ba330ec
1 parent d231afa
commit ba330ec
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ export default () => (
 | loading | show loading icon in arrow | boolean | false |
 | virtual | Disable virtual scroll | boolean | true |
 | direction | direction of dropdown | 'ltr' \| 'rtl' | 'ltr' |
-| optionRender | Custom rendering options | (params: OptionRenderParams) => React.ReactNode | - |
+| optionRender | Custom rendering options | (oriOption: OptionType, info: { index: number }) => React.ReactNode | - |
 
 ### Methods
 

diff --git a/docs/examples/option-render.tsx b/docs/examples/option-render.tsx
@@ -9,8 +9,8 @@ export default () => {
         { label: 'test1', value: '1' },
         { label: 'test2', value: '2' },
       ]}
-      optionRender={({ option, index }) => {
-        return <div>{`${option.label} - ${index}`}</div>;
+      optionRender={(option, { index }) => {
+        return `${option.label} - ${index}`;
       }}
     />
   );

diff --git a/src/OptionList.tsx b/src/OptionList.tsx
@@ -369,14 +369,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
             >
               <div className={`${optionPrefixCls}-content`}>
                 {typeof optionRender === 'function'
-                  ? optionRender({
-                      option: { ...item.data, label: item.label },
-                      index: itemIndex,
-                      options: memoFlattenOptions.map((flattenItem) => ({
-                        ...flattenItem.data,
-                        label: flattenItem.label,
-                      })),
-                    })
+                  ? optionRender({ ...item.data, label: item.label }, { index: itemIndex })
                   : content}
               </div>
               {React.isValidElement(menuItemSelectedIcon) || selected}

diff --git a/src/Select.tsx b/src/Select.tsx
@@ -103,12 +103,6 @@ export type SelectHandler<ValueType, OptionType extends BaseOptionType = Default
   option: OptionType,
 ) => void;
 
-export type OptionRenderParams = {
-  option: DefaultOptionType;
-  index: number;
-  options: DefaultOptionType[];
-};
-
 type ArrayElementType<T> = T extends (infer E)[] ? E : T;
 
 export interface SelectProps<ValueType = any, OptionType extends BaseOptionType = DefaultOptionType>
@@ -144,7 +138,7 @@ export interface SelectProps<ValueType = any, OptionType extends BaseOptionType
   optionLabelProp?: string;
   children?: React.ReactNode;
   options?: OptionType[];
-  optionRender?: (params: OptionRenderParams) => React.ReactNode;
+  optionRender?: (oriOption: OptionType, info: { index: number }) => React.ReactNode;
   defaultActiveFirstOption?: boolean;
   virtual?: boolean;
   direction?: 'ltr' | 'rtl';

diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx
@@ -2105,8 +2105,8 @@ describe('Select.Basic', () => {
       <Select
         open
         options={options}
-        optionRender={({ option, index }) => {
-          return `${option.label} - ${index}`
+        optionRender={(option, {index}) => {
+          return `${option.label} - ${index}`;
         }}
       />,
     );