@tanstack/react-router 1.51.9 → 1.52.2

package/package.json

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

package/src/Match.tsx

@@ -129,8 +129,8 @@ export const MatchInner = React.memo(function MatchInnerImpl({
 
   const out = React.useMemo(() => {
     const Comp = route.options.component ?? router.options.defaultComponent
-    return Comp ? <Comp key={routeId} /> : <Outlet />
-  }, [routeId, route.options.component, router.options.defaultComponent])
+    return Comp ? <Comp /> : <Outlet />
+  }, [route.options.component, router.options.defaultComponent])
 
   // function useChangedDiff(value: any) {
   //   const ref = React.useRef(value)

package/src/router.ts

@@ -2133,7 +2133,7 @@ export class Router<
                 (async () => {
                   const { loaderPromise: prevLoaderPromise } =
                     this.getMatch(matchId)!
-
+                  let loaderRunningAsync = false
                   if (prevLoaderPromise) {
                     await prevLoaderPromise
                   } else {
@@ -2328,13 +2328,12 @@ export class Router<
 
                     // If the route is successful and still fresh, just resolve
                     const { status, invalid } = this.getMatch(matchId)!
-
-                    if (preload && route.options.preload === false) {
-                      // Do nothing
-                    } else if (
+                    loaderRunningAsync =
                       status === 'success' &&
                       (invalid || (shouldReload ?? age > staleAge))
-                    ) {
+                    if (preload && route.options.preload === false) {
+                      // Do nothing
+                    } else if (loaderRunningAsync) {
                       ;(async () => {
                         try {
                           await runLoader()
@@ -2353,7 +2352,7 @@ export class Router<
 
                   updateMatch(matchId, (prev) => ({
                     ...prev,
-                    isFetching: false,
+                    isFetching: loaderRunningAsync ? prev.isFetching : false,
                     loaderPromise: undefined,
                   }))
                 })(),