Merge 16329ea into f304a24

react-component · Nov 2, 2016 · 740da56 · 740da56
2 parents f304a24 + 16329ea
commit 740da56
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Dropdown.jsx b/src/Dropdown.jsx
@@ -76,6 +76,9 @@ const Dropdown = React.createClass({
         visible: false,
       });
     }
+    if (props.onOverlayClick) {
+      props.onOverlayClick(e);
+    }
     if (overlayProps.onClick) {
       overlayProps.onClick(e);
     }

diff --git a/tests/index.js b/tests/index.js
@@ -24,11 +24,16 @@ describe('dropdown', () => {
 
   it('simply works', () => {
     let clicked;
+    let overlayClicked;
 
     function onClick({ key }) {
       clicked = key;
     }
 
+    function onOverlayClick({ key }) {
+      overlayClicked = key;
+    }
+
     const menu = (
       <Menu style={{ width: 140 }} onClick={onClick}>
         <MenuItem key="1">
@@ -38,9 +43,11 @@ describe('dropdown', () => {
         <MenuItem key="2">two</MenuItem>
       </Menu>
     );
-    const dropdown = ReactDOM.render(<Dropdown trigger={['click']} overlay={menu}>
-      <button className="my-button">open</button>
-    </Dropdown>, div);
+    const dropdown = ReactDOM.render(
+      <Dropdown trigger={['click']} overlay={menu}onOverlayClick={onOverlayClick}>
+        <button className="my-button">open</button>
+      </Dropdown>, div
+    );
     expect(TestUtils.scryRenderedDOMComponentsWithClass(dropdown, 'my-button')[0]).to.be.ok();
     expect(ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithClass(dropdown,
       'rc-dropdown')[0])).not.to.be.ok();
@@ -50,6 +57,7 @@ describe('dropdown', () => {
     expect(clicked).not.to.be.ok();
     Simulate.click($(dropdown.getPopupDomNode()).find('.my-menuitem')[0]);
     expect(clicked).to.be('1');
+    expect(overlayClicked).to.be('1');
     expect($(dropdown.getPopupDomNode()).css('display')).to.be('none');
   });
 });