Merge pull request #576 from jmrog/typescript-functional-components

Add TypeScript typings for functional components and inclusive components
preactjs · Apr 2, 2017 · 1efecfb · 1efecfb
2 parents 9d9c232 + 2b19a3d
commit 1efecfb
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/preact.d.ts b/src/preact.d.ts
@@ -34,13 +34,18 @@ declare namespace preact {
 	}
 
 	interface FunctionalComponent<PropsType> {
-		(props?: PropsType & ComponentProps<this>, context?: any): JSX.Element
+		(props?:PropsType & ComponentProps<this>, context?:any):JSX.Element;
+		displayName?:string;
+		defaultProps?:any;
 	}
 
 	interface ComponentConstructor<PropsType, StateType> {
 		new (props?:PropsType, context?: any):Component<PropsType, StateType>;
 	}
 
+    // Type alias for a component considered generally, whether stateless or stateful.
+	type AnyComponent<PropsType, StateType> = FunctionalComponent<PropsType> | typeof Component;
+
 	abstract class Component<PropsType, StateType> implements ComponentLifecycle<PropsType, StateType> {
 		constructor(props?:PropsType, context?:any);
 
@@ -49,7 +54,7 @@ declare namespace preact {
 
 		state:StateType;
 		props:PropsType & ComponentProps<this>;
-		context: any;
+		context:any;
 		base:HTMLElement;
 
 		linkState:(name:string) => (event: Event) => void;
@@ -59,7 +64,7 @@ declare namespace preact {
 
 		forceUpdate(): void;
 
-		abstract render(props?:PropsType & ComponentProps<this>, state?:StateType, context?: any):JSX.Element;
+		abstract render(props?:PropsType & ComponentProps<this>, state?:StateType, context?:any):JSX.Element;
 	}
 
 	function h<PropsType>(node:ComponentConstructor<PropsType, any> | FunctionalComponent<PropsType>, params:PropsType, ...children:(JSX.Element|JSX.Element[]|string)[]):JSX.Element;