Skip to content

Commit

Permalink
[fixed] OverlayTrigger passes onClick prop to child
Browse files Browse the repository at this point in the history
  • Loading branch information
teloo committed Apr 26, 2015
1 parent eca9809 commit 1249eff
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/OverlayTrigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,16 @@ const OverlayTrigger = React.createClass({
},

render() {
let child = React.Children.only(this.props.children);
if (this.props.trigger === 'manual') {
return React.Children.only(this.props.children);
return child;
}

let props = {};

props.onClick = createChainedFunction(child.props.onClick, this.props.onClick);
if (isOneOf('click', this.props.trigger)) {
props.onClick = createChainedFunction(this.toggle, this.props.onClick);
props.onClick = createChainedFunction(this.toggle, props.onClick);
}

if (isOneOf('hover', this.props.trigger)) {
Expand All @@ -111,7 +113,7 @@ const OverlayTrigger = React.createClass({
}

return cloneElement(
React.Children.only(this.props.children),
child,
props
);
},
Expand Down
30 changes: 30 additions & 0 deletions test/OverlayTriggerSpec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from 'react';
import ReactTestUtils from 'react/lib/ReactTestUtils';
import OverlayTrigger from '../src/OverlayTrigger';

describe('OverlayTrigger', function() {
it('Should create OverlayTrigger element', function() {
let instance = ReactTestUtils.renderIntoDocument(
<OverlayTrigger overlay={<div>test</div>}>
<button>button</button>
</OverlayTrigger>
);
let overlayTrigger = instance.getDOMNode();
assert.equal(overlayTrigger.nodeName, 'BUTTON');
});

it('Should pass OverlayTrigger onClick prop to child', function() {
let called = false;
let callback = function() {
called = true;
};
let instance = ReactTestUtils.renderIntoDocument(
<OverlayTrigger overlay={<div>test</div>} onClick={callback}>
<button>button</button>
</OverlayTrigger>
);
let overlayTrigger = instance.getDOMNode();
ReactTestUtils.Simulate.click(overlayTrigger);
assert.equal(called, true);
});
});

0 comments on commit 1249eff

Please sign in to comment.