From 4de43677065cd319f6eeecca3ce2545b6d727d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E7=88=B1=E5=90=83=E7=99=BD=E8=90=9D?=
 =?UTF-8?q?=E5=8D=9C?= <smith3816@gmail.com>
Date: Thu, 20 Jul 2023 09:46:26 +0800
Subject: [PATCH] fix: Button default event handler (#43666)

* test: test driven

* fix: types

* chore: post script
---
 components/button/__tests__/index.test.tsx | 31 ++++++++++++++++++++++
 components/button/button.tsx               | 29 ++++++++------------
 scripts/post-script.js                     |  1 +
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/components/button/__tests__/index.test.tsx b/components/button/__tests__/index.test.tsx
index 496de4d8c8..4f9aff1ede 100644
--- a/components/button/__tests__/index.test.tsx
+++ b/components/button/__tests__/index.test.tsx
@@ -351,7 +351,38 @@ describe('Button', () => {
     const button = <Button onClick={onBtnClick} />;
     const anchor = <Button href="https://ant.design" onClick={onAnchorClick} />;
 
+    const defaultBtn = (
+      <Button
+        onClick={(e) => {
+          expect(e).toBeTruthy();
+        }}
+      />
+    );
+
+    const defaultABtn = (
+      <Button
+        href="https://ant.design"
+        onClick={(e) => {
+          expect(e).toBeTruthy();
+        }}
+      />
+    );
+
+    const btnRef = React.createRef<HTMLButtonElement>();
+    const refBtn = <Button ref={btnRef} />;
+
+    const anchorRef = React.createRef<HTMLAnchorElement>();
+    const refAnchor = <Button ref={anchorRef} />;
+
+    const htmlRef = React.createRef<HTMLElement>();
+    const refHtml = <Button ref={htmlRef} />;
+
     expect(button).toBeTruthy();
     expect(anchor).toBeTruthy();
+    expect(defaultBtn).toBeTruthy();
+    expect(defaultABtn).toBeTruthy();
+    expect(refBtn).toBeTruthy();
+    expect(refAnchor).toBeTruthy();
+    expect(refHtml).toBeTruthy();
   });
 });
diff --git a/components/button/button.tsx b/components/button/button.tsx
index 7396fe8299..4d12bda75e 100644
--- a/components/button/button.tsx
+++ b/components/button/button.tsx
@@ -55,22 +55,15 @@ export interface BaseButtonProps {
   styles?: { icon: React.CSSProperties };
 }
 
-export type AnchorButtonProps = {
-  href: string;
-  target?: React.HTMLAttributeAnchorTarget;
-  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
-} & BaseButtonProps &
-  Omit<React.AnchorHTMLAttributes<HTMLAnchorElement | HTMLButtonElement>, 'type' | 'onClick'>;
-
-export type NativeButtonProps = {
-  htmlType?: ButtonHTMLType;
-  onClick?: React.MouseEventHandler<HTMLButtonElement>;
-} & BaseButtonProps &
-  Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type' | 'onClick'>;
-
-export type ButtonProps = AnchorButtonProps | NativeButtonProps;
+type MergedHTMLAttributes = Omit<
+  React.HTMLAttributes<HTMLElement> & React.AnchorHTMLAttributes<HTMLElement>,
+  'type'
+>;
 
-type InternalButtonProps = Partial<AnchorButtonProps & NativeButtonProps>;
+export interface ButtonProps extends BaseButtonProps, MergedHTMLAttributes {
+  href?: string;
+  htmlType?: ButtonHTMLType;
+}
 
 type CompoundedComponent = React.ForwardRefExoticComponent<
   ButtonProps & React.RefAttributes<HTMLElement>
@@ -125,7 +118,7 @@ const InternalButton: React.ForwardRefRenderFunction<
     classNames: customClassNames,
     style: customStyle = {},
     ...rest
-  } = props as InternalButtonProps;
+  } = props;
 
   const { getPrefixCls, autoInsertSpaceInButton, direction, button } = useContext(ConfigContext);
   const prefixCls = getPrefixCls('btn', customizePrefixCls);
@@ -218,7 +211,7 @@ const InternalButton: React.ForwardRefRenderFunction<
 
   const iconType = innerLoading ? 'loading' : icon;
 
-  const linkButtonRestProps = omit(rest as InternalButtonProps & { navigate: any }, ['navigate']);
+  const linkButtonRestProps = omit(rest as ButtonProps & { navigate: any }, ['navigate']);
 
   const classes = classNames(
     prefixCls,
@@ -280,7 +273,7 @@ const InternalButton: React.ForwardRefRenderFunction<
 
   let buttonNode = (
     <button
-      {...(rest as NativeButtonProps)}
+      {...rest}
       type={htmlType}
       className={classes}
       style={fullStyle}
diff --git a/scripts/post-script.js b/scripts/post-script.js
index 5972f434cb..3da43d5bc0 100644
--- a/scripts/post-script.js
+++ b/scripts/post-script.js
@@ -39,6 +39,7 @@ const DEPRECIATED_VERSION = {
   ],
   '5.6.2': ['https://github.com/ant-design/ant-design/issues/43113'],
   '5.6.3': ['https://github.com/ant-design/ant-design/issues/43190'],
+  '5.7.1': ['https://github.com/ant-design/ant-design/issues/43654'],
 };
 
 function matchDeprecated(version) {