targetj 1.0.253 → 1.0.254

package/build/EventListener.js

@@ -94,6 +94,7 @@ var EventListener = /*#__PURE__*/function () {
     this.bindedHandleWindowEvent = this.handleWindowEvent.bind(this);
     this.bindedHandleEvent = this.handleEvent.bind(this);
     this.bindedParentHandleEvent = this.handleDocEvent.bind(this);
+    this.maxPointerMoveDistance = 0;
   }
   return _createClass(EventListener, [{
     key: "detachWindowEvents",
@@ -223,38 +224,43 @@ var EventListener = /*#__PURE__*/function () {
   }, {
     key: "resetEventsOnTimeout",
     value: function resetEventsOnTimeout() {
-      if (this.scrollEndTimeStamp.x > 0 || this.scrollEndTimeStamp.y > 0 || this.currentTouch.pinchDelta) {
-        var now = TUtil.now();
-        var diff = Math.max(this.scrollEndTimeStamp.x - now, this.scrollEndTimeStamp.y - now);
-        if (diff > 100) {
-          this.currentTouch.deltaY *= 0.95;
-          this.currentTouch.deltaX *= 0.95;
-          this.currentTouch.pinchDelta *= 0.95;
-          if (Math.abs(this.currentTouch.deltaY) < 0.1) {
-            this.currentTouch.deltaY = 0;
-          }
-          if (Math.abs(this.currentTouch.deltaX) < 0.1) {
-            this.currentTouch.deltaX = 0;
-          }
-          if (Math.abs(this.currentTouch.pinchDelta) < 0.1) {
-            this.currentTouch.pinchDelta = 0;
-          }
-        }
-        if (diff <= 0) {
+      var hasPendingScroll = this.scrollEndTimeStamp.x > 0 || this.scrollEndTimeStamp.y > 0 || this.currentTouch.pinchDelta !== 0;
+      if (!hasPendingScroll) {
+        return;
+      }
+      if (this.touchCount > 0) {
+        return;
+      }
+      var now = TUtil.now();
+      var diff = Math.max(this.scrollEndTimeStamp.x - now, this.scrollEndTimeStamp.y - now);
+      if (diff > 100) {
+        this.currentTouch.deltaY *= 0.95;
+        this.currentTouch.deltaX *= 0.95;
+        this.currentTouch.pinchDelta *= 0.95;
+        if (Math.abs(this.currentTouch.deltaY) < 0.1) {
           this.currentTouch.deltaY = 0;
-          this.currentTouch.deltaX = 0;
-          this.currentTouch.pinchDelta = 0;
         }
-        if (!this.currentTouch.deltaX && this.scrollEndTimeStamp.x && now >= this.scrollEndTimeStamp.x && this.touchCount === 0) {
-          this.scrollEndTimeStamp.x = 0;
-          this.queueScrollEndEvent('x', this.currentHandlers.scrollLeft);
+        if (Math.abs(this.currentTouch.deltaX) < 0.1) {
+          this.currentTouch.deltaX = 0;
         }
-        if (!this.currentTouch.deltaY && this.scrollEndTimeStamp.y && now >= this.scrollEndTimeStamp.y && this.touchCount === 0) {
-          this.queueScrollEndEvent('y', this.currentHandlers.scrollTop);
-          this.scrollEndTimeStamp.y = 0;
+        if (Math.abs(this.currentTouch.pinchDelta) < 0.1) {
+          this.currentTouch.pinchDelta = 0;
         }
-        getRunScheduler().schedule(10, 'scroll decay');
       }
+      if (diff <= 0) {
+        this.currentTouch.deltaY = 0;
+        this.currentTouch.deltaX = 0;
+        this.currentTouch.pinchDelta = 0;
+      }
+      if (!this.currentTouch.deltaX && this.scrollEndTimeStamp.x && now >= this.scrollEndTimeStamp.x) {
+        this.scrollEndTimeStamp.x = 0;
+        this.queueScrollEndEvent('x', this.currentHandlers.scrollLeft);
+      }
+      if (!this.currentTouch.deltaY && this.scrollEndTimeStamp.y && now >= this.scrollEndTimeStamp.y) {
+        this.queueScrollEndEvent('y', this.currentHandlers.scrollTop);
+        this.scrollEndTimeStamp.y = 0;
+      }
+      getRunScheduler().schedule(10, 'scroll decay');
     }
   }, {
     key: "findEventHandlers",
@@ -448,6 +454,7 @@ var EventListener = /*#__PURE__*/function () {
       switch (eventName) {
         case 'mousedown':
         case 'touchstart':
+          this.maxPointerMoveDistance = 0;
           this.clearStart();
           this.clearEnd();
           this.clearTouch();
@@ -509,7 +516,7 @@ var EventListener = /*#__PURE__*/function () {
             }
             this.end0 = this.getTouch(event);
             var clickHandler = SearchUtil.findFirstClickHandler(tmodel);
-            var canAcceptClick = !this.start0 || clickHandler === this.currentHandlers.click && (clickHandler !== this.currentHandlers.swipe || this.getSwipeDistance() < 5);
+            var canAcceptClick = !this.start0 || clickHandler === this.currentHandlers.click && this.maxPointerMoveDistance < EventListener.CLICK_MOVE_THRESHOLD;
             if (clickHandler && canAcceptClick) {
               this.eventQueue.length = 0;
               this.eventQueue.push({
@@ -524,6 +531,7 @@ var EventListener = /*#__PURE__*/function () {
             }
             this.clearEnd();
             this.clearStart();
+            this.maxPointerMoveDistance = 0;
             this.touchCount = 0;
             event.stopPropagation();
             break;
@@ -555,6 +563,7 @@ var EventListener = /*#__PURE__*/function () {
           this.clearStart();
           this.clearEnd();
           this.clearTouch();
+          this.maxPointerMoveDistance = 0;
           this.touchCount = 0;
           event.stopPropagation();
           break;
@@ -726,6 +735,7 @@ var EventListener = /*#__PURE__*/function () {
       this.windowScrollEndTimer = 0;
       this.scrollEndTimeStamp.x = 0;
       this.scrollEndTimeStamp.y = 0;
+      this.maxPointerMoveDistance = 0;
       this.currentHandlers = {
         touch: null,
         click: null,
@@ -773,14 +783,6 @@ var EventListener = /*#__PURE__*/function () {
     value: function swipeY() {
       return this.cursor.y - this.swipeStartY;
     }
-  }, {
-    key: "getSwipeDistance",
-    value: function getSwipeDistance() {
-      if (this.start0 && this.end0) {
-        return TUtil.distance(this.start0.originalX, this.start0.originalY, this.end0.x, this.end0.y);
-      }
-      return 0;
-    }
   }, {
     key: "pinchDelta",
     value: function pinchDelta() {
@@ -1040,6 +1042,8 @@ var EventListener = /*#__PURE__*/function () {
         this.start0.x = this.end0 ? this.end0.x : this.start0.x;
         this.end0 = this.getTouch(event);
         if (TUtil.isDefined(this.end0)) {
+          var distance = TUtil.distance(this.start0.originalX, this.start0.originalY, this.end0.x, this.end0.y);
+          this.maxPointerMoveDistance = Math.max(this.maxPointerMoveDistance, distance);
           var deltaX = this.start0.x - this.end0.x;
           var deltaY = this.start0.y - this.end0.y;
           this.setDeltaXDeltaY(deltaX, deltaY, 'touch');
@@ -1144,4 +1148,5 @@ var EventListener = /*#__PURE__*/function () {
 }();
 _defineProperty(EventListener, "MAX_EVENT_QUEUE_SIZE", 10);
 _defineProperty(EventListener, "MAX_EVENT_TYPE_CAPACITY", 2);
+_defineProperty(EventListener, "CLICK_MOVE_THRESHOLD", 10);
 export { EventListener };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.253",
+  "version": "1.0.254",
   "description": "TargetJS: JavaScript UI framework where state is a destination and code order defines the UI sequence",
   "keywords": [
     "targetjs"