From 2f3ca0b39fb8d9343a7c1063629a3321a783f39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A0=97=E5=98=89=E7=94=B7?= <574980606@qq.com> Date: Thu, 20 Jul 2023 14:56:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=F0=9F=90=9B=20replace=20?= =?UTF-8?q?defaultProps=20with=20useDefaultProps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/popup/Popup.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/popup/Popup.tsx b/src/popup/Popup.tsx index 7e6121c5e..517d62449 100644 --- a/src/popup/Popup.tsx +++ b/src/popup/Popup.tsx @@ -17,6 +17,7 @@ import { getTransitionParams } from './utils/transition'; import useMutationObserver from '../_util/useMutationObserver'; import useWindowSize from '../_util/useWindowSize'; import { popupDefaultProps } from './defaultProps'; +import useDefaultProps from '../hooks/useDefaultProps'; export interface PopupProps extends TdPopupProps { // 是否触发展开收起动画,内部下拉式组件使用 @@ -34,7 +35,8 @@ export interface PopupRef { getPortalElement: () => HTMLDivElement; } -const Popup = forwardRef((props: PopupProps, ref: React.RefObject) => { +const Popup = forwardRef((originalProps, ref) => { + const props = useDefaultProps(originalProps, popupDefaultProps); const { trigger, content, @@ -228,6 +230,5 @@ const Popup = forwardRef((props: PopupProps, ref: React.RefObject) => }); Popup.displayName = 'Popup'; -Popup.defaultProps = popupDefaultProps; export default Popup;