Merge pull request #107 from scottwoodall/tranferPropsToNavUl

Pass Nav props to ul so css classes can be applied
react-bootstrap · Jun 15, 2014 · fb3bd3f · fb3bd3f
2 parents e2bd6d1 + aeeb9b8
commit fb3bd3f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Nav.jsx b/src/Nav.jsx
@@ -46,7 +46,7 @@ var Nav = React.createClass({
     classes['navbar-collapse'] = this.props.isCollapsable;
 
     if (this.props.navbar && !this.props.isCollapsable) {
-      return this.renderUl();
+      return this.transferPropsTo(this.renderUl());
     }
 
     return this.transferPropsTo(
@@ -104,4 +104,4 @@ var Nav = React.createClass({
   }
 });
 
-export default = Nav;
+export default = Nav;
diff --git a/test/NavbarSpec.jsx b/test/NavbarSpec.jsx
@@ -107,4 +107,14 @@ describe('Nav', function () {
 
     assert.ok(instance.refs.nav.props.navbar);
   });
+
+  it('Should pass nav prop to ul', function () {
+    var instance = ReactTestUtils.renderIntoDocument(
+            <Nav className="pull-right" />
+        );
+
+    assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'pull-right'));
+    instance.setProps({navbar: true});
+    assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'pull-right'));
+  });
 });