Merge pull request #164 from wwayne/fix

Fix for delayShwo #163
ReactTooltip · Aug 1, 2016 · 9f1cb9b · 9f1cb9b
2 parents c0c4b7a + 7b7e547
commit 9f1cb9b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -258,8 +258,8 @@ class ReactTooltip extends Component {
       }
     }
 
+    this.clearTimer()
     if (delayShow) {
-      clearTimeout(this.delayShowLoop)
       this.delayShowLoop = setTimeout(updateState, delayTime)
     } else {
       updateState()
@@ -274,18 +274,18 @@ class ReactTooltip extends Component {
 
     if (!this.mount) return
 
-    const resetState = (resetPlace) => {
+    const resetState = () => {
       this.setState({
         show: false
       })
       this.removeScrollListener()
     }
 
+    this.clearTimer()
     if (delayHide) {
-      this.clearTimer()
       this.delayHideLoop = setTimeout(resetState, parseInt(delayHide, 10))
     } else {
-      resetState(true)
+      resetState()
     }
   }