@tanstack/react-router 1.131.28 → 1.131.31

package/dist/llms/rules/guide.js

@@ -2256,7 +2256,7 @@ Literally any library that **can return a promise and read/write data** can be i
 
 ## Using Loaders to ensure data is loaded
 
-The easiest way to use integrate and external caching/data library into Router is to use \`route.loader\`s to ensure that the data required inside of a route has been loaded and is ready to be displayed.
+The easiest way to integrate external caching/data library into Router is to use \`route.loader\`s to ensure that the data required inside of a route has been loaded and is ready to be displayed.
 
 > ⚠️ BUT WHY? It's very important to preload your critical render data in the loader for a few reasons:
 >
@@ -2324,7 +2324,7 @@ export const Route = createFileRoute('/posts')({
 
 ### Error handling with TanStack Query
 
-When an error occurs while using \`suspense\` with \`TanStack Query\`, you'll need to let queries know that you want to try again when re-rendering. This can be done by using the \`reset\` function provided by the \`useQueryErrorResetBoundary\` hook. We can invoke this function in an effect as soon as the error component mounts. This will make sure that the query is reset and will try to fetch data again when the route component is rendered again. This will also cover cases where users navigate away from our route instead of clicking the \`retry\` button.
+When an error occurs while using \`suspense\` with \`TanStack Query\`, you need to let queries know that you want to try again when re-rendering. This can be done by using the \`reset\` function provided by the \`useQueryErrorResetBoundary\` hook. You can invoke this function in an effect as soon as the error component mounts. This will make sure that the query is reset and will try to fetch data again when the route component is rendered again. This will also cover cases where users navigate away from the route instead of clicking the \`retry\` button.
 
 \`\`\`tsx
 export const Route = createFileRoute('/')({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.131.28",
+  "version": "1.131.31",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -80,7 +80,7 @@
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
     "@tanstack/history": "1.131.2",
-    "@tanstack/router-core": "1.131.28"
+    "@tanstack/router-core": "1.131.30"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",

package/src/link.tsx

@@ -7,7 +7,6 @@ import {
   preloadWarning,
   removeTrailingSlash,
 } from '@tanstack/router-core'
-import { useActiveLocation } from './useActiveLocation'
 import { useRouterState } from './useRouterState'
 import { useRouter } from './useRouter'
 
@@ -99,15 +98,7 @@ export function useLinkProps<
     structuralSharing: true as any,
   })
 
-  // subscribe to location here to re-build fromPath if it changes
-  const routerLocation = useRouterState({
-    select: (s) => s.location,
-    structuralSharing: true as any,
-  })
-
-  const { getFromPath } = useActiveLocation()
-
-  const from = getFromPath(options.from)
+  const from = options.from
 
   const _options = React.useMemo(
     () => {
@@ -116,7 +107,6 @@ export function useLinkProps<
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       router,
-      routerLocation,
       currentSearch,
       from,
       options._fromLocation,

package/src/useNavigate.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react'
 import { useRouter } from './useRouter'
-import { useActiveLocation } from './useActiveLocation'
 import type {
   AnyRouter,
   FromPathOption,
@@ -17,19 +16,14 @@ export function useNavigate<
 }): UseNavigateResult<TDefaultFrom> {
   const router = useRouter()
 
-  const { getFromPath, activeLocation } = useActiveLocation()
-
   return React.useCallback(
     (options: NavigateOptions) => {
-      const from = getFromPath(options.from ?? _defaultOpts?.from)
-
       return router.navigate({
         ...options,
-        from,
+        from: options.from ?? _defaultOpts?.from,
       })
     },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [_defaultOpts?.from, router, getFromPath, activeLocation],
+    [_defaultOpts?.from, router],
   ) as UseNavigateResult<TDefaultFrom>
 }
 

package/dist/cjs/useActiveLocation.cjs

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const routerCore = require("@tanstack/router-core");
-const React = require("react");
-const useRouter = require("./useRouter.cjs");
-const useMatch = require("./useMatch.cjs");
-const useRouterState = require("./useRouterState.cjs");
-const useActiveLocation = (location) => {
-  const router = useRouter.useRouter();
-  const routerLocation = useRouterState.useRouterState({ select: (state) => state.location });
-  const [activeLocation, setActiveLocation] = React.useState(
-    routerLocation
-  );
-  const [customActiveLocation, setCustomActiveLocation] = React.useState(location);
-  React.useEffect(() => {
-    setActiveLocation(customActiveLocation ?? routerLocation);
-  }, [routerLocation, customActiveLocation]);
-  const matchIndex = useMatch.useMatch({
-    strict: false,
-    select: (match) => match.index
-  });
-  const getFromPath = React.useCallback(
-    (from) => {
-      const activeLocationMatches = router.matchRoutes(activeLocation, {
-        _buildLocation: false
-      });
-      const activeLocationMatch = routerCore.last(activeLocationMatches);
-      return from ?? (activeLocationMatch == null ? void 0 : activeLocationMatch.fullPath) ?? router.state.matches[matchIndex].fullPath;
-    },
-    [activeLocation, matchIndex, router]
-  );
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation
-  };
-};
-exports.useActiveLocation = useActiveLocation;
-//# sourceMappingURL=useActiveLocation.cjs.map

package/dist/cjs/useActiveLocation.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveLocation.cjs","sources":["../../src/useActiveLocation.ts"],"sourcesContent":["import { last } from '@tanstack/router-core'\nimport { useCallback, useEffect, useState } from 'react'\nimport { useRouter } from './useRouter'\nimport { useMatch } from './useMatch'\nimport { useRouterState } from './useRouterState'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\nexport type UseActiveLocationResult = {\n  activeLocation: ParsedLocation\n  getFromPath: (from?: string) => string\n  setActiveLocation: (location?: ParsedLocation) => void\n}\n\nexport const useActiveLocation = (\n  location?: ParsedLocation,\n): UseActiveLocationResult => {\n  const router = useRouter()\n  const routerLocation = useRouterState({ select: (state) => state.location })\n  const [activeLocation, setActiveLocation] = useState<ParsedLocation>(\n    location ?? routerLocation,\n  )\n  const [customActiveLocation, setCustomActiveLocation] = useState<\n    ParsedLocation | undefined\n  >(location)\n\n  useEffect(() => {\n    setActiveLocation(customActiveLocation ?? routerLocation)\n  }, [routerLocation, customActiveLocation])\n\n  const matchIndex = useMatch({\n    strict: false,\n    select: (match) => match.index,\n  })\n\n  const getFromPath = useCallback(\n    (from?: string) => {\n      const activeLocationMatches = router.matchRoutes(activeLocation, {\n        _buildLocation: false,\n      })\n\n      const activeLocationMatch = last(activeLocationMatches)\n\n      return (\n        from ??\n        activeLocationMatch?.fullPath ??\n        router.state.matches[matchIndex]!.fullPath\n      )\n    },\n    [activeLocation, matchIndex, router],\n  )\n\n  return {\n    activeLocation,\n    getFromPath,\n    setActiveLocation: setCustomActiveLocation,\n  }\n}\n"],"names":["useRouter","useRouterState","useState","useEffect","useMatch","useCallback","last"],"mappings":";;;;;;;AAaa,MAAA,oBAAoB,CAC/B,aAC4B;AAC5B,QAAM,SAASA,UAAAA,UAAU;AACnB,QAAA,iBAAiBC,eAAAA,eAAe,EAAE,QAAQ,CAAC,UAAU,MAAM,UAAU;AACrE,QAAA,CAAC,gBAAgB,iBAAiB,IAAIC,MAAA;AAAA,IAC9B;AAAA,EACd;AACA,QAAM,CAAC,sBAAsB,uBAAuB,IAAIA,MAAAA,SAEtD,QAAQ;AAEVC,QAAAA,UAAU,MAAM;AACd,sBAAkB,wBAAwB,cAAc;AAAA,EAAA,GACvD,CAAC,gBAAgB,oBAAoB,CAAC;AAEzC,QAAM,aAAaC,SAAAA,SAAS;AAAA,IAC1B,QAAQ;AAAA,IACR,QAAQ,CAAC,UAAU,MAAM;AAAA,EAAA,CAC1B;AAED,QAAM,cAAcC,MAAA;AAAA,IAClB,CAAC,SAAkB;AACX,YAAA,wBAAwB,OAAO,YAAY,gBAAgB;AAAA,QAC/D,gBAAgB;AAAA,MAAA,CACjB;AAEK,YAAA,sBAAsBC,gBAAK,qBAAqB;AAEtD,aACE,SACA,2DAAqB,aACrB,OAAO,MAAM,QAAQ,UAAU,EAAG;AAAA,IAEtC;AAAA,IACA,CAAC,gBAAgB,YAAY,MAAM;AAAA,EACrC;AAEO,SAAA;AAAA,IACL;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,EACrB;AACF;;"}

package/dist/cjs/useActiveLocation.d.cts

@@ -1,7 +0,0 @@
-import { ParsedLocation } from '@tanstack/router-core';
-export type UseActiveLocationResult = {
-    activeLocation: ParsedLocation;
-    getFromPath: (from?: string) => string;
-    setActiveLocation: (location?: ParsedLocation) => void;
-};
-export declare const useActiveLocation: (location?: ParsedLocation) => UseActiveLocationResult;

package/dist/esm/useActiveLocation.d.ts

@@ -1,7 +0,0 @@
-import { ParsedLocation } from '@tanstack/router-core';
-export type UseActiveLocationResult = {
-    activeLocation: ParsedLocation;
-    getFromPath: (from?: string) => string;
-    setActiveLocation: (location?: ParsedLocation) => void;
-};
-export declare const useActiveLocation: (location?: ParsedLocation) => UseActiveLocationResult;

package/dist/esm/useActiveLocation.js

@@ -1,39 +0,0 @@
-import { last } from "@tanstack/router-core";
-import { useState, useEffect, useCallback } from "react";
-import { useRouter } from "./useRouter.js";
-import { useMatch } from "./useMatch.js";
-import { useRouterState } from "./useRouterState.js";
-const useActiveLocation = (location) => {
-  const router = useRouter();
-  const routerLocation = useRouterState({ select: (state) => state.location });
-  const [activeLocation, setActiveLocation] = useState(
-    routerLocation
-  );
-  const [customActiveLocation, setCustomActiveLocation] = useState(location);
-  useEffect(() => {
-    setActiveLocation(customActiveLocation ?? routerLocation);
-  }, [routerLocation, customActiveLocation]);
-  const matchIndex = useMatch({
-    strict: false,
-    select: (match) => match.index
-  });
-  const getFromPath = useCallback(
-    (from) => {
-      const activeLocationMatches = router.matchRoutes(activeLocation, {
-        _buildLocation: false
-      });
-      const activeLocationMatch = last(activeLocationMatches);
-      return from ?? (activeLocationMatch == null ? void 0 : activeLocationMatch.fullPath) ?? router.state.matches[matchIndex].fullPath;
-    },
-    [activeLocation, matchIndex, router]
-  );
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation
-  };
-};
-export {
-  useActiveLocation
-};
-//# sourceMappingURL=useActiveLocation.js.map

package/dist/esm/useActiveLocation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveLocation.js","sources":["../../src/useActiveLocation.ts"],"sourcesContent":["import { last } from '@tanstack/router-core'\nimport { useCallback, useEffect, useState } from 'react'\nimport { useRouter } from './useRouter'\nimport { useMatch } from './useMatch'\nimport { useRouterState } from './useRouterState'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\nexport type UseActiveLocationResult = {\n  activeLocation: ParsedLocation\n  getFromPath: (from?: string) => string\n  setActiveLocation: (location?: ParsedLocation) => void\n}\n\nexport const useActiveLocation = (\n  location?: ParsedLocation,\n): UseActiveLocationResult => {\n  const router = useRouter()\n  const routerLocation = useRouterState({ select: (state) => state.location })\n  const [activeLocation, setActiveLocation] = useState<ParsedLocation>(\n    location ?? routerLocation,\n  )\n  const [customActiveLocation, setCustomActiveLocation] = useState<\n    ParsedLocation | undefined\n  >(location)\n\n  useEffect(() => {\n    setActiveLocation(customActiveLocation ?? routerLocation)\n  }, [routerLocation, customActiveLocation])\n\n  const matchIndex = useMatch({\n    strict: false,\n    select: (match) => match.index,\n  })\n\n  const getFromPath = useCallback(\n    (from?: string) => {\n      const activeLocationMatches = router.matchRoutes(activeLocation, {\n        _buildLocation: false,\n      })\n\n      const activeLocationMatch = last(activeLocationMatches)\n\n      return (\n        from ??\n        activeLocationMatch?.fullPath ??\n        router.state.matches[matchIndex]!.fullPath\n      )\n    },\n    [activeLocation, matchIndex, router],\n  )\n\n  return {\n    activeLocation,\n    getFromPath,\n    setActiveLocation: setCustomActiveLocation,\n  }\n}\n"],"names":[],"mappings":";;;;;AAaa,MAAA,oBAAoB,CAC/B,aAC4B;AAC5B,QAAM,SAAS,UAAU;AACnB,QAAA,iBAAiB,eAAe,EAAE,QAAQ,CAAC,UAAU,MAAM,UAAU;AACrE,QAAA,CAAC,gBAAgB,iBAAiB,IAAI;AAAA,IAC9B;AAAA,EACd;AACA,QAAM,CAAC,sBAAsB,uBAAuB,IAAI,SAEtD,QAAQ;AAEV,YAAU,MAAM;AACd,sBAAkB,wBAAwB,cAAc;AAAA,EAAA,GACvD,CAAC,gBAAgB,oBAAoB,CAAC;AAEzC,QAAM,aAAa,SAAS;AAAA,IAC1B,QAAQ;AAAA,IACR,QAAQ,CAAC,UAAU,MAAM;AAAA,EAAA,CAC1B;AAED,QAAM,cAAc;AAAA,IAClB,CAAC,SAAkB;AACX,YAAA,wBAAwB,OAAO,YAAY,gBAAgB;AAAA,QAC/D,gBAAgB;AAAA,MAAA,CACjB;AAEK,YAAA,sBAAsB,KAAK,qBAAqB;AAEtD,aACE,SACA,2DAAqB,aACrB,OAAO,MAAM,QAAQ,UAAU,EAAG;AAAA,IAEtC;AAAA,IACA,CAAC,gBAAgB,YAAY,MAAM;AAAA,EACrC;AAEO,SAAA;AAAA,IACL;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,EACrB;AACF;"}

package/src/useActiveLocation.ts

@@ -1,57 +0,0 @@
-import { last } from '@tanstack/router-core'
-import { useCallback, useEffect, useState } from 'react'
-import { useRouter } from './useRouter'
-import { useMatch } from './useMatch'
-import { useRouterState } from './useRouterState'
-import type { ParsedLocation } from '@tanstack/router-core'
-
-export type UseActiveLocationResult = {
-  activeLocation: ParsedLocation
-  getFromPath: (from?: string) => string
-  setActiveLocation: (location?: ParsedLocation) => void
-}
-
-export const useActiveLocation = (
-  location?: ParsedLocation,
-): UseActiveLocationResult => {
-  const router = useRouter()
-  const routerLocation = useRouterState({ select: (state) => state.location })
-  const [activeLocation, setActiveLocation] = useState<ParsedLocation>(
-    location ?? routerLocation,
-  )
-  const [customActiveLocation, setCustomActiveLocation] = useState<
-    ParsedLocation | undefined
-  >(location)
-
-  useEffect(() => {
-    setActiveLocation(customActiveLocation ?? routerLocation)
-  }, [routerLocation, customActiveLocation])
-
-  const matchIndex = useMatch({
-    strict: false,
-    select: (match) => match.index,
-  })
-
-  const getFromPath = useCallback(
-    (from?: string) => {
-      const activeLocationMatches = router.matchRoutes(activeLocation, {
-        _buildLocation: false,
-      })
-
-      const activeLocationMatch = last(activeLocationMatches)
-
-      return (
-        from ??
-        activeLocationMatch?.fullPath ??
-        router.state.matches[matchIndex]!.fullPath
-      )
-    },
-    [activeLocation, matchIndex, router],
-  )
-
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation,
-  }
-}