Skip to content

Commit b1a3dd3

Browse files
authored
chore(deps): update RC component dependencies (#514)
* chore(deps): update RC component dependencies * refactor: migrate from rc-* dependencies to @rc-component/* packages * test: mock ResizeObserver for Jest testing environment
1 parent f6e5e85 commit b1a3dd3

37 files changed

+69
-62
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ coverage
2828
yarn.lock
2929
package-lock.json
3030
bun.lockb
31+
.vscode
3132

3233
# dumi
3334
.umi

docs/examples/body-overflow.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-console:0 */
2-
import Trigger from 'rc-trigger';
2+
import Trigger from '@rc-component/trigger';
33
import React from 'react';
44
import { createPortal } from 'react-dom';
55
import '../../assets/index.less';

docs/examples/case.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import type { CSSMotionProps } from 'rc-motion';
5-
import type { ActionType, BuildInPlacements } from 'rc-trigger';
6-
import Trigger from 'rc-trigger';
4+
import type { CSSMotionProps } from '@rc-component/motion';
5+
import type { ActionType, BuildInPlacements } from '@rc-component/trigger';
6+
import Trigger from '@rc-component/trigger';
77
import './case.less';
88

99
const builtinPlacements: BuildInPlacements = {

docs/examples/click-nested.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint no-console:0 */
22

3-
import Trigger from 'rc-trigger';
3+
import Trigger from '@rc-component/trigger';
44
import React from 'react';
55
import '../../assets/index.less';
66

docs/examples/clip.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-console:0 */
2-
import Trigger from 'rc-trigger';
2+
import Trigger from '@rc-component/trigger';
33
import React from 'react';
44
import '../../assets/index.less';
55

docs/examples/container.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-console:0 */
2-
import Trigger from 'rc-trigger';
2+
import Trigger from '@rc-component/trigger';
33
import React from 'react';
44
import '../../assets/index.less';
55

docs/examples/large-popup.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-console:0 */
2-
import Trigger from 'rc-trigger';
2+
import Trigger from '@rc-component/trigger';
33
import React from 'react';
44
import '../../assets/index.less';
55

docs/examples/nested.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import React from 'react';
44
import ReactDOM from 'react-dom';
5-
import Trigger from 'rc-trigger';
5+
import Trigger from '@rc-component/trigger';
66
import '../../assets/index.less';
77

88
const builtinPlacements = {

docs/examples/point.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-console:0 */
22

33
import React from 'react';
4-
import Trigger, { ActionType } from 'rc-trigger';
4+
import Trigger, { ActionType } from '@rc-component/trigger';
55
import '../../assets/index.less';
66
import './point.less';
77

docs/examples/portal.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint no-console:0 */
22

3-
import Trigger from 'rc-trigger';
3+
import Trigger from '@rc-component/trigger';
44
import React from 'react';
55
import { createPortal } from 'react-dom';
66
import '../../assets/index.less';

docs/examples/shadow.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-console:0 */
2-
import Trigger from 'rc-trigger';
2+
import Trigger from '@rc-component/trigger';
33
import React from 'react';
44
import { createRoot } from 'react-dom/client';
55
import '../../assets/index.less';

docs/examples/simple.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint no-console:0 */
22

3-
import Trigger, { ActionType } from 'rc-trigger';
3+
import Trigger, { ActionType } from '@rc-component/trigger';
44
import React from 'react';
55
import '../../assets/index.less';
66

docs/examples/static-scroll.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-console:0 */
2-
import Trigger from 'rc-trigger';
2+
import Trigger from '@rc-component/trigger';
33
import React from 'react';
44
import '../../assets/index.less';
55
import { builtinPlacements } from './inside';

docs/examples/visible-fallback.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint no-console:0 */
2-
import type { AlignType, TriggerRef } from 'rc-trigger';
3-
import Trigger from 'rc-trigger';
2+
import type { AlignType, TriggerRef } from '@rc-component/trigger';
3+
import Trigger from '@rc-component/trigger';
44
import React from 'react';
55
import '../../assets/index.less';
66

package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,14 @@
6464
"typescript": "^5.1.6"
6565
},
6666
"dependencies": {
67-
"@babel/runtime": "^7.23.2",
67+
"@rc-component/motion": "^1.1.4",
6868
"@rc-component/portal": "^1.1.0",
69-
"classnames": "^2.3.2",
70-
"rc-motion": "^2.0.0",
71-
"rc-resize-observer": "^1.3.1",
72-
"rc-util": "^5.44.0"
69+
"@rc-component/resize-observer": "^1.0.0",
70+
"@rc-component/util": "^1.2.1",
71+
"classnames": "^2.3.2"
7372
},
7473
"peerDependencies": {
7574
"react": ">=16.9.0",
7675
"react-dom": ">=16.9.0"
7776
}
78-
}
77+
}

src/Popup/Mask.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import classNames from 'classnames';
2-
import type { CSSMotionProps } from 'rc-motion';
3-
import CSSMotion from 'rc-motion';
2+
import type { CSSMotionProps } from '@rc-component/motion';
3+
import CSSMotion from '@rc-component/motion';
44
import * as React from 'react';
55

66
export interface MaskProps {

src/Popup/index.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import classNames from 'classnames';
2-
import type { CSSMotionProps } from 'rc-motion';
3-
import CSSMotion from 'rc-motion';
4-
import ResizeObserver from 'rc-resize-observer';
5-
import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
6-
import { composeRef } from 'rc-util/lib/ref';
2+
import type { CSSMotionProps } from '@rc-component/motion';
3+
import CSSMotion from '@rc-component/motion';
4+
import ResizeObserver from '@rc-component/resize-observer';
5+
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
6+
import { composeRef } from '@rc-component/util/lib/ref';
77
import * as React from 'react';
88
import type { TriggerProps } from '../';
99
import type { AlignType, ArrowPos, ArrowTypeOuter } from '../interface';

src/TriggerWrapper.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
getNodeRef,
44
supportRef,
55
useComposeRef,
6-
} from 'rc-util/lib/ref';
6+
} from '@rc-component/util/lib/ref';
77
import * as React from 'react';
88
import type { TriggerProps } from '.';
99

src/hooks/useAlign.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { isDOM } from 'rc-util/lib/Dom/findDOMNode';
2-
import isVisible from 'rc-util/lib/Dom/isVisible';
3-
import useEvent from 'rc-util/lib/hooks/useEvent';
4-
import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
1+
import { isDOM } from '@rc-component/util/lib/Dom/findDOMNode';
2+
import isVisible from '@rc-component/util/lib/Dom/isVisible';
3+
import useEvent from '@rc-component/util/lib/hooks/useEvent';
4+
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
55
import * as React from 'react';
66
import type { TriggerProps } from '..';
77
import type {

src/hooks/useWatch.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
1+
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
22
import { collectScroller, getWin } from '../util';
33

44
export default function useWatch(

src/hooks/useWinClick.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { getShadowRoot } from 'rc-util/lib/Dom/shadow';
2-
import { warning } from 'rc-util/lib/warning';
1+
import { getShadowRoot } from '@rc-component/util/lib/Dom/shadow';
2+
import { warning } from '@rc-component/util/lib/warning';
33
import * as React from 'react';
44
import { getWin } from '../util';
55

src/index.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import Portal from '@rc-component/portal';
22
import classNames from 'classnames';
3-
import type { CSSMotionProps } from 'rc-motion';
4-
import ResizeObserver from 'rc-resize-observer';
5-
import { isDOM } from 'rc-util/lib/Dom/findDOMNode';
6-
import { getShadowRoot } from 'rc-util/lib/Dom/shadow';
7-
import useEvent from 'rc-util/lib/hooks/useEvent';
8-
import useId from 'rc-util/lib/hooks/useId';
9-
import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
10-
import isMobile from 'rc-util/lib/isMobile';
3+
import type { CSSMotionProps } from '@rc-component/motion';
4+
import ResizeObserver from '@rc-component/resize-observer';
5+
import { isDOM } from '@rc-component/util/lib/Dom/findDOMNode';
6+
import { getShadowRoot } from '@rc-component/util/lib/Dom/shadow';
7+
import useEvent from '@rc-component/util/lib/hooks/useEvent';
8+
import useId from '@rc-component/util/lib/hooks/useId';
9+
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
10+
import isMobile from '@rc-component/util/lib/isMobile';
1111
import * as React from 'react';
1212
import Popup from './Popup';
1313
import TriggerWrapper from './TriggerWrapper';

src/interface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { CSSMotionProps } from 'rc-motion';
1+
import type { CSSMotionProps } from '@rc-component/motion';
22

33
export type Placement =
44
| 'top'

tests/align.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { act, cleanup, fireEvent, render } from '@testing-library/react';
2-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
2+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
33
import React from 'react';
44
import type { TriggerProps, TriggerRef } from '../src';
55
import Trigger from '../src';
66
import { awaitFakeTimer } from './util';
77

8-
import { _rs } from 'rc-resize-observer';
8+
import { _rs } from '@rc-component/resize-observer';
99

1010
export const triggerResize = (target: Element) => {
1111
act(() => {

tests/arrow.test.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { act, cleanup, render } from '@testing-library/react';
44
import {
55
spyElementPrototype,
66
spyElementPrototypes,
7-
} from 'rc-util/lib/test/domHook';
7+
} from '@rc-component/util/lib/test/domHook';
88
import Trigger from '../src';
99

1010
describe('Trigger.Arrow', () => {

tests/basic.test.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-classes-per-file */
22

33
import { act, cleanup, fireEvent, render } from '@testing-library/react';
4-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
4+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
55
import React, { StrictMode, createRef } from 'react';
66
import ReactDOM, { createPortal } from 'react-dom';
77
import Trigger from '../src';

tests/flip-visibleFirst.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-invalid-this */
22
import { act, cleanup, render } from '@testing-library/react';
3-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
3+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
44
import * as React from 'react';
55
import type { AlignType, TriggerProps, TriggerRef } from '../src';
66
import Trigger from '../src';

tests/flip.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { act, cleanup, render } from '@testing-library/react';
2-
import { _rs } from 'rc-resize-observer';
3-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
2+
import { _rs } from '@rc-component/resize-observer';
3+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
44
import * as React from 'react';
55
import type { AlignType, TriggerProps } from '../src';
66
import Trigger from '../src';

tests/flipShift.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { act, cleanup, render } from '@testing-library/react';
2-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
2+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
33
import React from 'react';
44
import Trigger from '../src';
55

tests/mask.test.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { fireEvent, render } from '@testing-library/react';
33
import Trigger from '../src';
4-
import CSSMotion from 'rc-motion';
4+
import CSSMotion from '@rc-component/motion';
55
import { placementAlignMap } from './util';
66

77
describe('Trigger.Mask', () => {

tests/mobile.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { act, fireEvent, render } from '@testing-library/react';
2-
import isMobile from 'rc-util/lib/isMobile';
2+
import isMobile from '@rc-component/util/lib/isMobile';
33
import React from 'react';
44
import Trigger from '../src';
55
import { placementAlignMap } from './util';
66

7-
jest.mock('rc-util/lib/isMobile');
7+
jest.mock('@rc-component/util/lib/isMobile');
88

99
describe('Trigger.Mobile', () => {
1010
beforeAll(() => {

tests/portal.test.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-classes-per-file */
22

33
import { act, cleanup, fireEvent, render } from '@testing-library/react';
4-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
4+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
55
import React from 'react';
66
import ReactDOM from 'react-dom';
77
import Trigger from '../src';

tests/rect.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { cleanup, render } from '@testing-library/react';
2-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
2+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
33
import React from 'react';
44
import Trigger from '../src';
55
import { awaitFakeTimer } from './util';

tests/ref.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-classes-per-file */
22

33
import { cleanup, render } from '@testing-library/react';
4-
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
4+
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
55
import React from 'react';
66
import Trigger, { type TriggerRef } from '../src';
77

tests/setup.js

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
// jsdom add motion events to test CSSMotion
22
window.AnimationEvent = window.AnimationEvent || (() => {});
33
window.TransitionEvent = window.TransitionEvent || (() => {});
4+
global.ResizeObserver = jest.fn(() => {
5+
return {
6+
observe() { },
7+
unobserve() { },
8+
disconnect() { },
9+
};
10+
});

tests/shadow.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { act, fireEvent } from '@testing-library/react';
2-
import { resetWarned } from 'rc-util/lib/warning';
2+
import { resetWarned } from '@rc-component/util/lib/warning';
33
import React from 'react';
44
import { createRoot } from 'react-dom/client';
55
import Trigger from '../src';

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"paths": {
1212
"@/*": ["src/*"],
1313
"@@/*": [".dumi/tmp/*"],
14-
"rc-trigger": ["src/index.tsx"]
14+
"@rc-component/trigger": ["src/index.tsx"]
1515
}
1616
}
1717
}

0 commit comments

Comments
 (0)