refactor: use rc-util getNodeRef (#238)

Author: zombieJ

package.json

@@ -47,7 +47,7 @@
     "@babel/runtime": "^7.18.3",
     "@rc-component/trigger": "^2.0.0",
     "classnames": "^2.2.6",
-    "rc-util": "^5.17.0"
+    "rc-util": "^5.44.1"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^1.0.0",

src/Dropdown.tsx

@@ -7,8 +7,7 @@ import type {
   BuildInPlacements,
 } from '@rc-component/trigger/lib/interface';
 import classNames from 'classnames';
-import { composeRef, supportRef } from 'rc-util/lib/ref';
-import type { ReactElement } from 'react';
+import { composeRef, getNodeRef, supportRef } from 'rc-util/lib/ref';
 import React from 'react';
 import useAccessibility from './hooks/useAccessibility';
 import Overlay from './Overlay';
@@ -139,10 +138,7 @@ function Dropdown(props: DropdownProps, ref) {
       mergedVisible && getOpenClassName(),
     ),
     ref: supportRef(children)
-      ? composeRef(
-          childRef,
-          (children as ReactElement & { ref: React.Ref<HTMLElement> }).ref,
-        )
+      ? composeRef(childRef, getNodeRef(children))
       : undefined,
   });
 

src/Overlay.tsx

@@ -1,11 +1,14 @@
-import React, { forwardRef, ReactElement, useMemo } from 'react';
+import { composeRef, getNodeRef, supportRef } from 'rc-util/lib/ref';
+import React, { forwardRef, useMemo } from 'react';
 import type { DropdownProps } from './Dropdown';
-import { composeRef, supportRef } from 'rc-util/lib/ref';
 
-export type OverlayProps = Pick<DropdownProps, 'overlay' | 'arrow' | 'prefixCls'>
+export type OverlayProps = Pick<
+  DropdownProps,
+  'overlay' | 'arrow' | 'prefixCls'
+>;
 
 const Overlay = forwardRef<HTMLElement, OverlayProps>((props, ref) => {
-  const {overlay, arrow, prefixCls} = props;
+  const { overlay, arrow, prefixCls } = props;
 
   const overlayNode = useMemo(() => {
     let overlayElement: React.ReactElement;
@@ -17,14 +20,16 @@ const Overlay = forwardRef<HTMLElement, OverlayProps>((props, ref) => {
     return overlayElement;
   }, [overlay]);
 
-  const composedRef = composeRef(ref, (overlayNode as ReactElement & {ref: React.Ref<HTMLElement>})?.ref);
+  const composedRef = composeRef(ref, getNodeRef(overlayNode));
 
   return (
     <>
       {arrow && <div className={`${prefixCls}-arrow`} />}
-      {React.cloneElement(overlayNode, { ref: supportRef(overlayNode) ? composedRef : undefined })}
+      {React.cloneElement(overlayNode, {
+        ref: supportRef(overlayNode) ? composedRef : undefined,
+      })}
     </>
-  )
+  );
 });
 
-export default Overlay;
+export default Overlay;