Merge branch 'master' into dependabot/npm_and_yarn/rc-component/father-plugin-2.1.3

Author: afc163

.umirc.ts renamed to .dumirc.ts

@@ -4,4 +4,5 @@ export default defineConfig({
   themeConfig: {
     name: 'Tree',
   },
+  outputPath: '.doc',
 });

.gitignore

@@ -7,7 +7,9 @@ lib/
 ~*
 yarn.lock
 package-lock.json
+pnpm-lock.yaml
 !tests/__mocks__/rc-util/lib
+!tests/__mocks__/@rc-component/util/lib
 bun.lockb
 
 # umi

README.md

@@ -1,19 +1,32 @@
-# rc-virtual-list
+# @rc-component/virtual-list
 
 React Virtual List Component which worked with animation.
 
-[![NPM version][npm-image]][npm-url] [![dumi](https://img.shields.io/badge/docs%20by-dumi-blue?style=flat-square)](https://github.com/umijs/dumi) [![build status][github-actions-image]][github-actions-url] [![Test coverage][coveralls-image]][coveralls-url] [![node version][node-image]][node-url] [![npm download][download-image]][download-url]
-
-[npm-image]: http://img.shields.io/npm/v/rc-virtual-list.svg?style=flat-square
-[npm-url]: http://npmjs.org/package/rc-virtual-list
-[github-actions-image]: https://github.com/react-component/virtual-list/workflows/CI/badge.svg
-[github-actions-url]: https://github.com/react-component/virtual-list/actions
-[coveralls-image]: https://img.shields.io/codecov/c/github/react-component/virtual-list/master.svg?style=flat-square
-[coveralls-url]: https://codecov.io/gh/react-component/virtual-list
-[node-image]: https://img.shields.io/badge/node.js-%3E=_6.0-green.svg?style=flat-square
-[node-url]: http://nodejs.org/download/
-[download-image]: https://img.shields.io/npm/dm/rc-virtual-list.svg?style=flat-square
-[download-url]: https://npmjs.org/package/rc-virtual-list
+[![NPM version][npm-image]][npm-url]
+[![npm download][download-image]][download-url]
+[![build status][github-actions-image]][github-actions-url]
+[![Codecov][codecov-image]][codecov-url]
+[![bundle size][bundlephobia-image]][bundlephobia-url]
+[![dumi][dumi-image]][dumi-url]
+
+[npm-image]: https://img.shields.io/npm/v/@rc-component/virtual-list.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/@rc-component/virtual-list
+[travis-image]: https://img.shields.io/travis/react-component/virtual-list/master?style=flat-square
+[travis-url]: https://travis-ci.com/react-component/virtual-list
+[github-actions-image]: https://github.com/react-component/virtual-list/actions/workflows/main.yml/badge.svg
+[github-actions-url]: https://github.com/react-component/virtual-list/actions/workflows/main.yml
+[codecov-image]: https://img.shields.io/codecov/c/github/react-component/virtual-list/master.svg?style=flat-square
+[codecov-url]: https://app.codecov.io/gh/react-component/virtual-list
+[david-url]: https://david-dm.org/react-component/virtual-list
+[david-image]: https://david-dm.org/react-component/virtual-list/status.svg?style=flat-square
+[david-dev-url]: https://david-dm.org/react-component/virtual-list?type=dev
+[david-dev-image]: https://david-dm.org/react-component/virtual-list/dev-status.svg?style=flat-square
+[download-image]: https://img.shields.io/npm/dm/@rc-component/virtual-list.svg?style=flat-square
+[download-url]: https://npmjs.org/package/@rc-component/virtual-list
+[bundlephobia-url]: https://bundlephobia.com/package/@rc-component/virtual-list
+[bundlephobia-image]: https://badgen.net/bundlephobia/minzip/@rc-component/virtual-list
+[dumi-url]: https://github.com/umijs/dumi
+[dumi-image]: https://img.shields.io/badge/docs%20by-dumi-blue?style=flat-square
 
 ## Online Preview
 
@@ -35,15 +48,15 @@ open http://localhost:8000/
 
 ## Install
 
-[![rc-virtual-list](https://nodei.co/npm/rc-virtual-list.png)](https://npmjs.org/package/rc-virtual-list)
+[![@rc-component/virtual-list](https://nodei.co/npm/@rc-component/virtual-list.png)](https://npmjs.org/package/@rc-component/virtual-list)
 
 ## Usage
 
-```js
-import List from 'rc-virtual-list';
+```tsx
+import List from '@rc-component/virtual-list';
 
 <List data={[0, 1, 2]} height={200} itemHeight={30} itemKey="id">
-  {index => <div>{index}</div>}
+  {(index) => <div>{index}</div>}
 </List>;
 ```
 

examples/animate.tsx

@@ -3,9 +3,9 @@
 import * as React from 'react';
 // @ts-ignore
 import CSSMotion from 'rc-animate/lib/CSSMotion';
-import classNames from 'classnames';
+import { clsx } from 'clsx';
 import List, { ListRef } from '../src/List';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
 import './animate.less';
 
 let uuid = 0;
@@ -74,7 +74,7 @@ const MyItem: React.ForwardRefRenderFunction<any, MyItemProps> = (
       motionName="motion"
       motionAppear={motionAppear}
       onAppearStart={getCollapsedHeight}
-      onAppearActive={node => {
+      onAppearActive={(node) => {
         motionRef.current = true;
         return getMaxHeight(node);
       }}
@@ -87,12 +87,7 @@ const MyItem: React.ForwardRefRenderFunction<any, MyItemProps> = (
     >
       {({ className, style }, passedMotionRef) => {
         return (
-          <div
-            ref={passedMotionRef}
-            className={classNames('item', className)}
-            style={style}
-            data-id={id}
-          >
+          <div ref={passedMotionRef} className={clsx('item', className)} style={style} data-id={id}>
             <div style={{ height: itemUuid % 2 ? 100 : undefined }}>
               <button
                 type="button"
@@ -145,7 +140,7 @@ const Demo = () => {
   };
 
   const onLeave = (id: string) => {
-    const newData = data.filter(item => item.id !== id);
+    const newData = data.filter((item) => item.id !== id);
     setData(newData);
   };
 
@@ -159,14 +154,14 @@ const Demo = () => {
   }
 
   const onInsertBefore = (id: string) => {
-    const index = data.findIndex(item => item.id === id);
+    const index = data.findIndex((item) => item.id === id);
     const newData = [...data.slice(0, index), genItem(), ...data.slice(index)];
     setInsertIndex(index);
     setData(newData);
     lockForAnimation();
   };
   const onInsertAfter = (id: string) => {
-    const index = data.findIndex(item => item.id === id) + 1;
+    const index = data.findIndex((item) => item.id === id) + 1;
     const newData = [...data.slice(0, index), genItem(), ...data.slice(index)];
     setInsertIndex(index);
     setData(newData);

jest.config.js

@@ -1,6 +1,6 @@
 {
-  "name": "rc-virtual-list",
-  "version": "3.18.6",
+  "name": "@rc-component/virtual-list",
+  "version": "1.0.0",
   "description": "React Virtual List Component",
   "engines": {
     "node": ">=8.x"
@@ -31,7 +31,7 @@
     "start": "dumi dev",
     "build": "dumi build",
     "compile": "father build",
-    "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish",
+    "prepublishOnly": "npm run compile && rc-np",
     "lint": "eslint src/ --ext .tsx,.ts",
     "test": "rc-test",
     "now-build": "npm run build"
@@ -42,25 +42,22 @@
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^2.1.3",
+    "@rc-component/np": "^1.0.4",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^12.1.5",
-    "@types/classnames": "^2.2.10",
     "@types/enzyme": "^3.10.5",
-    "@types/jest": "^25.1.3",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.10.1",
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
     "@types/warning": "^3.0.0",
-    "cheerio": "1.0.0-rc.12",
-    "cross-env": "^5.2.0",
     "dumi": "^2.2.17",
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "^1.15.6",
-    "enzyme-to-json": "^3.1.4",
     "eslint": "^8.56.0",
     "eslint-plugin-unicorn": "^55.0.0",
     "father": "^4.4.0",
     "glob": "^7.1.6",
-    "np": "^7.5.0",
     "rc-animate": "^2.9.1",
     "rc-test": "^7.0.15",
     "react": "16.14.0",
@@ -69,8 +66,11 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "classnames": "^2.2.6",
-    "rc-resize-observer": "^1.0.0",
-    "rc-util": "^5.36.0"
+    "@rc-component/resize-observer": "^1.0.1",
+    "@rc-component/util": "^1.4.0",
+    "clsx": "^2.1.1"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

now.json

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import ResizeObserver from 'rc-resize-observer';
-import classNames from 'classnames';
+import ResizeObserver from '@rc-component/resize-observer';
+import { clsx } from 'clsx';
 
 export type InnerProps = Pick<React.HTMLAttributes<HTMLDivElement>, 'role' | 'id'>;
 
@@ -80,9 +80,7 @@ const Filler = React.forwardRef(
         >
           <div
             style={innerStyle}
-            className={classNames({
-              [`${prefixCls}-holder-inner`]: prefixCls,
-            })}
+            className={clsx({ [`${prefixCls}-holder-inner`]: prefixCls })}
             ref={ref}
             {...innerProps}
           >

package.json

@@ -1,8 +1,8 @@
-import classNames from 'classnames';
-import type { ResizeObserverProps } from 'rc-resize-observer';
-import ResizeObserver from 'rc-resize-observer';
-import { useEvent } from 'rc-util';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
+import { clsx } from 'clsx';
+import type { ResizeObserverProps } from '@rc-component/resize-observer';
+import ResizeObserver from '@rc-component/resize-observer';
+import { useEvent } from '@rc-component/util';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
 import * as React from 'react';
 import { useRef, useState } from 'react';
 import { flushSync } from 'react-dom';
@@ -37,7 +37,7 @@ export interface ScrollInfo {
 
 export type ScrollConfig = ScrollTarget | ScrollPos;
 
-export type ScrollTo = (arg: number | ScrollConfig) => void;
+export type ScrollTo = (arg?: number | ScrollConfig | null) => void;
 
 export type ListRef = {
   nativeElement: HTMLDivElement;
@@ -146,7 +146,7 @@ export function RawList<T>(props: ListProps<T>, ref: React.Ref<ListRef>) {
     (Math.max(itemHeight * data.length, containerHeight) > height || !!scrollWidth);
   const isRTL = direction === 'rtl';
 
-  const mergedClassName = classNames(prefixCls, { [`${prefixCls}-rtl`]: isRTL }, className);
+  const mergedClassName = clsx(prefixCls, { [`${prefixCls}-rtl`]: isRTL }, className);
   const mergedData = data || EMPTY_DATA;
   const componentRef = useRef<HTMLDivElement>();
   const fillerInnerRef = useRef<HTMLDivElement>();