perf: compression code

ant-design · Aug 22, 2023 · bded5e8 · bded5e8
1 parent f206701
commit bded5e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/components/modal/ConfirmDialog.tsx b/components/modal/ConfirmDialog.tsx
@@ -47,22 +47,15 @@ export function ConfirmContent(
 ) {
   const {
     icon,
-    onCancel,
-    onOk,
-    close,
-    onConfirm,
-    isSilent,
     okText,
-    okButtonProps,
     cancelText,
-    cancelButtonProps,
     confirmPrefixCls,
-    rootPrefixCls,
     type,
     okCancel,
     footer,
     // Legacy for static function usage
     locale: staticLocale,
+    ...resetProps
   } = props;
 
   warning(
@@ -94,7 +87,6 @@ export function ConfirmContent(
     }
   }
 
-  const okType = props.okType || 'primary';
   // 默认为 true，保持向下兼容
   const mergedOkCancel = okCancel ?? type === 'confirm';
 
@@ -111,26 +103,14 @@ export function ConfirmContent(
   // ================= Context Value =================
   const confirmBtnCtxValue: ConfirmOkBtnProps = {
     autoFocusButton,
-    close,
-    isSilent,
-    okButtonProps,
-    rootPrefixCls,
     okTextLocale,
-    okType,
-    onConfirm,
-    onOk,
+    ...resetProps,
   };
 
   const cancelBtnCtxValue: ConfirmCancelBtnProps = {
     autoFocusButton,
-    cancelButtonProps,
     cancelTextLocale,
-    isSilent,
-    mergedOkCancel,
-    rootPrefixCls,
-    close,
-    onCancel,
-    onConfirm,
+    ...resetProps,
   };
 
   const confirmBtnCtxValueMemo = React.useMemo(

diff --git a/components/modal/components/ConfirmCancelBtn.tsx b/components/modal/components/ConfirmCancelBtn.tsx
@@ -9,7 +9,7 @@ export interface ConfirmCancelBtnProps
     ConfirmDialogProps,
     'cancelButtonProps' | 'isSilent' | 'rootPrefixCls' | 'close' | 'onConfirm' | 'onCancel'
   > {
-  autoFocusButton?: false | 'ok' | 'cancel';
+  autoFocusButton?: false | 'ok' | 'cancel' | null;
   cancelTextLocale?:
     | string
     | number

diff --git a/components/modal/components/ConfirmOkBtn.tsx b/components/modal/components/ConfirmOkBtn.tsx
@@ -9,7 +9,7 @@ export interface ConfirmOkBtnProps
     ConfirmDialogProps,
     'close' | 'isSilent' | 'okType' | 'okButtonProps' | 'rootPrefixCls' | 'onConfirm' | 'onOk'
   > {
-  autoFocusButton?: false | 'ok' | 'cancel';
+  autoFocusButton?: false | 'ok' | 'cancel' | null;
   okTextLocale?:
     | string
     | number
@@ -33,7 +33,7 @@ const ConfirmOkBtn: FC = () => {
   return (
     <ActionButton
       isSilent={isSilent}
-      type={okType}
+      type={okType || 'primary'}
       actionFn={onOk}
       close={(...args: any[]) => {
         close?.(...args);