fix onClose being called two times

ref tajo#45
luchkonikita · Jan 21, 2016 · b118d12 · b118d12
1 parent 8bb0ca1
commit b118d12
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/lib/portal.js b/lib/portal.js
@@ -66,7 +66,9 @@ export default class Portal extends React.Component {
       document.removeEventListener('touchstart', this.handleOutsideMouseClick);
     }
 
-    this.closePortal();
+    if (this.state.active) {
+      this.closePortal();
+    }
   }
 
   shouldComponentUpdate(nextProps, nextState) {

diff --git a/test/portal_spec.js b/test/portal_spec.js
@@ -2,6 +2,7 @@ import jsdom from 'jsdom';
 import Portal from '../lib/portal';
 import assert from 'assert';
 import {spy} from 'sinon';
+import {render, unmountComponentAtNode} from 'react-dom';
 import {
   mount,
   spyLifecycle
@@ -110,7 +111,24 @@ describe('react-portal', () => {
       const props = {isOpened: true, onClose: spy()};
       const wrapper = mount(<Portal {...props}><p>Hi</p></Portal>);
       wrapper.instance().closePortal();
-      assert(props.onClose.called);
+      assert(props.onClose.calledOnce);
+    });
+
+    it('should call props.onClose() only once when portal closes and then is unmounted', () => {
+      const div = document.createElement('div');
+      const props = {isOpened: true, onClose: spy()};
+      const component = render(<Portal {...props}><p>Hi</p></Portal>, div);
+      component.closePortal();
+      unmountComponentAtNode(div);
+      assert(props.onClose.calledOnce);
+    });
+
+    it('should call props.onClose() only once when directly unmounting', () => {
+      const div = document.createElement('div');
+      const props = {isOpened: true, onClose: spy()};
+      render(<Portal {...props}><p>Hi</p></Portal>, div);
+      unmountComponentAtNode(div);
+      assert(props.onClose.calledOnce);
     });
   });