From 70779548d5352f88f1a96b4512ca5e8d37aba71b Mon Sep 17 00:00:00 2001
From: Vincent Siao <vincent@asana.com>
Date: Tue, 24 Feb 2015 17:18:58 -0800
Subject: [PATCH] Remove Context generics from React 0.13 defs

---
 react/future/react-0.13.0-tests.ts           |  18 +--
 react/future/react-0.13.0.d.ts               |  66 +++++-----
 react/future/react-addons-0.13.0-tests.ts    |  18 +--
 react/future/react-addons-0.13.0.d.ts        | 128 +++++++++----------
 react/future/react-addons-global-0.13.0.d.ts |  62 ++++-----
 react/future/react-global-0.13.0.d.ts        |  66 +++++-----
 6 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/react/future/react-0.13.0-tests.ts b/react/future/react-0.13.0-tests.ts
index dd0052ee39..b323561196 100644
--- a/react/future/react-0.13.0-tests.ts
+++ b/react/future/react-0.13.0-tests.ts
@@ -23,7 +23,7 @@ interface ChildContext {
     someOtherValue: string;
 }
 
-interface MyComponent extends React.Component<Props, State, Context> {
+interface MyComponent extends React.Component<Props, State> {
     reset(): void;
 }
 
@@ -42,8 +42,8 @@ var INPUT_REF: string = "input";
 // Top-Level API
 // --------------------------------------------------------------------------
 
-var ClassicComponent: React.ClassicComponentClass<Props, State, Context> =
-    React.createClass<Props, State, Context>({
+var ClassicComponent: React.ClassicComponentClass<Props, State> =
+    React.createClass<Props, State>({
         getDefaultProps: () => {
             return <Props>{
                 hello: undefined,
@@ -70,7 +70,7 @@ var ClassicComponent: React.ClassicComponentClass<Props, State, Context> =
         }
     });
 
-class ModernComponent extends React.Component<Props, State, Context>
+class ModernComponent extends React.Component<Props, State>
     implements React.ChildContextProvider<ChildContext> {
 
     constructor(props: Props, context: Context) {
@@ -145,9 +145,9 @@ var domElement: React.ReactHTMLElement =
     React.createElement("div");
 
 // React.render
-var component: React.Component<Props, any, any> =
+var component: React.Component<Props, any> =
     React.render(element, container);
-var classicComponent: React.ClassicComponent<Props, any, any> =
+var classicComponent: React.ClassicComponent<Props, any> =
     React.render(classicElement, container);
 var domComponent: React.DOMComponent<any> =
     React.render(domElement, container);
@@ -234,7 +234,7 @@ React.DOM.input(htmlAttr);
 // React.PropTypes
 // --------------------------------------------------------------------------
 
-var PropTypesSpecification: React.ComponentSpec<any, any, any> = {
+var PropTypesSpecification: React.ComponentSpec<any, any> = {
     propTypes: {
         optionalArray: React.PropTypes.array,
         optionalBool: React.PropTypes.bool,
@@ -275,7 +275,7 @@ var PropTypesSpecification: React.ComponentSpec<any, any, any> = {
 // ContextTypes
 // --------------------------------------------------------------------------
 
-var ContextTypesSpecification: React.ComponentSpec<any, any, any> = {
+var ContextTypesSpecification: React.ComponentSpec<any, any> = {
     contextTypes: {
         optionalArray: React.PropTypes.array,
         optionalBool: React.PropTypes.bool,
@@ -329,7 +329,7 @@ var onlyChild = React.Children.only([null, [[["Hallo"], true]], false]);
 interface TimerState {
     secondsElapsed: number;
 }
-class Timer extends React.Component<{}, TimerState, {}> {
+class Timer extends React.Component<{}, TimerState> {
     static state = {
         secondsElapsed: 0
     }
diff --git a/react/future/react-0.13.0.d.ts b/react/future/react-0.13.0.d.ts
index 842623bc8f..fd4b27e98d 100644
--- a/react/future/react-0.13.0.d.ts
+++ b/react/future/react-0.13.0.d.ts
@@ -16,10 +16,10 @@ declare module "react" {
     }
 
     interface ReactElement<P>
-        extends ReactElementBase<ComponentClass<P, any, any>, P> {}
+        extends ReactElementBase<ComponentClass<P, any>, P> {}
 
     interface ReactClassicElement<P>
-        extends ReactElementBase<ClassicComponentClass<P, any, any> | string, P> {}
+        extends ReactElementBase<ClassicComponentClass<P, any> | string, P> {}
 
     interface ReactDOMElement<P> // subtype of ReactClassicElement
         extends ReactElementBase<string, P> {}
@@ -62,26 +62,26 @@ declare module "react" {
     // Top Level API
     // ----------------------------------------------------------------------
 
-    function createClass<P, S, C>(
-        spec: ComponentSpec<P, S, C>): ClassicComponentClass<P, S, C>;
+    function createClass<P, S>(
+        spec: ComponentSpec<P, S>): ClassicComponentClass<P, S>;
 
     function createFactory<P>(
         type: string): DOMFactory<P>;
     function createFactory<P>(
-        type: ClassicComponentClass<P, any, any> | string): ClassicFactory<P>;
+        type: ClassicComponentClass<P, any> | string): ClassicFactory<P>;
     function createFactory<P>(
-        type: ComponentClass<P, any, any>): Factory<P>;
+        type: ComponentClass<P, any>): Factory<P>;
 
     function createElement<P>(
         type: string,
         props?: P,
         ...children: ReactNode[]): ReactDOMElement<P>;
     function createElement<P>(
-        type: ClassicComponentClass<P, any, any> | string,
+        type: ClassicComponentClass<P, any> | string,
         props?: P,
         ...children: ReactNode[]): ReactClassicElement<P>;
     function createElement<P>(
-        type: ComponentClass<P, any, any>,
+        type: ComponentClass<P, any>,
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
@@ -92,11 +92,11 @@ declare module "react" {
     function render<P, S>(
         element: ReactClassicElement<P>,
         container: Element,
-        callback?: () => any): ClassicComponent<P, S, {}>;
+        callback?: () => any): ClassicComponent<P, S>;
     function render<P, S>(
         element: ReactElement<P>,
         container: Element,
-        callback?: () => any): Component<P, S, {}>;
+        callback?: () => any): Component<P, S>;
 
     function unmountComponentAtNode(container: Element): boolean;
     function renderToString(element: ReactElementBase<any, any>): string;
@@ -105,9 +105,9 @@ declare module "react" {
     function initializeTouchEvents(shouldUseTouch: boolean): void;
 
     function findDOMNode<TElement extends Element>(
-        componentOrElement: Component<any, any, any> | Element): TElement;
+        componentOrElement: Component<any, any> | Element): TElement;
     function findDOMNode(
-        componentOrElement: Component<any, any, any> | Element): Element;
+        componentOrElement: Component<any, any> | Element): Element;
 
     var DOM: ReactDOM;
     var PropTypes: ReactPropTypes;
@@ -118,19 +118,19 @@ declare module "react" {
     // ----------------------------------------------------------------------
 
     // Base component for plain JS classes
-    class Component<P, S, C> implements ComponentLifecycle<P, S, C> {
-        constructor(props: P, context: C);
+    class Component<P, S> implements ComponentLifecycle<P, S> {
+        constructor(props: P, context: any);
         setState(state: S, callback?: () => any): void;
         forceUpdate(): void;
         props: P;
         state: S;
-        context: C;
+        context: any;
         refs: {
-            [key: string]: Component<any, any, any>
+            [key: string]: Component<any, any>
         };
     }
 
-    interface ClassicComponent<P, S, C> extends Component<P, S, C> {
+    interface ClassicComponent<P, S> extends Component<P, S> {
         replaceState(nextState: S, callback?: () => any): void;
         getDOMNode<TElement extends Element>(): TElement;
         getDOMNode(): Element;
@@ -140,7 +140,7 @@ declare module "react" {
         replaceProps(nextProps: P, callback?: () => any): void;
     }
 
-    interface DOMComponent<P> extends ClassicComponent<P, any, any> {
+    interface DOMComponent<P> extends ClassicComponent<P, any> {
         tagName: string;
     }
 
@@ -155,19 +155,19 @@ declare module "react" {
     // Class Interfaces
     // ----------------------------------------------------------------------
 
-    interface ComponentClassBase<P, C> {
+    interface ComponentClassBase<P> {
         propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<C>;
-        childContextTypes?: ValidationMap<{}>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
     }
 
-    interface ComponentClass<P, S, C> extends ComponentClassBase<P, C> {
-        new(props?: P, context?: C): Component<P, S, C>;
+    interface ComponentClass<P, S> extends ComponentClassBase<P> {
+        new(props?: P, context?: any): Component<P, S>;
         defaultProps?: P;
     }
 
-    interface ClassicComponentClass<P, S, C> extends ComponentClassBase<P, C> {
-        new(props?: P, context?: C): ClassicComponent<P, S, C>;
+    interface ClassicComponentClass<P, S> extends ComponentClassBase<P> {
+        new(props?: P, context?: any): ClassicComponent<P, S>;
         getDefaultProps?(): P;
         displayName?: string;
     }
@@ -176,18 +176,18 @@ declare module "react" {
     // Component Specs and Lifecycle
     // ----------------------------------------------------------------------
 
-    interface ComponentLifecycle<P, S, C> {
+    interface ComponentLifecycle<P, S> {
         componentWillMount?(): void;
         componentDidMount?(): void;
-        componentWillReceiveProps?(nextProps: P, nextContext: C): void;
-        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: C): boolean;
-        componentWillUpdate?(nextProps: P, nextState: S, nextContext: C): void;
-        componentDidUpdate?(prevProps: P, prevState: S, prevContext: C): void;
+        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
+        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
+        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
+        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
         componentWillUnmount?(): void;
     }
 
-    interface Mixin<P, S, C> extends ComponentLifecycle<P, S, C> {
-        mixins?: Mixin<P, S, C>;
+    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
+        mixins?: Mixin<P, S>;
         statics?: {
             [key: string]: any;
         };
@@ -201,7 +201,7 @@ declare module "react" {
         getDefaultProps?(): P;
     }
 
-    interface ComponentSpec<P, S, C> extends Mixin<P, S, C> {
+    interface ComponentSpec<P, S> extends Mixin<P, S> {
         render(): ReactElementBase<any, any>;
     }
 
diff --git a/react/future/react-addons-0.13.0-tests.ts b/react/future/react-addons-0.13.0-tests.ts
index a1be24add9..d76097cd67 100644
--- a/react/future/react-addons-0.13.0-tests.ts
+++ b/react/future/react-addons-0.13.0-tests.ts
@@ -21,7 +21,7 @@ interface ChildContext {
     someOtherValue: string;
 }
 
-interface MyComponent extends React.Component<Props, State, Context> {
+interface MyComponent extends React.Component<Props, State> {
     reset(): void;
 }
 
@@ -40,8 +40,8 @@ var INPUT_REF: string = "input";
 // Top-Level API
 // --------------------------------------------------------------------------
 
-var ClassicComponent: React.ClassicComponentClass<Props, State, Context> =
-    React.createClass<Props, State, Context>({
+var ClassicComponent: React.ClassicComponentClass<Props, State> =
+    React.createClass<Props, State>({
         getDefaultProps: () => {
             return <Props>{
                 hello: undefined,
@@ -68,7 +68,7 @@ var ClassicComponent: React.ClassicComponentClass<Props, State, Context> =
         }
     });
 
-class ModernComponent extends React.Component<Props, State, Context>
+class ModernComponent extends React.Component<Props, State>
     implements React.ChildContextProvider<ChildContext> {
 
     constructor(props: Props, context: Context) {
@@ -143,9 +143,9 @@ var domElement: React.ReactHTMLElement =
     React.createElement("div");
 
 // React.render
-var component: React.Component<Props, any, any> =
+var component: React.Component<Props, any> =
     React.render(element, container);
-var classicComponent: React.ClassicComponent<Props, any, any> =
+var classicComponent: React.ClassicComponent<Props, any> =
     React.render(classicElement, container);
 var domComponent: React.DOMComponent<any> =
     React.render(domElement, container);
@@ -232,7 +232,7 @@ React.DOM.input(htmlAttr);
 // React.PropTypes
 // --------------------------------------------------------------------------
 
-var PropTypesSpecification: React.ComponentSpec<any, any, any> = {
+var PropTypesSpecification: React.ComponentSpec<any, any> = {
     propTypes: {
         optionalArray: React.PropTypes.array,
         optionalBool: React.PropTypes.bool,
@@ -273,7 +273,7 @@ var PropTypesSpecification: React.ComponentSpec<any, any, any> = {
 // ContextTypes
 // --------------------------------------------------------------------------
 
-var ContextTypesSpecification: React.ComponentSpec<any, any, any> = {
+var ContextTypesSpecification: React.ComponentSpec<any, any> = {
     contextTypes: {
         optionalArray: React.PropTypes.array,
         optionalBool: React.PropTypes.bool,
@@ -327,7 +327,7 @@ var onlyChild = React.Children.only([null, [[["Hallo"], true]], false]);
 interface TimerState {
     secondsElapsed: number;
 }
-class Timer extends React.Component<{}, TimerState, {}> {
+class Timer extends React.Component<{}, TimerState> {
     static state = {
         secondsElapsed: 0
     }
diff --git a/react/future/react-addons-0.13.0.d.ts b/react/future/react-addons-0.13.0.d.ts
index dd06aa1e92..bb4af1d1ef 100644
--- a/react/future/react-addons-0.13.0.d.ts
+++ b/react/future/react-addons-0.13.0.d.ts
@@ -16,10 +16,10 @@ declare module "react/addons" {
     }
 
     interface ReactElement<P>
-        extends ReactElementBase<ComponentClass<P, any, any>, P> {}
+        extends ReactElementBase<ComponentClass<P, any>, P> {}
 
     interface ReactClassicElement<P>
-        extends ReactElementBase<ClassicComponentClass<P, any, any> | string, P> {}
+        extends ReactElementBase<ClassicComponentClass<P, any> | string, P> {}
 
     interface ReactDOMElement<P> // subtype of ReactClassicElement
         extends ReactElementBase<string, P> {}
@@ -62,26 +62,26 @@ declare module "react/addons" {
     // Top Level API
     // ----------------------------------------------------------------------
 
-    function createClass<P, S, C>(
-        spec: ComponentSpec<P, S, C>): ClassicComponentClass<P, S, C>;
+    function createClass<P, S>(
+        spec: ComponentSpec<P, S>): ClassicComponentClass<P, S>;
 
     function createFactory<P>(
         type: string): DOMFactory<P>;
     function createFactory<P>(
-        type: ClassicComponentClass<P, any, any> | string): ClassicFactory<P>;
+        type: ClassicComponentClass<P, any> | string): ClassicFactory<P>;
     function createFactory<P>(
-        type: ComponentClass<P, any, any>): Factory<P>;
+        type: ComponentClass<P, any>): Factory<P>;
 
     function createElement<P>(
         type: string,
         props?: P,
         ...children: ReactNode[]): ReactDOMElement<P>;
     function createElement<P>(
-        type: ClassicComponentClass<P, any, any> | string,
+        type: ClassicComponentClass<P, any> | string,
         props?: P,
         ...children: ReactNode[]): ReactClassicElement<P>;
     function createElement<P>(
-        type: ComponentClass<P, any, any>,
+        type: ComponentClass<P, any>,
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
@@ -92,11 +92,11 @@ declare module "react/addons" {
     function render<P, S>(
         element: ReactClassicElement<P>,
         container: Element,
-        callback?: () => any): ClassicComponent<P, S, {}>;
+        callback?: () => any): ClassicComponent<P, S>;
     function render<P, S>(
         element: ReactElement<P>,
         container: Element,
-        callback?: () => any): Component<P, S, {}>;
+        callback?: () => any): Component<P, S>;
 
     function unmountComponentAtNode(container: Element): boolean;
     function renderToString(element: ReactElementBase<any, any>): string;
@@ -105,9 +105,9 @@ declare module "react/addons" {
     function initializeTouchEvents(shouldUseTouch: boolean): void;
 
     function findDOMNode<TElement extends Element>(
-        componentOrElement: Component<any, any, any> | Element): TElement;
+        componentOrElement: Component<any, any> | Element): TElement;
     function findDOMNode(
-        componentOrElement: Component<any, any, any> | Element): Element;
+        componentOrElement: Component<any, any> | Element): Element;
 
     var DOM: ReactDOM;
     var PropTypes: ReactPropTypes;
@@ -118,19 +118,19 @@ declare module "react/addons" {
     // ----------------------------------------------------------------------
 
     // Base component for plain JS classes
-    class Component<P, S, C> implements ComponentLifecycle<P, S, C> {
-        constructor(props: P, context: C);
+    class Component<P, S> implements ComponentLifecycle<P, S> {
+        constructor(props: P, context: any);
         setState(state: S, callback?: () => any): void;
         forceUpdate(): void;
         props: P;
         state: S;
-        context: C;
+        context: any;
         refs: {
-            [key: string]: Component<any, any, any>
+            [key: string]: Component<any, any>
         };
     }
 
-    interface ClassicComponent<P, S, C> extends Component<P, S, C> {
+    interface ClassicComponent<P, S> extends Component<P, S> {
         replaceState(nextState: S, callback?: () => any): void;
         getDOMNode<TElement extends Element>(): TElement;
         getDOMNode(): Element;
@@ -140,7 +140,7 @@ declare module "react/addons" {
         replaceProps(nextProps: P, callback?: () => any): void;
     }
 
-    interface DOMComponent<P> extends ClassicComponent<P, any, any> {
+    interface DOMComponent<P> extends ClassicComponent<P, any> {
         tagName: string;
     }
 
@@ -155,19 +155,19 @@ declare module "react/addons" {
     // Class Interfaces
     // ----------------------------------------------------------------------
 
-    interface ComponentClassBase<P, C> {
+    interface ComponentClassBase<P> {
         propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<C>;
-        childContextTypes?: ValidationMap<{}>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
     }
 
-    interface ComponentClass<P, S, C> extends ComponentClassBase<P, C> {
-        new(props?: P, context?: C): Component<P, S, C>;
+    interface ComponentClass<P, S> extends ComponentClassBase<P> {
+        new(props?: P, context?: any): Component<P, S>;
         defaultProps?: P;
     }
 
-    interface ClassicComponentClass<P, S, C> extends ComponentClassBase<P, C> {
-        new(props?: P, context?: C): ClassicComponent<P, S, C>;
+    interface ClassicComponentClass<P, S> extends ComponentClassBase<P> {
+        new(props?: P, context?: any): ClassicComponent<P, S>;
         getDefaultProps?(): P;
         displayName?: string;
     }
@@ -176,18 +176,18 @@ declare module "react/addons" {
     // Component Specs and Lifecycle
     // ----------------------------------------------------------------------
 
-    interface ComponentLifecycle<P, S, C> {
+    interface ComponentLifecycle<P, S> {
         componentWillMount?(): void;
         componentDidMount?(): void;
-        componentWillReceiveProps?(nextProps: P, nextContext: C): void;
-        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: C): boolean;
-        componentWillUpdate?(nextProps: P, nextState: S, nextContext: C): void;
-        componentDidUpdate?(prevProps: P, prevState: S, prevContext: C): void;
+        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
+        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
+        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
+        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
         componentWillUnmount?(): void;
     }
 
-    interface Mixin<P, S, C> extends ComponentLifecycle<P, S, C> {
-        mixins?: Mixin<P, S, C>;
+    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
+        mixins?: Mixin<P, S>;
         statics?: {
             [key: string]: any;
         };
@@ -201,7 +201,7 @@ declare module "react/addons" {
         getDefaultProps?(): P;
     }
 
-    interface ComponentSpec<P, S, C> extends Mixin<P, S, C> {
+    interface ComponentSpec<P, S> extends Mixin<P, S> {
         render(): ReactElementBase<any, any>;
     }
 
@@ -748,7 +748,7 @@ declare module "react/addons" {
     // React.addons (Transitions)
     // ----------------------------------------------------------------------
 
-    type ReactType = ComponentClass<any, any, any> | string;
+    type ReactType = ComponentClass<any, any> | string;
 
     interface TransitionGroupProps {
         component?: ReactType;
@@ -763,9 +763,9 @@ declare module "react/addons" {
     }
 
     type CSSTransitionGroup =
-        ComponentClass<CSSTransitionGroupProps, any, any>;
+        ComponentClass<CSSTransitionGroupProps, any>;
     type TransitionGroup =
-        ComponentClass<TransitionGroupProps, any, any>;
+        ComponentClass<TransitionGroupProps, any>;
 
     //
     // React.addons (Mixins)
@@ -776,11 +776,11 @@ declare module "react/addons" {
         requestChange(newValue: T): void;
     }
 
-    interface LinkedStateMixin extends Mixin<any, any, any> {
+    interface LinkedStateMixin extends Mixin<any, any> {
         linkState<T>(key: string): ReactLink<T>;
     }
 
-    interface PureRenderMixin extends Mixin<any, any, any> {
+    interface PureRenderMixin extends Mixin<any, any> {
     }
 
     //
@@ -846,50 +846,50 @@ declare module "react/addons" {
     interface ReactTestUtils {
         Simulate: Simulate;
 
-        renderIntoDocument<P>(element: ReactElement<P>): Component<P, any, any>;
-        renderIntoDocument<C extends Component<any, any, any>>(element: ReactElement<any>): C;
+        renderIntoDocument<P>(element: ReactElement<P>): Component<P, any>;
+        renderIntoDocument<C extends Component<any, any>>(element: ReactElement<any>): C;
 
         mockComponent(mocked: MockedComponentClass, mockTagName?: string): ReactTestUtils;
 
         isElementOfType(element: ReactElement<any>, type: ReactType): boolean;
-        isTextComponent(instance: Component<any, any, any>): boolean;
-        isDOMComponent(instance: Component<any, any, any>): boolean;
-        isCompositeComponent(instance: Component<any, any, any>): boolean;
+        isTextComponent(instance: Component<any, any>): boolean;
+        isDOMComponent(instance: Component<any, any>): boolean;
+        isCompositeComponent(instance: Component<any, any>): boolean;
         isCompositeComponentWithType(
-            instance: Component<any, any, any>,
-            type: ComponentClass<any, any, any>): boolean;
+            instance: Component<any, any>,
+            type: ComponentClass<any, any>): boolean;
 
         findAllInRenderedTree(
-            tree: Component<any, any, any>,
-            fn: (i: Component<any, any, any>) => boolean): Component<any, any, any>;
+            tree: Component<any, any>,
+            fn: (i: Component<any, any>) => boolean): Component<any, any>;
 
         scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             className: string): DOMComponent<any>[];
         findRenderedDOMComponentWithClass(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             className: string): DOMComponent<any>;
 
         scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             tagName: string): DOMComponent<any>[];
         findRenderedDOMComponentWithTag(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             tagName: string): DOMComponent<any>;
 
-        scryRenderedComponentsWithType<P, S, C>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<P, S, C>): Component<P, S, C>[];
-        scryRenderedComponentsWithType<C extends Component<any, any, any>>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<any, any, any>): C[];
+        scryRenderedComponentsWithType<P, S>(
+            tree: Component<any, any>,
+            type: ComponentClass<P, S>): Component<P, S>[];
+        scryRenderedComponentsWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any, any>): C[];
 
-        findRenderedComponentWithType<P, S, C>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<P, S, C>): Component<P, S, C>;
-        findRenderedComponentWithType<C extends Component<any, any, any>>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<any, any, any>): C;
+        findRenderedComponentWithType<P, S>(
+            tree: Component<any, any>,
+            type: ComponentClass<P, S>): Component<P, S>;
+        findRenderedComponentWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any, any>): C;
     }
 
     interface SyntheticEventData {
@@ -928,7 +928,7 @@ declare module "react/addons" {
 
     interface EventSimulator {
         (element: Element, eventData?: SyntheticEventData): void;
-        (descriptor: Component<any, any, any>, eventData?: SyntheticEventData): void;
+        (component: Component<any, any>, eventData?: SyntheticEventData): void;
     }
 
     interface Simulate {
diff --git a/react/future/react-addons-global-0.13.0.d.ts b/react/future/react-addons-global-0.13.0.d.ts
index 733ba54a50..d11a4ae03a 100644
--- a/react/future/react-addons-global-0.13.0.d.ts
+++ b/react/future/react-addons-global-0.13.0.d.ts
@@ -37,7 +37,7 @@ declare module React {
     // React.addons (Transitions)
     // ----------------------------------------------------------------------
 
-    type ReactType = ComponentClass<any, any, any> | string;
+    type ReactType = ComponentClass<any, any> | string;
 
     interface TransitionGroupProps {
         component?: ReactType;
@@ -52,9 +52,9 @@ declare module React {
     }
 
     type CSSTransitionGroup =
-        ComponentClass<CSSTransitionGroupProps, any, any>;
+        ComponentClass<CSSTransitionGroupProps, any>;
     type TransitionGroup =
-        ComponentClass<TransitionGroupProps, any, any>;
+        ComponentClass<TransitionGroupProps, any>;
 
     //
     // React.addons (Mixins)
@@ -65,11 +65,11 @@ declare module React {
         requestChange(newValue: T): void;
     }
 
-    interface LinkedStateMixin extends Mixin<any, any, any> {
+    interface LinkedStateMixin extends Mixin<any, any> {
         linkState<T>(key: string): ReactLink<T>;
     }
 
-    interface PureRenderMixin extends Mixin<any, any, any> {
+    interface PureRenderMixin extends Mixin<any, any> {
     }
 
     //
@@ -135,50 +135,50 @@ declare module React {
     interface ReactTestUtils {
         Simulate: Simulate;
 
-        renderIntoDocument<P>(element: ReactElement<P>): Component<P, any, any>;
-        renderIntoDocument<C extends Component<any, any, any>>(element: ReactElement<any>): C;
+        renderIntoDocument<P>(element: ReactElement<P>): Component<P, any>;
+        renderIntoDocument<C extends Component<any, any>>(element: ReactElement<any>): C;
 
         mockComponent(mocked: MockedComponentClass, mockTagName?: string): ReactTestUtils;
 
         isElementOfType(element: ReactElement<any>, type: ReactType): boolean;
-        isTextComponent(instance: Component<any, any, any>): boolean;
-        isDOMComponent(instance: Component<any, any, any>): boolean;
-        isCompositeComponent(instance: Component<any, any, any>): boolean;
+        isTextComponent(instance: Component<any, any>): boolean;
+        isDOMComponent(instance: Component<any, any>): boolean;
+        isCompositeComponent(instance: Component<any, any>): boolean;
         isCompositeComponentWithType(
-            instance: Component<any, any, any>,
-            type: ComponentClass<any, any, any>): boolean;
+            instance: Component<any, any>,
+            type: ComponentClass<any, any>): boolean;
 
         findAllInRenderedTree(
-            tree: Component<any, any, any>,
-            fn: (i: Component<any, any, any>) => boolean): Component<any, any, any>;
+            tree: Component<any, any>,
+            fn: (i: Component<any, any>) => boolean): Component<any, any>;
 
         scryRenderedDOMComponentsWithClass(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             className: string): DOMComponent<any>[];
         findRenderedDOMComponentWithClass(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             className: string): DOMComponent<any>;
 
         scryRenderedDOMComponentsWithTag(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             tagName: string): DOMComponent<any>[];
         findRenderedDOMComponentWithTag(
-            tree: Component<any, any, any>,
+            tree: Component<any, any>,
             tagName: string): DOMComponent<any>;
 
-        scryRenderedComponentsWithType<P, S, C>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<P, S, C>): Component<P, S, C>[];
-        scryRenderedComponentsWithType<C extends Component<any, any, any>>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<any, any, any>): C[];
+        scryRenderedComponentsWithType<P, S>(
+            tree: Component<any, any>,
+            type: ComponentClass<P, S>): Component<P, S>[];
+        scryRenderedComponentsWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any, any>): C[];
 
-        findRenderedComponentWithType<P, S, C>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<P, S, C>): Component<P, S, C>;
-        findRenderedComponentWithType<C extends Component<any, any, any>>(
-            tree: Component<any, any, any>,
-            type: ComponentClass<any, any, any>): C;
+        findRenderedComponentWithType<P, S>(
+            tree: Component<any, any>,
+            type: ComponentClass<P, S>): Component<P, S>;
+        findRenderedComponentWithType<C extends Component<any, any>>(
+            tree: Component<any, any>,
+            type: ComponentClass<any, any>): C;
     }
 
     interface SyntheticEventData {
@@ -217,7 +217,7 @@ declare module React {
 
     interface EventSimulator {
         (element: Element, eventData?: SyntheticEventData): void;
-        (descriptor: Component<any, any, any>, eventData?: SyntheticEventData): void;
+        (component: Component<any, any>, eventData?: SyntheticEventData): void;
     }
 
     interface Simulate {
diff --git a/react/future/react-global-0.13.0.d.ts b/react/future/react-global-0.13.0.d.ts
index 996d09d3a2..60675aec9e 100644
--- a/react/future/react-global-0.13.0.d.ts
+++ b/react/future/react-global-0.13.0.d.ts
@@ -16,10 +16,10 @@ declare module React {
     }
 
     interface ReactElement<P>
-        extends ReactElementBase<ComponentClass<P, any, any>, P> {}
+        extends ReactElementBase<ComponentClass<P, any>, P> {}
 
     interface ReactClassicElement<P>
-        extends ReactElementBase<ClassicComponentClass<P, any, any> | string, P> {}
+        extends ReactElementBase<ClassicComponentClass<P, any> | string, P> {}
 
     interface ReactDOMElement<P> // subtype of ReactClassicElement
         extends ReactElementBase<string, P> {}
@@ -62,26 +62,26 @@ declare module React {
     // Top Level API
     // ----------------------------------------------------------------------
 
-    function createClass<P, S, C>(
-        spec: ComponentSpec<P, S, C>): ClassicComponentClass<P, S, C>;
+    function createClass<P, S>(
+        spec: ComponentSpec<P, S>): ClassicComponentClass<P, S>;
 
     function createFactory<P>(
         type: string): DOMFactory<P>;
     function createFactory<P>(
-        type: ClassicComponentClass<P, any, any> | string): ClassicFactory<P>;
+        type: ClassicComponentClass<P, any> | string): ClassicFactory<P>;
     function createFactory<P>(
-        type: ComponentClass<P, any, any>): Factory<P>;
+        type: ComponentClass<P, any>): Factory<P>;
 
     function createElement<P>(
         type: string,
         props?: P,
         ...children: ReactNode[]): ReactDOMElement<P>;
     function createElement<P>(
-        type: ClassicComponentClass<P, any, any> | string,
+        type: ClassicComponentClass<P, any> | string,
         props?: P,
         ...children: ReactNode[]): ReactClassicElement<P>;
     function createElement<P>(
-        type: ComponentClass<P, any, any>,
+        type: ComponentClass<P, any>,
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
@@ -92,11 +92,11 @@ declare module React {
     function render<P, S>(
         element: ReactClassicElement<P>,
         container: Element,
-        callback?: () => any): ClassicComponent<P, S, {}>;
+        callback?: () => any): ClassicComponent<P, S>;
     function render<P, S>(
         element: ReactElement<P>,
         container: Element,
-        callback?: () => any): Component<P, S, {}>;
+        callback?: () => any): Component<P, S>;
 
     function unmountComponentAtNode(container: Element): boolean;
     function renderToString(element: ReactElementBase<any, any>): string;
@@ -105,9 +105,9 @@ declare module React {
     function initializeTouchEvents(shouldUseTouch: boolean): void;
 
     function findDOMNode<TElement extends Element>(
-        componentOrElement: Component<any, any, any> | Element): TElement;
+        componentOrElement: Component<any, any> | Element): TElement;
     function findDOMNode(
-        componentOrElement: Component<any, any, any> | Element): Element;
+        componentOrElement: Component<any, any> | Element): Element;
 
     var DOM: ReactDOM;
     var PropTypes: ReactPropTypes;
@@ -118,19 +118,19 @@ declare module React {
     // ----------------------------------------------------------------------
 
     // Base component for plain JS classes
-    class Component<P, S, C> implements ComponentLifecycle<P, S, C> {
-        constructor(props: P, context: C);
+    class Component<P, S> implements ComponentLifecycle<P, S> {
+        constructor(props: P, context: any);
         setState(state: S, callback?: () => any): void;
         forceUpdate(): void;
         props: P;
         state: S;
-        context: C;
+        context: any;
         refs: {
-            [key: string]: Component<any, any, any>
+            [key: string]: Component<any, any>
         };
     }
 
-    interface ClassicComponent<P, S, C> extends Component<P, S, C> {
+    interface ClassicComponent<P, S> extends Component<P, S> {
         replaceState(nextState: S, callback?: () => any): void;
         getDOMNode<TElement extends Element>(): TElement;
         getDOMNode(): Element;
@@ -140,7 +140,7 @@ declare module React {
         replaceProps(nextProps: P, callback?: () => any): void;
     }
 
-    interface DOMComponent<P> extends ClassicComponent<P, any, any> {
+    interface DOMComponent<P> extends ClassicComponent<P, any> {
         tagName: string;
     }
 
@@ -155,19 +155,19 @@ declare module React {
     // Class Interfaces
     // ----------------------------------------------------------------------
 
-    interface ComponentClassBase<P, C> {
+    interface ComponentClassBase<P> {
         propTypes?: ValidationMap<P>;
-        contextTypes?: ValidationMap<C>;
-        childContextTypes?: ValidationMap<{}>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
     }
 
-    interface ComponentClass<P, S, C> extends ComponentClassBase<P, C> {
-        new(props?: P, context?: C): Component<P, S, C>;
+    interface ComponentClass<P, S> extends ComponentClassBase<P> {
+        new(props?: P, context?: any): Component<P, S>;
         defaultProps?: P;
     }
 
-    interface ClassicComponentClass<P, S, C> extends ComponentClassBase<P, C> {
-        new(props?: P, context?: C): ClassicComponent<P, S, C>;
+    interface ClassicComponentClass<P, S> extends ComponentClassBase<P> {
+        new(props?: P, context?: any): ClassicComponent<P, S>;
         getDefaultProps?(): P;
         displayName?: string;
     }
@@ -176,18 +176,18 @@ declare module React {
     // Component Specs and Lifecycle
     // ----------------------------------------------------------------------
 
-    interface ComponentLifecycle<P, S, C> {
+    interface ComponentLifecycle<P, S> {
         componentWillMount?(): void;
         componentDidMount?(): void;
-        componentWillReceiveProps?(nextProps: P, nextContext: C): void;
-        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: C): boolean;
-        componentWillUpdate?(nextProps: P, nextState: S, nextContext: C): void;
-        componentDidUpdate?(prevProps: P, prevState: S, prevContext: C): void;
+        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
+        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
+        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
+        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
         componentWillUnmount?(): void;
     }
 
-    interface Mixin<P, S, C> extends ComponentLifecycle<P, S, C> {
-        mixins?: Mixin<P, S, C>;
+    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
+        mixins?: Mixin<P, S>;
         statics?: {
             [key: string]: any;
         };
@@ -201,7 +201,7 @@ declare module React {
         getDefaultProps?(): P;
     }
 
-    interface ComponentSpec<P, S, C> extends Mixin<P, S, C> {
+    interface ComponentSpec<P, S> extends Mixin<P, S> {
         render(): ReactElementBase<any, any>;
     }