Fix Navigate doesn't handle location objects

Author: fzaninotto

packages/ra-router-tanstack/src/tanStackRouterProvider.spec.tsx

@@ -1084,6 +1084,27 @@ describe('tanStackRouterProvider', () => {
             });
         });
 
+        it('should preserve search params on redirect', async () => {
+            render(<NavigateComponent />);
+            await waitFor(() => {
+                expect(screen.getByTestId('posts-page')).toBeInTheDocument();
+            });
+
+            fireEvent.click(screen.getByText('Go to redirect with params'));
+
+            // Should immediately redirect back to posts with search params
+            await waitFor(() => {
+                expect(screen.getByTestId('posts-page')).toBeInTheDocument();
+            });
+
+            expect(
+                screen.getByText(/\"pathname\": \"\/posts\"/)
+            ).toBeInTheDocument();
+            expect(
+                screen.getByText(/\"search\": \"\?foo=bar\"/)
+            ).toBeInTheDocument();
+        });
+
         it('should redirect conditionally when state changes', async () => {
             render(<NavigateComponent />);
             await waitFor(() => {

packages/ra-router-tanstack/src/tanStackRouterProvider.stories.tsx

@@ -852,6 +852,15 @@ export const UseBlockerTest = () => {
 };
 
 export const NavigateComponent = () => {
+    const DummyPage = () => {
+        return (
+            <div>
+                <p>Dummy page</p>
+                <Navigate to={{ pathname: '/posts', search: '?foo=bar' }} />
+            </div>
+        );
+    };
+
     const RedirectPage = () => {
         return (
             <div>
@@ -887,8 +896,10 @@ export const NavigateComponent = () => {
         <CoreAdmin
             routerProvider={tanStackRouterProvider}
             dataProvider={dataProvider}
+            layout={LayoutWithLocationDisplay}
         >
             <CustomRoutes>
+                <Route path="/dummy" element={<DummyPage />} />
                 <Route path="/redirect" element={<RedirectPage />} />
                 <Route
                     path="/conditional-redirect"
@@ -914,8 +925,12 @@ export const NavigateComponent = () => {
                                     Go to Conditional Redirect
                                 </LinkBase>
                             </li>
+                            <li>
+                                <LinkBase to="/dummy">
+                                    Go to redirect with params
+                                </LinkBase>
+                            </li>
                         </ul>
-                        <LocationDisplay />
                     </div>
                 }
             />

packages/ra-router-tanstack/src/tanStackRouterProvider.tsx

@@ -472,18 +472,41 @@ Link.displayName = 'Link';
 const Navigate = ({ to, replace, state }: RouterNavigateProps) => {
     const basename = useBasename();
 
+    // Handle both string and object forms of `to`
+    let resolvedPath: string;
+    let search: string | undefined;
+    let hash: string | undefined;
+
+    if (typeof to === 'string') {
+        resolvedPath = to;
+    } else {
+        resolvedPath = to.pathname || '/';
+        search = to.search;
+        hash = to.hash;
+        // Merge state from object with state prop (prop takes precedence)
+        state = state ?? to.state;
+    }
+
     // Prepend basename to the path (like react-router does)
     // Only prepend if path doesn't already start with basename
-    let resolvedTo = to;
-    if (typeof to === 'string' && basename && to.startsWith('/')) {
-        if (!to.startsWith(basename + '/') && to !== basename) {
-            resolvedTo = `${basename}${to}`;
+    if (basename && resolvedPath.startsWith('/')) {
+        if (
+            !resolvedPath.startsWith(basename + '/') &&
+            resolvedPath !== basename
+        ) {
+            resolvedPath = `${basename}${resolvedPath}`;
         }
     }
 
     return (
         <TanStackNavigate
-            to={resolvedTo as string}
+            to={resolvedPath}
+            search={
+                search
+                    ? Object.fromEntries(new URLSearchParams(search))
+                    : undefined
+            }
+            hash={hash}
             replace={replace}
             state={state}
         />