feat:修改index赋值节点

react-component · Jan 7, 2025 · a2e4470 · a2e4470
1 parent a25df5a
commit a2e4470
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/Item.tsx b/src/Item.tsx
@@ -1,17 +1,18 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
+import type { ItemWithIndex } from './Overflow';
 import type { ComponentType } from './RawItem';
 
 // Use shared variable to save bundle size
 const UNDEFINED = undefined;
 
 export interface ItemProps<ItemType> extends React.HTMLAttributes<any> {
   prefixCls: string;
-  item?: ItemType;
+  item?: ItemWithIndex<ItemType>;
   className?: string;
   style?: React.CSSProperties;
-  renderItem?: (item: ItemType) => React.ReactNode;
+  renderItem?: (item: ItemWithIndex<ItemType>) => React.ReactNode;
   responsive?: boolean;
   // https://github.com/ant-design/ant-design/issues/35475
   /**

diff --git a/src/Overflow.tsx b/src/Overflow.tsx
@@ -16,6 +16,8 @@ export { OverflowContext } from './context';
 
 export type { ComponentType } from './RawItem';
 
+export type ItemWithIndex<ItemType> = ItemType & { index?: number };
+
 export interface OverflowProps<ItemType> extends React.HTMLAttributes<any> {
   prefixCls?: string;
   className?: string;
@@ -24,7 +26,7 @@ export interface OverflowProps<ItemType> extends React.HTMLAttributes<any> {
   itemKey?: React.Key | ((item: ItemType) => React.Key);
   /** Used for `responsive`. It will limit render node to avoid perf issue */
   itemWidth?: number;
-  renderItem?: (item: ItemType) => React.ReactNode;
+  renderItem?: (item: ItemWithIndex<ItemType>) => React.ReactNode;
   /** @private Do not use in your production. Render raw node that need wrap Item by developer self */
   renderRawItem?: (item: ItemType, index: number) => React.ReactElement;
   maxCount?: number | typeof RESPONSIVE | typeof INVALIDATE;
@@ -341,13 +343,13 @@ function Overflow<ItemType = any>(
       }
     : (item: ItemType, index: number) => {
         const key = getKey(item, index);
-
+        const propsItem: ItemWithIndex<ItemType> = { ...item, index };
         return (
           <Item
             {...itemSharedProps}
             order={index}
             key={key}
-            item={{ ...item, index }}
+            item={propsItem}
             renderItem={mergedRenderItem}
             itemKey={key}
             registerSize={registerSize}

diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx
@@ -56,8 +56,8 @@ describe('Overflow.Basic', () => {
     const wrapper = mount(
       <Overflow
         data={testData}
-        renderItem={(item, order) => {
-          return `${item.label}-${order}-test`;
+        renderItem={(item) => {
+          return `${item.label}-${item.index}-test`;
         }}
       />,
     );