diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index ed4ad53d..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,13 +0,0 @@ -const base = require('@umijs/fabric/dist/eslint'); - -module.exports = { - ...base, - rules: { - ...base.rules, - 'react/sort-comp': 0, - 'default-case': 0, - 'eslint-comments/disable-enable-pair': 0, - 'jsx-a11y/interactive-supports-focus': 0, - '@typescript-eslint/no-object-literal-type-assertion': 0, - }, -}; diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3b730ef9..5e6c7faa 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 36653f79..1850ed53 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/tree-select

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

๐ŸŒณ React TreeSelect component for choosing values from tree data, with search, checkable nodes, async loading, and virtual scrolling.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 9f64d291..9a4ba242 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/tree-select

-

Ant Design Ant Design ็”Ÿๆ€็š„ไธ€้ƒจๅˆ†ใ€‚

+

Ant Design Ant Design ็”Ÿๆ€็š„ไธ€้ƒจๅˆ†ใ€‚

๐ŸŒณ React ๆ ‘้€‰ๆ‹ฉ็ป„ไปถ๏ผŒ็ป“ๅˆๆ ‘ๅฝขๆ•ฐๆฎใ€ๅคš้€‰ใ€ๆœ็ดขๅ’Œไธ‹ๆ‹‰ไบคไบ’ใ€‚

diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 00000000..40f08ec9 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,115 @@ +import js from '@eslint/js'; +import { defineConfig } from 'eslint/config'; +import { dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import prettier from 'eslint-config-prettier'; +import jest from 'eslint-plugin-jest'; +import react from 'eslint-plugin-react'; +import reactHooks from 'eslint-plugin-react-hooks'; +import globals from 'globals'; +import tseslint from 'typescript-eslint'; + +const tsconfigRootDir = dirname(fileURLToPath(import.meta.url)); + +export default defineConfig([ + { + plugins: { + '@typescript-eslint': tseslint.plugin, + }, + }, + { + linterOptions: { + reportUnusedDisableDirectives: 'warn', + }, + }, + { + ignores: [ + 'node_modules/', + 'coverage/', + 'es/', + 'lib/', + 'dist/', + 'docs-dist/', + '.docs-dist/', + '.dumi/', + '.doc/', + '.vercel/', + ], + }, + { + files: ['**/*.{js,jsx,ts,tsx}'], + extends: [ + js.configs.recommended, + react.configs.flat.recommended, + react.configs.flat['jsx-runtime'], + prettier, + ], + plugins: { + 'react-hooks': reactHooks, + }, + languageOptions: { + globals: { + ...globals.browser, + ...globals.node, + }, + }, + settings: { + react: { + version: 'detect', + }, + }, + rules: { + 'no-async-promise-executor': 'off', + 'no-empty-pattern': 'off', + 'no-irregular-whitespace': 'off', + 'no-prototype-builtins': 'off', + 'no-useless-escape': 'off', + 'no-extra-boolean-cast': 'off', + 'no-undef': 'off', + 'no-unused-vars': 'off', + 'react/no-find-dom-node': 'off', + 'react/display-name': 'off', + 'react/no-unknown-property': 'off', + 'react/prop-types': 'off', + 'react-hooks/exhaustive-deps': 'warn', + 'react-hooks/rules-of-hooks': 'error', + }, + }, + { + files: ['**/*.{ts,tsx}'], + extends: [...tseslint.configs.recommended], + rules: { + '@typescript-eslint/ban-ts-comment': 'off', + '@typescript-eslint/no-empty-object-type': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-unsafe-function-type': 'off', + '@typescript-eslint/no-unnecessary-type-constraint': 'off', + '@typescript-eslint/no-unused-vars': 'off', + }, + }, + { + files: ['src/**/*.{ts,tsx}'], + languageOptions: { + parserOptions: { + projectService: true, + tsconfigRootDir, + }, + }, + }, + { + files: ['tests/**/*.{js,jsx,ts,tsx}', '**/*.{test,spec}.{js,jsx,ts,tsx}'], + extends: [jest.configs['flat/recommended']], + rules: { + 'jest/no-disabled-tests': 'off', + 'jest/no-done-callback': 'off', + 'jest/no-identical-title': 'off', + 'jest/expect-expect': 'off', + 'jest/no-alias-methods': 'off', + 'jest/no-conditional-expect': 'off', + 'jest/no-export': 'off', + 'jest/no-standalone-expect': 'off', + 'jest/valid-expect': 'off', + 'jest/valid-title': 'off', + }, + }, +]); diff --git a/global.d.ts b/global.d.ts new file mode 100644 index 00000000..e0bd355c --- /dev/null +++ b/global.d.ts @@ -0,0 +1,11 @@ +/// +/// +/// +/// +/// + +declare module '*.css'; +declare module '*.less'; +declare module 'jsonp'; + +declare module 'moment/locale/zh-cn'; diff --git a/package.json b/package.json index d7bc5f57..6e2df107 100644 --- a/package.json +++ b/package.json @@ -49,35 +49,39 @@ "clsx": "^2.1.1" }, "devDependencies": { + "@eslint/js": "^9.39.4", "@rc-component/dialog": "^1.2.0", "@rc-component/father-plugin": "^2.2.0", "@rc-component/form": "^1.4.0", "@rc-component/np": "^1.0.4", "@rc-component/trigger": "^3.0.0", "@rc-component/virtual-list": "^1.0.1", - "@testing-library/react": "^15.0.7", - "@types/jest": "^29.5.14", + "@testing-library/dom": "^10.4.1", + "@testing-library/jest-dom": "^6.9.1", + "@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": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", - "@umijs/fabric": "^4.0.1", "cross-env": "^10.1.0", - "dumi": "^2.4.35", - "eslint": "^8.57.1", - "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-unicorn": "^56.0.1", - "father": "^4.6.23", + "dumi": "^2.4.38", + "eslint": "^9.39.4", + "eslint-config-prettier": "^10.1.8", + "eslint-plugin-jest": "^29.15.4", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-react-hooks": "^7.1.1", + "father": "^4.6.24", "glob": "^13.0.6", + "globals": "^17.7.0", "husky": "^9.1.7", - "lint-staged": "^16.4.0", - "prettier": "^3.9.0", + "lint-staged": "^17.0.8", + "prettier": "^3.9.4", "rc-test": "^7.1.3", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "typescript": "^5.9.3" + "react": "^19.2.7", + "react-dom": "^19.2.7", + "typescript": "^6.0.3", + "typescript-eslint": "^8.62.1" }, "peerDependencies": { "react": "*", diff --git a/src/OptionList.tsx b/src/OptionList.tsx index b1efdac5..ea5fc8bf 100644 --- a/src/OptionList.tsx +++ b/src/OptionList.tsx @@ -79,7 +79,7 @@ const OptionList: React.ForwardRefRenderFunction = (_, keyEntities, } = React.useContext(LegacyContext); - const treeRef = React.useRef(); + const treeRef = React.useRef(null); const memoTreeData = useMemo( () => treeData, diff --git a/src/hooks/useRefFunc.ts b/src/hooks/useRefFunc.ts index 720f972c..993e9021 100644 --- a/src/hooks/useRefFunc.ts +++ b/src/hooks/useRefFunc.ts @@ -5,7 +5,7 @@ import * as React from 'react'; * but redirect to real function. */ export default function useRefFunc any>(callback: T): T { - const funcRef = React.useRef(); + const funcRef = React.useRef(callback); funcRef.current = callback; const cacheFn = React.useCallback((...args: any[]) => { diff --git a/src/utils/legacyUtil.tsx b/src/utils/legacyUtil.tsx index c5583f45..576c4a37 100644 --- a/src/utils/legacyUtil.tsx +++ b/src/utils/legacyUtil.tsx @@ -11,7 +11,7 @@ import TreeNode from '../TreeNode'; export function convertChildrenToData(nodes: React.ReactNode): DataNode[] { return toArray(nodes) - .map((node: React.ReactElement) => { + .map((node: React.ReactElement) => { if (!React.isValidElement(node) || !node.type) { return null; } @@ -19,7 +19,7 @@ export function convertChildrenToData(nodes: React.ReactNode): DataNode[] { const { key, props: { children, value, ...restProps }, - } = node as React.ReactElement; + } = node as React.ReactElement; const data = { key, @@ -119,12 +119,12 @@ export function fillAdditionalInfo( node: { props: { value: val1 }, }, - }, + }: { node: React.ReactElement }, { node: { props: { value: val2 }, }, - }, + }: { node: React.ReactElement }, ) => { const index1 = checkedValues.indexOf(val1); const index2 = checkedValues.indexOf(val2); diff --git a/tests/__snapshots__/Select.checkable.spec.tsx.snap b/tests/__snapshots__/Select.checkable.spec.tsx.snap index e65699e8..0a044f28 100644 --- a/tests/__snapshots__/Select.checkable.spec.tsx.snap +++ b/tests/__snapshots__/Select.checkable.spec.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1`] = `

diff --git a/tests/__snapshots__/Select.multiple.spec.js.snap b/tests/__snapshots__/Select.multiple.spec.js.snap index 74db1c9c..713cd8d4 100644 --- a/tests/__snapshots__/Select.multiple.spec.js.snap +++ b/tests/__snapshots__/Select.multiple.spec.js.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`TreeSelect.multiple can hide search box by showSearch = false 1`] = `