Merge pull request #21233 from AviVahl/master

Backport ts 2.6.1 fix to @types/react@15
This commit is contained in:
Nathan Shively-Sanders 2017-11-06 08:57:12 -08:00 committed by GitHub
commit 66f36eb2be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -78,7 +78,7 @@ declare namespace React {
type ComponentType<P = {}> = ComponentClass<P> | StatelessComponent<P>;
type Key = string | number;
type Ref<T> = string | ((instance: T | null) => any);
type Ref<T> = string | { bivarianceHack(instance: T | null): any }["bivarianceHack"];
// tslint:disable-next-line:interface-over-type-literal
type ComponentState = {};
@ -521,7 +521,7 @@ declare namespace React {
// Event Handler Types
// ----------------------------------------------------------------------
type EventHandler<E extends SyntheticEvent<any>> = (event: E) => void;
type EventHandler<E extends SyntheticEvent<any>> = { bivarianceHack(event: E): void }["bivarianceHack"];
type ReactEventHandler<T> = EventHandler<SyntheticEvent<T>>;
@ -3335,7 +3335,7 @@ declare namespace React {
// React.PropTypes
// ----------------------------------------------------------------------
type Validator<T> = (object: T, key: string, componentName: string, ...rest: any[]) => Error | null;
type Validator<T> = { bivarianceHack(object: T, key: string, componentName: string, ...rest: any[]): Error | null }["bivarianceHack"];
interface Requireable<T> extends Validator<T> {
isRequired: Validator<T>;