fix(v8/react): From location can be undefined in Tanstack Router Inst…

…rumentation (#15237) backport of #15235 and #15241 --------- Co-authored-by: Tanner Linsley <[email protected]> Co-authored-by: Francesco Novy <[email protected]>
getsentry · Jan 31, 2025 · ef4f210 · ef4f210
1 parent 4df3759
commit ef4f210
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/react/src/tanstackrouter.ts b/packages/react/src/tanstackrouter.ts
@@ -64,8 +64,9 @@ export function tanstackRouterBrowserTracingIntegration(
       if (instrumentNavigation) {
         // The onBeforeNavigate hook is called at the very beginning of a navigation and is only called once per navigation, even when the user is redirected
         castRouterInstance.subscribe('onBeforeNavigate', onBeforeNavigateArgs => {
+          const fromLocationState = onBeforeNavigateArgs.fromLocation && onBeforeNavigateArgs.fromLocation.state;
           // onBeforeNavigate is called during pageloads. We can avoid creating navigation spans by comparing the states of the to and from arguments.
-          if (onBeforeNavigateArgs.toLocation.state === onBeforeNavigateArgs.fromLocation.state) {
+          if (onBeforeNavigateArgs.toLocation.state === fromLocationState) {
             return;
           }
 

diff --git a/packages/react/src/vendor/tanstackrouter-types.ts b/packages/react/src/vendor/tanstackrouter-types.ts
@@ -46,7 +46,7 @@ export interface VendoredTanstackRouter {
     eventType: 'onResolved' | 'onBeforeNavigate',
     callback: (stateUpdate: {
       toLocation: VendoredTanstackRouterLocation;
-      fromLocation: VendoredTanstackRouterLocation;
+      fromLocation?: VendoredTanstackRouterLocation;
     }) => void,
   ): () => void;
 }