@homecode/ui 5.20.10 → 5.20.12

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

@@ -5,7 +5,7 @@ import cn from 'classnames';
 import { Icon } from '../../Icon/Icon.js';
 import Context from '../context.js';
 import S from './Link.styl.js';
-import { isRootRelativeHref, isNativeDocumentHref } from './linkHref.js';
+import { isExternalHref, isNativeDocumentHref } from './linkHref.js';
 
 const isStartFromDoubleSlash = href => /^\/\//.test(href);
 const isHttpHref = (href) => /^https?:\/\//i.test(href);
@@ -33,13 +33,7 @@ const Link = ({ className, exactClassName, children, href: hrefProp, isClear = f
     const isExternal = useMemo(() => {
         if (internalHref)
             return false;
-        // A dot in `?filePath=a.pdf` is not a hostname. `http://` + `/api/…`
-        // is parsed as host `api`.
-        if (isRootRelativeHref(hrefProp))
-            return false;
-        if (isHttpHref(hrefProp))
-            return true;
-        return /\./.test(hrefProp);
+        return isExternalHref(hrefProp);
     }, [hrefProp, internalHref]);
     const nativeDocumentProp = isNativeDocumentHref(internalHref ?? hrefProp);
     const rootPath = useMemo(() => {

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

@@ -14,6 +14,18 @@ function isNativeDocumentHref(href) {
     if (path === '/api' || path.startsWith('/api/'))
         return true;
     return path.includes('.');
+}
+/**
+ * Opens in a new tab. A bare `example.com` is a host, but a dot only in the
+ * query (`//storage?file=a.mp4`) is not.
+ */
+function isExternalHref(href) {
+    if (isRootRelativeHref(href))
+        return false;
+    if (/^https?:\/\//i.test(href))
+        return true;
+    const path = href.split(/[?#]/)[0] ?? '';
+    return path.includes('.');
 }
 
-export { isNativeDocumentHref, isRootRelativeHref };
+export { isExternalHref, isNativeDocumentHref, isRootRelativeHref };

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/components/Router/Link/linkHref.d.ts

@@ -6,3 +6,8 @@ export declare function isRootRelativeHref(href: string): boolean;
  * an in-app route.
  */
 export declare function isNativeDocumentHref(href: string): boolean;
+/**
+ * Opens in a new tab. A bare `example.com` is a host, but a dot only in the
+ * query (`//storage?file=a.mp4`) is not.
+ */
+export declare function isExternalHref(href: string): boolean;

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.10",
+  "version": "5.20.12",
   "description": "React UI components library",
   "scripts": {
     "tests": "jest",