From 51b6fad2472eb1ec752b32c4b9e9a2b896347ce3 Mon Sep 17 00:00:00 2001
From: Phips Peter <pspeter333@gmail.com>
Date: Fri, 17 Oct 2014 13:22:14 -0700
Subject: [PATCH] Adding the new Element types

https://gist.github.com/sebmarkbage/fcb1b6ab493b0c77d589
---
 react-addons/react-addons.d.ts |  8 ++--
 react/react.d.ts               | 86 +++++++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/react-addons/react-addons.d.ts b/react-addons/react-addons.d.ts
index 09ea7257a..e4041a073 100644
--- a/react-addons/react-addons.d.ts
+++ b/react-addons/react-addons.d.ts
@@ -13,12 +13,12 @@ declare module React {
     export var addons: {
         classSet: (classes: {[key: string]: boolean}) => string;
         cloneWithProps: CloneWithProps<any>;
-        CSSTransitionGroup: Factory<CSSTransitionGroupProps>;
+        CSSTransitionGroup: ReactFactory<CSSTransitionGroupProps>;
         LinkedStateMixin: LinkedStateMixin<any, any>;
         Perf: Perf;
         PureRenderMixin: Mixin<any, any>;
         TestUtils: TestUtils;
-        TransitionGroup: Factory<any>;
+        TransitionGroup: ReactFactory<any>;
         update(object: Object, changes: Object): Object;
     };
 
@@ -80,8 +80,8 @@ declare module React {
     export interface TestUtils {
         Simulate: Simulate;
         renderIntoDocument(instance: Descriptor<any>): Descriptor<any>;
-        mockComponent(componentClass: Factory<any>, mockTagName?: string): TestUtils;
-        isDescriptorOfType(descriptor: Descriptor<any>, componentClass: Factory<any>): boolean;
+        mockComponent(componentClass: ReactFactory<any>, mockTagName?: string): TestUtils;
+        isDescriptorOfType(descriptor: Descriptor<any>, componentClass: ReactFactory<any>): boolean;
         isDOMComponent(instance: Descriptor<any>): boolean;
         isCompositeComponent(instance: Descriptor<any>): boolean;
         isCompositeComponentWithType(instance: Descriptor<any>, componentClass: Function): boolean;
diff --git a/react/react.d.ts b/react/react.d.ts
index eb7b4989b..407605944 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -4,33 +4,93 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module "react" {
-    export = React;
+export = React;
 }
 
 declare module React {
-    export function createClass<P, S>(specification: Specification<P, S>): Factory<P>;
+    export function createClass<P, S>(specification: Specification<P, S>): ReactComponentFactory<P>;
 
-    export function render<P>(component: Descriptor<P>, container: Element, callback?: () => void): Descriptor<P>;
+    export function render<P>(component: ReactComponentElement<P>, container: Element, callback?: () => void): ReactComponentElement<P>;
+
+    export function render(component: ReactHTMLElement, container: Element, callback?: () => void): ReactHTMLElement;
+
+    export function render(component: ReactSVGElement, container: Element, callback?: () => void): ReactSVGElement;
 
     export function unmountComponentAtNode(container: Element): boolean;
 
-    export function renderToString(component: Descriptor<any>): string;
+    export function renderToString<P>(component: ReactComponentElement<P>): string;
 
-    export function renderToStaticMarkup(component: Descriptor<any>): string;
+    export function renderToString(component: ReactHTMLElement): string;
 
-    export function isValidClass(factory: Factory<any>): boolean;
+    export function renderToString(component: ReactSVGElement): string;
 
-    export function isValidElement(component: Descriptor<any>): boolean;
+    export function renderToStaticMarkup<P>(component: ReactComponentElement<P>): string;
+
+    export function renderToStaticMarkup(component: ReactHTMLElement): string;
+
+    export function renderToStaticMarkup(component: ReactSVGElement): string;
+
+    export function isValidClass(factory: ReactComponentElement<any>): boolean;
+
+    export function isValidElement(component: ReactHTMLElement): boolean;
+
+    export function isValidElement(component: ReactSVGElement): boolean;
 
     export function initializeTouchEvents(shouldUseTouch: boolean): void;
 
+    export interface ReactFactory<P, E extends ReactElement> {
+        (properties: P, ...children: any[]): E;
+    }
+
+    export interface ReactComponentFactory<P> extends ReactFactory<P, ReactComponentElement<P>> {
+    }
+
+    export interface ReactElementFactory<P, E extends ReactDOMElement<any>> extends ReactFactory<P, E>  {
+    }
+
+    export interface DomElement extends ReactElementFactory<DomAttributes, ReactHTMLElement> {
+    }
+
+    export interface SvgElement extends ReactElementFactory<SvgAttributes, ReactSVGElement> {
+    }
+
+    export interface ReactClass<P> {
+        (props: P): ReactComponent<P>;
+    }
+
+    export interface ReactComponent<P> {
+        props: P;
+        render(): ReactElement;
+    }
+
+    export interface ReactElement {
+        type: any;
+        props: any;
+        key: string;
+        ref: string;
+    }
+
+    export interface ReactDOMElement<P> extends ReactElement {
+        type: string;
+        props: P;
+    }
+
+    export interface ReactHTMLElement extends ReactDOMElement<DomAttributes> {
+    }
+
+    export interface ReactSVGElement extends ReactDOMElement<SvgAttributes> {
+    }
+
+    export interface ReactComponentElement<P> extends ReactElement {
+        type: ReactClass<P>;
+        props: P;
+    }
+
     export interface Descriptor<P> {
         props: P;
     }
 
-    export interface Factory<P> {
-        (properties?: P, ...children: any[]): Descriptor<P>;
-    }
+
 
     export interface Mixin<P, S> {
         componentWillMount?(): void;
@@ -411,12 +471,6 @@ declare module React {
         y?: any;
     }
 
-    export interface DomElement extends Factory<DomAttributes> {
-    }
-
-    export interface SvgElement extends Factory<SvgAttributes> {
-    }
-
     export var DOM: {
         // HTML
         a: DomElement;