fix tc

Author: yiminghe

examples/nested.js

@@ -60,6 +60,7 @@ const Test = React.createClass({
             builtinPlacements={builtinPlacements}
             popup={<div style={popupBorderStyle}>i am a click popup</div>}
           >
+            <span>
             <Trigger
               popupPlacement="bottom"
               action={['hover']}
@@ -68,6 +69,7 @@ const Test = React.createClass({
             >
               <span href="#" style={{ margin: 20 }}>trigger</span>
             </Trigger>
+            </span>
           </Trigger>
         </div>
         <div style={{ margin: 50 }}>

src/Trigger.jsx

@@ -107,13 +107,7 @@ const Trigger = React.createClass({
       const self = this;
       self.popupInstance = ReactDOM.unstable_renderSubtreeIntoContainer(this,
         this.getPopupElement(),
-        this.getPopupContainer(), function renderPopup() {
-          /* eslint react/no-is-mounted:0 */
-          if (this.isMounted()) {
-            self.popupDomNode = this.getPopupDomNode();
-          } else {
-            self.popupDomNode = null;
-          }
+        this.getPopupContainer(), () => {
           if (prevState.popupVisible !== state.popupVisible) {
             props.afterPopupVisibleChange(state.popupVisible);
           }
@@ -228,7 +222,7 @@ const Trigger = React.createClass({
 
   getPopupDomNode() {
     // for test
-    return this.popupDomNode;
+    return this.popupInstance.isMounted() ? this.popupInstance.getPopupDomNode() : null;
   },
 
   getRootDomNode() {

tests/index.js

@@ -239,19 +239,19 @@ describe('rc-trigger', function main() {
       // can not simulate mouseenter
       Simulate.mouseEnter(target);
       Simulate.click(target);
-      async.series([timeout(100), (next) => {
+      async.series([timeout(200), (next) => {
         const clickPopupDomNode = trigger.refs.clickTrigger.getPopupDomNode();
         const hoverPopupDomNode = trigger.refs.hoverTrigger.getPopupDomNode();
         expect(clickPopupDomNode).to.be.ok();
         expect(hoverPopupDomNode).to.be.ok();
         Simulate.mouseLeave(target);
         next();
-      }, timeout(100), (next) => {
+      }, timeout(200), (next) => {
         const hoverPopupDomNode = trigger.refs.hoverTrigger.getPopupDomNode();
         expect($(hoverPopupDomNode).css('display')).to.be('none');
         Simulate.click(target);
         next();
-      }, timeout(100), (next) => {
+      }, timeout(200), (next) => {
         const clickPopupDomNode = trigger.refs.clickTrigger.getPopupDomNode();
         expect($(clickPopupDomNode).css('display')).to.be('none');
         next();
@@ -521,7 +521,7 @@ describe('rc-trigger', function main() {
   });
 
   describe('destroyPopupOnHide', () => {
-    it('defaults to false', () => {
+    it('defaults to false', (done) => {
       const trigger = ReactDOM.render(
         <Trigger
           action={['click']}
@@ -534,10 +534,13 @@ describe('rc-trigger', function main() {
       Simulate.click(domNode);
       expect(trigger.getPopupDomNode()).to.be.ok();
       Simulate.click(domNode);
-      expect(trigger.getPopupDomNode()).to.be.ok();
+      setTimeout(() => {
+        expect(trigger.getPopupDomNode()).to.be.ok();
+        done();
+      }, 0);
     });
 
-    it('set true will destroy tooltip on hide', () => {
+    it('set true will destroy tooltip on hide', (done) => {
       const trigger = ReactDOM.render(
         <Trigger
           action={['click']}
@@ -551,7 +554,10 @@ describe('rc-trigger', function main() {
       Simulate.click(domNode);
       expect(trigger.getPopupDomNode()).to.be.ok();
       Simulate.click(domNode);
-      expect(trigger.getPopupDomNode()).not.to.be.ok();
+      setTimeout(() => {
+        expect(trigger.getPopupDomNode()).not.to.be.ok();
+        done();
+      }, 0);
     });
   });