From a43c2843cdcdfbf62a7c5d503f29acf24c4d38f3 Mon Sep 17 00:00:00 2001
From: Vincent Siao <vincent@asana.com>
Date: Thu, 5 Nov 2015 11:25:16 -0800
Subject: [PATCH] [React.14] Add ReactInstance type (Component<any, any> |
 Element)

---
 react/react-addons-test-utils.d.ts | 37 +++++++++++++++---------------
 react/react-dom.d.ts               |  8 ++-----
 react/react.d.ts                   | 11 +++------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/react/react-addons-test-utils.d.ts b/react/react-addons-test-utils.d.ts
index 1362f64c1..0b3f8c0f6 100644
--- a/react/react-addons-test-utils.d.ts
+++ b/react/react-addons-test-utils.d.ts
@@ -94,6 +94,8 @@ declare namespace __React {
                 export var wheel: EventSimulator;
             }
     
+            export function renderIntoDocument(
+                element: DOMElement<any>): Element;
             export function renderIntoDocument<P>(
                 element: ReactElement<P>): Component<P, any>;
             export function renderIntoDocument<C extends Component<any, any>>(
@@ -104,43 +106,42 @@ declare namespace __React {
     
             export function isElementOfType(
                 element: ReactElement<any>, type: ReactType): boolean;
-            export function isTextComponent(instance: Component<any, any>): boolean;
-            export function isDOMComponent(instance: Component<any, any>): boolean;
-            export function isCompositeComponent(instance: Component<any, any>): boolean;
+            export function isDOMComponent(instance: ReactInstance): boolean;
+            export function isCompositeComponent(instance: ReactInstance): boolean;
             export function isCompositeComponentWithType(
-                instance: Component<any, any>,
+                instance: ReactInstance,
                 type: ComponentClass<any>): boolean;
     
             export function findAllInRenderedTree(
-                tree: Component<any, any>,
-                fn: (i: Component<any, any>) => boolean): Component<any, any>;
+                root: Component<any, any>,
+                fn: (i: ReactInstance) => boolean): ReactInstance[];
     
             export function scryRenderedDOMComponentsWithClass(
-                tree: Component<any, any>,
-                className: string): DOMComponent<any>[];
+                root: Component<any, any>,
+                className: string): Element[];
             export function findRenderedDOMComponentWithClass(
-                tree: Component<any, any>,
-                className: string): DOMComponent<any>;
+                root: Component<any, any>,
+                className: string): Element;
     
             export function scryRenderedDOMComponentsWithTag(
-                tree: Component<any, any>,
-                tagName: string): DOMComponent<any>[];
+                root: Component<any, any>,
+                tagName: string): Element[];
             export function findRenderedDOMComponentWithTag(
-                tree: Component<any, any>,
-                tagName: string): DOMComponent<any>;
+                root: Component<any, any>,
+                tagName: string): Element;
     
             export function scryRenderedComponentsWithType<P>(
-                tree: Component<any, any>,
+                root: Component<any, any>,
                 type: ComponentClass<P>): Component<P, {}>[];
             export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-                tree: Component<any, any>,
+                root: Component<any, any>,
                 type: ComponentClass<any>): C[];
     
             export function findRenderedComponentWithType<P>(
-                tree: Component<any, any>,
+                root: Component<any, any>,
                 type: ComponentClass<P>): Component<P, {}>;
             export function findRenderedComponentWithType<C extends Component<any, any>>(
-                tree: Component<any, any>,
+                root: Component<any, any>,
                 type: ComponentClass<any>): C;
     
             export function createRenderer(): ShallowRenderer;
diff --git a/react/react-dom.d.ts b/react/react-dom.d.ts
index 7e90a9bf2..f8fd1d5c6 100644
--- a/react/react-dom.d.ts
+++ b/react/react-dom.d.ts
@@ -8,10 +8,8 @@
 declare namespace __React {
     
     namespace __DOM {
-        function findDOMNode<TElement extends Element>(
-            componentOrElement: __React.Component<any, any> | Element): TElement;
-        function findDOMNode(
-            componentOrElement: __React.Component<any, any> | Element): Element;
+        function findDOMNode<E extends Element>(instance: ReactInstance): E;
+        function findDOMNode(instance: ReactInstance): Element;
         
         function render<P>(
             element: DOMElement<P>,
@@ -49,8 +47,6 @@ declare namespace __React {
             nextElement: ReactElement<P>,
             container: Element,
             callback?: (component: Component<P, S>) => any): Component<P, S>;
-            
-        
     }
     
     namespace __DOMServer {
diff --git a/react/react.d.ts b/react/react.d.ts
index 46b114865..1140ce803 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -112,6 +112,8 @@ declare namespace __React {
     // Component API
     // ----------------------------------------------------------------------
 
+    type ReactInstance = Component<any, any> | Element;
+
     // Base component for plain JS classes
     class Component<P, S> implements ComponentLifecycle<P, S> {
         static propTypes: ValidationMap<any>;
@@ -128,7 +130,7 @@ declare namespace __React {
         state: S;
         context: {};
         refs: {
-            [key: string]: Component<any, any> | Element
+            [key: string]: ReactInstance
         };
     }
 
@@ -138,13 +140,6 @@ declare namespace __React {
         getInitialState?(): S;
     }
 
-    interface DOMComponent<P> extends ClassicComponent<P, any> {
-        tagName: string;
-    }
-
-    type HTMLComponent = DOMComponent<HTMLProps>;
-    type SVGComponent = DOMComponent<SVGProps>;
-
     interface ChildContextProvider<CC> {
         getChildContext(): CC;
     }