Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .eslintrc.js

This file was deleted.

8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '/'
Expand All @@ -17,3 +21,7 @@ updates:
time: '21:00'
timezone: Asia/Shanghai
open-pull-requests-limit: 10
groups:
github-actions:
patterns:
- '*'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<h1>@rc-component/motion</h1>
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Part of the Ant Design ecosystem.</sub></p>
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Part of the Ant Design ecosystem.</sub></p>
<p>🎞️ Lifecycle-driven motion primitives for React enter, leave, and list animations.</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<h1>@rc-component/motion</h1>
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Ant Design 生态的一部分。</sub></p>
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Ant Design 生态的一部分。</sub></p>
<p>🎞️ React 动效基础组件,封装 CSS 动画、过渡和生命周期状态。</p>

<p>
Expand Down
5 changes: 3 additions & 2 deletions docs/examples/ssr.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { clsx } from 'clsx';
import CSSMotion, { genCSSMotion } from 'rc-motion';
import React from 'react';
import { hydrate } from 'react-dom';
import { hydrateRoot } from 'react-dom/client';
import ReactDOMServer from 'react-dom/server';
import './basic.less';

Expand Down Expand Up @@ -44,9 +44,10 @@ const App = () => {
document.body.appendChild(div);
div.innerHTML = ssr;

hydrate(<MotionAppear supportMotion />, div);
const root = hydrateRoot(div, <MotionAppear supportMotion />);

return () => {
root.unmount();
document.body.removeChild(div);
};
}, []);
Expand Down
115 changes: 115 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -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',
},
},
]);
11 changes: 11 additions & 0 deletions global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/// <reference types="jest" />
/// <reference types="node" />
/// <reference types="react" />
/// <reference types="react-dom" />
/// <reference types="@testing-library/jest-dom" />

declare module '*.css';
declare module '*.less';
declare module 'jsonp';

declare module 'moment/locale/zh-cn';
33 changes: 20 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,34 @@
"clsx": "^2.1.1"
},
"devDependencies": {
"@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",
"@umijs/fabric": "^4.0.1",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"cross-env": "^10.1.0",
"dumi": "^2.4.35",
"eslint": "^8.57.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",
"gh-pages": "^6.3.0",
"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": ">=16.9.0",
Expand Down
2 changes: 1 addition & 1 deletion src/CSSMotion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export function genCSSMotion(config: CSSMotionConfig) {
const supportMotion = isSupportTransition(props, contextMotion);

// Ref to the react node, it may be a HTMLElement
const nodeRef = useRef<any>();
const nodeRef = useRef<any>(null);

function getDomElement() {
return getDOM(nodeRef.current) as HTMLElement;
Expand Down
11 changes: 7 additions & 4 deletions src/hooks/useDomMotionEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@ import { animationEndName, transitionEndName } from '../util/motion';

export default (
onInternalMotionEnd: (event: MotionEvent) => void,
): [(element: HTMLElement) => void, (element: HTMLElement) => void] => {
const cacheElementRef = useRef<HTMLElement>();
): [
(element: HTMLElement | null) => void,
(element: HTMLElement | null) => void,
] => {
const cacheElementRef = useRef<HTMLElement | null>(null);

Comment thread
afc163 marked this conversation as resolved.
// Remove events
function removeMotionEvents(element: HTMLElement) {
function removeMotionEvents(element: HTMLElement | null) {
if (element) {
element.removeEventListener(transitionEndName, onInternalMotionEnd);
element.removeEventListener(animationEndName, onInternalMotionEnd);
}
}

// Patch events
function patchMotionEvents(element: HTMLElement) {
function patchMotionEvents(element: HTMLElement | null) {
if (cacheElementRef.current && cacheElementRef.current !== element) {
removeMotionEvents(cacheElementRef.current);
}
Expand Down
25 changes: 24 additions & 1 deletion tests/CSSMotion.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -855,12 +855,35 @@ describe('CSSMotion', () => {
});

describe('strict mode', () => {
let hasFindDOMNode = false;
let originalFindDOMNode: unknown;

beforeEach(() => {
hasFindDOMNode = 'findDOMNode' in ReactDOM;
originalFindDOMNode = (ReactDOM as any).findDOMNode;

if (!('findDOMNode' in ReactDOM)) {
Object.defineProperty(ReactDOM, 'findDOMNode', {
value: jest.fn(),
writable: true,
Comment thread
afc163 marked this conversation as resolved.
configurable: true,
});
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
jest.spyOn(ReactDOM, 'findDOMNode');
});

afterEach(() => {
jest.resetAllMocks();
jest.restoreAllMocks();

if (hasFindDOMNode) {
Object.defineProperty(ReactDOM, 'findDOMNode', {
value: originalFindDOMNode,
writable: true,
configurable: true,
});
} else {
delete (ReactDOM as any).findDOMNode;
}
});

it('not crash when no refs are passed', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/CSSMotion.spec.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`CSSMotion transition not crash when no children 1`] = `null`;
37 changes: 9 additions & 28 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,20 @@
{
"compilerOptions": {
"target": "esnext",
"moduleResolution": "node",
"baseUrl": "./",
"moduleResolution": "bundler",
"jsx": "react",
"declaration": true,
"skipLibCheck": true,
"esModuleInterop": true,
"paths": {
"@/*": [
"src/*"
],
"@@/*": [
".dumi/tmp/*"
],
"@rc-component/motion": [
"src/index.tsx"
],
"rc-motion": [
"src/index.tsx"
]
"@/*": ["./src/*"],
"@@/*": ["./.dumi/tmp/*"],
"@rc-component/motion": ["./src/index.tsx"],
"rc-motion": ["./src/index.tsx"]
},
"ignoreDeprecations": "5.0"
"strict": false,
"module": "ESNext"
},
"include": [
"src",
"docs",
".dumirc.ts",
".fatherrc.ts"
],
"exclude": [
"node_modules",
"lib",
"es",
"dist",
"docs-dist"
]
"include": ["global.d.ts", "src", "docs", ".dumirc.ts", ".fatherrc.ts"],
"exclude": ["node_modules", "lib", "es", "dist", "docs-dist"]
}
Loading