wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove React.ModernXX interfaces

Browse Source 
React.ModernElement -> React.ReactElement
React.ModernFactory -> React.Factory
React.ModernComponentClass -> React.ComponentClass
This commit is contained in:
Vincent Siao
2015-03-10 18:36:27 -07:00
committed by Phips Peter
parent 4cc6ae4122
commit cbe9f0b94a
6 changed files with 42 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
react/future/react-0.13.0-tests.ts
+3 -3
View File
@@ -41,7 +41,7 @@ var container: Element;
// Top-Level API
// --------------------------------------------------------------------------
var ClassicComponent: React.ClassicComponentClass<Props, State> =
var ClassicComponent: React.ClassicComponentClass<Props> =
React.createClass<Props, State>({
getDefaultProps: () => {
return <Props>{
@@ -130,7 +130,7 @@ var domFactoryElement: React.DOMElement<any> =
domFactory();
// React.createElement
var element: React.ModernElement<Props> =
var element: React.ReactElement<Props> =
React.createElement(ModernComponent, props);
var classicElement: React.ClassicElement<Props> =
React.createElement(ClassicComponent, props);
@@ -138,7 +138,7 @@ var domElement: React.HTMLElement =
React.createElement("div");
// React.cloneElement
var clonedElement: React.ModernElement<Props> =
var clonedElement: React.ReactElement<Props> =
React.cloneElement(element, props);
var clonedClassicElement: React.ClassicElement<Props> =
React.cloneElement(classicElement, props);
react/future/react-0.13.0.d.ts
Vendored
+12 -30
View File
@@ -17,18 +17,12 @@ declare module "react" {
ref: string | ((component: Component<P, any>) => any);
}
interface ModernElement<P> extends ReactElement<P> {
type: ModernComponentClass<P, any>;
ref: string | ((component: Component<P, any>) => any);
}
interface ClassicElement<P> extends ReactElement<P> {
type: string | ClassicComponentClass<P, any>;
type: string | ClassicComponentClass<P>;
ref: string | ((component: ClassicComponent<P, any>) => any);
}
// subtype of ClassicElement
interface DOMElement<P> extends ReactElement<P> {
interface DOMElement<P> extends ClassicElement<P> {
type: string;
ref: string | ((component: DOMComponent<P>) => any);
}
@@ -44,15 +38,11 @@ declare module "react" {
(props?: P, ...children: ReactNode[]): ReactElement<P>;
}
interface ModernFactory<P> extends Factory<P> {
(props?: P, ...children: ReactNode[]): ModernElement<P>;
}
interface ClassicFactory<P> extends Factory<P> {
(props?: P, ...children: ReactNode[]): ClassicElement<P>;
}
interface DOMFactory<P> extends Factory<P> {
interface DOMFactory<P> extends ClassicFactory<P> {
(props?: P, ...children: ReactNode[]): DOMElement<P>;
}
@@ -75,11 +65,10 @@ declare module "react" {
// Top Level API
// ----------------------------------------------------------------------
function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P, S>;
function createClass<P>(spec: ComponentSpec<P, any>): ClassicComponentClass<P>;
function createFactory<P>(type: string): DOMFactory<P>;
function createFactory<P>(type: ClassicComponentClass<P, any> | string): ClassicFactory<P>;
function createFactory<P>(type: ModernComponentClass<P, any>): ModernFactory<P>;
function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
function createFactory<P>(type: ComponentClass<P>): Factory<P>;
function createElement<P>(
@@ -87,13 +76,13 @@ declare module "react" {
props?: P,
...children: ReactNode[]): DOMElement<P>;
function createElement<P>(
type: ClassicComponentClass<P, any> | string,
type: ClassicComponentClass<P> | string,
props?: P,
...children: ReactNode[]): ClassicElement<P>;
function createElement<P>(
type: ModernComponentClass<P, any>,
type: ComponentClass<P>,
props?: P,
...children: ReactNode[]): ModernElement<P>;
...children: ReactNode[]): ReactElement<P>;
function cloneElement<P>(
element: DOMElement<P>,
@@ -103,10 +92,6 @@ declare module "react" {
element: ClassicElement<P>,
props?: P,
...children: ReactNode[]): ClassicElement<P>;
function cloneElement<P>(
element: ModernElement<P>,
props?: P,
...children: ReactNode[]): ModernElement<P>;
function cloneElement<P>(
element: ReactElement<P>,
props?: P,
@@ -184,18 +169,15 @@ declare module "react" {
// ----------------------------------------------------------------------
interface ComponentClass<P> {
new(props?: P, context?: any): Component<P, any>;
propTypes?: ValidationMap<P>;
contextTypes?: ValidationMap<any>;
childContextTypes?: ValidationMap<any>;
}
interface ModernComponentClass<P, S> extends ComponentClass<P> {
new(props?: P, context?: any): Component<P, S>;
defaultProps?: P;
}
interface ClassicComponentClass<P, S> extends ComponentClass<P> {
new(props?: P, context?: any): ClassicComponent<P, S>;
interface ClassicComponentClass<P> extends ComponentClass<P> {
new(props?: P, context?: any): ClassicComponent<P, any>;
getDefaultProps?(): P;
displayName?: string;
}
@@ -225,8 +207,8 @@ declare module "react" {
contextTypes?: ValidationMap<any>;
childContextTypes?: ValidationMap<any>
getInitialState?(): S;
getDefaultProps?(): P;
getInitialState?(): S;
}
interface ComponentSpec<P, S> extends Mixin<P, S> {
react/future/react-addons-0.13.0-tests.ts
+3 -3
View File
@@ -39,7 +39,7 @@ var container: Element;
// Top-Level API
// --------------------------------------------------------------------------
var ClassicComponent: React.ClassicComponentClass<Props, State> =
var ClassicComponent: React.ClassicComponentClass<Props> =
React.createClass<Props, State>({
getDefaultProps: () => {
return <Props>{
@@ -128,7 +128,7 @@ var domFactoryElement: React.DOMElement<any> =
domFactory();
// React.createElement
var element: React.ModernElement<Props> =
var element: React.ReactElement<Props> =
React.createElement(ModernComponent, props);
var classicElement: React.ClassicElement<Props> =
React.createElement(ClassicComponent, props);
@@ -136,7 +136,7 @@ var domElement: React.HTMLElement =
React.createElement("div");
// React.cloneElement
var clonedElement: React.ModernElement<Props> =
var clonedElement: React.ReactElement<Props> =
React.cloneElement(element, props);
var clonedClassicElement: React.ClassicElement<Props> =
React.cloneElement(classicElement, props);
react/future/react-addons-0.13.0.d.ts
Vendored
+12 -31
View File
@@ -17,18 +17,12 @@ declare module "react/addons" {
ref: string | ((component: Component<P, any>) => any);
}
interface ModernElement<P> extends ReactElement<P> {
type: ModernComponentClass<P, any>;
ref: string | ((component: Component<P, any>) => any);
}
interface ClassicElement<P> extends ReactElement<P> {
type: string | ClassicComponentClass<P, any>;
type: string | ClassicComponentClass<P>;
ref: string | ((component: ClassicComponent<P, any>) => any);
}
// subtype of ClassicElement
interface DOMElement<P> extends ReactElement<P> {
interface DOMElement<P> extends ClassicElement<P> {
type: string;
ref: string | ((component: DOMComponent<P>) => any);
}
@@ -44,15 +38,11 @@ declare module "react/addons" {
(props?: P, ...children: ReactNode[]): ReactElement<P>;
}
interface ModernFactory<P> extends Factory<P> {
(props?: P, ...children: ReactNode[]): ModernElement<P>;
}
interface ClassicFactory<P> extends Factory<P> {
(props?: P, ...children: ReactNode[]): ClassicElement<P>;
}
interface DOMFactory<P> extends Factory<P> {
interface DOMFactory<P> extends ClassicFactory<P> {
(props?: P, ...children: ReactNode[]): DOMElement<P>;
}
@@ -75,11 +65,10 @@ declare module "react/addons" {
// Top Level API
// ----------------------------------------------------------------------
function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P, S>;
function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
function createFactory<P>(type: string): DOMFactory<P>;
function createFactory<P>(type: ClassicComponentClass<P, any> | string): ClassicFactory<P>;
function createFactory<P>(type: ModernComponentClass<P, any>): ModernFactory<P>;
function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
function createFactory<P>(type: ComponentClass<P>): Factory<P>;
function createElement<P>(
@@ -87,13 +76,13 @@ declare module "react/addons" {
props?: P,
...children: ReactNode[]): DOMElement<P>;
function createElement<P>(
type: ClassicComponentClass<P, any> | string,
type: ClassicComponentClass<P> | string,
props?: P,
...children: ReactNode[]): ClassicElement<P>;
function createElement<P>(
type: ModernComponentClass<P, any>,
type: ComponentClass<P>,
props?: P,
...children: ReactNode[]): ModernElement<P>;
...children: ReactNode[]): ReactElement<P>;
function cloneElement<P>(
element: DOMElement<P>,
@@ -103,10 +92,6 @@ declare module "react/addons" {
element: ClassicElement<P>,
props?: P,
...children: ReactNode[]): ClassicElement<P>;
function cloneElement<P>(
element: ModernElement<P>,
props?: P,
...children: ReactNode[]): ModernElement<P>;
function cloneElement<P>(
element: ReactElement<P>,
props?: P,
@@ -184,18 +169,15 @@ declare module "react/addons" {
// ----------------------------------------------------------------------
interface ComponentClass<P> {
new(props?: P, context?: any): Component<P, any>;
propTypes?: ValidationMap<P>;
contextTypes?: ValidationMap<any>;
childContextTypes?: ValidationMap<any>;
}
interface ModernComponentClass<P, S> extends ComponentClass<P> {
new(props?: P, context?: any): Component<P, S>;
defaultProps?: P;
}
interface ClassicComponentClass<P, S> extends ComponentClass<P> {
new(props?: P, context?: any): ClassicComponent<P, S>;
interface ClassicComponentClass<P> extends ComponentClass<P> {
new(props?: P, context?: any): ClassicComponent<P, any>;
getDefaultProps?(): P;
displayName?: string;
}
@@ -225,8 +207,8 @@ declare module "react/addons" {
contextTypes?: ValidationMap<any>;
childContextTypes?: ValidationMap<any>
getInitialState?(): S;
getDefaultProps?(): P;
getInitialState?(): S;
}
interface ComponentSpec<P, S> extends Mixin<P, S> {
@@ -768,7 +750,6 @@ declare module "react/addons" {
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;
react/future/react-addons-global-0.13.0.d.ts
Vendored
-1
View File
@@ -25,7 +25,6 @@ declare module React {
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;
react/future/react-global-0.13.0.d.ts
Vendored
+12 -30
View File
@@ -17,18 +17,12 @@ declare module React {
ref: string | ((component: Component<P, any>) => any);
}
interface ModernElement<P> extends ReactElement<P> {
type: ModernComponentClass<P, any>;
ref: string | ((component: Component<P, any>) => any);
}
interface ClassicElement<P> extends ReactElement<P> {
type: string | ClassicComponentClass<P, any>;
type: string | ClassicComponentClass<P>;
ref: string | ((component: ClassicComponent<P, any>) => any);
}
// subtype of ClassicElement
interface DOMElement<P> extends ReactElement<P> {
interface DOMElement<P> extends ClassicElement<P> {
type: string;
ref: string | ((component: DOMComponent<P>) => any);
}
@@ -44,15 +38,11 @@ declare module React {
(props?: P, ...children: ReactNode[]): ReactElement<P>;
}
interface ModernFactory<P> extends Factory<P> {
(props?: P, ...children: ReactNode[]): ModernElement<P>;
}
interface ClassicFactory<P> extends Factory<P> {
(props?: P, ...children: ReactNode[]): ClassicElement<P>;
}
interface DOMFactory<P> extends Factory<P> {
interface DOMFactory<P> extends ClassicFactory<P> {
(props?: P, ...children: ReactNode[]): DOMElement<P>;
}
@@ -75,11 +65,10 @@ declare module React {
// Top Level API
// ----------------------------------------------------------------------
function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P, S>;
function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
function createFactory<P>(type: string): DOMFactory<P>;
function createFactory<P>(type: ClassicComponentClass<P, any> | string): ClassicFactory<P>;
function createFactory<P>(type: ModernComponentClass<P, any>): ModernFactory<P>;
function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
function createFactory<P>(type: ComponentClass<P>): Factory<P>;
function createElement<P>(
@@ -87,13 +76,13 @@ declare module React {
props?: P,
...children: ReactNode[]): DOMElement<P>;
function createElement<P>(
type: ClassicComponentClass<P, any> | string,
type: ClassicComponentClass<P> | string,
props?: P,
...children: ReactNode[]): ClassicElement<P>;
function createElement<P>(
type: ModernComponentClass<P, any>,
type: ComponentClass<P>,
props?: P,
...children: ReactNode[]): ModernElement<P>;
...children: ReactNode[]): ReactElement<P>;
function cloneElement<P>(
element: DOMElement<P>,
@@ -103,10 +92,6 @@ declare module React {
element: ClassicElement<P>,
props?: P,
...children: ReactNode[]): ClassicElement<P>;
function cloneElement<P>(
element: ModernElement<P>,
props?: P,
...children: ReactNode[]): ModernElement<P>;
function cloneElement<P>(
element: ReactElement<P>,
props?: P,
@@ -184,18 +169,15 @@ declare module React {
// ----------------------------------------------------------------------
interface ComponentClass<P> {
new(props?: P, context?: any): Component<P, any>;
propTypes?: ValidationMap<P>;
contextTypes?: ValidationMap<any>;
childContextTypes?: ValidationMap<any>;
}
interface ModernComponentClass<P, S> extends ComponentClass<P> {
new(props?: P, context?: any): Component<P, S>;
defaultProps?: P;
}
interface ClassicComponentClass<P, S> extends ComponentClass<P> {
new(props?: P, context?: any): ClassicComponent<P, S>;
interface ClassicComponentClass<P> extends ComponentClass<P> {
new(props?: P, context?: any): ClassicComponent<P, any>;
getDefaultProps?(): P;
displayName?: string;
}
@@ -225,8 +207,8 @@ declare module React {
contextTypes?: ValidationMap<any>;
childContextTypes?: ValidationMap<any>
getInitialState?(): S;
getDefaultProps?(): P;
getInitialState?(): S;
}
interface ComponentSpec<P, S> extends Mixin<P, S> {