From d70f599a7e6f1963ad35df9ad88e2c93709f9028 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 14 Mar 2023 15:14:40 +0800
Subject: [PATCH] test: fix Modal test cov agian (#41216)

* test: fix Modal footer test cov

* test: fix Modal footer test cov

* fix footer

* Update components/modal/PurePanel.tsx

Co-authored-by: MadCcc <1075746765@qq.com>

* fix footer

---------

Co-authored-by: MadCcc <1075746765@qq.com>
---
 components/modal/Modal.tsx     | 7 ++++---
 components/modal/PurePanel.tsx | 7 ++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/components/modal/Modal.tsx b/components/modal/Modal.tsx
index 10d6239ff4..b369b944a4 100644
--- a/components/modal/Modal.tsx
+++ b/components/modal/Modal.tsx
@@ -200,6 +200,9 @@ const Modal: React.FC<ModalProps> = (props) => {
     warning(!('visible' in props), 'Modal', '`visible` is deprecated, please use `open` instead.');
   }
 
+  const dialogFooter =
+    footer === undefined ? <Footer {...props} onOk={handleOk} onCancel={handleCancel} /> : footer;
+
   return wrapSSR(
     <NoCompactStyle>
       <NoFormStyle status override>
@@ -210,9 +213,7 @@ const Modal: React.FC<ModalProps> = (props) => {
           prefixCls={prefixCls}
           rootClassName={classNames(hashId, rootClassName)}
           wrapClassName={wrapClassNameExtended}
-          footer={
-            footer === null ? footer : <Footer {...props} onOk={handleOk} onCancel={handleCancel} />
-          }
+          footer={dialogFooter}
           visible={open ?? visible}
           mousePosition={restProps.mousePosition ?? mousePosition}
           onClose={handleCancel}
diff --git a/components/modal/PurePanel.tsx b/components/modal/PurePanel.tsx
index 47ce47e10f..55a38831bf 100644
--- a/components/modal/PurePanel.tsx
+++ b/components/modal/PurePanel.tsx
@@ -55,12 +55,11 @@ export const Footer: React.FC<
     onCancel,
     okButtonProps,
     cancelButtonProps,
-    footer,
   } = props;
 
   const [locale] = useLocale('Modal', getConfirmLocale());
 
-  return footer === undefined ? (
+  return (
     <>
       <Button onClick={onCancel} {...cancelButtonProps}>
         {cancelText || locale?.cancelText}
@@ -74,8 +73,6 @@ export const Footer: React.FC<
         {okText || locale?.okText}
       </Button>
     </>
-  ) : (
-    (footer as React.ReactElement)
   );
 };
 
@@ -119,7 +116,7 @@ const PurePanel: React.FC<PurePanelProps> = (props) => {
     additionalProps = {
       closable: closable ?? true,
       title,
-      footer: <Footer {...props} />,
+      footer: props.footer === undefined ? <Footer {...props} /> : props.footer,
       children,
     };
   }