vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-12 04:50:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ccapndave-react-update-for-1.6'

Browse Source
This commit is contained in:
vvakame
2015-10-07 02:00:54 +09:00
parent 71e9e18338 e1171adaff
commit 8299ca4d6d
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
react/react-global.d.ts
Vendored
+8 -3
View File
@@ -85,14 +85,19 @@ declare namespace __React {
// Reat.addons.update
// ----------------------------------------------------------------------
interface UpdateSpec {
interface UpdateSpecCommand {
$set?: any;
$merge?: {};
$apply?(value: any): any;
// [key: string]: UpdateSpec;
}
interface UpdateArraySpec extends UpdateSpec {
interface UpdateSpecPath {
[key: string]: UpdateSpec;
}
type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
interface UpdateArraySpec extends UpdateSpecCommand {
$push?: any[];
$unshift?: any[];
$splice?: any[][];
react/react.d.ts
Vendored
+12 -7
View File
@@ -136,7 +136,7 @@ declare namespace __React {
static contextTypes: ValidationMap<any>;
static childContextTypes: ValidationMap<any>;
static defaultProps: Props<any>;
constructor(props?: P, context?: any);
setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
setState(state: S, callback?: () => any): void;
@@ -376,7 +376,7 @@ declare namespace __React {
onTouchStart?: TouchEventHandler;
onScroll?: UIEventHandler;
onWheel?: WheelEventHandler;
className?: string;
id?: string;
@@ -944,7 +944,7 @@ declare module "react/addons" {
static contextTypes: ValidationMap<any>;
static childContextTypes: ValidationMap<any>;
static defaultProps: Props<any>;
constructor(props?: P, context?: any);
setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
setState(state: S, callback?: () => any): void;
@@ -1613,7 +1613,7 @@ declare module "react/addons" {
item(index: number): Touch;
identifiedTouch(identifier: number): Touch;
}
//
// React.addons
// ----------------------------------------------------------------------
@@ -1691,14 +1691,19 @@ declare module "react/addons" {
// Reat.addons.update
// ----------------------------------------------------------------------
interface UpdateSpec {
interface UpdateSpecCommand {
$set?: any;
$merge?: {};
$apply?(value: any): any;
// [key: string]: UpdateSpec;
}
interface UpdateArraySpec extends UpdateSpec {
interface UpdateSpecPath {
[key: string]: UpdateSpec;
}
type UpdateSpec = UpdateSpecCommand | UpdateSpecPath;
interface UpdateArraySpec extends UpdateSpecCommand {
$push?: any[];
$unshift?: any[];
$splice?: any[][];