From bed663ca885a672ef5a3db38e2225f6e0a02c004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?= Date: Mon, 1 Jun 2026 10:59:58 +0800 Subject: [PATCH] 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. --- src/Popup/index.tsx | 3 +-- src/UniqueProvider/index.tsx | 3 +-- src/hooks/useAlign.ts | 10 ++++++---- src/hooks/useWatch.ts | 2 +- src/hooks/useWinClick.ts | 3 +-- src/index.tsx | 16 ++++++++++------ 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/Popup/index.tsx b/src/Popup/index.tsx index 51cff879..b3b7d4e6 100644 --- a/src/Popup/index.tsx +++ b/src/Popup/index.tsx @@ -4,8 +4,7 @@ import CSSMotion from '@rc-component/motion'; import ResizeObserver, { type ResizeObserverProps, } from '@rc-component/resize-observer'; -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; -import { composeRef } from '@rc-component/util/lib/ref'; +import { composeRef, useLayoutEffect } from '@rc-component/util'; import * as React from 'react'; import type { TriggerProps } from '../'; import type { AlignType, ArrowPos, ArrowTypeOuter } from '../interface'; diff --git a/src/UniqueProvider/index.tsx b/src/UniqueProvider/index.tsx index 148bc20b..021f93b8 100644 --- a/src/UniqueProvider/index.tsx +++ b/src/UniqueProvider/index.tsx @@ -9,9 +9,8 @@ import TriggerContext, { import useDelay from '../hooks/useDelay'; import useAlign from '../hooks/useAlign'; import Popup from '../Popup'; -import { useEvent } from '@rc-component/util'; +import { isDOM, useEvent } from '@rc-component/util'; import useTargetState from './useTargetState'; -import { isDOM } from '@rc-component/util/lib/Dom/findDOMNode'; import UniqueContainer from './UniqueContainer'; import { clsx } from 'clsx'; import { getAlignPopupClassName } from '../util'; diff --git a/src/hooks/useAlign.ts b/src/hooks/useAlign.ts index bb5b0611..679d0560 100644 --- a/src/hooks/useAlign.ts +++ b/src/hooks/useAlign.ts @@ -1,7 +1,9 @@ -import { isDOM } from '@rc-component/util/lib/Dom/findDOMNode'; -import isVisible from '@rc-component/util/lib/Dom/isVisible'; -import useEvent from '@rc-component/util/lib/hooks/useEvent'; -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; +import { + isDOM, + isVisible, + useEvent, + useLayoutEffect, +} from '@rc-component/util'; import * as React from 'react'; import type { TriggerProps } from '..'; import type { diff --git a/src/hooks/useWatch.ts b/src/hooks/useWatch.ts index d5d3fd66..12788153 100644 --- a/src/hooks/useWatch.ts +++ b/src/hooks/useWatch.ts @@ -1,4 +1,4 @@ -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; +import { useLayoutEffect } from '@rc-component/util'; import { collectScroller, getWin } from '../util'; export default function useWatch( diff --git a/src/hooks/useWinClick.ts b/src/hooks/useWinClick.ts index 7c208d41..5ccfbc82 100644 --- a/src/hooks/useWinClick.ts +++ b/src/hooks/useWinClick.ts @@ -1,5 +1,4 @@ -import { getShadowRoot } from '@rc-component/util/lib/Dom/shadow'; -import { warning } from '@rc-component/util/lib/warning'; +import { getShadowRoot, warning } from '@rc-component/util'; import * as React from 'react'; import { getWin } from '../util'; diff --git a/src/index.tsx b/src/index.tsx index 4cad2655..bb5fb838 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,12 +2,16 @@ import Portal from '@rc-component/portal'; import { clsx } from 'clsx'; import type { CSSMotionProps } from '@rc-component/motion'; import { useResizeObserver } from '@rc-component/resize-observer'; -import { getDOM, isDOM } from '@rc-component/util/lib/Dom/findDOMNode'; -import { getShadowRoot } from '@rc-component/util/lib/Dom/shadow'; -import { getNodeRef, useComposeRef } from '@rc-component/util/lib/ref'; -import useEvent from '@rc-component/util/lib/hooks/useEvent'; -import useId from '@rc-component/util/lib/hooks/useId'; -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; +import { + getDOM, + getNodeRef, + getShadowRoot, + isDOM, + useComposeRef, + useEvent, + useId, + useLayoutEffect, +} from '@rc-component/util'; import * as React from 'react'; import Popup, { type MobileConfig } from './Popup'; import type { TriggerContextProps } from './context';