From 3270f41214af02545c41b8fe1b124dd94ba0f87f Mon Sep 17 00:00:00 2001
From: Alec Larson <1925840+aleclarson@users.noreply.github.com>
Date: Thu, 5 Jun 2025 19:07:50 -0400
Subject: [PATCH] fix(types): ensure `forwardRef` overrides the default ref
 type

---
 compat/src/index.d.ts | 2 +-
 src/index-5.d.ts      | 6 +++---
 src/index.d.ts        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compat/src/index.d.ts b/compat/src/index.d.ts
index 5e7a1b6141..7305d0266e 100644
--- a/compat/src/index.d.ts
+++ b/compat/src/index.d.ts
@@ -265,7 +265,7 @@ declare namespace React {
 
 	export function forwardRef<R, P = {}>(
 		fn: ForwardRefRenderFunction<R, P>
-	): preact.FunctionalComponent<PropsWithoutRef<P> & { ref?: preact.Ref<R> }>;
+	): preact.FunctionalComponent<PropsWithoutRef<P>, R>;
 
 	export type PropsWithoutRef<P> = Omit<P, 'ref'>;
 
diff --git a/src/index-5.d.ts b/src/index-5.d.ts
index 6c7431cb00..4c3fe6898f 100644
--- a/src/index-5.d.ts
+++ b/src/index-5.d.ts
@@ -86,12 +86,12 @@ export type ComponentProps<
 		? JSXInternal.IntrinsicElements[C]
 		: {};
 
-export interface FunctionComponent<P = {}> {
-	(props: RenderableProps<P>, context?: any): VNode | null;
+export interface FunctionComponent<P = {}, RefType = any> {
+	(props: RenderableProps<P, RefType>, context?: any): VNode | null;
 	displayName?: string;
 	defaultProps?: Partial<P> | undefined;
 }
-export interface FunctionalComponent<P = {}> extends FunctionComponent<P> {}
+export interface FunctionalComponent<P = {}, RefType = any> extends FunctionComponent<P, RefType> {}
 
 export interface ComponentClass<P = {}, S = {}> {
 	new (props: P, context?: any): Component<P, S>;
diff --git a/src/index.d.ts b/src/index.d.ts
index 379bbebaaf..29fdda787f 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -86,12 +86,12 @@ export type ComponentProps<
 		? JSXInternal.IntrinsicElements[C]
 		: {};
 
-export interface FunctionComponent<P = {}> {
-	(props: RenderableProps<P>, context?: any): ComponentChildren;
+export interface FunctionComponent<P = {}, RefType = any> {
+	(props: RenderableProps<P, RefType>, context?: any): ComponentChildren;
 	displayName?: string;
 	defaultProps?: Partial<P> | undefined;
 }
-export interface FunctionalComponent<P = {}> extends FunctionComponent<P> {}
+export interface FunctionalComponent<P = {}, RefType = any> extends FunctionComponent<P, RefType> {}
 
 export interface ComponentClass<P = {}, S = {}> {
 	new (props: P, context?: any): Component<P, S>;