Merge branch 'main' into main

preactjs · Dec 29, 2023 · 8b9b531 · 8b9b531
2 parents 9459cde + da9d488
commit 8b9b531
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/compat/src/index.d.ts b/compat/src/index.d.ts
@@ -46,6 +46,7 @@ declare namespace React {
 	export import RefObject = preact.RefObject;
 	export import Component = preact.Component;
 	export import FunctionComponent = preact.FunctionComponent;
+	export import ComponentType = preact.ComponentType;
 	export import FC = preact.FunctionComponent;
 	export import createContext = preact.createContext;
 	export import createRef = preact.createRef;

diff --git a/src/jsx.d.ts b/src/jsx.d.ts
@@ -2136,8 +2136,9 @@ export namespace JSXInternal {
 			| Booleanish
 			| ''
 			| 'plaintext-only'
+			| 'inherit'
 			| undefined
-			| SignalLike<Booleanish | '' | 'plaintext-only' | undefined>;
+			| SignalLike<Booleanish | '' | 'inherit' | 'plaintext-only' | undefined>;
 		contenteditable?: HTMLAttributes['contentEditable'];
 		/** @deprecated See https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/contextmenu */
 		contextMenu?: string | undefined | SignalLike<string | undefined>;