add route parameter to shell

codehz · Dec 29, 2023 · 254076c · 254076c
1 parent bbcb205
commit 254076c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/hydrate.tsx b/hydrate.tsx
@@ -28,7 +28,10 @@ export async function hydrate(
   return hydrateRoot(
     document,
     <RouterHost Shell={Shell} {...options}>
-      <Shell {...globalX.__SERVERSIDE_PROPS__}>
+      <Shell
+        route={globalX.__INITIAL_ROUTE__}
+        {...globalX.__SERVERSIDE_PROPS__}
+      >
         <Initial.default {...globalX.__SERVERSIDE_PROPS__?.props} />
       </Shell>
     </RouterHost>,

diff --git a/index.tsx b/index.tsx
@@ -89,7 +89,7 @@ export class StaticRouters {
       });
     }
     const stream = await renderToReadableStream(
-      <Shell {...result}>
+      <Shell route={serverSide.pathname + search} {...result}>
         <module.default {...result?.props} />
       </Shell>,
       {

diff --git a/router/index.tsx b/router/index.tsx
@@ -69,7 +69,7 @@ export const RouterHost = ({
   onRouteUpdated,
 }: {
   children: React.ReactElement;
-  Shell: React.ComponentType<{ children: React.ReactElement }>;
+  Shell: React.ComponentType<{ children: React.ReactElement; route?: string }>;
   onRouteUpdated?: (path: string) => void;
 }) => {
   const pathname = useLocationProperty(
@@ -95,7 +95,7 @@ export const RouterHost = ({
             onRouteUpdated?.(target);
             setVersion(currentVersion);
             setCurrent(
-              <Shell {...props}>
+              <Shell route={target} {...props}>
                 <module.default {...props?.props} />
               </Shell>
             );