better handling of query only navigation

Author: ryansolid

.changeset/yellow-pillows-report.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+better handling of query only navigation

src/routers/MemoryRouter.ts

@@ -41,7 +41,6 @@ export function createMemoryHistory() {
           scrollToHash(value.split("#")[1] || "", true);
         }
       }, 0);
-      
     },
     back: () => {
       go(-1);

src/routers/Router.ts

@@ -14,6 +14,7 @@ export function Router(props: RouterProps): JSX.Element {
     const url = window.location.pathname.replace(/^\/+/, "/") + window.location.search;
     return {
       value: props.transformUrl ? props.transformUrl(url) + window.location.hash : url + window.location.hash,
+      rawPath: url,
       state: window.history.state
     }
   };

src/routers/StaticRouter.ts

@@ -14,6 +14,7 @@ export function StaticRouter(props: StaticRouterProps): JSX.Element {
   const url = props.url || ((e = getRequestEvent()) && getPath(e.request.url)) || ""
   const obj = {
     value: props.transformUrl ? props.transformUrl(url) : url,
+    rawPath: url,
   };
   return createRouterComponent({
     signal: [() => obj, next => Object.assign(obj, next)]

src/routing.ts

@@ -77,7 +77,7 @@ export const useHref = (to: () => string | undefined) => {
 export const useNavigate = () => useRouter().navigatorFactory();
 export const useLocation = <S = unknown>() => useRouter().location as Location<S>;
 export const useIsRouting = () => useRouter().isRouting;
-export const usePreloadRoute = () => useRouter().preloadRoute
+export const usePreloadRoute = () => useRouter().preloadRoute;
 
 export const useMatch = <S extends string>(path: () => S, matchFilters?: MatchFilters<S>) => {
   const location = useLocation();
@@ -103,9 +103,7 @@ export const useSearchParams = <T extends Params>(): [
   const location = useLocation();
   const navigate = useNavigate();
   const setSearchParams = (params: SetParams, options?: Partial<NavigateOptions>) => {
-    const searchString = untrack(
-      () => location.pathname + mergeSearchString(location.search, params) + location.hash
-    );
+    const searchString = untrack(() => mergeSearchString(location.search, params) + location.hash);
     navigate(searchString, {
       scroll: false,
       resolve: false,
@@ -403,19 +401,22 @@ export function createRouterContext(
         return;
       }
 
+      const queryOnly = to[0] === "?";
       const {
         replace,
         resolve,
         scroll,
         state: nextState
       } = {
         replace: false,
-        resolve: true,
+        resolve: !queryOnly,
         scroll: true,
         ...options
       };
 
-      const resolvedTo = resolve ? route.resolvePath(to) : resolvePath("", to);
+      const resolvedTo = resolve
+        ? route.resolvePath(to)
+        : resolvePath((queryOnly && source().rawPath) || "", to);
 
       if (resolvedTo === undefined) {
         throw new Error(`Path '${to}' is not a routable path`);

src/types.ts

@@ -58,6 +58,7 @@ export interface LocationChange<S = unknown> {
   replace?: boolean;
   scroll?: boolean;
   state?: S;
+  rawPath?: string;
 }
 export interface RouterIntegration {
   signal: Signal<LocationChange>;