fix(start): make router context available in match context after hydr…

…ation (#2598) fixes #2593
TanStack · Oct 20, 2024 · 82c2f49 · 82c2f49
1 parent 4f072ff
commit 82c2f49
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/start/src/client/serialization.tsx b/packages/start/src/client/serialization.tsx
@@ -79,7 +79,7 @@ export function afterHydrate({ router }: { router: AnyRouter }) {
     const dMatch = window.__TSR__?.matches[match.index]
     if (dMatch) {
       const parentMatch = router.state.matches[match.index - 1]
-      const parentContext = parentMatch?.context ?? {}
+      const parentContext = parentMatch?.context ?? router.options.context ?? {}
       if (dMatch.__beforeLoadContext) {
         match.__beforeLoadContext = router.options.transformer.parse(
           dMatch.__beforeLoadContext,