@tanstack/router-core 0.0.1-beta.182 → 0.0.1-beta.183

package/build/esm/index.js

@@ -746,6 +746,16 @@ class Router {
             return next.matchesById[id];
           });
         }
+        if (matchesByIdChanged || matchesChanged || pendingMatchesChanged) {
+          const hasPendingComponent = next.pendingMatches.some(d => {
+            const route = this.getRoute(d.routeId);
+            return !!route?.options.pendingComponent;
+          });
+          next.renderedMatchIds = hasPendingComponent ? next.pendingMatchIds : next.matchIds;
+          next.renderedMatches = next.renderedMatchIds.map(id => {
+            return next.matchesById[id];
+          });
+        }
         next.isFetching = [...next.matches, ...next.pendingMatches].some(d => d.isFetching);
         this.state = next;
       },
@@ -959,20 +969,10 @@ class Router {
     return this.latestLoadPromise;
   };
   #mergeMatches = (prevMatchesById, nextMatches) => {
-    const nextMatchesById = {
-      ...prevMatchesById
+    return {
+      ...prevMatchesById,
+      ...Object.fromEntries(nextMatches.map(match => [match.id, match]))
     };
-    let hadNew = false;
-    nextMatches.forEach(match => {
-      if (!nextMatchesById[match.id]) {
-        hadNew = true;
-        nextMatchesById[match.id] = match;
-      }
-    });
-    if (!hadNew) {
-      return prevMatchesById;
-    }
-    return nextMatchesById;
   };
   getRoute = id => {
     const route = this.routesById[id];
@@ -1122,14 +1122,17 @@ class Router {
         };
         try {
           const validator = typeof route.options.validateSearch === 'object' ? route.options.validateSearch.parse : route.options.validateSearch;
-          const routeSearch = validator?.(parentSearchInfo.search) ?? {};
-          const search = {
+          let routeSearch = validator?.(parentSearchInfo.search) ?? {};
+          let search = {
             ...parentSearchInfo.search,
             ...routeSearch
           };
+          routeSearch = replaceEqualDeep(match.routeSearch, routeSearch);
+          search = replaceEqualDeep(match.search, search);
           return {
-            routeSearch: replaceEqualDeep(match.routeSearch, routeSearch),
-            search: replaceEqualDeep(match.search, search)
+            routeSearch,
+            search,
+            searchDidChange: match.routeSearch !== routeSearch
           };
         } catch (err) {
           match.searchError = new SearchParamError(err.message, {
@@ -1710,7 +1713,6 @@ class Router {
   };
   #commitLocation = async location => {
     const next = this.buildNext(location);
-    const id = '' + Date.now() + Math.random();
     if (this.navigateTimeout) clearTimeout(this.navigateTimeout);
     let nextAction = 'replace';
     if (!location.replace) {
@@ -1721,10 +1723,7 @@ class Router {
       nextAction = 'replace';
     }
     const href = `${next.pathname}${next.searchStr}${next.hash ? `#${next.hash}` : ''}`;
-    this.history[nextAction === 'push' ? 'push' : 'replace'](href, {
-      id,
-      ...next.state
-    });
+    this.history[nextAction === 'push' ? 'push' : 'replace'](href, next.state);
     this.resetNextScroll = location.resetScroll ?? true;
     return this.latestLoadPromise;
   };
@@ -1810,6 +1809,8 @@ function getInitialRouterState() {
     pendingMatchIds: [],
     matches: [],
     pendingMatches: [],
+    renderedMatchIds: [],
+    renderedMatches: [],
     lastUpdated: Date.now()
   };
 }