targetj 1.0.253 → 1.0.255

package/build/$Dom.js

@@ -133,10 +133,15 @@ var $Dom = /*#__PURE__*/function () {
       }
       return slot;
     }
+  }, {
+    key: "isManagedChildNode",
+    value: function isManagedChildNode(node) {
+      return (node === null || node === void 0 ? void 0 : node.nodeType) === 1 && node.getAttribute("tgjs") === "true";
+    }
   }, {
     key: "enableSlotMode",
     value: function enableSlotMode() {
-      var _this$element4;
+      var _this = this;
       if (this.slotModeEnabled) {
         return;
       }
@@ -144,32 +149,24 @@ var $Dom = /*#__PURE__*/function () {
         this.slotModeEnabled = true;
         return;
       }
-      var existingSlot = this.findContentSlot();
-      if (existingSlot) {
-        if (this.element.firstChild !== existingSlot) {
-          this.element.insertBefore(existingSlot, this.element.firstChild);
+      var slot = this.findContentSlot();
+      if (!slot) {
+        var existingNodes = Array.from(this.element.childNodes);
+        slot = document.createElement("div");
+        slot.setAttribute("data-tj-slot", "content");
+        this.element.insertBefore(slot, this.element.firstChild);
+        for (var _i = 0, _existingNodes = existingNodes; _i < _existingNodes.length; _i++) {
+          var node = _existingNodes[_i];
+          if (!this.isManagedChildNode(node)) {
+            slot.appendChild(node);
+          }
         }
-        this.contentSlot = existingSlot;
-        this.slotModeEnabled = true;
-        this.hasRealChildren = Array.from(this.element.childNodes).some(function (node) {
-          return node !== existingSlot;
-        });
-        return;
-      }
-      if (!((_this$element4 = this.element) !== null && _this$element4 !== void 0 && _this$element4.firstChild)) {
-        this.slotModeEnabled = true;
-        return;
-      }
-      var existingNodes = Array.from(this.element.childNodes);
-      var slot = document.createElement("div");
-      slot.setAttribute("data-tj-slot", "content");
-      this.element.insertBefore(slot, this.element.firstChild);
-      for (var _i = 0, _existingNodes = existingNodes; _i < _existingNodes.length; _i++) {
-        var node = _existingNodes[_i];
-        slot.appendChild(node);
       }
       this.contentSlot = slot;
       this.slotModeEnabled = true;
+      this.hasRealChildren = Array.from(this.element.children).some(function (child) {
+        return child !== slot && _this.isManagedChildNode(child);
+      });
     }
   }, {
     key: "ensureSlotMode",
@@ -201,8 +198,8 @@ var $Dom = /*#__PURE__*/function () {
   }, {
     key: "getTagName",
     value: function getTagName() {
-      var _this$element5;
-      return (_this$element5 = this.element) === null || _this$element5 === void 0 || (_this$element5 = _this$element5.tagName) === null || _this$element5 === void 0 ? void 0 : _this$element5.toLowerCase();
+      var _this$element4;
+      return (_this$element4 = this.element) === null || _this$element4 === void 0 || (_this$element4 = _this$element4.tagName) === null || _this$element4 === void 0 ? void 0 : _this$element4.toLowerCase();
     }
   }, {
     key: "setSelector",
@@ -291,9 +288,9 @@ var $Dom = /*#__PURE__*/function () {
   }, {
     key: "setStyleByMap",
     value: function setStyleByMap(attrMap) {
-      var _this = this;
+      var _this2 = this;
       Object.keys(attrMap).forEach(function (key) {
-        _this.style(key, attrMap[key]);
+        _this2.style(key, attrMap[key]);
       });
     }
   }, {
@@ -578,14 +575,14 @@ var $Dom = /*#__PURE__*/function () {
   }, {
     key: "getScrollTop",
     value: function getScrollTop() {
-      var _this$element$scrollT, _this$element6;
-      return (_this$element$scrollT = (_this$element6 = this.element) === null || _this$element6 === void 0 ? void 0 : _this$element6.scrollTop) !== null && _this$element$scrollT !== void 0 ? _this$element$scrollT : 0;
+      var _this$element$scrollT, _this$element5;
+      return (_this$element$scrollT = (_this$element5 = this.element) === null || _this$element5 === void 0 ? void 0 : _this$element5.scrollTop) !== null && _this$element$scrollT !== void 0 ? _this$element$scrollT : 0;
     }
   }, {
     key: "getScrollLeft",
     value: function getScrollLeft() {
-      var _this$element$scrollL, _this$element7;
-      return (_this$element$scrollL = (_this$element7 = this.element) === null || _this$element7 === void 0 ? void 0 : _this$element7.scrollLeft) !== null && _this$element$scrollL !== void 0 ? _this$element$scrollL : 0;
+      var _this$element$scrollL, _this$element6;
+      return (_this$element$scrollL = (_this$element6 = this.element) === null || _this$element6 === void 0 ? void 0 : _this$element6.scrollLeft) !== null && _this$element$scrollL !== void 0 ? _this$element$scrollL : 0;
     }
   }], [{
     key: "createTemplate",

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 };