@tanstack/react-router 1.3.6 → 1.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "1.3.6",
+  "version": "1.4.0",
   "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.0"
   },
   "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
 }