@tanstack/react-router 1.12.9 → 1.12.11

package/dist/esm/routerContext.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { Router } from './router';
-export declare let routerContext: React.Context<Router<any, Record<string, any>, Record<string, any>>>;
+export declare function getRouterContext(): React.Context<Router<any, Record<string, any>, Record<string, any>>>;

package/dist/esm/routerContext.js

@@ -1,13 +1,16 @@
 import * as React from "react";
 let routerContext = React.createContext(null);
-if (typeof document !== "undefined") {
+function getRouterContext() {
+  if (typeof document === "undefined") {
+    return routerContext;
+  }
   if (window.__TSR_ROUTER_CONTEXT__) {
-    routerContext = window.__TSR_ROUTER_CONTEXT__;
-  } else {
-    window.__TSR_ROUTER_CONTEXT__ = routerContext;
+    return window.__TSR_ROUTER_CONTEXT__;
   }
+  window.__TSR_ROUTER_CONTEXT__ = routerContext;
+  return routerContext;
 }
 export {
-  routerContext
+  getRouterContext
 };
 //# sourceMappingURL=routerContext.js.map

package/dist/esm/routerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as React from 'react'\nimport { Router } from './router'\n\nexport let routerContext = React.createContext<Router<any>>(null!)\nif (typeof document !== 'undefined') {\n  if (window.__TSR_ROUTER_CONTEXT__) {\n    routerContext = window.__TSR_ROUTER_CONTEXT__\n  } else {\n    window.__TSR_ROUTER_CONTEXT__ = routerContext as any\n  }\n}\n"],"names":[],"mappings":";AAGW,IAAA,gBAAgB,MAAM,cAA2B,IAAK;AACjE,IAAI,OAAO,aAAa,aAAa;AACnC,MAAI,OAAO,wBAAwB;AACjC,oBAAgB,OAAO;AAAA,EAAA,OAClB;AACL,WAAO,yBAAyB;AAAA,EAClC;AACF;"}
+{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as React from 'react'\nimport { Router } from './router'\n\nlet routerContext = React.createContext<Router<any>>(null!)\n\nexport function getRouterContext() {\n  if (typeof document === 'undefined') {\n    return routerContext\n  }\n\n  if (window.__TSR_ROUTER_CONTEXT__) {\n    return window.__TSR_ROUTER_CONTEXT__\n  }\n\n  window.__TSR_ROUTER_CONTEXT__ = routerContext as any\n\n  return routerContext\n}\n"],"names":[],"mappings":";AAGA,IAAI,gBAAgB,MAAM,cAA2B,IAAK;AAEnD,SAAS,mBAAmB;AAC7B,MAAA,OAAO,aAAa,aAAa;AAC5B,WAAA;AAAA,EACT;AAEA,MAAI,OAAO,wBAAwB;AACjC,WAAO,OAAO;AAAA,EAChB;AAEA,SAAO,yBAAyB;AAEzB,SAAA;AACT;"}

package/dist/esm/useRouter.js

@@ -1,9 +1,8 @@
 import * as React from "react";
 import warning from "tiny-warning";
-import { routerContext } from "./routerContext.js";
+import { getRouterContext } from "./routerContext.js";
 function useRouter(opts) {
-  const resolvedContext = typeof document !== "undefined" ? window.__TSR_ROUTER_CONTEXT__ || routerContext : routerContext;
-  const value = React.useContext(resolvedContext);
+  const value = React.useContext(getRouterContext());
   warning(
     !(((opts == null ? void 0 : opts.warn) ?? true) && !value),
     "useRouter must be used inside a <RouterProvider> component!"

package/dist/esm/useRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRouter.js","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as React from 'react'\nimport warning from 'tiny-warning'\nimport { AnyRoute } from './route'\nimport { RegisteredRouter, Router } from './router'\nimport { routerContext } from './routerContext'\n\nexport function useRouter<\n  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n>(opts?: { warn?: boolean }): Router<TRouteTree> {\n  const resolvedContext =\n    typeof document !== 'undefined'\n      ? window.__TSR_ROUTER_CONTEXT__ || routerContext\n      : routerContext\n  const value = React.useContext(resolvedContext)\n  warning(\n    !((opts?.warn ?? true) && !value),\n    'useRouter must be used inside a <RouterProvider> component!',\n  )\n  return value as any\n}\n"],"names":[],"mappings":";;;AAMO,SAAS,UAEd,MAA+C;AAC/C,QAAM,kBACJ,OAAO,aAAa,cAChB,OAAO,0BAA0B,gBACjC;AACA,QAAA,QAAQ,MAAM,WAAW,eAAe;AAC9C;AAAA,IACE,IAAG,6BAAM,SAAQ,SAAS,CAAC;AAAA,IAC3B;AAAA,EAAA;AAEK,SAAA;AACT;"}
+{"version":3,"file":"useRouter.js","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as React from 'react'\nimport warning from 'tiny-warning'\nimport { AnyRoute } from './route'\nimport { RegisteredRouter, Router } from './router'\nimport { getRouterContext } from './routerContext'\n\nexport function useRouter<\n  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],\n>(opts?: { warn?: boolean }): Router<TRouteTree> {\n  const value = React.useContext(getRouterContext())\n  warning(\n    !((opts?.warn ?? true) && !value),\n    'useRouter must be used inside a <RouterProvider> component!',\n  )\n  return value as any\n}\n"],"names":[],"mappings":";;;AAMO,SAAS,UAEd,MAA+C;AAC/C,QAAM,QAAQ,MAAM,WAAW,iBAAkB,CAAA;AACjD;AAAA,IACE,IAAG,6BAAM,SAAQ,SAAS,CAAC;AAAA,IAC3B;AAAA,EAAA;AAEK,SAAA;AACT;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.12.9",
+  "version": "1.12.11",
   "description": "",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/RouterProvider.tsx

@@ -10,7 +10,7 @@ import { pick, useLayoutEffect } from './utils'
 import { RouteMatch } from './Matches'
 import { useRouter } from './useRouter'
 import { useRouterState } from './useRouterState'
-import { routerContext } from './routerContext'
+import { getRouterContext } from './routerContext'
 
 const useTransition =
   React.useTransition ||
@@ -78,6 +78,8 @@ export function RouterProvider<
     <Matches />
   )
 
+  const routerContext = getRouterContext()
+
   const provider = (
     <routerContext.Provider value={router}>
       {matches}
@@ -197,10 +199,10 @@ function Transitioner() {
   ])
 
   useLayoutEffect(() => {
-    if (window.__TSR_DEHYDRATED__) return
     if (
-      mountLoadForRouter.current.router === router &&
-      mountLoadForRouter.current.mounted
+      window.__TSR_DEHYDRATED__ ||
+      (mountLoadForRouter.current.router === router &&
+        mountLoadForRouter.current.mounted)
     ) {
       return
     }

package/src/path.ts

@@ -220,7 +220,9 @@ export function matchByPath(
       if (routeSegment) {
         if (routeSegment.type === 'wildcard') {
           if (baseSegment?.value) {
-            const _splat = joinPaths(baseSegments.slice(i).map((d) => d.value))
+            const _splat = decodeURI(
+              joinPaths(baseSegments.slice(i).map((d) => d.value)),
+            )
             // TODO: Deprecate *
             params['*'] = _splat
             params['_splat'] = _splat
@@ -257,7 +259,9 @@ export function matchByPath(
             return false
           }
           if (baseSegment.value.charAt(0) !== '$') {
-            params[routeSegment.value.substring(1)] = baseSegment.value
+            params[routeSegment.value.substring(1)] = decodeURI(
+              baseSegment.value,
+            )
           }
         }
       }

package/src/router.ts

@@ -509,13 +509,14 @@ export class Router<
       state,
     }: HistoryLocation): ParsedLocation<FullSearchSchema<TRouteTree>> => {
       const parsedSearch = this.options.parseSearch(search)
+      const searchStr = this.options.stringifySearch(parsedSearch)
 
       return {
         pathname: pathname,
-        searchStr: search,
+        searchStr,
         search: replaceEqualDeep(previousLocation?.search, parsedSearch) as any,
         hash: hash.split('#').reverse()[0] ?? '',
-        href: `${pathname}${search}${hash}`,
+        href: `${pathname}${searchStr}${hash}`,
         state: replaceEqualDeep(previousLocation?.state, state) as HistoryState,
       }
     }

package/src/routerContext.tsx

@@ -1,11 +1,18 @@
 import * as React from 'react'
 import { Router } from './router'
 
-export let routerContext = React.createContext<Router<any>>(null!)
-if (typeof document !== 'undefined') {
+let routerContext = React.createContext<Router<any>>(null!)
+
+export function getRouterContext() {
+  if (typeof document === 'undefined') {
+    return routerContext
+  }
+
   if (window.__TSR_ROUTER_CONTEXT__) {
-    routerContext = window.__TSR_ROUTER_CONTEXT__
-  } else {
-    window.__TSR_ROUTER_CONTEXT__ = routerContext as any
+    return window.__TSR_ROUTER_CONTEXT__
   }
+
+  window.__TSR_ROUTER_CONTEXT__ = routerContext as any
+
+  return routerContext
 }

package/src/useRouter.tsx

@@ -2,16 +2,12 @@ import * as React from 'react'
 import warning from 'tiny-warning'
 import { AnyRoute } from './route'
 import { RegisteredRouter, Router } from './router'
-import { routerContext } from './routerContext'
+import { getRouterContext } from './routerContext'
 
 export function useRouter<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
 >(opts?: { warn?: boolean }): Router<TRouteTree> {
-  const resolvedContext =
-    typeof document !== 'undefined'
-      ? window.__TSR_ROUTER_CONTEXT__ || routerContext
-      : routerContext
-  const value = React.useContext(resolvedContext)
+  const value = React.useContext(getRouterContext())
   warning(
     !((opts?.warn ?? true) && !value),
     'useRouter must be used inside a <RouterProvider> component!',