diff --git a/src/Item.tsx b/src/Item.tsx index 1a82aff..e1870b0 100644 --- a/src/Item.tsx +++ b/src/Item.tsx @@ -11,7 +11,7 @@ export interface ItemProps extends React.HTMLAttributes { item?: ItemType; className?: string; style?: React.CSSProperties; - renderItem?: (item: ItemType, order: number) => React.ReactNode; + renderItem?: (item: ItemType) => React.ReactNode; responsive?: boolean; // https://github.com/ant-design/ant-design/issues/35475 /** @@ -66,7 +66,7 @@ function InternalItem( // ================================ Render ================================ const childNode = - renderItem && item !== UNDEFINED ? renderItem(item, order) : children; + renderItem && item !== UNDEFINED ? renderItem(item) : children; let overflowStyle: React.CSSProperties | undefined; if (!invalidate) { diff --git a/src/Overflow.tsx b/src/Overflow.tsx index 3ce1a9e..cf933c2 100644 --- a/src/Overflow.tsx +++ b/src/Overflow.tsx @@ -1,13 +1,13 @@ -import * as React from 'react'; -import { useState, useMemo, useCallback } from 'react'; import classNames from 'classnames'; import ResizeObserver from 'rc-resize-observer'; import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect'; +import * as React from 'react'; +import { useCallback, useMemo, useState } from 'react'; import Item from './Item'; -import useEffectState, { useBatcher } from './hooks/useEffectState'; import type { ComponentType } from './RawItem'; import RawItem from './RawItem'; import { OverflowContext } from './context'; +import useEffectState, { useBatcher } from './hooks/useEffectState'; const RESPONSIVE = 'responsive' as const; const INVALIDATE = 'invalidate' as const; @@ -24,7 +24,7 @@ export interface OverflowProps extends React.HTMLAttributes { itemKey?: React.Key | ((item: ItemType) => React.Key); /** Used for `responsive`. It will limit render node to avoid perf issue */ itemWidth?: number; - renderItem?: (item: ItemType, order: number) => React.ReactNode; + renderItem?: (item: 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; @@ -347,7 +347,7 @@ function Overflow( {...itemSharedProps} order={index} key={key} - item={item} + item={{ ...item, index }} renderItem={mergedRenderItem} itemKey={key} registerSize={registerSize}