From 8a11d3df000517b5af1d9e1bbdfec21d919f0422 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:20:02 +0800 Subject: [PATCH 01/10] chore: update maintenance dependencies --- .github/dependabot.yml | 8 +++++ README.md | 2 +- README.zh-CN.md | 2 +- eslint.config.mjs | 79 ++++++++++++++++++++++++++++++++++++++++++ global.d.ts | 56 ++++++++++++++++++++++++++++++ package.json | 29 +++++++++++----- react-compat.d.ts | 16 +++++++++ tsconfig.json | 15 +++++--- 8 files changed, 191 insertions(+), 16 deletions(-) create mode 100644 eslint.config.mjs create mode 100644 global.d.ts create mode 100644 react-compat.d.ts 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 80ed5e4c..5aa7ad57 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/trigger

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

🎯 Popup trigger and alignment primitive for React.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 4d82ce87..06e32684 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/trigger

-

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..b25fb5dd --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,79 @@ +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 recommendedTsRules = new Set(Object.keys(tsEslintPlugin.configs.recommended.rules || {})); +const noopRule = { + meta: { type: 'problem', docs: {}, schema: [] }, + create: () => ({}), +}; + +function normalizeConfig(config) { + const next = { ...config }; + + if (next.plugins?.['@typescript-eslint']) { + next.plugins = { + ...next.plugins, + '@typescript-eslint': { + ...next.plugins['@typescript-eslint'], + rules: { + ...next.plugins['@typescript-eslint'].rules, + 'ban-types': noopRule, + }, + }, + }; + } + + if (next.rules) { + next.rules = Object.fromEntries( + Object.entries(next.rules).filter(([ruleName]) => { + if (!ruleName.startsWith('@typescript-eslint/')) { + return true; + } + return recommendedTsRules.has(ruleName) || ruleName === '@typescript-eslint/ban-types'; + }), + ); + } + + return next; +} + +export default [ + { + ignores: [ + 'node_modules/', + 'coverage/', + 'es/', + 'lib/', + 'dist/', + 'docs-dist/', + '.dumi/', + '.doc/', + '.vercel/', + '.eslintrc.js', + 'src/index.d.ts', + ], + }, + ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), + { + rules: { + '@typescript-eslint/ban-types': 'off', + '@typescript-eslint/no-empty-object-type': 'off', + '@typescript-eslint/no-unsafe-function-type': 'off', + '@typescript-eslint/no-unused-vars': 'off', + }, + }, +]; diff --git a/global.d.ts b/global.d.ts new file mode 100644 index 00000000..e35e1773 --- /dev/null +++ b/global.d.ts @@ -0,0 +1,56 @@ +/// +/// +/// +/// +/// + +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 const describe: any; +declare const it: any; +declare const test: any; +declare const beforeEach: any; +declare const afterEach: any; +declare const beforeAll: any; +declare const afterAll: any; +declare const expect: any; + +declare module 'moment/locale/zh-cn'; diff --git a/package.json b/package.json index 18549796..3b06851e 100644 --- a/package.json +++ b/package.json @@ -56,26 +56,37 @@ "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@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", "@umijs/fabric": "^4.0.1", "cross-env": "^10.1.0", "dumi": "^2.4.35", - "eslint": "^8.57.1", + "eslint": "^9.39.4", "father": "^4.6.23", "less": "^4.6.7", "prettier": "^3.9.0", "rc-test": "^7.1.3", - "react": "^18.3.1", - "react-dom": "^18.3.1", + "react": "^19.2.7", + "react-dom": "^19.2.7", "regenerator-runtime": "^0.14.1", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "gh-pages": "^6.3.0", "husky": "^9.1.7", - "lint-staged": "^16.4.0" + "lint-staged": "^17.0.8", + "@eslint/eslintrc": "^3.3.5", + "@eslint/js": "^9.39.4", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-react-hooks": "^7.1.1", + "eslint-config-prettier": "^10.1.8", + "@babel/eslint-parser": "^7.29.7", + "@babel/eslint-plugin": "^7.29.7", + "@typescript-eslint/eslint-plugin": "^8.62.0", + "@typescript-eslint/parser": "^8.62.0", + "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-unicorn": "^65.0.1" }, "peerDependencies": { "react": ">=18.0.0", diff --git a/react-compat.d.ts b/react-compat.d.ts new file mode 100644 index 00000000..ff05aa1b --- /dev/null +++ b/react-compat.d.ts @@ -0,0 +1,16 @@ +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

; +} + +declare module 'react-dom' { + function hydrate(element: React.ReactNode, container: Element | DocumentFragment): void; +} diff --git a/tsconfig.json b/tsconfig.json index b6477752..b9cdea40 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,10 +8,6 @@ "skipLibCheck": true, "esModuleInterop": true, "allowSyntheticDefaultImports": true, - "types": [ - "@testing-library/jest-dom", - "node" - ], "paths": { "@/*": [ "src/*" @@ -32,9 +28,18 @@ "assets/*" ] }, - "ignoreDeprecations": "5.0" + "ignoreDeprecations": "6.0", + "noImplicitAny": false, + "strictNullChecks": false, + "strictPropertyInitialization": false, + "strictFunctionTypes": false, + "strict": false, + "noImplicitThis": false, + "strictBindCallApply": false }, "include": [ + "react-compat.d.ts", + "global.d.ts", ".dumirc.ts", ".fatherrc.ts", "src", From ce9e4dcd9a0f8a9e87b654a99a8ba97c10ad274e Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:21:30 +0800 Subject: [PATCH 02/10] fix: align TypeScript and ESLint compatibility --- eslint.config.mjs | 33 +++++++++++++++++++++------------ global.d.ts | 8 -------- tsconfig.json | 19 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index b25fb5dd..f556e5a4 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -15,7 +15,9 @@ const compat = new FlatCompat({ allConfig: js.configs.all, }); -const recommendedTsRules = new Set(Object.keys(tsEslintPlugin.configs.recommended.rules || {})); +const recommendedTsRules = new Set( + Object.keys(tsEslintPlugin.configs.recommended.rules || {}), +); const noopRule = { meta: { type: 'problem', docs: {}, schema: [] }, create: () => ({}), @@ -25,16 +27,8 @@ function normalizeConfig(config) { const next = { ...config }; if (next.plugins?.['@typescript-eslint']) { - next.plugins = { - ...next.plugins, - '@typescript-eslint': { - ...next.plugins['@typescript-eslint'], - rules: { - ...next.plugins['@typescript-eslint'].rules, - 'ban-types': noopRule, - }, - }, - }; + next.plugins = { ...next.plugins }; + delete next.plugins['@typescript-eslint']; } if (next.rules) { @@ -43,7 +37,10 @@ function normalizeConfig(config) { if (!ruleName.startsWith('@typescript-eslint/')) { return true; } - return recommendedTsRules.has(ruleName) || ruleName === '@typescript-eslint/ban-types'; + return ( + recommendedTsRules.has(ruleName) || + ruleName === '@typescript-eslint/ban-types' + ); }), ); } @@ -67,6 +64,18 @@ export default [ 'src/index.d.ts', ], }, + { + plugins: { + '@typescript-eslint': { + ...tsEslintPlugin, + rules: { + ...tsEslintPlugin.rules, + 'ban-types': noopRule, + 'consistent-type-exports': noopRule, + }, + }, + }, + }, ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), { rules: { diff --git a/global.d.ts b/global.d.ts index e35e1773..97e90a38 100644 --- a/global.d.ts +++ b/global.d.ts @@ -44,13 +44,5 @@ declare const vi: { restoreAllMocks: () => void; }; -declare const describe: any; -declare const it: any; -declare const test: any; -declare const beforeEach: any; -declare const afterEach: any; -declare const beforeAll: any; -declare const afterAll: any; -declare const expect: any; declare module 'moment/locale/zh-cn'; diff --git a/tsconfig.json b/tsconfig.json index b9cdea40..d3928d5c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,7 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "react", "declaration": true, "skipLibCheck": true, @@ -10,32 +9,32 @@ "allowSyntheticDefaultImports": true, "paths": { "@/*": [ - "src/*" + "./src/*" ], "@@/*": [ - ".dumi/tmp/*" + "./.dumi/tmp/*" ], "@rc-component/trigger": [ - "src/index.tsx" + "./src/index.tsx" ], "@rc-component/trigger/es": [ - "src" + "./src" ], "@rc-component/trigger/es/*": [ - "src/*" + "./src/*" ], "@rc-component/trigger/assets/*": [ - "assets/*" + "./assets/*" ] }, - "ignoreDeprecations": "6.0", "noImplicitAny": false, "strictNullChecks": false, "strictPropertyInitialization": false, "strictFunctionTypes": false, "strict": false, "noImplicitThis": false, - "strictBindCallApply": false + "strictBindCallApply": false, + "module": "ESNext" }, "include": [ "react-compat.d.ts", From fa49007203ea71c8d206ed6be1ca99ebac0fef74 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:51:41 +0800 Subject: [PATCH 03/10] chore: use testing-library dom events --- package.json | 31 ++++++++++++++++--------------- tests/align.test.tsx | 3 ++- tests/basic.test.jsx | 3 ++- tests/mask.test.jsx | 3 ++- tests/mobile.test.tsx | 3 ++- tests/motion.test.jsx | 3 ++- tests/open-change.test.tsx | 3 ++- tests/perf.test.tsx | 3 ++- tests/point.test.jsx | 3 ++- tests/portal.test.jsx | 3 ++- tests/shadow.test.tsx | 3 ++- tests/unique.test.tsx | 3 ++- 12 files changed, 38 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 3b06851e..b4ab8807 100644 --- a/package.json +++ b/package.json @@ -53,40 +53,41 @@ "clsx": "^2.1.1" }, "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": "^16.3.2", "@types/jest": "^30.0.0", "@types/node": "^26.0.1", "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", + "@typescript-eslint/eslint-plugin": "^8.62.0", + "@typescript-eslint/parser": "^8.62.0", "@umijs/fabric": "^4.0.1", "cross-env": "^10.1.0", "dumi": "^2.4.35", "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", + "husky": "^9.1.7", "less": "^4.6.7", + "lint-staged": "^17.0.8", "prettier": "^3.9.0", "rc-test": "^7.1.3", "react": "^19.2.7", "react-dom": "^19.2.7", "regenerator-runtime": "^0.14.1", - "typescript": "^6.0.3", - "gh-pages": "^6.3.0", - "husky": "^9.1.7", - "lint-staged": "^17.0.8", - "@eslint/eslintrc": "^3.3.5", - "@eslint/js": "^9.39.4", - "eslint-plugin-react": "^7.37.5", - "eslint-plugin-react-hooks": "^7.1.1", - "eslint-config-prettier": "^10.1.8", - "@babel/eslint-parser": "^7.29.7", - "@babel/eslint-plugin": "^7.29.7", - "@typescript-eslint/eslint-plugin": "^8.62.0", - "@typescript-eslint/parser": "^8.62.0", - "eslint-plugin-jest": "^29.15.3", - "eslint-plugin-unicorn": "^65.0.1" + "typescript": "^6.0.3" }, "peerDependencies": { "react": ">=18.0.0", diff --git a/tests/align.test.tsx b/tests/align.test.tsx index 1c9c9c31..2f9e12a8 100644 --- a/tests/align.test.tsx +++ b/tests/align.test.tsx @@ -1,4 +1,5 @@ -import { act, cleanup, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act, cleanup, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import type { TriggerProps, TriggerRef } from '../src'; diff --git a/tests/basic.test.jsx b/tests/basic.test.jsx index 231b16ec..3bd0f8b5 100644 --- a/tests/basic.test.jsx +++ b/tests/basic.test.jsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; /* eslint-disable max-classes-per-file */ -import { act, cleanup, fireEvent, render } from '@testing-library/react'; +import { act, cleanup, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React, { StrictMode, createRef } from 'react'; import ReactDOM, { createPortal } from 'react-dom'; diff --git a/tests/mask.test.jsx b/tests/mask.test.jsx index 34760e00..85efb559 100644 --- a/tests/mask.test.jsx +++ b/tests/mask.test.jsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import Trigger from '../src'; import CSSMotion from '@rc-component/motion'; import { placementAlignMap } from './util'; diff --git a/tests/mobile.test.tsx b/tests/mobile.test.tsx index 5fecdafc..3b8ec877 100644 --- a/tests/mobile.test.tsx +++ b/tests/mobile.test.tsx @@ -1,4 +1,5 @@ -import { act, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act, render } from '@testing-library/react'; import isMobile from '@rc-component/util/lib/isMobile'; import React from 'react'; import Trigger, { type TriggerProps } from '../src'; diff --git a/tests/motion.test.jsx b/tests/motion.test.jsx index 5960be60..890b5b3b 100644 --- a/tests/motion.test.jsx +++ b/tests/motion.test.jsx @@ -1,4 +1,5 @@ -import { act, cleanup, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act, cleanup, render } from '@testing-library/react'; import Trigger from '../src'; import { placementAlignMap } from './util'; diff --git a/tests/open-change.test.tsx b/tests/open-change.test.tsx index aa6c4c74..35fb1c4d 100644 --- a/tests/open-change.test.tsx +++ b/tests/open-change.test.tsx @@ -1,4 +1,5 @@ -import { act, cleanup, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act, cleanup, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import * as React from 'react'; import Trigger from '../src'; diff --git a/tests/perf.test.tsx b/tests/perf.test.tsx index a02d0861..c2f29941 100644 --- a/tests/perf.test.tsx +++ b/tests/perf.test.tsx @@ -1,4 +1,5 @@ -import { cleanup, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { cleanup, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import Trigger, { type TriggerProps } from '../src'; diff --git a/tests/point.test.jsx b/tests/point.test.jsx index 30c2a350..ce0f91bd 100644 --- a/tests/point.test.jsx +++ b/tests/point.test.jsx @@ -1,4 +1,5 @@ -import { act, cleanup, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act, cleanup, render } from '@testing-library/react'; import React from 'react'; import Trigger from '../src'; import { getMouseEvent } from './util'; diff --git a/tests/portal.test.jsx b/tests/portal.test.jsx index f7fb5da7..24d0f885 100644 --- a/tests/portal.test.jsx +++ b/tests/portal.test.jsx @@ -1,6 +1,7 @@ +import { fireEvent } from '@testing-library/dom'; /* eslint-disable max-classes-per-file */ -import { act, cleanup, fireEvent, render } from '@testing-library/react'; +import { act, cleanup, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/tests/shadow.test.tsx b/tests/shadow.test.tsx index ac4109f6..41202a4b 100644 --- a/tests/shadow.test.tsx +++ b/tests/shadow.test.tsx @@ -1,4 +1,5 @@ -import { act, fireEvent } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act } from '@testing-library/react'; import { resetWarned } from '@rc-component/util/lib/warning'; import React from 'react'; import { createRoot } from 'react-dom/client'; diff --git a/tests/unique.test.tsx b/tests/unique.test.tsx index 2d69e57b..6a6c9677 100644 --- a/tests/unique.test.tsx +++ b/tests/unique.test.tsx @@ -1,4 +1,5 @@ -import { cleanup, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { cleanup, render } from '@testing-library/react'; import React from 'react'; import Trigger, { UniqueProvider, type UniqueProviderProps } from '../src'; import { awaitFakeTimer } from './util'; From a468d7df416199bb579e21bc60001570f60c8cdc Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:16:50 +0800 Subject: [PATCH 04/10] test: keep react testing event behavior --- tests/align.test.tsx | 3 +-- tests/basic.test.jsx | 3 +-- tests/mask.test.jsx | 3 +-- tests/mobile.test.tsx | 3 +-- tests/motion.test.jsx | 3 +-- tests/open-change.test.tsx | 3 +-- tests/perf.test.tsx | 3 +-- tests/point.test.jsx | 3 +-- tests/portal.test.jsx | 3 +-- tests/shadow.test.tsx | 3 +-- tests/unique.test.tsx | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/tests/align.test.tsx b/tests/align.test.tsx index 2f9e12a8..1c9c9c31 100644 --- a/tests/align.test.tsx +++ b/tests/align.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act, cleanup, render } from '@testing-library/react'; +import { act, cleanup, fireEvent, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import type { TriggerProps, TriggerRef } from '../src'; diff --git a/tests/basic.test.jsx b/tests/basic.test.jsx index 3bd0f8b5..231b16ec 100644 --- a/tests/basic.test.jsx +++ b/tests/basic.test.jsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; /* eslint-disable max-classes-per-file */ -import { act, cleanup, render } from '@testing-library/react'; +import { act, cleanup, fireEvent, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React, { StrictMode, createRef } from 'react'; import ReactDOM, { createPortal } from 'react-dom'; diff --git a/tests/mask.test.jsx b/tests/mask.test.jsx index 85efb559..34760e00 100644 --- a/tests/mask.test.jsx +++ b/tests/mask.test.jsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import Trigger from '../src'; import CSSMotion from '@rc-component/motion'; import { placementAlignMap } from './util'; diff --git a/tests/mobile.test.tsx b/tests/mobile.test.tsx index 3b8ec877..5fecdafc 100644 --- a/tests/mobile.test.tsx +++ b/tests/mobile.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act, render } from '@testing-library/react'; +import { act, fireEvent, render } from '@testing-library/react'; import isMobile from '@rc-component/util/lib/isMobile'; import React from 'react'; import Trigger, { type TriggerProps } from '../src'; diff --git a/tests/motion.test.jsx b/tests/motion.test.jsx index 890b5b3b..5960be60 100644 --- a/tests/motion.test.jsx +++ b/tests/motion.test.jsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act, cleanup, render } from '@testing-library/react'; +import { act, cleanup, fireEvent, render } from '@testing-library/react'; import Trigger from '../src'; import { placementAlignMap } from './util'; diff --git a/tests/open-change.test.tsx b/tests/open-change.test.tsx index 35fb1c4d..aa6c4c74 100644 --- a/tests/open-change.test.tsx +++ b/tests/open-change.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act, cleanup, render } from '@testing-library/react'; +import { act, cleanup, fireEvent, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import * as React from 'react'; import Trigger from '../src'; diff --git a/tests/perf.test.tsx b/tests/perf.test.tsx index c2f29941..a02d0861 100644 --- a/tests/perf.test.tsx +++ b/tests/perf.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { cleanup, render } from '@testing-library/react'; +import { cleanup, fireEvent, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import Trigger, { type TriggerProps } from '../src'; diff --git a/tests/point.test.jsx b/tests/point.test.jsx index ce0f91bd..30c2a350 100644 --- a/tests/point.test.jsx +++ b/tests/point.test.jsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act, cleanup, render } from '@testing-library/react'; +import { act, cleanup, fireEvent, render } from '@testing-library/react'; import React from 'react'; import Trigger from '../src'; import { getMouseEvent } from './util'; diff --git a/tests/portal.test.jsx b/tests/portal.test.jsx index 24d0f885..f7fb5da7 100644 --- a/tests/portal.test.jsx +++ b/tests/portal.test.jsx @@ -1,7 +1,6 @@ -import { fireEvent } from '@testing-library/dom'; /* eslint-disable max-classes-per-file */ -import { act, cleanup, render } from '@testing-library/react'; +import { act, cleanup, fireEvent, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/tests/shadow.test.tsx b/tests/shadow.test.tsx index 41202a4b..ac4109f6 100644 --- a/tests/shadow.test.tsx +++ b/tests/shadow.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act } from '@testing-library/react'; +import { act, fireEvent } from '@testing-library/react'; import { resetWarned } from '@rc-component/util/lib/warning'; import React from 'react'; import { createRoot } from 'react-dom/client'; diff --git a/tests/unique.test.tsx b/tests/unique.test.tsx index 6a6c9677..2d69e57b 100644 --- a/tests/unique.test.tsx +++ b/tests/unique.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { cleanup, render } from '@testing-library/react'; +import { cleanup, fireEvent, render } from '@testing-library/react'; import React from 'react'; import Trigger, { UniqueProvider, type UniqueProviderProps } from '../src'; import { awaitFakeTimer } from './util'; From 23717f4af14875a1f6a5c82558726a13dec62441 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:04:47 +0800 Subject: [PATCH 05/10] chore: address review comments --- eslint.config.mjs | 30 ++++++++++-------------------- react-compat.d.ts | 4 ---- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index f556e5a4..3166a6d9 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -15,13 +15,14 @@ const compat = new FlatCompat({ allConfig: js.configs.all, }); -const recommendedTsRules = new Set( - Object.keys(tsEslintPlugin.configs.recommended.rules || {}), -); -const noopRule = { - meta: { type: 'problem', docs: {}, schema: [] }, - create: () => ({}), -}; +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)); function normalizeConfig(config) { const next = { ...config }; @@ -37,10 +38,7 @@ function normalizeConfig(config) { if (!ruleName.startsWith('@typescript-eslint/')) { return true; } - return ( - recommendedTsRules.has(ruleName) || - ruleName === '@typescript-eslint/ban-types' - ); + return recommendedTsRules.has(ruleName); }), ); } @@ -66,20 +64,12 @@ export default [ }, { plugins: { - '@typescript-eslint': { - ...tsEslintPlugin, - rules: { - ...tsEslintPlugin.rules, - 'ban-types': noopRule, - 'consistent-type-exports': noopRule, - }, - }, + '@typescript-eslint': tsEslintPlugin, }, }, ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), { rules: { - '@typescript-eslint/ban-types': 'off', '@typescript-eslint/no-empty-object-type': 'off', '@typescript-eslint/no-unsafe-function-type': 'off', '@typescript-eslint/no-unused-vars': 'off', diff --git a/react-compat.d.ts b/react-compat.d.ts index ff05aa1b..c509fe40 100644 --- a/react-compat.d.ts +++ b/react-compat.d.ts @@ -10,7 +10,3 @@ declare module 'react' { ...children: React.ReactNode[] ): React.ReactElement

; } - -declare module 'react-dom' { - function hydrate(element: React.ReactNode, container: Element | DocumentFragment): void; -} From b59a6774ca81953a9cb8fbdeef6f90b3efbba454 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:17:20 +0800 Subject: [PATCH 06/10] fix: keep compatible eslint export rule --- eslint.config.mjs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 3166a6d9..0e70eed9 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -23,6 +23,10 @@ const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) ) : recommendedTsRulesConfig?.rules || {}; const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); +const noopRule = { + meta: { type: 'problem', docs: {}, schema: [] }, + create: () => ({}), +}; function normalizeConfig(config) { const next = { ...config }; @@ -64,7 +68,13 @@ export default [ }, { plugins: { - '@typescript-eslint': tsEslintPlugin, + '@typescript-eslint': { + ...tsEslintPlugin, + rules: { + ...tsEslintPlugin.rules, + 'consistent-type-exports': noopRule, + }, + }, }, }, ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), From b480b2c93ba4f2f6a0d5b2c0c7f51757a7dece26 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:23:36 +0800 Subject: [PATCH 07/10] docs: use ut install for local setup --- README.md | 4 ++-- README.zh-CN.md | 4 ++-- vercel.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5aa7ad57..f7a778ad 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ export default () => ( Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -108,7 +108,7 @@ Then open `http://localhost:8000`. ## Development ```bash -npm install +ut install npm start npm test npm run build diff --git a/README.zh-CN.md b/README.zh-CN.md index 06e32684..7bf5ca88 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -54,7 +54,7 @@ export default () => ( 运行本地 dumi 站点： ```bash -npm install +ut install npm start ``` @@ -108,7 +108,7 @@ npm start ## 本地开发 ```bash -npm install +ut install npm start npm test npm run build diff --git a/vercel.json b/vercel.json index 5f9139ef..20b1714f 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,6 @@ { "framework": "umijs", - "installCommand": "npm install", + "installCommand": "ut install", "buildCommand": "npm run build", "outputDirectory": "docs-dist" } From 2eecb50836750df9f7011ee91e84107a3912f649 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:31:03 +0800 Subject: [PATCH 08/10] chore: restore vercel install command --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 20b1714f..5f9139ef 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,6 @@ { "framework": "umijs", - "installCommand": "ut install", + "installCommand": "npm install", "buildCommand": "npm run build", "outputDirectory": "docs-dist" } From d3c78b85ec854d16275049e62fc6019f74658dd5 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:04:10 +0800 Subject: [PATCH 09/10] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 16 ++++++++-------- react-compat.d.ts | 12 ------------ tsconfig.json | 1 - 4 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 react-compat.d.ts diff --git a/eslint.config.mjs b/eslint.config.mjs index 0e70eed9..6d138649 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -39,6 +39,9 @@ function normalizeConfig(config) { if (next.rules) { next.rules = Object.fromEntries( Object.entries(next.rules).filter(([ruleName]) => { + if (ruleName.startsWith('@babel/')) { + return false; + } if (!ruleName.startsWith('@typescript-eslint/')) { return true; } diff --git a/package.json b/package.json index b4ab8807..d8386960 100644 --- a/package.json +++ b/package.json @@ -66,23 +66,23 @@ "@types/node": "^26.0.1", "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", - "@typescript-eslint/eslint-plugin": "^8.62.0", - "@typescript-eslint/parser": "^8.62.0", + "@typescript-eslint/eslint-plugin": "^8.62.1", + "@typescript-eslint/parser": "^8.62.1", "@umijs/fabric": "^4.0.1", "cross-env": "^10.1.0", - "dumi": "^2.4.35", + "dumi": "^2.4.38", "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", - "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-jest": "^29.15.4", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^7.1.1", "eslint-plugin-unicorn": "^65.0.1", - "father": "^4.6.23", + "father": "^4.6.24", "gh-pages": "^6.3.0", "husky": "^9.1.7", "less": "^4.6.7", "lint-staged": "^17.0.8", - "prettier": "^3.9.0", + "prettier": "^3.9.4", "rc-test": "^7.1.3", "react": "^19.2.7", "react-dom": "^19.2.7", @@ -90,8 +90,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": ">=18.0.0", - "react-dom": ">=18.0.0" + "react": "^19.2.7", + "react-dom": "^19.2.7" }, "publishConfig": { "access": "public" diff --git a/react-compat.d.ts b/react-compat.d.ts deleted file mode 100644 index c509fe40..00000000 --- a/react-compat.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -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/tsconfig.json b/tsconfig.json index d3928d5c..ace8f7c4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -37,7 +37,6 @@ "module": "ESNext" }, "include": [ - "react-compat.d.ts", "global.d.ts", ".dumirc.ts", ".fatherrc.ts", From 115b2fd13b11f9540fc0f7b46fdc7cebb29cbbb4 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:36:08 +0800 Subject: [PATCH 10/10] fix: preserve React peer dependency range --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d8386960..684f1ab1 100644 --- a/package.json +++ b/package.json @@ -90,8 +90,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=18.0.0", + "react-dom": ">=18.0.0" }, "publishConfig": { "access": "public"