refactor: fix compiling (ant-design#44616)

* refactor: fix compiling * perf: code logic update
ammar-knowledge · Sep 4, 2023 · b284648 · b284648
1 parent 85dc67f
commit b284648
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 36 deletions.
diff --git a/components/modal/components/ConfirmCancelBtn.tsx b/components/modal/components/ConfirmCancelBtn.tsx
@@ -32,23 +32,21 @@ const ConfirmCancelBtn: FC = () => {
     onCancel,
     onConfirm,
   } = useContext(ModalContext);
-  return (
-    mergedOkCancel && (
-      <ActionButton
-        isSilent={isSilent}
-        actionFn={onCancel}
-        close={(...args: any[]) => {
-          close?.(...args);
-          onConfirm?.(false);
-        }}
-        autoFocus={autoFocusButton === 'cancel'}
-        buttonProps={cancelButtonProps}
-        prefixCls={`${rootPrefixCls}-btn`}
-      >
-        {cancelTextLocale}
-      </ActionButton>
-    )
-  );
+  return mergedOkCancel ? (
+    <ActionButton
+      isSilent={isSilent}
+      actionFn={onCancel}
+      close={(...args: any[]) => {
+        close?.(...args);
+        onConfirm?.(false);
+      }}
+      autoFocus={autoFocusButton === 'cancel'}
+      buttonProps={cancelButtonProps}
+      prefixCls={`${rootPrefixCls}-btn`}
+    >
+      {cancelTextLocale}
+    </ActionButton>
+  ) : null;
 };
 
 export default ConfirmCancelBtn;
diff --git a/components/modal/shared.tsx b/components/modal/shared.tsx
@@ -68,25 +68,23 @@ export const Footer: React.FC<
 
   const btnCtxValueMemo = React.useMemo(() => btnCtxValue, [...Object.values(btnCtxValue)]);
 
-  const footerOriginNode = (
-    <>
-      <NormalCancelBtn />
-      <NormalOkBtn />
-    </>
-  );
-
-  return footer === undefined || typeof footer === 'function' ? (
-    <DisabledContextProvider disabled={false}>
+  let footerNode;
+  if (typeof footer === 'function' || typeof footer === 'undefined') {
+    footerNode = (
       <ModalContextProvider value={btnCtxValueMemo}>
-        {typeof footer === 'function'
-          ? footer(footerOriginNode, {
-              OkBtn: NormalOkBtn,
-              CancelBtn: NormalCancelBtn,
-            })
-          : footerOriginNode}
+        <NormalCancelBtn />
+        <NormalOkBtn />
       </ModalContextProvider>
-    </DisabledContextProvider>
-  ) : (
-    footer
-  );
+    );
+    if (typeof footer === 'function') {
+      footerNode = footer(footerNode, {
+        OkBtn: NormalOkBtn,
+        CancelBtn: NormalCancelBtn,
+      });
+    }
+  } else {
+    footerNode = footer;
+  }
+
+  return <DisabledContextProvider disabled={false}>{footerNode}</DisabledContextProvider>;
 };