Merge pull request #86 from Andorbal/master

Bypass setTimeout when activation should happen immediately
JedWatson · Apr 20, 2017 · a51eda7 · a51eda7
2 parents d37f461 + 013329e
commit a51eda7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/TappableMixin.js b/src/TappableMixin.js
@@ -73,7 +73,11 @@ var Mixin = {
 			this.initScrollDetection();
 			this.initPressDetection(event, this.endTouch);
 			this.initTouchmoveDetection();
-			this._activeTimeout = setTimeout(this.makeActive, this.props.activeDelay);
+			if (this.props.activeDelay > 0) {
+				this._activeTimeout = setTimeout(this.makeActive, this.props.activeDelay);
+			} else {
+				this.makeActive();
+			}
 		} else if (this.onPinchStart &&
 				(this.props.onPinchStart || this.props.onPinchMove || this.props.onPinchEnd) &&
 				event.touches.length === 2) {