Skip to content

Commit 9105b08

Browse files
EmilyyyLiu刘欢claude
authored
feat: adjust @rc-component/util imports to root path (#565)
* feat: adjust @rc-component/util imports to root path - src/Dialog/index.tsx: import contains, useId, pickAttrs, warning from root - src/Dialog/Content/Panel.tsx: import useComposeRef, useLockFocus, pickAttrs from root - src/IDialogPropTypes.ts: import GetContainer from root - tests/focus.spec.tsx: update jest mock path - src/Dialog/Content/index.tsx: add eslint-disable for CSSMotionRef import (not exported from root) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * feat: update @rc-component/motion dependency to version 1.3.3 and adjust import path --------- Co-authored-by: 刘欢 <lh01217311@antgroup.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 16c0f83 commit 9105b08

6 files changed

Lines changed: 8 additions & 13 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
]
5050
},
5151
"dependencies": {
52-
"@rc-component/motion": "^1.1.3",
52+
"@rc-component/motion": "^1.3.3",
5353
"@rc-component/portal": "^2.1.0",
5454
"@rc-component/util": "^1.9.0",
5555
"clsx": "^2.1.1"

src/Dialog/Content/Panel.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { clsx } from 'clsx';
2-
import { useComposeRef } from '@rc-component/util/lib/ref';
3-
import { useLockFocus } from '@rc-component/util/lib/Dom/focus';
2+
import { useComposeRef, useLockFocus, pickAttrs } from '@rc-component/util';
43
import React, { useMemo, useRef } from 'react';
54
import { RefContext } from '../../context';
65
import type { IDialogPropTypes } from '../../IDialogPropTypes';
76
import MemoChildren from './MemoChildren';
8-
import pickAttrs from '@rc-component/util/lib/pickAttrs';
97

108
export interface PanelProps extends Omit<IDialogPropTypes, 'getOpenCount'> {
119
prefixCls: string;

src/Dialog/Content/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import * as React from 'react';
22
import { useRef } from 'react';
33
import { clsx } from 'clsx';
44
import CSSMotion from '@rc-component/motion';
5+
import type { CSSMotionRef } from '@rc-component/motion';
56
import { offset } from '../../util';
67
import type { PanelProps, PanelRef } from './Panel';
78
import Panel from './Panel';
8-
import type { CSSMotionRef } from '@rc-component/motion/es/CSSMotion';
99

1010
export type CSSMotionStateRef = Pick<CSSMotionRef, 'inMotion' | 'enableMotion'>;
1111

src/Dialog/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import { clsx } from 'clsx';
2-
import contains from '@rc-component/util/lib/Dom/contains';
3-
import useId from '@rc-component/util/lib/hooks/useId';
4-
import pickAttrs from '@rc-component/util/lib/pickAttrs';
2+
import { contains, useId, pickAttrs, warning } from '@rc-component/util';
53
import * as React from 'react';
64
import { useEffect, useRef } from 'react';
75
import type { IDialogPropTypes } from '../IDialogPropTypes';
86
import { getMotionName } from '../util';
97
import Content, { type ContentRef } from './Content';
108
import Mask from './Mask';
11-
import { warning } from '@rc-component/util/lib/warning';
129

1310
const Dialog: React.FC<IDialogPropTypes> = (props) => {
1411
const {

src/IDialogPropTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { GetContainer } from '@rc-component/util/lib/PortalWrapper';
1+
import type { GetContainer } from '@rc-component/util';
22
import type { CSSProperties, ReactNode, SyntheticEvent } from 'react';
33

44
export type SemanticName = 'header' | 'body' | 'footer' | 'container' | 'title' | 'wrapper' | 'mask' | 'close';

tests/focus.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import ReactDOM from 'react-dom';
44
import { act, render } from '@testing-library/react';
55
import Dialog from '../src';
66

7-
// Mock: import { useLockFocus } from '@rc-component/util/lib/Dom/focus';
8-
jest.mock('@rc-component/util/lib/Dom/focus', () => {
9-
const actual = jest.requireActual('@rc-component/util/lib/Dom/focus');
7+
// Mock: import { useLockFocus } from '@rc-component/util';
8+
jest.mock('@rc-component/util', () => {
9+
const actual = jest.requireActual('@rc-component/util');
1010

1111
const useLockFocus = (visible: boolean, ...rest: any[]) => {
1212
globalThis.__useLockFocusVisible = visible;

0 commit comments

Comments
 (0)