Merge pull request #15702 from ferdikoomen/issue-15700

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

View File

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