vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-11 20:40:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for comments.

Browse Source
This commit is contained in:
Dovydas Navickas
2017-06-29 20:57:10 +03:00
parent 429ff58c9e
commit 929b4a206d
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/react/index.d.ts
Vendored
+21 -8
View File
@@ -52,7 +52,7 @@ declare namespace React {
}
interface ReactElement<P> {
type: string | keyof ReactHTML | keyof ReactSVG | ComponentClass<P> | SFC<P>;
type: string | ComponentClass<P> | SFC<P>;
props: P;
key: Key | null;
}
@@ -69,18 +69,18 @@ declare namespace React {
type ClassicElement<P> = CElement<P, ClassicComponent<P, ComponentState>>;
// ReactHTML for ReactHTMLElement
// ReactSVG for ReactSVGElement
// string fallback for custom web-components
interface DOMElement<P extends DOMAttributes<T>, T extends Element> extends ReactElement<P> {
type: string | keyof ReactHTML | keyof ReactSVG;
type: string;
ref: Ref<T>;
}
// ReactHTML for ReactHTMLElement
interface ReactHTMLElement<T extends HTMLElement> extends DOMElement<HTMLAttributes<T>, T> {
type: keyof ReactHTML;
}
// ReactSVG for ReactSVGElement
interface ReactSVGElement extends DOMElement<SVGAttributes<SVGElement>, SVGElement> {
type: keyof ReactSVG;
}
@@ -132,8 +132,15 @@ declare namespace React {
function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
// DOM Elements
function createFactory<T extends HTMLElement>(
type: keyof ReactHTML): HTMLFactory<T>;
function createFactory(
type: keyof ReactSVG): SVGFactory;
function createFactory<P extends DOMAttributes<T>, T extends Element>(
type: keyof ReactHTML): DOMFactory<P, T>;
type: string): DOMFactory<P, T>;
// Custom components
function createFactory<P>(type: SFC<P>): SFCFactory<P>;
function createFactory<P>(
type: ClassType<P, ClassicComponent<P, ComponentState>, ClassicComponentClass<P>>): CFactory<P, ClassicComponent<P, ComponentState>>;
@@ -141,6 +148,7 @@ declare namespace React {
type: ClassType<P, T, C>): CFactory<P, T>;
function createFactory<P>(type: ComponentClass<P>): Factory<P>;
// DOM Elements
function createElement<P extends HTMLAttributes<T>, T extends HTMLElement>(
type: keyof ReactHTML,
props?: ClassAttributes<T> & P,
@@ -149,10 +157,12 @@ declare namespace React {
type: keyof ReactSVG,
props?: ClassAttributes<T> & P,
...children: ReactNode[]): ReactSVGElement;
function createElement<P extends SVGAttributes<T>, T extends Element>(
type: string | keyof ReactSVG | keyof ReactHTML,
function createElement<P extends DOMAttributes<T>, T extends Element>(
type: string,
props?: ClassAttributes<T> & P,
...children: ReactNode[]): DOMElement<DOMAttributes<T>, T>;
...children: ReactNode[]): DOMElement<P, T>;
// Custom components
function createElement<P>(
type: SFC<P>,
props?: Attributes & P,
@@ -170,6 +180,7 @@ declare namespace React {
props?: Attributes & P,
...children: ReactNode[]): ReactElement<P>;
// DOM Elements
// ReactHTMLElement
function cloneElement<P extends HTMLAttributes<T>, T extends HTMLElement>(
element: ReactHTMLElement<T>,
@@ -185,6 +196,8 @@ declare namespace React {
element: DOMElement<P, T>,
props?: DOMAttributes<T> & P,
...children: ReactNode[]): DOMElement<P, T>;
// Custom components
function cloneElement<P extends Q, Q>(
element: SFCElement<P>,
props?: Q, // should be Q & Attributes, but then Q is inferred as {}
types/react/test/index.ts
+4
View File
@@ -189,6 +189,10 @@ const domElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDiv
const htmlElement = React.createElement("input", { type: "text" });
const svgElement = React.createElement("svg", { accentHeight: 12 });
let customProps: React.HTMLProps<HTMLElement> = props;
let customDomElement: string = "my-element";
const nonLiteralElement = React.createElement(customDomElement, customProps);
// React.cloneElement
const clonedElement: React.CElement<Props, ModernComponent> = React.cloneElement(element, { foo: 43 });