@tanstack/router-core 1.115.3 → 1.117.1

package/package.json

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

package/src/router.ts

@@ -670,7 +670,15 @@ export type AnyRouterWithContext<TContext> = RouterCore<
 export type AnyRouter = RouterCore<any, any, any, any, any>
 
 export interface ViewTransitionOptions {
-  types: Array<string>
+  types:
+    | Array<string>
+    | ((locationChangeInfo: {
+        fromLocation?: ParsedLocation
+        toLocation: ParsedLocation
+        pathChanged: boolean
+        hrefChanged: boolean
+        hashChanged: boolean
+      }) => Array<string>)
 }
 
 export function defaultSerializeError(err: unknown) {
@@ -2172,9 +2180,22 @@ export class RouterCore<
         typeof shouldViewTransition === 'object' &&
         this.isViewTransitionTypesSupported
       ) {
+        const next = this.latestLocation
+        const prevLocation = this.state.resolvedLocation
+
+        const resolvedViewTransitionTypes =
+          typeof shouldViewTransition.types === 'function'
+            ? shouldViewTransition.types(
+                getLocationChangeInfo({
+                  resolvedLocation: prevLocation,
+                  location: next,
+                }),
+              )
+            : shouldViewTransition.types
+
         startViewTransitionParams = {
           update: fn,
-          types: shouldViewTransition.types,
+          types: resolvedViewTransitionTypes,
         }
       } else {
         startViewTransitionParams = fn
@@ -2253,10 +2274,6 @@ export class RouterCore<
       return !!(allPreload && !this.state.matches.find((d) => d.id === matchId))
     }
 
-    if (!this.isServer && !this.state.matches.length) {
-      triggerOnReady()
-    }
-
     const handleRedirectAndNotFound = (match: AnyRouteMatch, err: any) => {
       if (isResolvedRedirect(err)) {
         if (!err.reloadDocument) {
@@ -2362,7 +2379,9 @@ export class RouterCore<
                 onReady &&
                 !this.isServer &&
                 !resolvePreload(matchId) &&
-                (route.options.loader || route.options.beforeLoad) &&
+                (route.options.loader ||
+                  route.options.beforeLoad ||
+                  routeNeedsPreload(route)) &&
                 typeof pendingMs === 'number' &&
                 pendingMs !== Infinity &&
                 (route.options.pendingComponent ??
@@ -2647,6 +2666,10 @@ export class RouterCore<
                             loaderData,
                           })
 
+                          // Last but not least, wait for the the components
+                          // to be preloaded before we resolve the match
+                          await route._componentsPromise
+
                           updateMatch(matchId, (prev) => ({
                             ...prev,
                             error: undefined,
@@ -2689,10 +2712,6 @@ export class RouterCore<
                           router: this,
                           match: this.getMatch(matchId)!,
                         })
-
-                        // Last but not least, wait for the the components
-                        // to be preloaded before we resolve the match
-                        await route._componentsPromise
                       } catch (err) {
                         updateMatch(matchId, (prev) => ({
                           ...prev,