@tanstack/react-router 0.0.1-beta.13 → 0.0.1-beta.14

package/build/esm/index.js

@@ -1747,10 +1747,16 @@ function createRouter(userOptions) {
       return router.routesById[id];
     },
     notify: () => {
-      router.state = _extends({}, router.state, {
-        isFetching: router.state.status === 'loading' || router.state.matches.some(d => d.isFetching),
-        isPreloading: Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId))
-      });
+      const isFetching = router.state.status === 'loading' || router.state.matches.some(d => d.isFetching);
+      const isPreloading = Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId));
+
+      if (router.state.isFetching !== isFetching || router.state.isPreloading !== isPreloading) {
+        router.state = _extends({}, router.state, {
+          isFetching,
+          isPreloading
+        });
+      }
+
       cascadeLoaderData(router.state.matches);
       router.listeners.forEach(listener => listener(router));
     },
@@ -1769,7 +1775,7 @@ function createRouter(userOptions) {
         invariant(dehydratedMatch, 'Oh no! Dehydrated route matches did not match the active state of the router 😬');
         Object.assign(match, dehydratedMatch);
       });
-      router.loadMatches(matches);
+      matches.forEach(match => match.__.validate());
       router.state = _extends({}, router.state, dehydratedState, {
         matches
       });
@@ -1785,8 +1791,11 @@ function createRouter(userOptions) {
 
       if (next.href !== router.location.href) {
         router.__.commitLocation(next, true);
-      } // router.load()
+      }
 
+      if (!router.state.matches.length) {
+        router.load();
+      }
 
       const unsub = router.history.listen(event => {
         router.load(router.__.parseLocation(event.location, router.location));
@@ -2487,9 +2496,6 @@ const _excluded = ["type", "children", "target", "activeProps", "inactiveProps",
 //
 const matchesContext = /*#__PURE__*/React.createContext(null);
 const routerContext = /*#__PURE__*/React.createContext(null); // Detect if we're in the DOM
-
-const isDOM = Boolean(typeof window !== 'undefined' && window.document && window.document.createElement);
-const useLayoutEffect = isDOM ? React.useLayoutEffect : React.useEffect;
 function MatchesProvider(props) {
   return /*#__PURE__*/React.createElement(matchesContext.Provider, props);
 }
@@ -2671,10 +2677,8 @@ function RouterProvider(_ref2) {
 
   router.update(rest);
   useRouterSubscription(router);
-  useLayoutEffect(() => {
-    const unsub = router.mount();
-    router.load();
-    return unsub;
+  React.useEffect(() => {
+    return router.mount();
   }, [router]);
   return /*#__PURE__*/React.createElement(routerContext.Provider, {
     value: {