From 5e963359ad9c0b5a9d9814cd73f0d1398b2ed243 Mon Sep 17 00:00:00 2001
From: Manuel Schiller <manuel.schiller@caligano.de>
Date: Sun, 20 Oct 2024 12:13:56 +0200
Subject: [PATCH] fix(start): make router context available in match context
 after hydration

fixes #2593
---
 packages/start/src/client/serialization.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/start/src/client/serialization.tsx b/packages/start/src/client/serialization.tsx
index c2a28d8f5c..fc1ce0b40d 100644
--- 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,