@homecode/ui 4.18.29 → 4.18.31

package/dist/esm/src/components/Router/Router.js

@@ -31,9 +31,12 @@ const Router = (props) => {
             }
             // @ts-ignore
             const isRouteComponent = child.type.displayName === 'Route';
-            const { path, exact, component: Component, ...rest } = child.props;
+            const { path, queryParam, exact, component: Component, ...rest } = child.props;
             if (!path) {
-                if (isRouteComponent && Component) {
+                const isMatched = queryParam
+                    ? router.query[queryParam]
+                    : isRouteComponent && Component;
+                if (isMatched) {
                     noMatchRoute = jsx(Component, { ...rest });
                     continue;
                 }

package/dist/esm/src/components/Router/store.js

@@ -20,11 +20,11 @@ const STORE = createStore('router', {
     un(cb) {
         spliceWhere(LISTENERS, cb);
     },
-    go(path, query, params = {}) {
+    go(path = this.path, query = {}, params = {}) {
         if (path === this.path && !query)
             return;
         const { replace } = params;
-        const pathStr = applyQueryParams(path ?? this.path, query, this.query);
+        const pathStr = applyQueryParams(path ?? this.path, query);
         const action = replace ? 'replaceState' : 'pushState';
         console.log('Router.go', query, pathStr);
         history[action]({}, '', pathStr);

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

@@ -15,17 +15,11 @@ function stringifyQueryParams(params) {
         .map(([key, value]) => `${key}=${value}`)
         .join('&');
 }
-function applyQueryParams(path, queryParams, currParams) {
+function applyQueryParams(path, queryParams) {
     const clearPath = path.replace(/\?.*/, '/');
-    if (!queryParams) {
-        if (Object.keys(currParams).length === 0)
-            return path;
-        return `${clearPath}?${stringifyQueryParams(currParams)}`;
-    }
-    if (typeof queryParams === 'string') {
+    if (typeof queryParams === 'string')
         return queryParams;
-    }
-    const query = { ...currParams };
+    const query = { ...queryParams };
     Object.entries(queryParams).forEach(([key, value]) => {
         if (value === false)
             delete query[key];

package/dist/esm/types/src/components/Router/Router.types.d.ts

@@ -5,7 +5,9 @@ export type RedirectProps = {
     to: string;
 };
 export type RouteProps = {
+    className?: string;
     path: string;
+    queryParam?: string;
     component: ComponentType;
     exact?: boolean;
 } & Partial<RedirectProps>;

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

@@ -1,5 +1,5 @@
 export declare function parseQueryParams(qs?: string): Record<string, string>;
 export declare function stringifyQueryParams(params: Record<string, string>): string;
-export declare function applyQueryParams(path: any, queryParams: any, currParams: any): any;
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homecode/ui",
-  "version": "4.18.29",
+  "version": "4.18.31",
   "description": "React UI components library",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",