test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-02 12:09:14 +08:00
Code Issues Actions 84 Packages Projects Releases Wiki Activity

refactor: review <Button/> defaultProps (#28211)

Browse Source
This commit is contained in:
Eugene Matvejev 2020-12-05 15:08:30 +00:00 committed by GitHub
parent ebb6fcf6c5
commit fa09208cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/button/button.tsx
View File

@ -129,7 +129,7 @@ type Loading = number | boolean;
const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (props, ref) => {
const {
loading,
loading = false,
prefixCls: customizePrefixCls,
type,
danger,
@ -138,8 +138,11 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
className,
children,
icon,
ghost,
block,
ghost = false,
block = false,
/** if we extract items here, we dont need use omit.js */
// React does not recognize the `htmlType` prop on a DOM element. Here we pick it out of `rest`.
htmlType = 'button' as ButtonProps['htmlType'],
...rest
} = props;
@ -260,7 +263,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
? spaceChildren(children, isNeedInserted() && autoInsertSpace)
: null;
const linkButtonRestProps = omit(rest as AnchorButtonProps, ['htmlType', 'loading', 'navigate']);
const linkButtonRestProps = omit(rest as AnchorButtonProps, ['navigate']);
if (linkButtonRestProps.href !== undefined) {
return (
<a {...linkButtonRestProps} className={classes} onClick={handleClick} ref={buttonRef}>
@ -270,12 +273,9 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr
);
}
// React does not recognize the `htmlType` prop on a DOM element. Here we pick it out of `rest`.
const { htmlType, ...otherProps } = rest as NativeButtonProps;
const buttonNode = (
<button
{...(omit(otherProps, ['loading']) as NativeButtonProps)}
{...rest as NativeButtonProps}
type={htmlType}
className={classes}
onClick={handleClick}
@ -297,13 +297,6 @@ const Button = React.forwardRef<unknown, ButtonProps>(InternalButton) as Compoun
Button.displayName = 'Button';
Button.defaultProps = {
loading: false,
ghost: false,
block: false,
htmlType: 'button' as ButtonProps['htmlType'],
};
Button.Group = Group;
Button.__ANT_BUTTON = true;