diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3b730ef..5e6c7fa 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,6 +8,10 @@ updates: time: '21:00' timezone: Asia/Shanghai open-pull-requests-limit: 10 + groups: + npm-dependencies: + patterns: + - '*' - package-ecosystem: github-actions directory: '/' @@ -17,3 +21,7 @@ updates: time: '21:00' timezone: Asia/Shanghai open-pull-requests-limit: 10 + groups: + github-actions: + patterns: + - '*' diff --git a/README.md b/README.md index 0d63d5f..33f2d99 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/virtual-list

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

πŸ“œ Virtual scrolling list component for React.

diff --git a/README.zh-CN.md b/README.zh-CN.md index d0a3192..d1cbe56 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/virtual-list

-

Ant Design Ant Design η”Ÿζ€ηš„δΈ€ιƒ¨εˆ†γ€‚

+

Ant Design Ant Design η”Ÿζ€ηš„δΈ€ιƒ¨εˆ†γ€‚

πŸ“œ React θ™šζ‹Ÿεˆ—θ‘¨η»„δ»ΆοΌŒη”¨δΊŽι«˜ζ€§θƒ½ζΈ²ζŸ“ι•Ώεˆ—θ‘¨γ€‚

diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..0e70eed --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,88 @@ +import { FlatCompat } from '@eslint/eslintrc'; +import js from '@eslint/js'; +import tsEslintPlugin from '@typescript-eslint/eslint-plugin'; +import { createRequire } from 'node:module'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); +const require = createRequire(import.meta.url); + +const compat = new FlatCompat({ + baseDirectory: __dirname, + recommendedConfig: js.configs.recommended, + allConfig: js.configs.all, +}); + +const recommendedTsRulesConfig = tsEslintPlugin.configs.recommended; +const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) + ? recommendedTsRulesConfig.reduce( + (rules, config) => ({ ...rules, ...(config.rules || {}) }), + {}, + ) + : recommendedTsRulesConfig?.rules || {}; +const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); +const noopRule = { + meta: { type: 'problem', docs: {}, schema: [] }, + create: () => ({}), +}; + +function normalizeConfig(config) { + const next = { ...config }; + + if (next.plugins?.['@typescript-eslint']) { + next.plugins = { ...next.plugins }; + delete next.plugins['@typescript-eslint']; + } + + if (next.rules) { + next.rules = Object.fromEntries( + Object.entries(next.rules).filter(([ruleName]) => { + if (!ruleName.startsWith('@typescript-eslint/')) { + return true; + } + return recommendedTsRules.has(ruleName); + }), + ); + } + + return next; +} + +export default [ + { + ignores: [ + 'node_modules/', + 'coverage/', + 'es/', + 'lib/', + 'dist/', + 'docs-dist/', + '.dumi/', + '.doc/', + '.vercel/', + '.eslintrc.js', + 'src/index.d.ts', + ], + }, + { + plugins: { + '@typescript-eslint': { + ...tsEslintPlugin, + rules: { + ...tsEslintPlugin.rules, + 'consistent-type-exports': noopRule, + }, + }, + }, + }, + ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), + { + rules: { + '@typescript-eslint/no-empty-object-type': 'off', + '@typescript-eslint/no-unsafe-function-type': 'off', + '@typescript-eslint/no-unused-vars': 'off', + }, + }, +]; diff --git a/examples/no-virtual.tsx b/examples/no-virtual.tsx index 793ab90..d48e0df 100644 --- a/examples/no-virtual.tsx +++ b/examples/no-virtual.tsx @@ -7,7 +7,7 @@ interface Item { height: number; } -const MyItem: React.FC = ({ id, height }, ref) => { +const MyItem = React.forwardRef(({ id, height }, ref) => { return ( = ({ id, height }, ref) => { {id} ); -}; +}); const ForwardMyItem = React.forwardRef(MyItem as any); diff --git a/examples/switch.tsx b/examples/switch.tsx index 5339e88..5d56dcb 100644 --- a/examples/switch.tsx +++ b/examples/switch.tsx @@ -6,7 +6,7 @@ interface Item { id: number; } -const MyItem: React.FC = ({ id }, ref) => ( +const MyItem = React.forwardRef(({ id }, ref) => ( = ({ id }, ref) => ( > {id} -); +)); const ForwardMyItem = React.forwardRef(MyItem as any); diff --git a/global.d.ts b/global.d.ts new file mode 100644 index 0000000..97e90a3 --- /dev/null +++ b/global.d.ts @@ -0,0 +1,48 @@ +/// +/// +/// +/// +/// + +declare module '*.css'; +declare module '*.less'; +declare module 'jsonp'; + +declare namespace JSX { + type Element = React.JSX.Element; + interface ElementClass extends React.JSX.ElementClass {} + interface ElementAttributesProperty extends React.JSX.ElementAttributesProperty {} + interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {} + type LibraryManagedAttributes = React.JSX.LibraryManagedAttributes; + interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {} + interface IntrinsicClassAttributes extends React.JSX.IntrinsicClassAttributes {} + interface IntrinsicElements extends React.JSX.IntrinsicElements {} +} + +declare namespace jest { + interface Matchers { + lastCalledWith(...expected: unknown[]): R; + nthCalledWith(nthCall: number, ...expected: unknown[]): R; + toBeCalled(): R; + toBeCalledTimes(expected: number): R; + toBeCalledWith(...expected: unknown[]): R; + } +} + +declare const vi: { + fn: any = (...args: any[]) => any>(implementation?: T) => jest.MockedFunction; + mock: (moduleName: string, factory?: (importOriginal: () => Promise) => unknown) => void; + spyOn: typeof jest.spyOn; + useFakeTimers: () => void; + useRealTimers: () => void; + advanceTimersByTime: (msToRun: number) => void; + clearAllTimers: () => void; + runAllTimers: () => void; + importActual: (moduleName: string) => Promise; + clearAllMocks: () => void; + resetAllMocks: () => void; + restoreAllMocks: () => void; +}; + + +declare module 'moment/locale/zh-cn'; diff --git a/package.json b/package.json index 62e4e0d..7c7a24b 100644 --- a/package.json +++ b/package.json @@ -48,30 +48,41 @@ "react-dom": ">=18.0.0" }, "devDependencies": { + "@babel/eslint-parser": "^7.29.7", + "@babel/eslint-plugin": "^7.29.7", + "@eslint/eslintrc": "^3.3.5", + "@eslint/js": "^9.39.4", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", + "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", - "@testing-library/react": "^15.0.7", - "@types/jest": "^29.5.14", + "@testing-library/react": "^16.3.2", + "@types/jest": "^30.0.0", "@types/node": "^26.0.1", - "@types/react": "^18.3.31", - "@types/react-dom": "^18.3.7", + "@types/react": "^19.2.17", + "@types/react-dom": "^19.2.3", "@types/warning": "^3.0.4", + "@typescript-eslint/eslint-plugin": "^8.62.0", + "@typescript-eslint/parser": "^8.62.0", + "cross-env": "^10.1.0", "dumi": "^2.4.35", - "eslint": "^8.57.1", - "eslint-plugin-unicorn": "^56.0.1", + "eslint": "^9.39.4", + "eslint-config-prettier": "^10.1.8", + "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-react-hooks": "^7.1.1", + "eslint-plugin-unicorn": "^65.0.1", "father": "^4.6.23", + "gh-pages": "^6.3.0", "glob": "^13.0.6", + "husky": "^9.1.7", + "lint-staged": "^17.0.8", + "prettier": "^3.9.0", "rc-animate": "^2.9.1", "rc-test": "^7.1.3", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "typescript": "^5.9.3", - "cross-env": "^10.1.0", - "gh-pages": "^6.3.0", - "prettier": "^3.9.0", - "husky": "^9.1.7", - "lint-staged": "^16.4.0" + "react": "^19.2.7", + "react-dom": "^19.2.7", + "typescript": "^6.0.3" }, "dependencies": { "@babel/runtime": "^7.20.0", diff --git a/react-compat.d.ts b/react-compat.d.ts new file mode 100644 index 0000000..c509fe4 --- /dev/null +++ b/react-compat.d.ts @@ -0,0 +1,12 @@ +import * as React from 'react'; + +declare module 'react' { + type ReactText = string | number; + function useRef(): React.MutableRefObject; + function isValidElement

(object: {} | null | undefined): object is React.ReactElement

; + function cloneElement

( + element: React.ReactElement

, + props?: (Partial

& React.Attributes) | null, + ...children: React.ReactNode[] + ): React.ReactElement

; +} diff --git a/src/Item.tsx b/src/Item.tsx index 8a8cb6c..2839a53 100644 --- a/src/Item.tsx +++ b/src/Item.tsx @@ -6,11 +6,14 @@ export interface ItemProps { } export function Item({ children, setRef }: ItemProps) { - const refFunc = React.useCallback(node => { - setRef(node); - }, []); + const refFunc = React.useCallback( + node => { + setRef(node); + }, + [setRef], + ); - return React.cloneElement(children, { + return React.cloneElement(children as React.ReactElement, { ref: refFunc, }); } diff --git a/tsconfig.json b/tsconfig.json index edc503c..267591e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,32 +1,40 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "react", "declaration": true, "skipLibCheck": true, "esModuleInterop": true, "paths": { "@/*": [ - "src/*" + "./src/*" ], "@@/*": [ - ".dumi/tmp/*" + "./.dumi/tmp/*" ], "@rc-component/virtual-list": [ - "src/index.ts" + "./src/index.ts" ], "@rc-component/virtual-list/es": [ - "src" + "./src" ], "@rc-component/virtual-list/es/*": [ - "src/*" + "./src/*" ] }, - "ignoreDeprecations": "5.0" + "noImplicitAny": false, + "strictNullChecks": false, + "strictPropertyInitialization": false, + "strictFunctionTypes": false, + "strict": false, + "noImplicitThis": false, + "strictBindCallApply": false, + "module": "ESNext" }, "include": [ + "react-compat.d.ts", + "global.d.ts", ".dumirc.ts", ".fatherrc.ts", "src",