[added] DropdownButton now applies onClick prop to Button

react-bootstrap · May 15, 2015 · 1531ac9 · 1531ac9
1 parent af4c0a0
commit 1531ac9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/DropdownButton.js b/src/DropdownButton.js
@@ -36,7 +36,7 @@ const DropdownButton = React.createClass({
  {...this.props}
  ref="dropdownButton"
  className={classNames('dropdown-toggle', this.props.buttonClassName)}
- onClick={this.handleDropdownClick}
+ onClick={createChainedFunction(this.props.onClick, this.handleDropdownClick)}
  key={0}
  navDropdown={this.props.navItem}
  navItem={null}

diff --git a/test/DropdownButtonSpec.js b/test/DropdownButtonSpec.js
@@ -213,4 +213,22 @@ describe('DropdownButton', function () {
  let button = ReactTestUtils.findRenderedComponentWithType(instance, Button).getDOMNode();
  assert.ok(button.className.match(/\btest-class\b/));
  });
+
+ it('should set onClick on Button', function (done) {
+ function handleClick() {
+ done();
+ }
+
+ instance = ReactTestUtils.renderIntoDocument(
+ <DropdownButton title="Title" onClick={handleClick}>
+ <MenuItem eventKey='1'>MenuItem 1 content</MenuItem>
+ <MenuItem eventKey='2'>MenuItem 2 content</MenuItem>
+ </DropdownButton>
+ );
+
+ let button = ReactTestUtils.findRenderedComponentWithType(instance, Button);
+ ReactTestUtils.SimulateNative.click(
+ ReactTestUtils.findRenderedDOMComponentWithClass(button, 'dropdown-toggle')
+ );
+ });
 });