mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-09-09 11:13:57 +08:00
Remove React prefix from Modern/Classic/DOM Elements
This commit is contained in:
committed by
Phips Peter
parent
69a3c97655
commit
4cc6ae4122
@@ -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;
|
||||
}
|
||||
};
|
||||
|
||||
Vendored
+20
-20
@@ -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>(
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
};
|
||||
|
||||
+23
-23
@@ -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;
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
+20
-20
@@ -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>(
|
||||
|
||||
Reference in New Issue
Block a user