@tanstack/react-router 0.0.1-beta.35 → 0.0.1-beta.37

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.35",
+  "version": "0.0.1-beta.37",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router/",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@tanstack/router-core": "0.0.1-beta.35",
+    "@tanstack/router-core": "0.0.1-beta.36",
     "use-sync-external-store": "^1.2.0"
   },
   "devDependencies": {

package/src/index.tsx

@@ -424,13 +424,10 @@ export function createReactRouter<
         useMatch: (routeId, opts) => {
           useRouterSubscription(router)
 
-          invariant(
-            routeId !== rootRouteId,
-            `"${rootRouteId}" cannot be used with useMatch! Did you mean to useRoute("${rootRouteId}")?`,
-          )
-
           const nearestMatch = useNearestMatch()
-          const match = router.state.matches.find((d) => d.routeId === routeId)
+          const match = router.state.currentMatches.find(
+            (d) => d.routeId === routeId,
+          )
 
           if (opts?.strict ?? true) {
             invariant(
@@ -504,7 +501,7 @@ export function RouterProvider<
   return (
     <>
       <routerContext.Provider value={{ router: router as any }}>
-        <MatchesProvider value={[undefined!, ...router.state.matches]}>
+        <MatchesProvider value={[undefined!, ...router.state.currentMatches]}>
           <Outlet />
         </MatchesProvider>
       </routerContext.Provider>
@@ -569,7 +566,7 @@ export function useRoute<
 export function useSearch<
   TId extends keyof RegisteredAllRouteInfo['routeInfoById'] = keyof RegisteredAllRouteInfo['routeInfoById'],
 >(_routeId?: TId): RegisteredAllRouteInfo['fullSearchSchema'] {
-  return useRouter().state.location.search
+  return useRouter().state.currentLocation.search
 }
 
 export function linkProps<TTo extends string = '.'>(
@@ -695,10 +692,10 @@ function CatchBoundaryInner(props: {
 
   React.useEffect(() => {
     if (activeErrorState) {
-      let prevKey = router.state.location.key
+      let prevKey = router.state.currentLocation.key
       return router.subscribe(() => {
-        if (router.state.location.key !== prevKey) {
-          prevKey = router.state.location.key
+        if (router.state.currentLocation.key !== prevKey) {
+          prevKey = router.state.currentLocation.key
           setActiveErrorState({} as any)
         }
       })
@@ -758,12 +755,12 @@ export function usePrompt(message: string, when: boolean | any): void {
         unblock()
         transition.retry()
       } else {
-        router.state.location.pathname = window.location.pathname
+        router.state.currentLocation.pathname = window.location.pathname
       }
     })
 
     return unblock
-  }, [when, location, message])
+  }, [when, message])
 }
 
 export function Prompt({ message, when, children }: PromptProps) {