diff --git a/lib/react/src/jsx-runtime/index.ts b/lib/react/src/jsx-runtime/index.ts
index 6c03b03..e3c78da 100644
--- a/lib/react/src/jsx-runtime/index.ts
+++ b/lib/react/src/jsx-runtime/index.ts
@@ -1,28 +1,28 @@
 import { jPatches } from './_internal'
-import type { ComponentProps, ElementType, Key, ReactElement } from 'react'
+import type { ElementType, Key, ReactElement } from 'react'
 import type { ReactJSXRuntime } from '..'
 
 export type AnyJSXFactoryFunction = (typeof ReactJSXRuntime)['jsx' | 'jsxs']
 
-export type BeforeJSXCallback<
-    E extends ElementType = ElementType,
-    P = ComponentProps<E>,
-> = (
-    args: [element: E, props: P, key?: Key | undefined],
+export type BeforeJSXCallback<E extends ElementType> = (
+    args: [element: E, props: ElementTypeProps<E>, key?: Key | undefined],
 ) => Parameters<AnyJSXFactoryFunction>
 
-export type InsteadJSXCallback<
-    E extends ElementType = ElementType,
-    P = ComponentProps<E>,
-> = (
-    args: [element: E, props: P, key?: Key | undefined],
+export type InsteadJSXCallback<E extends ElementType> = (
+    args: [element: E, props: ElementTypeProps<E>, key?: Key | undefined],
     jsx: AnyJSXFactoryFunction,
 ) => ReturnType<AnyJSXFactoryFunction> | null
 
-export type AfterJSXCallback = (
-    fiber: ReactElement,
+export type AfterJSXCallback<E extends ElementType> = (
+    fiber: ReactElement<ElementTypeProps<E>, E>,
 ) => ReturnType<AnyJSXFactoryFunction> | null
 
+type ElementTypeProps<E extends ElementType> = E extends ElementType<
+    infer Props
+>
+    ? Props
+    : never
+
 /**
  * Registers a hook to be called after a JSX element with the specified type is created.
  *
@@ -30,7 +30,10 @@ export type AfterJSXCallback = (
  * @param patch The hook.
  * @returns A function to unpatch.
  */
-export function afterJSX(type: ElementType, patch: AfterJSXCallback) {
+export function afterJSX<E extends ElementType>(
+    type: E,
+    patch: AfterJSXCallback<E>,
+) {
     let patches = jPatches.get(type)
     if (!patches) {
         patches = [undefined, new Set(), undefined]
@@ -39,9 +42,9 @@ export function afterJSX(type: ElementType, patch: AfterJSXCallback) {
 
     const set = patches[1]!
 
-    set.add(patch as AfterJSXCallback)
+    set.add(patch as AfterJSXCallback<E>)
     return () => {
-        const res = set.delete(patch as AfterJSXCallback)
+        const res = set.delete(patch as AfterJSXCallback<E>)
         if (res) attemptCleanup(type)
         return res
     }
@@ -54,10 +57,10 @@ export function afterJSX(type: ElementType, patch: AfterJSXCallback) {
  * @param patch The hook.
  * @returns A function to unpatch.
  */
-export function beforeJSX<
-    E extends ElementType = ElementType,
-    P = ComponentProps<E>,
->(type: E, patch: BeforeJSXCallback<E, P>) {
+export function beforeJSX<E extends ElementType>(
+    type: E,
+    patch: BeforeJSXCallback<E>,
+) {
     let patches = jPatches.get(type)
     if (!patches) {
         patches = [new Set(), undefined, undefined]
@@ -66,9 +69,9 @@ export function beforeJSX<
 
     const set = patches[0]!
 
-    set.add(patch as BeforeJSXCallback)
+    set.add(patch as BeforeJSXCallback<E>)
     return () => {
-        const res = set.delete(patch as BeforeJSXCallback)
+        const res = set.delete(patch as BeforeJSXCallback<E>)
         if (res) attemptCleanup(type)
         return res
     }
@@ -81,10 +84,10 @@ export function beforeJSX<
  * @param patch The hook.
  * @returns A function to unpatch.
  */
-export function insteadJSX<
-    E extends ElementType = ElementType,
-    P = ComponentProps<E>,
->(type: E, patch: InsteadJSXCallback<E, P>) {
+export function insteadJSX<E extends ElementType>(
+    type: E,
+    patch: InsteadJSXCallback<E>,
+) {
     let patches = jPatches.get(type)
     if (!patches) {
         patches = [undefined, undefined, new Set()]
@@ -93,9 +96,9 @@ export function insteadJSX<
 
     const set = patches[2]!
 
-    set.add(patch as InsteadJSXCallback)
+    set.add(patch as InsteadJSXCallback<E>)
     return () => {
-        const res = set.delete(patch as InsteadJSXCallback)
+        const res = set.delete(patch as InsteadJSXCallback<E>)
         if (res) attemptCleanup(type)
         return res
     }