@tanstack/router-core 0.0.1-beta.167 → 0.0.1-beta.169

package/build/esm/index.js

@@ -711,6 +711,7 @@ function stringifySearchWith(stringify, parser) {
 const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
 class Router {
   #unsubHistory;
+  resetNextScroll = false;
   constructor(options) {
     this.options = {
       defaultPreloadDelay: 50,
@@ -1058,8 +1059,8 @@ class Router {
         params: routeParams,
         pathname: joinPaths([this.basepath, interpolatedPath]),
         updatedAt: Date.now(),
-        invalidAt: 9999999999999,
-        preloadInvalidAt: 9999999999999,
+        invalidAt: Infinity,
+        preloadInvalidAt: Infinity,
         routeSearch: {},
         search: {},
         status: hasLoaders ? 'pending' : 'success',
@@ -1142,7 +1143,6 @@ class Router {
     return matches;
   };
   loadMatches = async (resolvedMatches, opts) => {
-    this.cleanMatches();
     if (!opts?.preload) {
       resolvedMatches.forEach(match => {
         // Update each match with its latest route data
@@ -1155,10 +1155,12 @@ class Router {
           error: match.error,
           paramsError: match.paramsError,
           searchError: match.searchError,
-          params: match.params
+          params: match.params,
+          preloadInvalidAt: 0
         }));
       });
     }
+    this.cleanMatches();
     let firstBadMatchIndex;
 
     // Check each match middleware to see if the route can be accessed
@@ -1294,6 +1296,7 @@ class Router {
       })());
     });
     await Promise.all(matchPromises);
+    this.cleanMatches();
   };
   reload = () => {
     return this.navigate({
@@ -1311,7 +1314,8 @@ class Router {
     search,
     hash,
     replace,
-    params
+    params,
+    resetScroll
   }) => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
@@ -1332,7 +1336,8 @@ class Router {
       search,
       hash,
       replace,
-      params
+      params,
+      resetScroll
     });
   };
   matchRoute = (location, opts) => {
@@ -1372,7 +1377,8 @@ class Router {
     preload,
     preloadDelay: userPreloadDelay,
     disabled,
-    state
+    state,
+    resetScroll
   }) => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
@@ -1394,7 +1400,8 @@ class Router {
       params,
       hash,
       replace,
-      state
+      state,
+      resetScroll
     };
     const next = this.buildNext(nextOpts);
     preload = preload ?? this.options.defaultPreload;
@@ -1712,6 +1719,8 @@ class Router {
       id,
       ...next.state
     });
+    this.resetNextScroll = location.resetScroll ?? true;
+    console.log('resetScroll', this.resetNextScroll);
     return this.latestLoadPromise;
   };
   getRouteMatch = id => {
@@ -1737,7 +1746,7 @@ class Router {
     const route = this.getRoute(match.routeId);
     const updatedAt = opts?.updatedAt ?? Date.now();
     const preloadInvalidAt = updatedAt + (opts?.maxAge ?? route.options.preloadMaxAge ?? this.options.defaultPreloadMaxAge ?? 5000);
-    const invalidAt = updatedAt + (opts?.maxAge ?? route.options.maxAge ?? this.options.defaultMaxAge ?? 9999999999999);
+    const invalidAt = updatedAt + (opts?.maxAge ?? route.options.maxAge ?? this.options.defaultMaxAge ?? Infinity);
     this.setRouteMatch(id, s => ({
       ...s,
       error: undefined,
@@ -1748,7 +1757,6 @@ class Router {
       preloadInvalidAt,
       invalidAt
     }));
-    if (this.state.matches.find(d => d.id === id)) ;
   };
   invalidate = async opts => {
     if (opts?.matchId) {
@@ -1931,6 +1939,9 @@ function watchScrollPositions(router, opts) {
 }
 function restoreScrollPositions(router, opts) {
   if (pathDidChange) {
+    if (!router.resetNextScroll) {
+      return;
+    }
     const getKey = opts?.getKey || defaultGetKey;
     pathDidChange = false;
     const restoreKey = getKey(router.state.location);