diff --git a/src/Item.tsx b/src/Item.tsx index e1870b0..35eeafd 100644 --- a/src/Item.tsx +++ b/src/Item.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; import classNames from 'classnames'; import ResizeObserver from 'rc-resize-observer'; +import * as React from 'react'; import type { ComponentType } from './RawItem'; // Use shared variable to save bundle size @@ -11,7 +11,7 @@ export interface ItemProps extends React.HTMLAttributes { item?: ItemType; className?: string; style?: React.CSSProperties; - renderItem?: (item: ItemType) => React.ReactNode; + renderItem?: (item: ItemType, info: { index: number }) => React.ReactNode; responsive?: boolean; // https://github.com/ant-design/ant-design/issues/35475 /** @@ -66,7 +66,9 @@ function InternalItem( // ================================ Render ================================ const childNode = - renderItem && item !== UNDEFINED ? renderItem(item) : children; + renderItem && item !== UNDEFINED + ? renderItem(item, { index: order }) + : children; let overflowStyle: React.CSSProperties | undefined; if (!invalidate) { diff --git a/src/Overflow.tsx b/src/Overflow.tsx index acc850c..f2a405f 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) => React.ReactNode; + renderItem?: (item: ItemType, info: { index: number }) => 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,7 +341,6 @@ function Overflow( } : (item: ItemType, index: number) => { const key = getKey(item, index); - return ( ( const mergedRenderRest = renderRest || defaultRenderRest; - const restNode = renderRawRest ? ( - - {renderRawRest(omittedItems)} - - ) : ( - - {typeof mergedRenderRest === 'function' - ? mergedRenderRest(omittedItems) - : mergedRenderRest} - - ); + const restNode = renderRawRest ? ( + + {renderRawRest(omittedItems)} + + ) : ( + + {typeof mergedRenderRest === 'function' + ? mergedRenderRest(omittedItems) + : mergedRenderRest} + + ); const overflowNode = ( ( {overflowNode} - ) : overflowNode; + ) : ( + overflowNode + ); } const ForwardOverflow = React.forwardRef(Overflow); diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx index bbfc2a0..ccfc01c 100644 --- a/tests/index.spec.tsx +++ b/tests/index.spec.tsx @@ -51,6 +51,23 @@ describe('Overflow.Basic', () => { expect(wrapper.find('Item').text()).toEqual('Bamboo Is Light'); }); + it('renderItem params have "order"', () => { + const testData = getData(3); + const wrapper = mount( + { + return `${item.label}-${info.index}-test`; + }} + />, + ); + const renderedItems = wrapper.find('.rc-overflow-item'); + expect(renderedItems).toHaveLength(testData.length); + renderedItems.forEach((node, index) => { + expect(node.text()).toBe(`${testData[index].label}-${index}-test`); + }); + }); + describe('renderRest', () => { it('function', () => { const wrapper = mount(