Merge pull request #16 from bqqbarbhg/jsx-types

Fix JSX TypeScript type declarations
oamaok · Oct 31, 2023 · 5e9ed95 · 5e9ed95
2 parents 0709dd5 + c9b6597
commit 5e9ed95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/jsx-runtime.d.ts b/jsx-runtime.d.ts
@@ -1,13 +1,13 @@
-import { DefaultProps, NodeDescriptor } from './dist/kaiku'
+import { DefaultProps, Child, NodeDescriptor } from './dist/kaiku'
 
 declare namespace JSX {
   type Element<T extends DefaultProps> = NodeDescriptor<T>
   type ArrayElement = Element<any>[]
   interface FunctionElement<T extends DefaultProps> {
-    (props: T): Element<T>
+    (props: T): Child
   }
   interface ElementClass<T extends DefaultProps> {
-    render(props: any): Element<T>
+    render(props: T): Child
   }
   type ElementChildrenAttribute = {
     children: any

diff --git a/src/kaiku.ts b/src/kaiku.ts
@@ -51,11 +51,10 @@ type HtmlElementProperties = Record<string, any> & {
 }
 
 export type DefaultProps = Record<string, any>
-export type WithIntrinsicProps<T extends DefaultProps> = T extends {
-  children: any
+export type WithIntrinsicProps<T extends DefaultProps> = T & {
+  children?: Child | Children
+  key?: string
 }
-  ? T
-  : T & { children?: Child | Children }
 type LazyProperty<T> = T | (() => T)
 
 type ClassComponentDescriptor<