fix: Button ts

ant-design · Jul 18, 2023 · 70500f8 · 70500f8
1 parent cf40fb0
commit 70500f8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/components/button/__tests__/index.test.tsx b/components/button/__tests__/index.test.tsx
@@ -343,4 +343,15 @@ describe('Button', () => {
     );
     expect(window.getComputedStyle(container.querySelector('#link')!).pointerEvents).toBe('none');
   });
+
+  it('Correct type', () => {
+    const onBtnClick: React.MouseEventHandler<HTMLButtonElement> = () => {};
+    const onAnchorClick: React.MouseEventHandler<HTMLAnchorElement> = () => {};
+
+    const button = <Button onClick={onBtnClick} />;
+    const anchor = <Button href="https://ant.design" onClick={onAnchorClick} />;
+
+    expect(button).toBeTruthy();
+    expect(anchor).toBeTruthy();
+  });
 });
diff --git a/components/button/button.tsx b/components/button/button.tsx
@@ -27,7 +27,9 @@ import useStyle from './style';
 
 export type LegacyButtonType = ButtonType | 'danger';
 
-export function convertLegacyProps(type?: LegacyButtonType): ButtonProps {
+export function convertLegacyProps(
+  type?: LegacyButtonType,
+): Pick<BaseButtonProps, 'danger' | 'type'> {
   if (type === 'danger') {
     return { danger: true };
   }
@@ -66,7 +68,9 @@ export type NativeButtonProps = {
 } & BaseButtonProps &
   Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type' | 'onClick'>;
 
-export type ButtonProps = Partial<AnchorButtonProps & NativeButtonProps>;
+export type ButtonProps = AnchorButtonProps | NativeButtonProps;
+
+type InternalButtonProps = Partial<AnchorButtonProps & NativeButtonProps>;
 
 type CompoundedComponent = React.ForwardRefExoticComponent<
   ButtonProps & React.RefAttributes<HTMLElement>
@@ -121,7 +125,7 @@ const InternalButton: React.ForwardRefRenderFunction<
     classNames: customClassNames,
     style: customStyle = {},
     ...rest
-  } = props;
+  } = props as InternalButtonProps;
 
   const { getPrefixCls, autoInsertSpaceInButton, direction, button } = useContext(ConfigContext);
   const prefixCls = getPrefixCls('btn', customizePrefixCls);
@@ -214,7 +218,7 @@ const InternalButton: React.ForwardRefRenderFunction<
 
   const iconType = innerLoading ? 'loading' : icon;
 
-  const linkButtonRestProps = omit(rest as ButtonProps & { navigate: any }, ['navigate']);
+  const linkButtonRestProps = omit(rest as InternalButtonProps & { navigate: any }, ['navigate']);
 
   const classes = classNames(
     prefixCls,

diff --git a/components/popconfirm/PurePanel.tsx b/components/popconfirm/PurePanel.tsx
@@ -77,7 +77,11 @@ export const Overlay: React.FC<OverlayProps> = (props) => {
           </Button>
         )}
         <ActionButton
-          buttonProps={{ size: 'small', ...convertLegacyProps(okType), ...okButtonProps }}
+          buttonProps={{
+            size: 'small',
+            ...convertLegacyProps(okType),
+            ...okButtonProps,
+          }}
           actionFn={onConfirm}
           close={close}
           prefixCls={getPrefixCls('btn')}