aboutsummaryrefslogtreecommitdiff
path: root/src/preact.d.ts
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-11-08 15:07:07 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-11-08 15:07:07 +0100
commit6e5fb04d3f3f9a6cd43ac20896d73321dd079f96 (patch)
tree6e9f4002ba1f682eb2dca0c320ab1e9933665a33 /src/preact.d.ts
parent30b577138dda685f65a8529be1866afa6e321845 (diff)
Squashed 'thirdparty/preact/' changes from b2d90cc..ba094e2
ba094e2 Run only local tests for pull requests (#390) e9fc3c2 Fix CI build (#386) 70a5ca3 This adds a link to preact-i18nline. (#382) 5dffd85 Merge branch 'pr-fix-build-for-windows' of https://github.com/Download/preact f14edf7 kilobits => kilobytes (#383) c193547 Test for #292 284e4aa 6.4.0 24eab2f Prevent accidental duplicate recycling of elements when swapping the base element of a component. Fixes #373. 76c5ef7 fix lint error 8008886 When swapping the base of a composed child component, update its parent's base reference. Fixes #349. fd4f21f Add an equality check prior to setting `.nodeValue` on text nodes, since Firefox (and maybe others) don't do this internally by default. Fixes #368 - thanks @zbinlin! 1555e2b Add CDNJS version badge in readme (#365) 79c8bae Disable React Developer Tools integration tests under IE (#362) 84f4eeb Refactor `linkState()` a bit to drop around 40 bytes. Coincidentally, that's the exact size of the hooks just added for DevTools... 👌 22bbfcb Little tweaks 👯 f8b326e Document how to use the React DevTools with Preact (#354) 1f4a8eb Correct "preact/devtools" type definitions (#355) 68f22eb Add React Developer Tools integration (#339) 2a7a027 Add ref and allow objects in className (#316) 4a59cca fix readme todomvc link (#345) 37ca4e0 Fixes build for Windows #343 cf93387 6.3.0 ff05818 Make `VNode.children` *always* be an Array, even when there are no children. 9b095f4 Added link to preact-layout (#342) git-subtree-dir: thirdparty/preact git-subtree-split: ba094e27b602cb16aded7dcad95f71e44b7b0476
Diffstat (limited to 'src/preact.d.ts')
-rw-r--r--src/preact.d.ts21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/preact.d.ts b/src/preact.d.ts
index 2dd8299a9..784844152 100644
--- a/src/preact.d.ts
+++ b/src/preact.d.ts
@@ -4,8 +4,14 @@ declare namespace preact {
key?:string;
}
+ interface DangerouslySetInnerHTML {
+ __html: string;
+ }
+
interface PreactHTMLAttributes {
+ dangerouslySetInnerHTML?:DangerouslySetInnerHTML;
key?:string;
+ ref?:(el?: Element) => void;
}
interface VNode {
@@ -51,8 +57,8 @@ declare namespace preact {
abstract render(props:PropsType & ComponentProps, state:any):JSX.Element;
}
- function h<PropsType>(node:ComponentConstructor<PropsType, any>, params:PropsType, ...children:(JSX.Element|string)[]):JSX.Element;
- function h(node:string, params:JSX.HTMLAttributes&JSX.SVGAttributes, ...children:(JSX.Element|string)[]):JSX.Element;
+ function h<PropsType>(node:ComponentConstructor<PropsType, any>, params:PropsType, ...children:(JSX.Element|JSX.Element[]|string)[]):JSX.Element;
+ function h(node:string, params:JSX.HTMLAttributes&JSX.SVGAttributes&{[propName: string]: any}, ...children:(JSX.Element|JSX.Element[]|string)[]):JSX.Element;
function render(node:JSX.Element, parent:Element, merge?:boolean):Element;
@@ -72,6 +78,11 @@ declare module "preact" {
export = preact;
}
+declare module "preact/devtools" {
+ // Empty. This module initializes the React Developer Tools integration
+ // when imported.
+}
+
declare namespace JSX {
interface Element extends preact.VNode {
@@ -277,8 +288,8 @@ declare namespace JSX {
charSet?:string;
challenge?:string;
checked?:boolean;
- class?:string;
- className?:string;
+ class?:string | { [key:string]: boolean };
+ className?:string | { [key:string]: boolean };
cols?:number;
colSpan?:number;
content?:string;
@@ -551,4 +562,4 @@ declare namespace JSX {
tspan:SVGAttributes;
use:SVGAttributes;
}
-}
+} \ No newline at end of file