Merge remote-tracking branch 'origin/master'

Author: zombieJ

.dumirc.ts

@@ -9,8 +9,8 @@ export default defineConfig({
   },
   exportStatic: {},
   outputPath: 'docs-dist',
-  base: isGitPagesSite ? `/rc-overflow/` : ``,
-  publicPath: isGitPagesSite ? `/rc-overflow/` : ``,
+  base: isGitPagesSite ? `/rc-overflow/` : `/`,
+  publicPath: isGitPagesSite ? `/rc-overflow/` : `/`,
   styles: [
     `
       .markdown table {

package.json

@@ -80,6 +80,9 @@
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
+  "overrides": {
+    "cheerio":"1.0.0-rc.12"
+  },
   "cnpm": {
     "mode": "npm"
   },

src/Item.tsx

@@ -11,7 +11,7 @@ export interface ItemProps<ItemType> extends React.HTMLAttributes<any> {
   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,7 @@ function InternalItem<ItemType>(
 
   // ================================ Render ================================
   const childNode =
-    renderItem && item !== UNDEFINED ? renderItem(item) : children;
+    renderItem && item !== UNDEFINED ? renderItem(item, { index: order }) : children;
 
   let overflowStyle: React.CSSProperties | undefined;
   if (!invalidate) {

src/Overflow.tsx

@@ -24,7 +24,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: 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;

tests/index.spec.tsx

@@ -51,6 +51,22 @@ describe('Overflow.Basic', () => {
     expect(wrapper.find('Item').text()).toEqual('Bamboo Is Light');
   });
 
+  it('renderItem params have "order"', () => {
+    const testData = getData(3);
+    const wrapper = mount(
+      <Overflow
+        data={testData}
+        renderItem={(item, info) => {
+          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(