kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-01 12:42:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5915 from ngbrown/patch-7

Browse Source 
react.d.ts: Make a generic base version of HTMLAttributes and DOMAttributes
This commit is contained in:
Masahiro Wakame
2015-09-23 07:07:20 +09:00
parent 51268e1b7d 7d0beb4825
commit 32029fcb4e
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
react/react.d.ts vendored
View File

@@ -336,7 +336,7 @@ declare namespace __React {
ref?: string | ((component: T) => any);
}
interface DOMAttributes extends Props<DOMComponent<any>> {
interface DOMAttributesBase<T> extends Props<T> {
onCopy?: ClipboardEventHandler;
onCut?: ClipboardEventHandler;
onPaste?: ClipboardEventHandler;
@@ -377,6 +377,9 @@ declare namespace __React {
};
}
interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
}
// This interface is not complete. Only properties accepting
// unitless numbers are listed here (see CSSProperty.js in React)
interface CSSProperties {
@@ -406,9 +409,7 @@ declare namespace __React {
[propertyName: string]: any;
}
interface HTMLAttributes extends DOMAttributes {
ref?: string | ((component: HTMLComponent) => void);
interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
accept?: string;
acceptCharset?: string;
accessKey?: string;
@@ -528,6 +529,9 @@ declare namespace __React {
unselectable?: boolean;
}
interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
}
interface SVGElementAttributes extends HTMLAttributes {
viewBox?: string;
preserveAspectRatio?: string;
@@ -1133,7 +1137,7 @@ declare module "react/addons" {
ref?: string | ((component: T) => any);
}
interface DOMAttributes extends Props<DOMComponent<any>> {
interface DOMAttributesBase<T> extends Props<T> {
onCopy?: ClipboardEventHandler;
onCut?: ClipboardEventHandler;
onPaste?: ClipboardEventHandler;
@@ -1174,6 +1178,9 @@ declare module "react/addons" {
};
}
interface DOMAttributes extends DOMAttributesBase<DOMComponent<any>> {
}
// This interface is not complete. Only properties accepting
// unitless numbers are listed here (see CSSProperty.js in React)
interface CSSProperties {
@@ -1203,9 +1210,7 @@ declare module "react/addons" {
[propertyName: string]: any;
}
interface HTMLAttributes extends DOMAttributes {
ref?: string | ((component: HTMLComponent) => void);
interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
accept?: string;
acceptCharset?: string;
accessKey?: string;
@@ -1325,6 +1330,9 @@ declare module "react/addons" {
unselectable?: boolean;
}
interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
}
interface SVGElementAttributes extends HTMLAttributes {
viewBox?: string;
preserveAspectRatio?: string;