Use class set for generating <Link> className

heydemo · Oct 10, 2014 · 0cf3d56 · 0cf3d56
1 parent bd23312
commit 0cf3d56
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/modules/components/Link.js b/modules/components/Link.js
@@ -1,4 +1,5 @@
 var React = require('react');
+var classSet = require('react/lib/cx');
 var merge = require('react/lib/merge');
 var ActiveState = require('../mixins/ActiveState');
 var Navigation = require('../mixins/Navigation');
@@ -80,12 +81,15 @@ var Link = React.createClass({
    * the value of the activeClassName property when this <Link> is active.
    */
   getClassName: function () {
-    var className = this.props.className || '';
+    var classNames = {};
+
+    if (this.props.className)
+      classNames[this.props.className] = true;
 
     if (this.isActive(this.props.to, this.props.params, this.props.query))
-      className += ' ' + this.props.activeClassName;
+      classNames[this.props.activeClassName] = true;
 
-    return className;
+    return classSet(classNames);
   },
 
   render: function () {