Merge pull request #3534 from preactjs/improve-types

improve compat types
preactjs · May 4, 2022 · c536b0d · c536b0d
2 parents c7b14ef + a5ac0c5
commit c536b0d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/compat/src/index.d.ts b/compat/src/index.d.ts
@@ -31,6 +31,8 @@ declare namespace React {
 	export import useState = _hooks.useState;
 
 	// Preact Defaults
+	export import ContextType = preact.ContextType;
+	export import RefObject = preact.RefObject;
 	export import Component = preact.Component;
 	export import FunctionComponent = preact.FunctionComponent;
 	export import FC = preact.FunctionComponent;
@@ -50,6 +52,16 @@ declare namespace React {
 	export import StrictMode = preact.Fragment;
 	export const version: string;
 
+	// HTML
+	export import HTMLAttributes = JSXInternal.HTMLAttributes;
+	export import DetailedHTMLProps = JSXInternal.DetailedHTMLProps;
+	export import CSSProperties = JSXInternal.CSSProperties;
+
+	// Events
+	export import TargetedEvent = JSXInternal.TargetedEvent;
+	export import ChangeEvent = JSXInternal.TargetedEvent;
+	export import ChangeEventHandler = JSXInternal.GenericEventHandler;
+
 	export function createPortal(
 		vnode: preact.VNode,
 		container: Element
@@ -78,7 +90,9 @@ declare namespace React {
 		...children: preact.ComponentChildren[]
 	) => preact.VNode<any>;
 	export function isValidElement(element: any): boolean;
-	export function findDOMNode(component: preact.Component): Element | null;
+	export function findDOMNode(
+		component: preact.Component | Element
+	): Element | null;
 
 	export abstract class PureComponent<P = {}, S = {}> extends preact.Component<
 		P,

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -303,6 +303,9 @@ export interface Provider<T>
 		children: ComponentChildren;
 	}> {}
 export interface PreactProvider<T> extends Provider<T> {}
+export type ContextType<C extends Context<any>> = C extends Context<infer T>
+	? T
+	: never;
 
 export interface Context<T> {
 	Consumer: Consumer<T>;

diff --git a/src/jsx.d.ts b/src/jsx.d.ts
@@ -821,6 +821,11 @@ export namespace JSXInternal {
 		itemRef?: string;
 	}
 
+	export type DetailedHTMLProps<
+		HA extends HTMLAttributes<RefType>,
+		RefType extends EventTarget = EventTarget
+	> = HA;
+
 	export interface HTMLMarqueeElement extends HTMLElement {
 		behavior?: 'scroll' | 'slide' | 'alternate';
 		bgColor?: string;
@@ -890,7 +895,7 @@ export namespace JSXInternal {
 		i: HTMLAttributes<HTMLElement>;
 		iframe: HTMLAttributes<HTMLIFrameElement>;
 		img: HTMLAttributes<HTMLImageElement>;
-		input: HTMLAttributes<HTMLInputElement>;
+		input: HTMLAttributes<HTMLInputElement> & { defaultValue?: string };
 		ins: HTMLAttributes<HTMLModElement>;
 		kbd: HTMLAttributes<HTMLElement>;
 		keygen: HTMLAttributes<HTMLUnknownElement>;