mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-01 04:48:55 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge pull request #15702 from ferdikoomen/issue-15700

Browse Source 
Fix for changes in @types/react (see issue #15700)
This commit is contained in:
偏右 2019-03-28 10:28:46 +08:00 committed by GitHub
commit d0b68f9948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/button/button.tsx
View File

@ -7,7 +7,7 @@ import omit from 'omit.js';
import Icon from '../icon'; import Icon from '../icon';
import { ConfigConsumer, ConfigConsumerProps } from '../config-provider'; import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
import Wave from '../_util/wave'; import Wave from '../_util/wave';
import { tuple } from '../_util/type'; import { Omit, tuple } from '../_util/type';
const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/; const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/;
const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar); const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar);
@ -67,13 +67,13 @@ export type AnchorButtonProps = {
target?: string; target?: string;
onClick?: React.MouseEventHandler<HTMLAnchorElement>; onClick?: React.MouseEventHandler<HTMLAnchorElement>;
} & BaseButtonProps & } & BaseButtonProps &
React.AnchorHTMLAttributes<HTMLAnchorElement>; Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'type'>;
export type NativeButtonProps = { export type NativeButtonProps = {
htmlType?: ButtonHTMLType; htmlType?: ButtonHTMLType;
onClick?: React.MouseEventHandler<HTMLButtonElement>; onClick?: React.MouseEventHandler<HTMLButtonElement>;
} & BaseButtonProps & } & BaseButtonProps &
React.ButtonHTMLAttributes<HTMLButtonElement>; Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'type'>;
export type ButtonProps = AnchorButtonProps | NativeButtonProps; export type ButtonProps = AnchorButtonProps | NativeButtonProps;