From 4cc6ae4122a6f397e6e77c50ab6c0882ff0ed35f Mon Sep 17 00:00:00 2001
From: Vincent Siao <vincent@asana.com>
Date: Fri, 6 Mar 2015 01:02:02 -0800
Subject: [PATCH] Remove React prefix from Modern/Classic/DOM Elements

---
 react/future/react-0.13.0-tests.ts           | 20 ++++-----
 react/future/react-0.13.0.d.ts               | 40 ++++++++---------
 react/future/react-addons-0.13.0-tests.ts    | 20 ++++-----
 react/future/react-addons-0.13.0.d.ts        | 46 ++++++++++----------
 react/future/react-addons-global-0.13.0.d.ts |  6 +--
 react/future/react-global-0.13.0.d.ts        | 40 ++++++++---------
 6 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/react/future/react-0.13.0-tests.ts b/react/future/react-0.13.0-tests.ts
index cf216503e..fefa644b8 100644
--- a/react/future/react-0.13.0-tests.ts
+++ b/react/future/react-0.13.0-tests.ts
@@ -121,28 +121,28 @@ var factoryElement: React.ReactElement<Props> =
 
 var classicFactory: React.ClassicFactory<Props> =
     React.createFactory(ClassicComponent);
-var classicFactoryElement: React.ReactClassicElement<Props> =
+var classicFactoryElement: React.ClassicElement<Props> =
     classicFactory(props);
 
 var domFactory: React.DOMFactory<any> =
     React.createFactory("foo");
-var domFactoryElement: React.ReactDOMElement<any> =
+var domFactoryElement: React.DOMElement<any> =
     domFactory();
 
 // React.createElement
-var element: React.ReactModernElement<Props> =
+var element: React.ModernElement<Props> =
     React.createElement(ModernComponent, props);
-var classicElement: React.ReactClassicElement<Props> =
+var classicElement: React.ClassicElement<Props> =
     React.createElement(ClassicComponent, props);
-var domElement: React.ReactHTMLElement =
+var domElement: React.HTMLElement =
     React.createElement("div");
 
 // React.cloneElement
-var clonedElement: React.ReactModernElement<Props> =
+var clonedElement: React.ModernElement<Props> =
     React.cloneElement(element, props);
-var clonedClassicElement: React.ReactClassicElement<Props> =
+var clonedClassicElement: React.ClassicElement<Props> =
     React.cloneElement(classicElement, props);
-var clonedDOMElement: React.ReactHTMLElement =
+var clonedDOMElement: React.HTMLElement =
     React.cloneElement(domElement);
 
 // React.render
@@ -262,7 +262,7 @@ var PropTypesSpecification: React.ComponentSpec<any, any> = {
             return null;
         }
     },
-    render: (): React.ReactHTMLElement => {
+    render: (): React.ReactElement<any> => {
         return null;
     }
 };
@@ -303,7 +303,7 @@ var ContextTypesSpecification: React.ComponentSpec<any, any> = {
             return null;
         }
     },
-    render: (): React.ReactHTMLElement => {
+    render: (): React.ReactElement<any> => {
         return null;
     }
 };
diff --git a/react/future/react-0.13.0.d.ts b/react/future/react-0.13.0.d.ts
index f87bdc721..a0fbb5214 100644
--- a/react/future/react-0.13.0.d.ts
+++ b/react/future/react-0.13.0.d.ts
@@ -17,24 +17,24 @@ declare module "react" {
         ref: string | ((component: Component<P, any>) => any);
     }
 
-    interface ReactModernElement<P> extends ReactElement<P> {
+    interface ModernElement<P> extends ReactElement<P> {
         type: ModernComponentClass<P, any>;
         ref: string | ((component: Component<P, any>) => any);
     }
 
-    interface ReactClassicElement<P> extends ReactElement<P> {
+    interface ClassicElement<P> extends ReactElement<P> {
         type: string | ClassicComponentClass<P, any>;
         ref: string | ((component: ClassicComponent<P, any>) => any);
     }
 
-    // subtype of ReactClassicElement
-    interface ReactDOMElement<P> extends ReactElement<P> {
+    // subtype of ClassicElement
+    interface DOMElement<P> extends ReactElement<P> {
         type: string;
         ref: string | ((component: DOMComponent<P>) => any);
     }
 
-    type ReactHTMLElement = ReactDOMElement<HTMLAttributes>;
-    type ReactSVGElement = ReactDOMElement<SVGAttributes>;
+    type HTMLElement = DOMElement<HTMLAttributes>;
+    type SVGElement = DOMElement<SVGAttributes>;
 
     //
     // Factories
@@ -45,15 +45,15 @@ declare module "react" {
     }
 
     interface ModernFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactModernElement<P>;
+        (props?: P, ...children: ReactNode[]): ModernElement<P>;
     }
 
     interface ClassicFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactClassicElement<P>;
+        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
     }
 
     interface DOMFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactDOMElement<P>;
+        (props?: P, ...children: ReactNode[]): DOMElement<P>;
     }
 
     type HTMLFactory = DOMFactory<HTMLAttributes>;
@@ -85,39 +85,39 @@ declare module "react" {
     function createElement<P>(
         type: string,
         props?: P,
-        ...children: ReactNode[]): ReactDOMElement<P>;
+        ...children: ReactNode[]): DOMElement<P>;
     function createElement<P>(
         type: ClassicComponentClass<P, any> | string,
         props?: P,
-        ...children: ReactNode[]): ReactClassicElement<P>;
+        ...children: ReactNode[]): ClassicElement<P>;
     function createElement<P>(
         type: ModernComponentClass<P, any>,
         props?: P,
-        ...children: ReactNode[]): ReactModernElement<P>;
+        ...children: ReactNode[]): ModernElement<P>;
 
     function cloneElement<P>(
-        element: ReactDOMElement<P>,
+        element: DOMElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactDOMElement<P>;
+        ...children: ReactNode[]): DOMElement<P>;
     function cloneElement<P>(
-        element: ReactClassicElement<P>,
+        element: ClassicElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactClassicElement<P>;
+        ...children: ReactNode[]): ClassicElement<P>;
     function cloneElement<P>(
-        element: ReactModernElement<P>,
+        element: ModernElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactModernElement<P>;
+        ...children: ReactNode[]): ModernElement<P>;
     function cloneElement<P>(
         element: ReactElement<P>,
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
     function render<P>(
-        element: ReactDOMElement<P>,
+        element: DOMElement<P>,
         container: Element,
         callback?: () => any): DOMComponent<P>;
     function render<P, S>(
-        element: ReactClassicElement<P>,
+        element: ClassicElement<P>,
         container: Element,
         callback?: () => any): ClassicComponent<P, S>;
     function render<P, S>(
diff --git a/react/future/react-addons-0.13.0-tests.ts b/react/future/react-addons-0.13.0-tests.ts
index ff6889ec0..8ad3a03e9 100644
--- a/react/future/react-addons-0.13.0-tests.ts
+++ b/react/future/react-addons-0.13.0-tests.ts
@@ -119,28 +119,28 @@ var factoryElement: React.ReactElement<Props> =
 
 var classicFactory: React.ClassicFactory<Props> =
     React.createFactory(ClassicComponent);
-var classicFactoryElement: React.ReactClassicElement<Props> =
+var classicFactoryElement: React.ClassicElement<Props> =
     classicFactory(props);
 
 var domFactory: React.DOMFactory<any> =
     React.createFactory("foo");
-var domFactoryElement: React.ReactDOMElement<any> =
+var domFactoryElement: React.DOMElement<any> =
     domFactory();
 
 // React.createElement
-var element: React.ReactModernElement<Props> =
+var element: React.ModernElement<Props> =
     React.createElement(ModernComponent, props);
-var classicElement: React.ReactClassicElement<Props> =
+var classicElement: React.ClassicElement<Props> =
     React.createElement(ClassicComponent, props);
-var domElement: React.ReactHTMLElement =
+var domElement: React.HTMLElement =
     React.createElement("div");
 
 // React.cloneElement
-var clonedElement: React.ReactModernElement<Props> =
+var clonedElement: React.ModernElement<Props> =
     React.cloneElement(element, props);
-var clonedClassicElement: React.ReactClassicElement<Props> =
+var clonedClassicElement: React.ClassicElement<Props> =
     React.cloneElement(classicElement, props);
-var clonedDOMElement: React.ReactHTMLElement =
+var clonedDOMElement: React.HTMLElement =
     React.cloneElement(domElement);
 
 // React.render
@@ -260,7 +260,7 @@ var PropTypesSpecification: React.ComponentSpec<any, any> = {
             return null;
         }
     },
-    render: (): React.ReactHTMLElement => {
+    render: (): React.ReactElement<any> => {
         return null;
     }
 };
@@ -301,7 +301,7 @@ var ContextTypesSpecification: React.ComponentSpec<any, any> = {
             return null;
         }
     },
-    render: (): React.ReactHTMLElement => {
+    render: (): React.ReactElement<any> => {
         return null;
     }
 };
diff --git a/react/future/react-addons-0.13.0.d.ts b/react/future/react-addons-0.13.0.d.ts
index 5148be3c6..42f18190f 100644
--- a/react/future/react-addons-0.13.0.d.ts
+++ b/react/future/react-addons-0.13.0.d.ts
@@ -17,24 +17,24 @@ declare module "react/addons" {
         ref: string | ((component: Component<P, any>) => any);
     }
 
-    interface ReactModernElement<P> extends ReactElement<P> {
+    interface ModernElement<P> extends ReactElement<P> {
         type: ModernComponentClass<P, any>;
         ref: string | ((component: Component<P, any>) => any);
     }
 
-    interface ReactClassicElement<P> extends ReactElement<P> {
+    interface ClassicElement<P> extends ReactElement<P> {
         type: string | ClassicComponentClass<P, any>;
         ref: string | ((component: ClassicComponent<P, any>) => any);
     }
 
-    // subtype of ReactClassicElement
-    interface ReactDOMElement<P> extends ReactElement<P> {
+    // subtype of ClassicElement
+    interface DOMElement<P> extends ReactElement<P> {
         type: string;
         ref: string | ((component: DOMComponent<P>) => any);
     }
 
-    type ReactHTMLElement = ReactDOMElement<HTMLAttributes>;
-    type ReactSVGElement = ReactDOMElement<SVGAttributes>;
+    type HTMLElement = DOMElement<HTMLAttributes>;
+    type SVGElement = DOMElement<SVGAttributes>;
 
     //
     // Factories
@@ -45,15 +45,15 @@ declare module "react/addons" {
     }
 
     interface ModernFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactModernElement<P>;
+        (props?: P, ...children: ReactNode[]): ModernElement<P>;
     }
 
     interface ClassicFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactClassicElement<P>;
+        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
     }
 
     interface DOMFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactDOMElement<P>;
+        (props?: P, ...children: ReactNode[]): DOMElement<P>;
     }
 
     type HTMLFactory = DOMFactory<HTMLAttributes>;
@@ -85,39 +85,39 @@ declare module "react/addons" {
     function createElement<P>(
         type: string,
         props?: P,
-        ...children: ReactNode[]): ReactDOMElement<P>;
+        ...children: ReactNode[]): DOMElement<P>;
     function createElement<P>(
         type: ClassicComponentClass<P, any> | string,
         props?: P,
-        ...children: ReactNode[]): ReactClassicElement<P>;
+        ...children: ReactNode[]): ClassicElement<P>;
     function createElement<P>(
         type: ModernComponentClass<P, any>,
         props?: P,
-        ...children: ReactNode[]): ReactModernElement<P>;
+        ...children: ReactNode[]): ModernElement<P>;
 
     function cloneElement<P>(
-        element: ReactDOMElement<P>,
+        element: DOMElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactDOMElement<P>;
+        ...children: ReactNode[]): DOMElement<P>;
     function cloneElement<P>(
-        element: ReactClassicElement<P>,
+        element: ClassicElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactClassicElement<P>;
+        ...children: ReactNode[]): ClassicElement<P>;
     function cloneElement<P>(
-        element: ReactModernElement<P>,
+        element: ModernElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactModernElement<P>;
+        ...children: ReactNode[]): ModernElement<P>;
     function cloneElement<P>(
         element: ReactElement<P>,
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
     function render<P>(
-        element: ReactDOMElement<P>,
+        element: DOMElement<P>,
         container: Element,
         callback?: () => any): DOMComponent<P>;
     function render<P, S>(
-        element: ReactClassicElement<P>,
+        element: ClassicElement<P>,
         container: Element,
         callback?: () => any): ClassicComponent<P, S>;
     function render<P, S>(
@@ -766,9 +766,9 @@ declare module "react/addons" {
         classSet(cx: { [key: string]: boolean }): string;
         classSet(...classList: string[]): string;
 
-        cloneWithProps<P>(element: ReactDOMElement<P>, props: P): ReactDOMElement<P>;
-        cloneWithProps<P>(element: ReactClassicElement<P>, props: P): ReactClassicElement<P>;
-        cloneWithProps<P>(element: ReactModernElement<P>, props: P): ReactModernElement<P>;
+        cloneWithProps<P>(element: DOMElement<P>, props: P): DOMElement<P>;
+        cloneWithProps<P>(element: ClassicElement<P>, props: P): ClassicElement<P>;
+        cloneWithProps<P>(element: ModernElement<P>, props: P): ModernElement<P>;
         cloneWithProps<P>(element: ReactElement<P>, props: P): ReactElement<P>;
 
         createFragment(object: { [key: string]: ReactNode }): ReactFragment;
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 94f2844c0..aa83abe34 100644
--- a/react/future/react-addons-global-0.13.0.d.ts
+++ b/react/future/react-addons-global-0.13.0.d.ts
@@ -23,9 +23,9 @@ declare module React {
         classSet(cx: { [key: string]: boolean }): string;
         classSet(...classList: string[]): string;
 
-        cloneWithProps<P>(element: ReactDOMElement<P>, props: P): ReactDOMElement<P>;
-        cloneWithProps<P>(element: ReactClassicElement<P>, props: P): ReactClassicElement<P>;
-        cloneWithProps<P>(element: ReactModernElement<P>, props: P): ReactModernElement<P>;
+        cloneWithProps<P>(element: DOMElement<P>, props: P): DOMElement<P>;
+        cloneWithProps<P>(element: ClassicElement<P>, props: P): ClassicElement<P>;
+        cloneWithProps<P>(element: ModernElement<P>, props: P): ModernElement<P>;
         cloneWithProps<P>(element: ReactElement<P>, props: P): ReactElement<P>;
 
         createFragment(object: { [key: string]: ReactNode }): ReactFragment;
diff --git a/react/future/react-global-0.13.0.d.ts b/react/future/react-global-0.13.0.d.ts
index 9cd5b69fe..9e9b33640 100644
--- a/react/future/react-global-0.13.0.d.ts
+++ b/react/future/react-global-0.13.0.d.ts
@@ -17,24 +17,24 @@ declare module React {
         ref: string | ((component: Component<P, any>) => any);
     }
 
-    interface ReactModernElement<P> extends ReactElement<P> {
+    interface ModernElement<P> extends ReactElement<P> {
         type: ModernComponentClass<P, any>;
         ref: string | ((component: Component<P, any>) => any);
     }
 
-    interface ReactClassicElement<P> extends ReactElement<P> {
+    interface ClassicElement<P> extends ReactElement<P> {
         type: string | ClassicComponentClass<P, any>;
         ref: string | ((component: ClassicComponent<P, any>) => any);
     }
 
-    // subtype of ReactClassicElement
-    interface ReactDOMElement<P> extends ReactElement<P> {
+    // subtype of ClassicElement
+    interface DOMElement<P> extends ReactElement<P> {
         type: string;
         ref: string | ((component: DOMComponent<P>) => any);
     }
 
-    type ReactHTMLElement = ReactDOMElement<HTMLAttributes>;
-    type ReactSVGElement = ReactDOMElement<SVGAttributes>;
+    type HTMLElement = DOMElement<HTMLAttributes>;
+    type SVGElement = DOMElement<SVGAttributes>;
 
     //
     // Factories
@@ -45,15 +45,15 @@ declare module React {
     }
 
     interface ModernFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactModernElement<P>;
+        (props?: P, ...children: ReactNode[]): ModernElement<P>;
     }
 
     interface ClassicFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactClassicElement<P>;
+        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
     }
 
     interface DOMFactory<P> extends Factory<P> {
-        (props?: P, ...children: ReactNode[]): ReactDOMElement<P>;
+        (props?: P, ...children: ReactNode[]): DOMElement<P>;
     }
 
     type HTMLFactory = DOMFactory<HTMLAttributes>;
@@ -85,39 +85,39 @@ declare module React {
     function createElement<P>(
         type: string,
         props?: P,
-        ...children: ReactNode[]): ReactDOMElement<P>;
+        ...children: ReactNode[]): DOMElement<P>;
     function createElement<P>(
         type: ClassicComponentClass<P, any> | string,
         props?: P,
-        ...children: ReactNode[]): ReactClassicElement<P>;
+        ...children: ReactNode[]): ClassicElement<P>;
     function createElement<P>(
         type: ModernComponentClass<P, any>,
         props?: P,
-        ...children: ReactNode[]): ReactModernElement<P>;
+        ...children: ReactNode[]): ModernElement<P>;
 
     function cloneElement<P>(
-        element: ReactDOMElement<P>,
+        element: DOMElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactDOMElement<P>;
+        ...children: ReactNode[]): DOMElement<P>;
     function cloneElement<P>(
-        element: ReactClassicElement<P>,
+        element: ClassicElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactClassicElement<P>;
+        ...children: ReactNode[]): ClassicElement<P>;
     function cloneElement<P>(
-        element: ReactModernElement<P>,
+        element: ModernElement<P>,
         props?: P,
-        ...children: ReactNode[]): ReactModernElement<P>;
+        ...children: ReactNode[]): ModernElement<P>;
     function cloneElement<P>(
         element: ReactElement<P>,
         props?: P,
         ...children: ReactNode[]): ReactElement<P>;
 
     function render<P>(
-        element: ReactDOMElement<P>,
+        element: DOMElement<P>,
         container: Element,
         callback?: () => any): DOMComponent<P>;
     function render<P, S>(
-        element: ReactClassicElement<P>,
+        element: ClassicElement<P>,
         container: Element,
         callback?: () => any): ClassicComponent<P, S>;
     function render<P, S>(