Avoid rc package deep imports

package.json

@@ -44,11 +44,11 @@
     "@rc-component/motion": "^1.1.4",
     "@rc-component/portal": "^2.2.0",
     "@rc-component/resize-observer": "^1.1.1",
-    "@rc-component/util": "^1.2.1",
+    "@rc-component/util": "^1.11.1",
     "clsx": "^2.1.1"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^2.0.0",
+    "@rc-component/father-plugin": "^2.2.0",
     "@rc-component/np": "^1.0.3",
     "@testing-library/jest-dom": "^6.1.4",
     "@testing-library/react": "^16.0.0",

src/Popup/index.tsx

@@ -4,16 +4,14 @@ 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, useEvent, useLayoutEffect } from '@rc-component/util';
 import * as React from 'react';
 import type { TriggerProps } from '../';
 import type { AlignType, ArrowPos, ArrowTypeOuter } from '../interface';
 import Arrow from './Arrow';
 import Mask from './Mask';
 import PopupContent from './PopupContent';
 import useOffsetStyle from '../hooks/useOffsetStyle';
-import { useEvent } from '@rc-component/util';
 import type { PortalProps } from '@rc-component/portal';
 
 export interface MobileConfig {

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';

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 {

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(

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';
 

src/index.tsx

@@ -2,12 +2,18 @@ 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,
+  supportRef,
+  useComposeRef,
+  useControlledState,
+  useEvent,
+  useId,
+  useLayoutEffect,
+} from '@rc-component/util';
 import * as React from 'react';
 import Popup, { type MobileConfig } from './Popup';
 import type { TriggerContextProps } from './context';
@@ -22,6 +28,7 @@ import type { PortalProps } from '@rc-component/portal';
 import type {
   ActionType,
   AlignType,
+  AnimationType,
   ArrowPos,
   ArrowTypeOuter,
   BuildInPlacements,
@@ -31,12 +38,12 @@ import { getAlignPopupClassName } from './util';
 export type {
   ActionType,
   AlignType,
+  AnimationType,
   ArrowTypeOuter as ArrowType,
   BuildInPlacements,
 };
 
 import UniqueProvider, { type UniqueProviderProps } from './UniqueProvider';
-import { useControlledState } from '@rc-component/util';
 import { flushSync } from 'react-dom';
 
 export { UniqueProvider };
@@ -791,13 +798,17 @@ export function generateTrigger(
     useResizeObserver(mergedOpen, targetEle, onTargetResize);
 
     // Compose refs
-    const mergedRef = useComposeRef(setTargetRef, getNodeRef(child));
+    const childSupportRef = supportRef(child);
+    const mergedRef = useComposeRef(
+      setTargetRef,
+      childSupportRef ? getNodeRef(child) : null,
+    );
 
     // Child Node
     const triggerNode = React.cloneElement(child, {
       ...mergedChildrenProps,
       ...passedProps,
-      ref: mergedRef,
+      ref: childSupportRef ? mergedRef : undefined,
     });
 
     // Render
@@ -869,4 +880,36 @@ export function generateTrigger(
   return Trigger;
 }
 
+interface MockPortalProps {
+  open?: boolean;
+  autoDestroy?: boolean;
+  children: React.ReactElement<any>;
+  getContainer?: () => HTMLElement;
+}
+
+const MockPortal: React.FC<MockPortalProps> = ({
+  open,
+  autoDestroy,
+  children,
+  getContainer,
+}) => {
+  const [visible, setVisible] = React.useState(open);
+
+  React.useEffect(() => {
+    getContainer?.();
+  });
+
+  React.useEffect(() => {
+    if (open) {
+      setVisible(true);
+    } else if (autoDestroy) {
+      setVisible(false);
+    }
+  }, [open, autoDestroy]);
+
+  return visible ? children : null;
+};
+
+export const MockTrigger = generateTrigger(MockPortal);
+
 export default generateTrigger(Portal);

src/mock.tsx

@@ -1,36 +1 @@
-import * as React from 'react';
-import { generateTrigger, UniqueProvider } from './index';
-
-interface MockPortalProps {
-  open?: boolean;
-  autoDestroy?: boolean;
-  children: React.ReactElement<any>;
-  getContainer?: () => HTMLElement;
-}
-
-const MockPortal: React.FC<MockPortalProps> = ({
-  open,
-  autoDestroy,
-  children,
-  getContainer,
-}) => {
-  const [visible, setVisible] = React.useState(open);
-
-  React.useEffect(() => {
-    getContainer?.();
-  });
-
-  React.useEffect(() => {
-    if (open) {
-      setVisible(true);
-    } else if (autoDestroy) {
-      setVisible(false);
-    }
-  }, [open, autoDestroy]);
-
-  return visible ? children : null;
-};
-
-export default generateTrigger(MockPortal);
-
-export { UniqueProvider };
+export { MockTrigger as default, UniqueProvider } from './index';

tests/align.test.tsx

@@ -1,5 +1,5 @@
 import { act, cleanup, fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import type { TriggerProps, TriggerRef } from '../src';
 import Trigger from '../src';

tests/arrow.test.jsx

@@ -1,10 +1,7 @@
 /* eslint-disable max-classes-per-file */
 
 import { act, cleanup, render } from '@testing-library/react';
-import {
-  spyElementPrototype,
-  spyElementPrototypes,
-} from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototype, spyElementPrototypes } from '@rc-component/util';
 import Trigger from '../src';
 
 describe('Trigger.Arrow', () => {

tests/basic.test.jsx

@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { act, cleanup, fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React, { StrictMode, createRef } from 'react';
 import ReactDOM, { createPortal } from 'react-dom';
 import Trigger from '../src';

tests/flip-visibleFirst.test.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-invalid-this */
 import { act, cleanup, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import * as React from 'react';
 import type { AlignType, TriggerProps, TriggerRef } from '../src';
 import Trigger from '../src';

tests/flip.test.tsx

@@ -1,6 +1,6 @@
 import { act, cleanup, render } from '@testing-library/react';
 import { _rs } from '@rc-component/resize-observer';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import * as React from 'react';
 import type { AlignType, TriggerProps } from '../src';
 import Trigger from '../src';

tests/flipShift.test.tsx

@@ -1,5 +1,5 @@
 import { act, cleanup, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import Trigger from '../src';
 

tests/mobile.test.tsx

@@ -1,5 +1,5 @@
 import { act, fireEvent, render } from '@testing-library/react';
-import isMobile from '@rc-component/util/lib/isMobile';
+import { isMobile } from '@rc-component/util';
 import React from 'react';
 import Trigger, { type TriggerProps } from '../src';
 import { placementAlignMap } from './util';

tests/open-change.test.tsx

@@ -1,5 +1,5 @@
 import { act, cleanup, fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import * as React from 'react';
 import Trigger from '../src';
 

tests/perf.test.tsx

@@ -1,5 +1,5 @@
 import { cleanup, fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import Trigger, { type TriggerProps } from '../src';
 import { awaitFakeTimer, placementAlignMap } from './util';

tests/portal.test.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 
 import { act, cleanup, fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Trigger from '../src';

tests/rect.test.tsx

@@ -1,5 +1,5 @@
 import { cleanup, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import Trigger from '../src';
 import { awaitFakeTimer } from './util';

tests/ref.test.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 
 import { cleanup, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import Trigger, { type TriggerRef } from '../src';
 

tests/shadow.test.tsx

@@ -1,5 +1,5 @@
 import { act, fireEvent } from '@testing-library/react';
-import { resetWarned } from '@rc-component/util/lib/warning';
+import { resetWarned } from '@rc-component/util';
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 import Trigger from '../src';