@@ -14,6 +14,10 @@ import {
1414import { CFCacheStore , MemorySegmentCacheStore } from "@rangojs/router/cache" ;
1515import { Suspense , type ReactNode } from "react" ;
1616import { Link , Outlet } from "@rangojs/router/client" ;
17+ import {
18+ LateSuspenseReader ,
19+ LateSuspenseWriter ,
20+ } from "./components/LateSuspenseReader.js" ;
1721import { StreamTest } from "./components/StreamTest.js" ;
1822import { NavLayout } from "./components/NavLayout.js" ;
1923import { RootLayout } from "./components/SlowRootLayout.js" ;
@@ -403,6 +407,11 @@ async function LoaderKeyCraftedPage(ctx: HandlerContext): Promise<ReactNode> {
403407/**
404408 * Main URL patterns - Django-style routing API
405409 */
410+ async function LateSuspenseContent ( ) {
411+ await new Promise ( ( resolve ) => setTimeout ( resolve , 500 ) ) ;
412+ return < LateSuspenseReader /> ;
413+ }
414+
406415export const urlpatterns = urls (
407416 ( {
408417 path,
@@ -2150,6 +2159,24 @@ export const urlpatterns = urls(
21502159 ( ) => [ middleware ( setOverlayCookie ) , loader ( CookieOverlayLoader ) ] ,
21512160 ) ,
21522161
2162+ // #992: persistent useLocationState reader inside a Suspense boundary
2163+ // that resolves after the root hydrates.
2164+ path (
2165+ "/location-state-late-suspense" ,
2166+ ( ) => (
2167+ < div data-testid = "ls-late-suspense" >
2168+ < h1 > Late Suspense</ h1 >
2169+ < LateSuspenseWriter />
2170+ < Suspense
2171+ fallback = { < div data-testid = "late-ls-fallback" > loading</ div > }
2172+ >
2173+ < LateSuspenseContent />
2174+ </ Suspense >
2175+ </ div >
2176+ ) ,
2177+ { name : "locationStateLateSuspense" } ,
2178+ ) ,
2179+
21532180 // Action location state test route (non-redirect flow)
21542181 path ( "/action-location-state" , ActionLocationStatePage , {
21552182 name : "actionLocationState" ,
0 commit comments