From 30bd1a0180883faf3e58bf8fcdf1c11ba40d12d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Mon, 21 Jul 2025 11:19:55 +0200
Subject: [PATCH] Suspense refactoring

---
 packages/effect-fc/src/Component.ts | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/effect-fc/src/Component.ts b/packages/effect-fc/src/Component.ts
index c692bfa..5a7f6cb 100644
--- a/packages/effect-fc/src/Component.ts
+++ b/packages/effect-fc/src/Component.ts
@@ -368,14 +368,21 @@ export const memoWithOptions: {
 
 export interface Suspense {
     readonly suspense: true
+    readonly suspenseOptions: Suspense.Options
 }
 
-export type SuspenseProps = Omit<React.SuspenseProps, "children">
+export namespace Suspense {
+    export interface Options {
+        readonly defaultFallback?: React.ReactNode
+    }
+
+    export type Props = Omit<React.SuspenseProps, "children">
+}
 
 export const suspense = <T extends Component<any, any, P>, P extends {}>(
-    self: ExcludeKeys<T, keyof Suspense> & Component<any, any, ExcludeKeys<P, keyof SuspenseProps>>
+    self: ExcludeKeys<T, keyof Suspense> & Component<any, any, ExcludeKeys<P, keyof Suspense.Props>>
 ): T & Suspense => Object.setPrototypeOf(
-    { ...self, suspense: true },
+    { ...self, suspense: true, suspenseOptions: {} },
     Object.getPrototypeOf(self),
 )
 
@@ -383,7 +390,7 @@ export const suspense = <T extends Component<any, any, P>, P extends {}>(
 export const useFC: {
     <E, R, P extends {}>(
         self: Component<E, R, P> & Suspense
-    ): Effect.Effect<React.FC<P & SuspenseProps>, never, Exclude<R, Scope.Scope>>
+    ): Effect.Effect<React.FC<P & Suspense.Props>, never, Exclude<R, Scope.Scope>>
     <E, R, P extends {}>(
         self: Component<E, R, P>
     ): Effect.Effect<React.FC<P>, never, Exclude<R, Scope.Scope>>
@@ -408,14 +415,14 @@ export const useFC: {
                         return React.use(props.promise)
                     },
 
-                    SuspenseInner => ({ fallback, name, ...props }: P & SuspenseProps) => {
+                    SuspenseInner => ({ fallback, name, ...props }: P & Suspense.Props) => {
                         const promise = Runtime.runPromise(runtimeRef.current)(
                             Effect.provideService(self.body(props as P), Scope.Scope, scope)
                         )
 
                         return React.createElement(
                             React.Suspense,
-                            { fallback, name },
+                            { fallback: fallback ?? self.suspenseOptions.defaultFallback, name },
                             React.createElement(SuspenseInner, { promise }),
                         )
                     },
@@ -437,7 +444,7 @@ export const useFC: {
 export const use: {
     <E, R, P extends {}>(
         self: Component<E, R, P> & Suspense,
-        fn: (Component: React.FC<P & SuspenseProps>) => React.ReactNode,
+        fn: (Component: React.FC<P & Suspense.Props>) => React.ReactNode,
     ): Effect.Effect<React.ReactNode, never, Exclude<R, Scope.Scope>>
     <E, R, P extends {}>(
         self: Component<E, R, P>,
@@ -451,13 +458,13 @@ export const withRuntime: {
     <T extends Component<any, R, any>, R>(
         context: React.Context<Runtime.Runtime<R>>,
     ): (self: T) => React.FC<T extends Suspense
-        ? Component.Props<T> & SuspenseProps
+        ? Component.Props<T> & Suspense.Props
         : Component.Props<T>
     >
     <E, R, P extends {}>(
         self: Component<E, R, P> & Suspense,
         context: React.Context<Runtime.Runtime<R>>,
-    ): React.FC<P & SuspenseProps>
+    ): React.FC<P & Suspense.Props>
     <E, R, P extends {}>(
         self: Component<E, R, P>,
         context: React.Context<Runtime.Runtime<R>>,