@tanstack/react-router 1.77.4 → 1.77.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.77.4",
+  "version": "1.77.6",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/Matches.tsx

@@ -121,6 +121,16 @@ export const isMatch = <TMatch, TPath extends string>(
   return value != null
 }
 
+export type MakeRouteMatchFromRoute<TRoute extends AnyRoute> = RouteMatch<
+  TRoute['types']['id'],
+  TRoute['types']['fullPath'],
+  TRoute['types']['allParams'],
+  TRoute['types']['fullSearchSchema'],
+  TRoute['types']['loaderData'],
+  TRoute['types']['allContext'],
+  TRoute['types']['loaderDeps']
+>
+
 export interface RouteMatch<
   TRouteId,
   TFullPath,

package/src/Transitioner.tsx

@@ -84,7 +84,7 @@ export function Transitioner() {
     if (previousIsLoading && !routerState.isLoading) {
       const toLocation = router.state.location
       const fromLocation = router.state.resolvedLocation
-      const pathChanged = fromLocation.href !== toLocation.href
+      const pathChanged = fromLocation.pathname !== toLocation.pathname
 
       router.emit({
         type: 'onLoad', // When the new URL has committed, when the new matches have been loaded into state.matches
@@ -100,7 +100,7 @@ export function Transitioner() {
     if (previousIsPagePending && !isPagePending) {
       const toLocation = router.state.location
       const fromLocation = router.state.resolvedLocation
-      const pathChanged = fromLocation.href !== toLocation.href
+      const pathChanged = fromLocation.pathname !== toLocation.pathname
 
       router.emit({
         type: 'onBeforeRouteMount',
@@ -116,7 +116,7 @@ export function Transitioner() {
     if (previousIsAnyPending && !isAnyPending) {
       const toLocation = router.state.location
       const fromLocation = router.state.resolvedLocation
-      const pathChanged = fromLocation.href !== toLocation.href
+      const pathChanged = fromLocation.pathname !== toLocation.pathname
 
       router.emit({
         type: 'onResolved',

package/src/route.ts

@@ -11,7 +11,12 @@ import { rootRouteId } from './root'
 import type * as React from 'react'
 import type { RootRouteId } from './root'
 import type { UseNavigateResult } from './useNavigate'
-import type { MakeRouteMatch, MakeRouteMatchUnion, RouteMatch } from './Matches'
+import type {
+  MakeRouteMatch,
+  MakeRouteMatchFromRoute,
+  MakeRouteMatchUnion,
+  RouteMatch,
+} from './Matches'
 import type { NavigateOptions, ParsePathParams, ToMaskOptions } from './link'
 import type { ParsedLocation } from './location'
 import type { RouteById, RouteIds, RoutePaths } from './routeInfo'
@@ -591,7 +596,7 @@ export interface LoaderFnContext<
    * @deprecated Use `throw redirect({ to: '/somewhere' })` instead
    **/
   navigate: (opts: NavigateOptions<AnyRouter>) => Promise<void>
-  parentMatchPromise?: Promise<void>
+  parentMatchPromise?: Promise<MakeRouteMatchFromRoute<TParentRoute>>
   cause: 'preload' | 'enter' | 'stay'
   route: Route
 }

package/src/router.ts

@@ -2299,7 +2299,7 @@ export class Router<
             }
 
             const validResolvedMatches = matches.slice(0, firstBadMatchIndex)
-            const matchPromises: Array<Promise<any>> = []
+            const matchPromises: Array<Promise<AnyRouteMatch>> = []
 
             validResolvedMatches.forEach(({ id: matchId, routeId }, index) => {
               matchPromises.push(
@@ -2535,6 +2535,7 @@ export class Router<
                     loaderPromise: undefined,
                     invalid: false,
                   }))
+                  return this.getMatch(matchId)!
                 })(),
               )
             })