@viewfly/router 0.3.2 → 0.4.0

package/bundles/index.esm.js

@@ -42,11 +42,8 @@ class Navigator {
 }
 function formatUrl(pathname, urlFormatParams) {
     pathname = pathname.replace(/\/+/g, '/');
-    if (urlFormatParams) {
-        const { queryParams, fragment } = urlFormatParams;
-        return pathname + (queryParams ? '?' + formatQueryParams(queryParams) : '') + (fragment ? '#' + fragment : '');
-    }
-    return pathname;
+    const { queryParams, fragment } = urlFormatParams;
+    return pathname + (queryParams ? '?' + formatQueryParams(queryParams) : '') + (fragment ? '#' + fragment : '');
 }
 function formatQueryParams(queryParams) {
     const params = [];
@@ -256,7 +253,11 @@ function Link(props) {
     }
     return () => {
         const Tag = props.tag || 'a';
-        const attrs = Object.assign({}, props, Object.assign({ onClick: navigate }, props));
+        const attrs = Object.assign({}, props, Object.assign({ onClick(ev) {
+                var _a;
+                navigate(ev);
+                (_a = props.onClick) === null || _a === void 0 ? void 0 : _a.call(props, ev);
+            } }, props));
         if (Tag === 'a') {
             attrs.href = navigator.join(props.to, router, props.queryParams, props.fragment);
         }

package/bundles/index.js

@@ -44,11 +44,8 @@ class Navigator {
 }
 function formatUrl(pathname, urlFormatParams) {
     pathname = pathname.replace(/\/+/g, '/');
-    if (urlFormatParams) {
-        const { queryParams, fragment } = urlFormatParams;
-        return pathname + (queryParams ? '?' + formatQueryParams(queryParams) : '') + (fragment ? '#' + fragment : '');
-    }
-    return pathname;
+    const { queryParams, fragment } = urlFormatParams;
+    return pathname + (queryParams ? '?' + formatQueryParams(queryParams) : '') + (fragment ? '#' + fragment : '');
 }
 function formatQueryParams(queryParams) {
     const params = [];
@@ -258,7 +255,11 @@ function Link(props) {
     }
     return () => {
         const Tag = props.tag || 'a';
-        const attrs = Object.assign({}, props, Object.assign({ onClick: navigate }, props));
+        const attrs = Object.assign({}, props, Object.assign({ onClick(ev) {
+                var _a;
+                navigate(ev);
+                (_a = props.onClick) === null || _a === void 0 ? void 0 : _a.call(props, ev);
+            } }, props));
         if (Tag === 'a') {
             attrs.href = navigator.join(props.to, router, props.queryParams, props.fragment);
         }

package/bundles/providers/navigator.d.ts

@@ -20,7 +20,7 @@ export interface UrlFormatParams {
     queryParams?: QueryParams;
     fragment?: string;
 }
-export declare function formatUrl(pathname: string, urlFormatParams?: UrlFormatParams): string;
+export declare function formatUrl(pathname: string, urlFormatParams: UrlFormatParams): string;
 export declare function formatQueryParams(queryParams: QueryParams): string;
 export declare class BrowserNavigator extends Navigator {
     onUrlChanged: Observable<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/router",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "A routing library based on the Viewfly framework that can be run in the browser or Nodejs background.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -13,7 +13,7 @@
   "keywords": [],
   "dependencies": {
     "@tanbo/stream": "^1.2.3",
-    "@viewfly/core": "^0.3.1",
+    "@viewfly/core": "^0.4.0",
     "url": "^0.11.1"
   },
   "devDependencies": {
@@ -34,5 +34,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "b66ca589f7662cd518fc2e5955b3e3ff9de83f94"
+  "gitHead": "d14b3cd0247a07f72519745933c3070f12adbfa1"
 }