@tanstack/react-router 1.4.7 → 1.4.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.4.7"
+    "@tanstack/history": "1.4.8"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/router.ts

@@ -1060,9 +1060,9 @@ export class Router<
 
           const pendingMs =
             route.options.pendingMs ?? this.options.defaultPendingMs
-          const pendingPromise = new Promise<void>((r) =>
-            setTimeout(r, pendingMs),
-          )
+          const pendingPromise = typeof pendingMs === 'number' && pendingMs <= 0
+            ? Promise.resolve()
+            : new Promise<void>((r) => setTimeout(r, pendingMs))
 
           const beforeLoadContext =
             (await route.options.beforeLoad?.({
@@ -1145,7 +1145,7 @@ export class Router<
             route.options.pendingMinMs ?? this.options.defaultPendingMinMs
           const shouldPending =
             !preload &&
-            pendingMs &&
+            typeof pendingMs === 'number' &&
             (route.options.pendingComponent ??
               this.options.defaultPendingComponent)
 

package/src/utils.ts

@@ -156,7 +156,8 @@ export function replaceEqualDeep<T>(prev: any, _next: T): T {
   const array = isPlainArray(prev) && isPlainArray(next)
 
   if (array || (isPlainObject(prev) && isPlainObject(next))) {
-    const prevSize = array ? prev.length : Object.keys(prev).length
+    const prevItems = array ? prev : Object.keys(prev)
+    const prevSize = prevItems.length
     const nextItems = array ? next : Object.keys(next)
     const nextSize = nextItems.length
     const copy: any = array ? [] : {}
@@ -165,9 +166,19 @@ export function replaceEqualDeep<T>(prev: any, _next: T): T {
 
     for (let i = 0; i < nextSize; i++) {
       const key = array ? i : nextItems[i]
-      copy[key] = replaceEqualDeep(prev[key], next[key])
-      if (copy[key] === prev[key] && prev[key] !== undefined) {
+      if (
+        !array &&
+        prev[key] === undefined &&
+        next[key] === undefined &&
+        prevItems.includes(key)
+      ) {
+        copy[key] = undefined
         equalItems++
+      } else {
+        copy[key] = replaceEqualDeep(prev[key], next[key])
+        if (copy[key] === prev[key] && prev[key] !== undefined) {
+          equalItems++
+        }
       }
     }