@homecode/ui 5.20.11 → 5.20.12

package/dist/esm/src/tools/queryParams.js

@@ -12,15 +12,22 @@ function parseQueryParams(qs) {
 }
 function stringifyQueryParams(params) {
     return Object.entries(params)
-        .map(([key, value]) => `${key}=${value}`)
+        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
         .join('&');
 }
+/**
+ * Path with `queryParams` applied. A query already in `path`
+ * (`go('/storage?folder=1')`) is kept; `queryParams` override its keys.
+ */
 function applyQueryParams(path, queryParams) {
-    const clearPath = path.replace(/\?.*/, '/');
     if (typeof queryParams === 'string')
         return queryParams;
-    const query = { ...queryParams };
-    Object.entries(queryParams).forEach(([key, value]) => {
+    const [clearPath, pathQuery = ''] = path.split('?');
+    const query = {
+        ...Object.fromEntries(new URLSearchParams(pathQuery)),
+        ...queryParams,
+    };
+    Object.entries(query).forEach(([key, value]) => {
         if (value === false)
             delete query[key];
         else

package/dist/esm/types/src/tools/queryParams.d.ts

@@ -1,5 +1,9 @@
 export declare function parseQueryParams(qs?: string): Record<string, string>;
 export declare function stringifyQueryParams(params: Record<string, string>): string;
+/**
+ * Path with `queryParams` applied. A query already in `path`
+ * (`go('/storage?folder=1')`) is kept; `queryParams` override its keys.
+ */
 export declare function applyQueryParams(path: any, queryParams: Record<string, any> | string): string;
 export declare const setSSRQueryParams: (params: any) => void;
 export declare const queryParams: Record<string, string>;

package/dist/esm/types/src/tools/queryParams.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homecode/ui",
-  "version": "5.20.11",
+  "version": "5.20.12",
   "description": "React UI components library",
   "scripts": {
     "tests": "jest",