fix; add children to link and pass listener params in mixin

router5 · Jul 7, 2015 · 2c641fd · 2c641fd
1 parent 1c1b242
commit 2c641fd
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 28 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "router5-react",
-  "version": "0.1.0-alpha.4",
+  "version": "0.1.0-alpha.5",
   "homepage": "http://router5.github.io",
   "authors": [
     "Thomas Roch <thomas.c.roch@gmail.com>"

diff --git a/dist/amd/link-factory.js b/dist/amd/link-factory.js
@@ -22,8 +22,7 @@ define(['exports', 'module', 'react'], function (exports, module, _react) {
                     className: '',
                     activeClassName: 'active',
                     routeParams: {},
-                    routeOptions: {},
-                    onClick: this.clickHandler
+                    routeOptions: {}
                 };
             },
 
@@ -66,9 +65,10 @@ define(['exports', 'module', 'react'], function (exports, module, _react) {
                 var active = this.state.active;
 
                 var href = router.buildUrl(props.routeName, props.routeParams);
-                var className = props.className.split(' ').concat(active ? [props.activeClassName] : []).join(' ');
+                var className = (props.className ? props.className.split(' ') : []).concat(active ? [props.activeClassName] : []).join(' ');
+                var onClick = props.onClick || this.clickHandler;
 
-                return _React['default'].createElement('a', { href: href, className: props.className, onClick: props.onClick });
+                return _React['default'].createElement('a', { href: href, className: className, onClick: onClick }, props.children);
             }
         });
     }

diff --git a/dist/amd/segment-mixin-factory.js b/dist/amd/segment-mixin-factory.js
@@ -6,8 +6,8 @@ define(["exports", "module"], function (exports, module) {
     function segmentMixinFactory(router) {
         return function (routeName, listener) {
             return {
-                nodeListener: function nodeListener() {
-                    listener.call(this);
+                nodeListener: function nodeListener(toState, fromState) {
+                    listener.call(this, toState, fromState);
                 },
 
                 componentDidMount: function componentDidMount() {

diff --git a/dist/browser/router5-react.js b/dist/browser/router5-react.js
@@ -40,8 +40,7 @@ function linkFactory(router) {
                 className: '',
                 activeClassName: 'active',
                 routeParams: {},
-                routeOptions: {},
-                onClick: this.clickHandler
+                routeOptions: {}
             };
         },
 
@@ -84,17 +83,18 @@ function linkFactory(router) {
             var active = this.state.active;
 
             var href = router.buildUrl(props.routeName, props.routeParams);
-            var className = props.className.split(' ').concat(active ? [props.activeClassName] : []).join(' ');
+            var className = (props.className ? props.className.split(' ') : []).concat(active ? [props.activeClassName] : []).join(' ');
+            var onClick = props.onClick || this.clickHandler;
 
-            return React.createElement('a', { href: href, className: props.className, onClick: props.onClick });
+            return React.createElement('a', { href: href, className: className, onClick: onClick }, props.children);
         }
     });
 }
 function segmentMixinFactory(router) {
     return function (routeName, listener) {
         return {
-            nodeListener: function nodeListener() {
-                listener.call(this);
+            nodeListener: function nodeListener(toState, fromState) {
+                listener.call(this, toState, fromState);
             },
 
             componentDidMount: function componentDidMount() {

diff --git a/dist/browser/router5-react.min.js b/dist/browser/router5-react.min.js
diff --git a/dist/commonjs/link-factory.js b/dist/commonjs/link-factory.js
@@ -27,8 +27,7 @@ function linkFactory(router) {
                 className: '',
                 activeClassName: 'active',
                 routeParams: {},
-                routeOptions: {},
-                onClick: this.clickHandler
+                routeOptions: {}
             };
         },
 
@@ -71,9 +70,10 @@ function linkFactory(router) {
             var active = this.state.active;
 
             var href = router.buildUrl(props.routeName, props.routeParams);
-            var className = props.className.split(' ').concat(active ? [props.activeClassName] : []).join(' ');
+            var className = (props.className ? props.className.split(' ') : []).concat(active ? [props.activeClassName] : []).join(' ');
+            var onClick = props.onClick || this.clickHandler;
 
-            return _react2['default'].createElement('a', { href: href, className: props.className, onClick: props.onClick });
+            return _react2['default'].createElement('a', { href: href, className: className, onClick: onClick }, props.children);
         }
     });
 }

diff --git a/dist/commonjs/segment-mixin-factory.js b/dist/commonjs/segment-mixin-factory.js
@@ -8,8 +8,8 @@ exports["default"] = segmentMixinFactory;
 function segmentMixinFactory(router) {
     return function (routeName, listener) {
         return {
-            nodeListener: function nodeListener() {
-                listener.call(this);
+            nodeListener: function nodeListener(toState, fromState) {
+                listener.call(this, toState, fromState);
             },
 
             componentDidMount: function componentDidMount() {

diff --git a/modules/link-factory.js b/modules/link-factory.js
@@ -17,8 +17,7 @@ function linkFactory(router) {
                 className:       '',
                 activeClassName: 'active',
                 routeParams:     {},
-                routeOptions:    {},
-                onClick:         this.clickHandler
+                routeOptions:    {}
             };
         },
 
@@ -63,11 +62,12 @@ function linkFactory(router) {
             let props = this.props
             let active = this.state.active
 
-            let href =  router.buildUrl(props.routeName, props.routeParams);
-            let className = props.className.split(' ')
+            let href =  router.buildUrl(props.routeName, props.routeParams)
+            let className = (props.className ? props.className.split(' ') : [])
                 .concat(active ? [props.activeClassName] : []).join(' ')
+            let onClick = props.onClick || this.clickHandler
 
-            return React.createElement('a', {href, className: props.className, onClick: props.onClick})
+            return React.createElement('a', {href, className, onClick}, props.children)
         }
     })
 }
diff --git a/modules/segment-mixin-factory.js b/modules/segment-mixin-factory.js
@@ -2,8 +2,8 @@ export default segmentMixinFactory
 
 function segmentMixinFactory(router) {
     return (routeName, listener) => ({
-        nodeListener() {
-            listener.call(this)
+        nodeListener(toState, fromState) {
+            listener.call(this, toState, fromState)
         },
 
         componentDidMount() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "router5-react",
-  "version": "0.1.0-alpha.4",
+  "version": "0.1.0-alpha.5",
   "description": "router5 helpers for React",
   "main": "dist/commonjs/index.js",
   "scripts": {