reactiveComponent(TestComponent2));
- React.render(c4Factory({
+ ReactDOM.render(c4Factory({
test: "hello"
}) , null);
}
\ No newline at end of file
diff --git a/react-input-calendar/react-input-calendar-tests.tsx b/react-input-calendar/react-input-calendar-tests.tsx
index 127106424..9cc4963fb 100644
--- a/react-input-calendar/react-input-calendar-tests.tsx
+++ b/react-input-calendar/react-input-calendar-tests.tsx
@@ -1,6 +1,8 @@
///
///
+///
import * as ReactInputCalendar from 'react-input-calendar';
import * as React from 'react';
-React.render(, document.body);
+import * as ReactDOM from 'react-dom';
+ReactDOM.render(, document.body);
diff --git a/react-native/react-native.d.ts b/react-native/react-native.d.ts
index 485fdf5c0..2b6f076d0 100644
--- a/react-native/react-native.d.ts
+++ b/react-native/react-native.d.ts
@@ -2274,8 +2274,8 @@ declare namespace ReactNative {
export interface DOMElement extends React.DOMElement
{}
- export type HTMLElement =React.HTMLElement;
- export type SVGElement = React.SVGElement;
+ export type HTMLElement =React.ReactHTMLElement;
+ export type SVGElement = React.ReactSVGElement;
//
// Factories
@@ -2289,7 +2289,6 @@ declare namespace ReactNative {
export type HTMLFactory = React.HTMLFactory;
export type SVGFactory = React.SVGFactory;
- export type SVGElementFactory = React.SVGElementFactory;
//
// React Nodes
@@ -2352,9 +2351,6 @@ declare namespace ReactNative {
tagName: string;
}
- export type HTMLComponent = React.HTMLComponent;
- export type SVGComponent = React.SVGComponent
-
export interface ChildContextProvider extends React.ChildContextProvider {}
//
@@ -2422,20 +2418,14 @@ declare namespace ReactNative {
export interface Props extends React.Props {}
- export interface DOMAttributesBase extends React.DOMAttributesBase {}
-
export interface DOMAttributes extends React.DOMAttributes {}
// This interface is not complete. Only properties accepting
// unitless numbers are listed here (see CSSProperty.js in React)
export interface CSSProperties extends React.CSSProperties {}
- export interface HTMLAttributesBase extends React.HTMLAttributesBase {}
-
export interface HTMLAttributes extends React.HTMLAttributes {}
- export interface SVGElementAttributes extends React.SVGElementAttributes {}
-
export interface SVGAttributes extends React.SVGAttributes {}
//
diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index abbacabef..a44c0bfaa 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -1,11 +1,13 @@
///
///
+///
///
///
///
import { Component, ReactElement } from 'react';
import * as React from 'react';
+import * as ReactDOM from 'react-dom';
import * as Router from 'react-router';
import { Route, RouterState } from 'react-router';
import { Store, Dispatch, bindActionCreators } from 'redux';
@@ -65,7 +67,7 @@ class App extends Component {
const targetEl = document.getElementById('root');
-React.render((
+ReactDOM.render((
{() => }
@@ -100,7 +102,7 @@ declare var addTodo: () => { type: string; };
declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
-React.render(
+ReactDOM.render(
{() => }
,
@@ -108,7 +110,7 @@ React.render(
);
Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
- React.render(
+ ReactDOM.render(
{/*
//TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
@@ -121,7 +123,7 @@ Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "
//TODO: for React Router 1.0
//TODO: error TS2604: JSX element type 'Router' does not have any construct or call signatures.
-//React.render(
+//ReactDOM.render(
//
// {() => ...}
// ,
diff --git a/react-router/react-router-tests.ts b/react-router/react-router-tests.ts
index 54b0545e2..7c80d740a 100644
--- a/react-router/react-router-tests.ts
+++ b/react-router/react-router-tests.ts
@@ -1,8 +1,9 @@
///
+///
"use strict";
import React = require('react');
-import ReactAddons = require('react/addons');
+import ReactDOM = require('react-dom');
import Router = require('react-router');
// Mixin
@@ -129,9 +130,6 @@ class DefaultRouteTest {
var Handler: React.ComponentClass;
React.createElement(Router.DefaultRoute, null);
React.createElement(Router.DefaultRoute, {name: 'name', handler: Handler});
-
- ReactAddons.createElement(Router.DefaultRoute, null);
- ReactAddons.createElement(Router.DefaultRoute, {name: 'name', handler: Handler});
}
}
@@ -169,16 +167,6 @@ class LinkTest {
query: {},
onClick: () => console.log(1)
});
-
- ReactAddons.createElement(Router.Link, null);
- ReactAddons.createElement(Router.Link, {to: 'home'});
- ReactAddons.createElement(Router.Link, {
- activeClassName: 'name',
- to: 'home',
- params: {},
- query: {},
- onClick: () => console.log(1)
- });
}
}
@@ -195,10 +183,6 @@ class NotFoundRouteTest {
React.createElement(Router.NotFoundRoute, null);
React.createElement(Router.NotFoundRoute, {handler: Handler});
React.createElement(Router.NotFoundRoute, {handler: Handler, name: "home"});
-
- ReactAddons.createElement(Router.NotFoundRoute, null);
- ReactAddons.createElement(Router.NotFoundRoute, {handler: Handler});
- ReactAddons.createElement(Router.NotFoundRoute, {handler: Handler, name: "home"});
}
}
@@ -215,10 +199,6 @@ class RedirectTest {
React.createElement(Router.Redirect, null);
React.createElement(Router.Redirect, {});
React.createElement(Router.Redirect, {path: 'a', from: 'a', to: 'b'});
-
- ReactAddons.createElement(Router.Redirect, null);
- ReactAddons.createElement(Router.Redirect, {});
- ReactAddons.createElement(Router.Redirect, {path: 'a', from: 'a', to: 'b'});
}
}
@@ -237,10 +217,6 @@ class RouteTest {
React.createElement(Router.Route, null);
React.createElement(Router.Route, {});
React.createElement(Router.Route, {name: "home", path: "/", handler: Handler, ignoreScrollBehavior: true});
-
- ReactAddons.createElement(Router.Route, null);
- ReactAddons.createElement(Router.Route, {});
- ReactAddons.createElement(Router.Route, {name: "home", path: "/", handler: Handler, ignoreScrollBehavior: true});
}
}
@@ -250,9 +226,6 @@ class RouteHandlerTest {
createElement() {
React.createElement(Router.RouteHandler, null);
React.createElement(Router.RouteHandler, {});
-
- ReactAddons.createElement(Router.RouteHandler, null);
- ReactAddons.createElement(Router.RouteHandler, {});
}
}
@@ -307,24 +280,24 @@ class RunTest {
constructor() {
// React.createElement() version
var v1: Router.Router = Router.run(React.createElement(Router.Route, null), (Handler) => {
- React.render(React.createElement(Handler, null), document.body);
+ ReactDOM.render(React.createElement(Handler, null), document.body);
});
var v2: Router.Router = Router.run(React.createElement(Router.Route, null), Router.HistoryLocation, (Handler, state) => {
- React.render(React.createElement(Handler, null), document.body);
+ ReactDOM.render(React.createElement(Handler, null), document.body);
});
var v3: Router.Router = Router.run(React.createElement(Router.Route, null), '/foo/bar', (Handler, state) => {
- React.render(React.createElement(Handler, null), document.body);
+ ReactDOM.render(React.createElement(Handler, null), document.body);
});
// React.createFactory() version
var v4: Router.Router = Router.run(React.createFactory(Router.Route)(), (Handler) => {
- React.render(React.createElement(Handler, null), document.body);
+ ReactDOM.render(React.createElement(Handler, null), document.body);
});
var v5: Router.Router = Router.run(React.createFactory(Router.Route)(), Router.HistoryLocation, (Handler, state) => {
- React.render(React.createElement(Handler, null), document.body);
+ ReactDOM.render(React.createElement(Handler, null), document.body);
});
var v6: Router.Router = Router.run(React.createFactory(Router.Route)(), '/foo/bar', (Handler, state) => {
- React.render(React.createElement(Handler, null), document.body);
+ ReactDOM.render(React.createElement(Handler, null), document.body);
});
}
}