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

package/build/umd/index.development.js

@@ -9,10 +9,10 @@
  * @license MIT
  */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('use-sync-external-store/shim/with-selector')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'react', 'use-sync-external-store/shim/with-selector'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ReactRouter = {}, global.React, global.withSelector));
-})(this, (function (exports, React, withSelector) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('use-sync-external-store/shim/with-selector'), require('react')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'use-sync-external-store/shim/with-selector', 'react'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ReactRouter = {}, global.withSelector, global.React));
+})(this, (function (exports, withSelector, React) { 'use strict';
 
   function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -34,21 +34,6 @@
 
   var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-  function _extends() {
-    _extends = Object.assign ? Object.assign.bind() : function (target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i];
-        for (var key in source) {
-          if (Object.prototype.hasOwnProperty.call(source, key)) {
-            target[key] = source[key];
-          }
-        }
-      }
-      return target;
-    };
-    return _extends.apply(this, arguments);
-  }
-
   /**
    * @tanstack/store/src/index.ts
    *
@@ -886,6 +871,7 @@
   const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
   class Router {
     #unsubHistory;
+    resetNextScroll = false;
     constructor(options) {
       this.options = {
         defaultPreloadDelay: 50,
@@ -1233,8 +1219,8 @@
           params: routeParams,
           pathname: joinPaths([this.basepath, interpolatedPath]),
           updatedAt: Date.now(),
-          invalidAt: 9999999999999,
-          preloadInvalidAt: 9999999999999,
+          invalidAt: Infinity,
+          preloadInvalidAt: Infinity,
           routeSearch: {},
           search: {},
           status: hasLoaders ? 'pending' : 'success',
@@ -1317,7 +1303,6 @@
       return matches;
     };
     loadMatches = async (resolvedMatches, opts) => {
-      this.cleanMatches();
       if (!opts?.preload) {
         resolvedMatches.forEach(match => {
           // Update each match with its latest route data
@@ -1330,10 +1315,12 @@
             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
@@ -1469,6 +1456,7 @@
         })());
       });
       await Promise.all(matchPromises);
+      this.cleanMatches();
     };
     reload = () => {
       return this.navigate({
@@ -1486,7 +1474,8 @@
       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
@@ -1507,7 +1496,8 @@
         search,
         hash,
         replace,
-        params
+        params,
+        resetScroll
       });
     };
     matchRoute = (location, opts) => {
@@ -1547,7 +1537,8 @@
       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
@@ -1569,7 +1560,8 @@
         params,
         hash,
         replace,
-        state
+        state,
+        resetScroll
       };
       const next = this.buildNext(nextOpts);
       preload = preload ?? this.options.defaultPreload;
@@ -1887,6 +1879,8 @@
         id,
         ...next.state
       });
+      this.resetNextScroll = location.resetScroll ?? true;
+      console.log('resetScroll', this.resetNextScroll);
       return this.latestLoadPromise;
     };
     getRouteMatch = id => {
@@ -1912,7 +1906,7 @@
       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,
@@ -1923,7 +1917,6 @@
         preloadInvalidAt,
         invalidAt
       }));
-      if (this.state.matches.find(d => d.id === id)) ;
     };
     invalidate = async opts => {
       if (opts?.matchId) {
@@ -2106,6 +2099,9 @@
   }
   function restoreScrollPositions(router, opts) {
     if (pathDidChange) {
+      if (!router.resetNextScroll) {
+        return;
+      }
       const getKey = opts?.getKey || defaultGetKey;
       pathDidChange = false;
       const restoreKey = getKey(router.state.location);
@@ -2154,44 +2150,19 @@
     return typeof obj === 'object' && obj !== null && !(obj instanceof Promise) && !obj.then && '__deferredState' in obj;
   }
 
-  const useLayoutEffect = typeof window !== 'undefined' ? React__namespace.useLayoutEffect : React__namespace.useEffect;
-  function useScrollRestoration(options) {
-    const router = useRouter();
-    useLayoutEffect(() => {
-      return watchScrollPositions(router, options);
-    }, []);
-    useLayoutEffect(() => {
-      restoreScrollPositions(router, options);
-    });
-  }
-  function ScrollRestoration(props) {
-    useScrollRestoration(props);
-    return null;
-  }
-
-  function useDeferred({
-    promise
-  }) {
-    const router = useRouter();
-    let state = promise.__deferredState;
-    const key = `__TSR__DEFERRED__${state.uid}`;
-    if (isDehydratedDeferred(promise)) {
-      state = router.hydrateData(key);
-      promise = Promise.resolve(state.data);
-      promise.__deferredState = state;
-    }
-    if (state.status === 'pending') {
-      throw promise;
-    }
-    if (state.status === 'error') {
-      throw state.error;
-    }
-    router.dehydrateData(key, state);
-    return [state.data];
-  }
-  function Deferred(props) {
-    const awaited = useDeferred(props);
-    return props.children(...awaited);
+  function _extends() {
+    _extends = Object.assign ? Object.assign.bind() : function (target) {
+      for (var i = 1; i < arguments.length; i++) {
+        var source = arguments[i];
+        for (var key in source) {
+          if (Object.prototype.hasOwnProperty.call(source, key)) {
+            target[key] = source[key];
+          }
+        }
+      }
+      return target;
+    };
+    return _extends.apply(this, arguments);
   }
 
   Route.__onInit = route => {
@@ -2765,8 +2736,48 @@
     return true;
   }
 
+  const useLayoutEffect = typeof window !== 'undefined' ? React__namespace.useLayoutEffect : React__namespace.useEffect;
+  function useScrollRestoration(options) {
+    const router = useRouter();
+    useLayoutEffect(() => {
+      return watchScrollPositions(router, options);
+    }, []);
+    useLayoutEffect(() => {
+      restoreScrollPositions(router, options);
+    });
+  }
+  function ScrollRestoration(props) {
+    useScrollRestoration(props);
+    return null;
+  }
+
+  function useAwaited({
+    promise
+  }) {
+    const router = useRouter();
+    let state = promise.__deferredState;
+    const key = `__TSR__DEFERRED__${state.uid}`;
+    if (isDehydratedDeferred(promise)) {
+      state = router.hydrateData(key);
+      promise = Promise.resolve(state.data);
+      promise.__deferredState = state;
+    }
+    if (state.status === 'pending') {
+      throw promise;
+    }
+    if (state.status === 'error') {
+      throw state.error;
+    }
+    router.dehydrateData(key, state);
+    return [state.data];
+  }
+  function Await(props) {
+    const awaited = useAwaited(props);
+    return props.children(...awaited);
+  }
+
+  exports.Await = Await;
   exports.Block = Block;
-  exports.Deferred = Deferred;
   exports.ErrorComponent = ErrorComponent;
   exports.FileRoute = FileRoute;
   exports.Link = Link;
@@ -2819,8 +2830,8 @@
   exports.trimPath = trimPath;
   exports.trimPathLeft = trimPathLeft;
   exports.trimPathRight = trimPathRight;
+  exports.useAwaited = useAwaited;
   exports.useBlocker = useBlocker;
-  exports.useDeferred = useDeferred;
   exports.useDehydrate = useDehydrate;
   exports.useHydrate = useHydrate;
   exports.useInjectHtml = useInjectHtml;