apply staticProps when soft navigation

codehz · Aug 16, 2024 · 9d17397 · 9d17397
1 parent 2365703
commit 9d17397
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/hydrate.tsx b/hydrate.tsx
@@ -31,7 +31,11 @@ export async function hydrate(
   const Initial = await import(matched.value);
   return hydrateRoot(
     document,
-    <RouterHost Shell={Shell} {...options}>
+    <RouterHost
+      Shell={Shell}
+      staticProps={globalX.__STATIC_PROPS__}
+      {...options}
+    >
       <Shell
         route={globalX.__INITIAL_ROUTE__}
         {...globalX.__STATIC_PROPS__}

diff --git a/router/index.tsx b/router/index.tsx
@@ -106,11 +106,13 @@ export const RouterHost = ({
   normalizeUrl = (url: string) => url,
   Shell,
   onRouteUpdated,
+  staticProps,
 }: {
   children: React.ReactElement;
   normalizeUrl?: (url: string) => string;
   Shell: React.ComponentType<{ children: React.ReactElement; route?: string }>;
   onRouteUpdated?: (path: string) => void;
+  staticProps?: Record<string, unknown>;
 }) => {
   const pathname = useLocationProperty(
     () => normalizeUrl(location.pathname + location.search),
@@ -135,7 +137,7 @@ export const RouterHost = ({
             onRouteUpdated?.(target);
             setVersion(currentVersion);
             setCurrent(
-              <Shell route={target} {...props}>
+              <Shell route={target} {...staticProps} {...props}>
                 <module.default {...props?.props} />
               </Shell>
             );