@tanstack/react-router 1.160.0 → 1.161.1

package/src/link.tsx

@@ -376,10 +376,17 @@ export function useLinkProps<
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const isHydrated = useHydrated()
 
-  // subscribe to search params to re-build location if it changes
+  // subscribe to path/search/hash/params to re-build location when they change
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const currentSearch = useRouterState({
-    select: (s) => s.location.search,
+  const currentLocationState = useRouterState({
+    select: (s) => {
+      const leaf = s.matches[s.matches.length - 1]
+      return {
+        search: leaf?.search,
+        hash: s.location.hash,
+        path: leaf?.pathname, // path + params
+      }
+    },
     structuralSharing: true as any,
   })
 
@@ -393,7 +400,7 @@ export function useLinkProps<
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       router,
-      currentSearch,
+      currentLocationState,
       from,
       options._fromLocation,
       options.hash,
@@ -556,11 +563,13 @@ export function useLinkProps<
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const doPreload = React.useCallback(() => {
-    router.preloadRoute({ ..._options } as any).catch((err) => {
-      console.warn(err)
-      console.warn(preloadWarning)
-    })
-  }, [router, _options])
+    router
+      .preloadRoute({ ..._options, _builtLocation: next } as any)
+      .catch((err) => {
+        console.warn(err)
+        console.warn(preloadWarning)
+      })
+  }, [router, _options, next])
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const preloadViewportIoCallback = React.useCallback(