@tanstack/react-router 1.3.6 → 1.4.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "1.3.6",
+  "version": "1.4.1",
   "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.3.6"
+    "@tanstack/history": "1.4.1"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/RouterProvider.tsx

@@ -235,12 +235,16 @@ export function getRouteMatch<TRouteTree extends AnyRoute>(
 }
 
 export function useRouterState<
-  TSelected = RouterState<RegisteredRouter['routeTree']>,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
+  TSelected = RouterState<TRouteTree>,
 >(opts?: {
+  router?: Router<TRouteTree>
   select: (state: RouterState<RegisteredRouter['routeTree']>) => TSelected
 }): TSelected {
-  const router = useRouter()
-  return useStore(router.__store, opts?.select as any)
+  const contextRouter = useRouter<TRouteTree>({
+    warn: opts?.router === undefined,
+  })
+  return useStore((opts?.router || contextRouter).__store, opts?.select as any)
 }
 
 export type RouterProps<
@@ -253,12 +257,15 @@ export type RouterProps<
 
 export function useRouter<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
->(): Router<TRouteTree> {
+>(opts?: { warn?: boolean }): Router<TRouteTree> {
   const resolvedContext =
     typeof document !== 'undefined'
       ? window.__TSR_ROUTER_CONTEXT__ || routerContext
       : routerContext
   const value = React.useContext(resolvedContext)
-  warning(value, 'useRouter must be used inside a <RouterProvider> component!')
+  warning(
+    opts?.warn && value,
+    'useRouter must be used inside a <RouterProvider> component!',
+  )
   return value as any
 }

package/src/utils.ts

@@ -141,7 +141,7 @@ export function pick<T, K extends keyof T>(parent: T, keys: K[]): Pick<T, K> {
 }
 
 /**
- * This function returns `a` if `b` is deeply equal.
+ * This function returns `prev` if `_next` is deeply equal.
  * If not, it will replace any deeply equal children of `b` with those of `a`.
  * This can be used for structural sharing between immutable JSON values for example.
  * Do not use this with signals
@@ -153,7 +153,7 @@ export function replaceEqualDeep<T>(prev: any, _next: T): T {
 
   const next = _next as any
 
-  const array = Array.isArray(prev) && Array.isArray(next)
+  const array = isPlainArray(prev) && isPlainArray(next)
 
   if (array || (isPlainObject(prev) && isPlainObject(next))) {
     const prevSize = array ? prev.length : Object.keys(prev).length
@@ -208,6 +208,10 @@ function hasObjectPrototype(o: any) {
   return Object.prototype.toString.call(o) === '[object Object]'
 }
 
+export function isPlainArray(value: unknown) {
+  return Array.isArray(value) && value.length === Object.keys(value).length
+}
+
 export function deepEqual(a: any, b: any, partial: boolean = false): boolean {
   if (a === b) {
     return true