Improve click behaviour

vkbansal · Nov 15, 2016 · 347a9ae · 347a9ae
1 parent 73fef7b
commit 347a9ae
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/ContextMenuTrigger.js b/src/ContextMenuTrigger.js
@@ -21,39 +21,37 @@ export default class ContextMenuTrigger extends Component {
     };
 
 
-    mouseDown = false;
-
     handleMouseDown = (event) => {
         if (this.props.holdToDisplay >= 0 && event.button === 0) {
             event.persist();
 
-            this.mouseDown = true;
-            setTimeout(() => {
-                if (this.mouseDown) this.handleContextClick(event);
-            }, this.props.holdToDisplay);
+            this.mouseDownTimeoutId = setTimeout(
+                () => this.handleContextClick(event),
+                this.props.holdToDisplay
+            );
         }
     }
 
     handleMouseUp = (event) => {
         if (event.button === 0) {
-            this.mouseDown = false;
+            clearTimeout(this.mouseDownTimeoutId)
         }
     }
 
     handleTouchstart = (event) => {
         if (this.props.holdToDisplay >= 0) {
             event.persist();
 
-            this.mouseDown = true;
-            setTimeout(() => {
-                if (this.mouseDown) this.handleContextClick(event);
-            }, this.props.holdToDisplay);
+            this.touchstartTimeoutId = setTimeout(
+                () => this.handleContextClick(event),
+                this.props.holdToDisplay
+            );
         }
     }
 
     handleTouchEnd = (event) => {
         event.preventDefault();
-        this.mouseDown = false;
+        clearTimeout(this.touchstartTimeoutId)
     }
 
     handleContextClick = (event) => {