@tanstack/react-router 1.97.18 → 1.97.20

package/src/useBlocker.tsx

@@ -230,7 +230,14 @@ export function useBlocker(
     return disabled
       ? undefined
       : history.block({ blockerFn: blockerFnComposed, enableBeforeUnload })
-  }, [shouldBlockFn, enableBeforeUnload, disabled, withResolver, history])
+  }, [
+    shouldBlockFn,
+    enableBeforeUnload,
+    disabled,
+    withResolver,
+    history,
+    router,
+  ])
 
   return resolver
 }

package/src/useNavigate.tsx

@@ -60,7 +60,7 @@ export function Navigate<
     navigate({
       ...props,
     } as any)
-  }, [])
+  }, [navigate, props])
 
   return null
 }

package/src/utils.ts

@@ -54,11 +54,17 @@ export type IsUnion<T, U extends T = T> = (
   ? false
   : true
 
+export type IsNonEmptyObject<T> = T extends object
+  ? keyof T extends never
+    ? false
+    : true
+  : false
+
 export type Assign<TLeft, TRight> = TLeft extends any
   ? TRight extends any
-    ? keyof TLeft extends never
+    ? IsNonEmptyObject<TLeft> extends false
       ? TRight
-      : keyof TRight extends never
+      : IsNonEmptyObject<TRight> extends false
         ? TLeft
         : keyof TLeft & keyof TRight extends never
           ? TLeft & TRight
@@ -66,6 +72,16 @@ export type Assign<TLeft, TRight> = TLeft extends any
     : never
   : never
 
+export type IntersectAssign<TLeft, TRight> = TLeft extends any
+  ? TRight extends any
+    ? IsNonEmptyObject<TLeft> extends false
+      ? TRight
+      : IsNonEmptyObject<TRight> extends false
+        ? TLeft
+        : TRight & TLeft
+    : never
+  : never
+
 export type Timeout = ReturnType<typeof setTimeout>
 
 export type Updater<TPrevious, TResult = TPrevious> =