[added] Added buttonClassName to DropdownButton

react-bootstrap · Apr 29, 2015 · 3767c43 · 3767c43
1 parent 2e8a8bc
commit 3767c43
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/DropdownButton.js b/src/DropdownButton.js
@@ -20,7 +20,8 @@ const DropdownButton = React.createClass({
  onClick: React.PropTypes.func,
  onSelect: React.PropTypes.func,
  navItem: React.PropTypes.bool,
- noCaret: React.PropTypes.bool
+ noCaret: React.PropTypes.bool,
+ buttonClassName: React.PropTypes.string
  },
 
  render() {
@@ -34,7 +35,7 @@ const DropdownButton = React.createClass({
  <Button
  {...this.props}
  ref="dropdownButton"
- className="dropdown-toggle"
+ className={classNames('dropdown-toggle', this.props.buttonClassName)}
  onClick={this.handleDropdownClick}
  key={0}
  navDropdown={this.props.navItem}

diff --git a/test/DropdownButtonSpec.js b/test/DropdownButtonSpec.js
@@ -201,4 +201,16 @@ describe('DropdownButton', function () {
  let carets = button.getElementsByClassName('caret');
  assert.equal(carets.length, 0);
  });
+
+ it('should set button class when buttonClassName is given', function() {
+ instance = ReactTestUtils.renderIntoDocument(
+ <DropdownButton buttonClassName="test-class">
+ <MenuItem eventKey="1">MenuItem 1 content</MenuItem>
+ <MenuItem eventKey="2">MenuItem 2 content</MenuItem>
+ </DropdownButton>
+ );
+
+ let button = ReactTestUtils.findRenderedComponentWithType(instance, Button).getDOMNode();
+ assert.ok(button.className.match(/\btest-class\b/));
+ });
 });