Merge pull request #3 from damidevelopment/dev

update to version 1.0.1
damidevelopment · May 24, 2019 · a2ead24 · a2ead24
2 parents b346224 + ccc48e2
commit a2ead24
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 28 deletions.
diff --git a/lib/components/Link.js b/lib/components/Link.js
@@ -73,7 +73,6 @@ function (_React$Component) {
   _createClass(LinkBase, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(newProps) {
-      console.log('Link.componentDidUpdate');
       this.setRouterState(newProps);
     }
   }, {
@@ -106,11 +105,17 @@ function (_React$Component) {
       var shouldNavigateManually = refresh || openinNewTab || cmdOrCtrl || target === '_blank';
 
       if (!shouldNavigateManually) {
-        e.preventDefault();
-        routerStore.push({
-          pathname: pathname,
-          search: search
-        });
+        if (typeof this.props.onClick === 'function') {
+          this.props.onClick(e);
+
+          if (!e.defaultPrevented) {
+            e.preventDefault();
+            routerStore.push({
+              pathname: pathname,
+              search: search
+            });
+          }
+        }
       }
     }
   }, {

diff --git a/lib/router-store.js b/lib/router-store.js
@@ -76,8 +76,6 @@ function () {
 
       if (this.currentView.hasOwnProperty(slot) && route.component != null) {
         // @intentionaly !=
-        console.log('onMatch.real', slot);
-
         this.currentView[slot] = function () {
           return typeof route.component === 'function' ? route.component(params, rootStore) : route.component;
         };

diff --git a/lib/start-router.js b/lib/start-router.js
@@ -63,7 +63,6 @@ var startRouter = function startRouter(views, rootStore) {
       var path = fn.split('.');
       var obj = path[0];
       var action = path[1];
-      console.log('buildAction', resources);
 
       if (resources.hasOwnProperty(obj) && typeof resources[obj][action] === 'function') {
         runAction = resources[obj][action];
@@ -119,8 +118,8 @@ var startRouter = function startRouter(views, rootStore) {
     // default redirect
 
     if (!match) {
-      console.log('404 Not Found!'); // store.replace('notFound');
-
+      console.error('404 Not Found!');
+      store.replace('notFound');
       return; // route = store.routes.notFound;
     } // add only routes that are not currently active
 
@@ -138,8 +137,7 @@ var startRouter = function startRouter(views, rootStore) {
       return !route.isActive || i === newPath.length - 1
       /* && route !== store.currentRoute*/
       ;
-    });
-    console.log('lookup', newPath, oldPath); // build fns
+    }); // build fns
 
     var fns = _utils.buildFnsArray.apply(void 0, _toConsumableArray(getPropValuesFromArray(oldPath, 'onExit')))
     /*.map(fn => compileSyncAction(fn))*/
@@ -154,11 +152,10 @@ var startRouter = function startRouter(views, rootStore) {
 
     for (var i = 0; i < newPath.length; i++) {
       _loop(i);
-    }
-
-    console.log('callback fns', fns); // invoke fns
+    } // invoke fns
     // @see https://decembersoft.com/posts/promises-in-serial-with-array-reduce/
 
+
     fns.reduce(function (promiseChain, currentTask) {
       return promiseChain.then(function (chainResults) {
         return apply(currentTask, chainResults).then(function (currentResult) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "damidev-mobx-router",
   "description": "MobX powered router for React apps",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Jakub Hrášek <[email protected]>",
   "license": "MIT",
   "bugs": {

diff --git a/src/components/Link.jsx b/src/components/Link.jsx
@@ -20,7 +20,6 @@ class LinkBase extends React.Component
     }
 
     componentDidUpdate(newProps) {
-        console.log('Link.componentDidUpdate');
         this.setRouterState(newProps);
     }
 
@@ -48,8 +47,14 @@ class LinkBase extends React.Component
         const shouldNavigateManually = refresh || openinNewTab || cmdOrCtrl || target === '_blank';
 
         if (!shouldNavigateManually) {
-            e.preventDefault();
-            routerStore.push({ pathname, search });
+            if (typeof this.props.onClick === 'function') {
+                this.props.onClick(e);
+
+                if (!e.defaultPrevented) {
+                    e.preventDefault();
+                    routerStore.push({ pathname, search });
+                }
+            }
         }
     }
 

diff --git a/src/router-store.js b/src/router-store.js
@@ -53,7 +53,6 @@ export class RouterStore
 
         // change currentView only when slot exists and component is not empty
         if (this.currentView.hasOwnProperty(slot) && route.component != null) {// @intentionaly !=
-            console.log('onMatch.real', slot);
             this.currentView[slot] = () =>
                 typeof route.component === 'function' ? route.component(params, rootStore) : route.component;
         }

diff --git a/src/start-router.js b/src/start-router.js
@@ -33,7 +33,6 @@ export const startRouter = (views, rootStore, { resources, ...config } = {}) =>
             let obj = path[0];
             let action = path[1];
 
-            console.log('buildAction', resources);
             if (resources.hasOwnProperty(obj) && typeof resources[obj][action] === 'function') {
                 runAction = resources[obj][action];
             }
@@ -97,8 +96,8 @@ export const startRouter = (views, rootStore, { resources, ...config } = {}) =>
         // TODO: when 404 happens, should we redirect or replace?
         // default redirect
         if (!match) {
-            console.log('404 Not Found!');
-            // store.replace('notFound');
+            console.error('404 Not Found!');
+            store.replace('notFound');
             return;
             // route = store.routes.notFound;
         }
@@ -114,8 +113,6 @@ export const startRouter = (views, rootStore, { resources, ...config } = {}) =>
         // TODO there should be check if route params changed
         newPath = newPath.filter((route, i) => !route.isActive || (i === newPath.length - 1/* && route !== store.currentRoute*/));
 
-        console.log('lookup', newPath, oldPath);
-
         // build fns
         let fns = buildFnsArray(...getPropValuesFromArray(oldPath, 'onExit'))
             /*.map(fn => compileSyncAction(fn))*/;
@@ -129,8 +126,6 @@ export const startRouter = (views, rootStore, { resources, ...config } = {}) =>
             );
         }
 
-        console.log('callback fns', fns);
-
         // invoke fns
         // @see https://decembersoft.com/posts/promises-in-serial-with-array-reduce/
         fns.reduce((promiseChain, currentTask) => {