Merge pull request #102 from oluckyman/hideTooltip-timeout

Clear hide timeout on component unmount
ReactTooltip · May 14, 2016 · 34aabd4 · 34aabd4
2 parents d778981 + 77f4c2b
commit 34aabd4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -71,6 +71,7 @@ class ReactTooltip extends Component {
       isCapture: props.isCapture || false
     }
     this.delayShowLoop = null
+    this.delayHideLoop = null
   }
 
   /* Bind this with method */
@@ -103,6 +104,7 @@ class ReactTooltip extends Component {
 
   componentWillUnmount () {
     clearTimeout(this.delayShowLoop)
+    clearTimeout(this.delayHideLoop)
     this.unbindListener()
     this.removeScrollListener()
     this.mount = false
@@ -312,7 +314,8 @@ class ReactTooltip extends Component {
   hideTooltip () {
     const {delayHide} = this.state
     clearTimeout(this.delayShowLoop)
-    setTimeout(() => {
+    clearTimeout(this.delayHideLoop)
+    this.delayHideLoop = setTimeout(() => {
       this.setState({
         show: false
       })