fix destroy. close #7

react-component · Apr 1, 2016 · 88d5be8 · 88d5be8
1 parent c7bb5d2
commit 88d5be8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/examples/simple.js b/examples/simple.js
@@ -186,7 +186,7 @@ const Test = React.createClass({
       </div>
       <div style={{ margin: 100, position: 'relative' }}>
         <Trigger
-          getPopupContainer={null && getPopupContainer}
+          getPopupContainer={undefined && getPopupContainer}
           popupAlign={getPopupAlign(state)}
           mouseEnterDelay={0}
           popupPlacement={state.placement}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-trigger",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "base abstract trigger component for react",
   "keywords": [
     "react",

diff --git a/src/Trigger.jsx b/src/Trigger.jsx
@@ -134,12 +134,7 @@ const Trigger = React.createClass({
     const popupContainer = this.popupContainer;
     if (popupContainer) {
       ReactDOM.unmountComponentAtNode(popupContainer);
-      if (this.props.getPopupContainer) {
-        const mountNode = this.props.getPopupContainer(findDOMNode(this));
-        mountNode.removeChild(popupContainer);
-      } else {
-        document.body.removeChild(popupContainer);
-      }
+      popupContainer.parentNode.removeChild(popupContainer);
       this.popupContainer = null;
     }
     this.clearDelayTimer();
@@ -222,12 +217,9 @@ const Trigger = React.createClass({
   getPopupContainer() {
     if (!this.popupContainer) {
       this.popupContainer = document.createElement('div');
-      if (this.props.getPopupContainer) {
-        const mountNode = this.props.getPopupContainer(findDOMNode(this));
-        mountNode.appendChild(this.popupContainer);
-      } else {
-        document.body.appendChild(this.popupContainer);
-      }
+      const mountNode = this.props.getPopupContainer ?
+        this.props.getPopupContainer(findDOMNode(this)) : document.body;
+      mountNode.appendChild(this.popupContainer);
     }
     return this.popupContainer;
   },