Skip to content

Commit bed663c

Browse files
committed
fix: import from @rc-component/util package root
Imports from `@rc-component/util/lib/*` are blocked by the `no-restricted-imports` lint rule wired into `npm run compile`, causing the build to fail. Switch all six call sites to the package root export.
1 parent 614fd4b commit bed663c

6 files changed

Lines changed: 20 additions & 17 deletions

File tree

src/Popup/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import CSSMotion from '@rc-component/motion';
44
import ResizeObserver, {
55
type ResizeObserverProps,
66
} from '@rc-component/resize-observer';
7-
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
8-
import { composeRef } from '@rc-component/util/lib/ref';
7+
import { composeRef, useLayoutEffect } from '@rc-component/util';
98
import * as React from 'react';
109
import type { TriggerProps } from '../';
1110
import type { AlignType, ArrowPos, ArrowTypeOuter } from '../interface';

src/UniqueProvider/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import TriggerContext, {
99
import useDelay from '../hooks/useDelay';
1010
import useAlign from '../hooks/useAlign';
1111
import Popup from '../Popup';
12-
import { useEvent } from '@rc-component/util';
12+
import { isDOM, useEvent } from '@rc-component/util';
1313
import useTargetState from './useTargetState';
14-
import { isDOM } from '@rc-component/util/lib/Dom/findDOMNode';
1514
import UniqueContainer from './UniqueContainer';
1615
import { clsx } from 'clsx';
1716
import { getAlignPopupClassName } from '../util';

src/hooks/useAlign.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
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';
1+
import {
2+
isDOM,
3+
isVisible,
4+
useEvent,
5+
useLayoutEffect,
6+
} from '@rc-component/util';
57
import * as React from 'react';
68
import type { TriggerProps } from '..';
79
import type {

src/hooks/useWatch.ts

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

44
export default function useWatch(

src/hooks/useWinClick.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { getShadowRoot } from '@rc-component/util/lib/Dom/shadow';
2-
import { warning } from '@rc-component/util/lib/warning';
1+
import { getShadowRoot, warning } from '@rc-component/util';
32
import * as React from 'react';
43
import { getWin } from '../util';
54

src/index.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ import Portal from '@rc-component/portal';
22
import { clsx } from 'clsx';
33
import type { CSSMotionProps } from '@rc-component/motion';
44
import { useResizeObserver } from '@rc-component/resize-observer';
5-
import { getDOM, isDOM } from '@rc-component/util/lib/Dom/findDOMNode';
6-
import { getShadowRoot } from '@rc-component/util/lib/Dom/shadow';
7-
import { getNodeRef, useComposeRef } from '@rc-component/util/lib/ref';
8-
import useEvent from '@rc-component/util/lib/hooks/useEvent';
9-
import useId from '@rc-component/util/lib/hooks/useId';
10-
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
5+
import {
6+
getDOM,
7+
getNodeRef,
8+
getShadowRoot,
9+
isDOM,
10+
useComposeRef,
11+
useEvent,
12+
useId,
13+
useLayoutEffect,
14+
} from '@rc-component/util';
1115
import * as React from 'react';
1216
import Popup, { type MobileConfig } from './Popup';
1317
import type { TriggerContextProps } from './context';

0 commit comments

Comments
 (0)