targetj 1.0.234 → 1.0.235

package/build/BaseModel.js

@@ -550,19 +550,19 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       return ((_this$targetValues$ke6 = this.targetValues[key]) === null || _this$targetValues$ke6 === void 0 ? void 0 : _this$targetValues$ke6.status) === 'complete' ? true : this.targetValues[key] === undefined ? undefined : false;
     }
   }, {
-    key: "isTargetCompleteDeep",
-    value: function isTargetCompleteDeep(key) {
-      return _TargetUtil.TargetUtil.isTargetCompleteDeep(this, key);
+    key: "isTargetTreeComplete",
+    value: function isTargetTreeComplete(key) {
+      return _TargetUtil.TargetUtil.isTargetTreeComplete(this, key) === true;
     }
   }, {
     key: "isTargetFullyCompleted",
     value: function isTargetFullyCompleted(key) {
-      return _TargetUtil.TargetUtil.isTargetFullyCompleted(this, key);
+      return _TargetUtil.TargetUtil.isTargetFullyCompleted(this, key) === true;
     }
   }, {
     key: "arePreviousTargetsComplete",
     value: function arePreviousTargetsComplete(key) {
-      return _TargetUtil.TargetUtil.arePreviousTargetsComplete(this, key);
+      return _TargetUtil.TargetUtil.arePreviousTargetsComplete(this, key) === true;
     }
   }, {
     key: "cleanupTarget",
@@ -1147,9 +1147,9 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         actualOptions = value;
       }
       if (this.canTargetBeActivated(key)) {
-        var _actualOptions, _target$childAction, _target$addChildActio;
+        var _actualOptions;
         if ((_actualOptions = actualOptions) !== null && _actualOptions !== void 0 && _actualOptions.reset) {
-          _TargetUtil.TargetUtil.resetTargetPipelineState(this, key);
+          _TargetUtil.TargetUtil.resetTargetState(this, key);
         }
         if (_TUtil.TUtil.isDefined(actualValue)) {
           this.val("___".concat(key), actualValue);
@@ -1157,13 +1157,6 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         if (this.isVisible()) {
           this.markLayoutDirty(key);
         }
-        var target = this.targets[key];
-        if (target !== null && target !== void 0 && (_target$childAction = target.childAction) !== null && _target$childAction !== void 0 && _target$childAction.length) {
-          target.childAction = [];
-        }
-        if (target !== null && target !== void 0 && (_target$addChildActio = target.addChildAction) !== null && _target$addChildActio !== void 0 && _target$addChildActio.length) {
-          target.addChildAction = [];
-        }
         var invokerTModel = _TargetUtil.TargetUtil.currentTModel;
         var invokerTarget = _TargetUtil.TargetUtil.currentTargetName;
         var targetValue = this.targetValues[key] || _TargetUtil.TargetUtil.emptyValue();

package/build/BracketGenerator.js

@@ -145,13 +145,13 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
         var bracket = targetBracket;
         bracket.startIndex = Math.min(bracket.startIndex, index);
         bracket.endIndex = bracket.startIndex + bracket.allChildrenList.length;
-        bracket.currentStatus = 'new';
+        bracket.currentBrakcetStatus = 2;
         bracket.markLayoutDirty('update');
         bracket = targetBracket.getParent();
         while (bracket instanceof _Bracket.Bracket) {
           bracket.startIndex = Math.min(bracket.startIndex, index);
           bracket.endIndex = Math.max(bracket.endIndex, index + 1);
-          bracket.currentStatus = 'new';
+          bracket.currentBrakcetStatus = 2;
           bracket.markLayoutDirty('update');
           bracket = bracket.getParent();
         }
@@ -296,7 +296,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     value: function markBracketDirty(bracket) {
       var current = bracket;
       while (current && current.type === 'BI') {
-        current.currentStatus = 'new';
+        current.currentBrakcetStatus = 2;
         current.markLayoutDirty('update');
         current = current.parent;
       }

package/build/EventListener.js

@@ -60,6 +60,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     this.swipeStartY = 0;
     this.currentEventName = '';
     this.currentEventType = '';
+    this.currentEventTModel = undefined;
     this.currentOriginalEvent = undefined;
     this.currentKey = '';
     this.currentHandlers = {
@@ -83,6 +84,11 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     this.allEvents = {};
     this.windowScrollX = window.scrollX | 0;
     this.windowScrollY = window.scrollY | 0;
+    this.windowScrollEndTimer = 0;
+    this.scrollEndTimeStamp = {
+      x: 0,
+      y: 0
+    };
     this.windowEpoch = 0;
     this.eventEpoch = 0;
     Object.values(_TargetData.TargetData.events).forEach(function (group) {
@@ -221,8 +227,9 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "resetEventsOnTimeout",
     value: function resetEventsOnTimeout() {
-      if (this.currentTouch.deltaY || this.currentTouch.deltaX || this.currentTouch.pinchDelta) {
-        var diff = this.touchTimeStamp - _TUtil.TUtil.now();
+      if (this.scrollEndTimeStamp.x > 0 || this.scrollEndTimeStamp.y > 0 || this.currentTouch.pinchDelta) {
+        var now = _TUtil.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;
@@ -236,16 +243,19 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           if (Math.abs(this.currentTouch.pinchDelta) < 0.1) {
             this.currentTouch.pinchDelta = 0;
           }
-          if (this.currentTouch.deltaX === 0 && this.currentTouch.deltaY === 0 && this.currentTouch.pinchDelta === 0) {
-            this.touchTimeStamp = 0;
-          }
         }
-        if (diff <= 0 || this.touchTimeStamp === 0) {
+        if (diff <= 0) {
           this.currentTouch.deltaY = 0;
           this.currentTouch.deltaX = 0;
           this.currentTouch.pinchDelta = 0;
-          this.currentTouch.dir = '';
-          this.touchTimeStamp = 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 (!this.currentTouch.deltaY && this.scrollEndTimeStamp.y && now >= this.scrollEndTimeStamp.y && this.touchCount === 0) {
+          this.queueScrollEndEvent('y', this.currentHandlers.scrollTop);
+          this.scrollEndTimeStamp.y = 0;
         }
         (0, _App.getRunScheduler)().schedule(10, 'scroll decay');
       }
@@ -297,12 +307,13 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       if (this.eventQueue.length === 0) {
         this.currentEventName = '';
         this.currentEventType = '';
+        this.currentEventTModel = undefined;
         this.currentOriginalEvent = undefined;
         this.currentKey = '';
         return;
       }
       var lastEvent = this.eventQueue.shift();
-      if (this.canFindHandlers) {
+      if (this.canFindHandlers && !lastEvent.synthetic) {
         this.findEventHandlers(lastEvent);
       }
       if (lastEvent.eventType === 'end' || lastEvent.eventType === 'click') {
@@ -316,6 +327,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       }
       this.currentEventName = lastEvent.eventName;
       this.currentEventType = lastEvent.eventType;
+      this.currentEventTModel = lastEvent.tmodel;
       this.currentOriginalEvent = lastEvent.originalEvent;
       this.currentTouch.key = '';
     }
@@ -332,7 +344,16 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "handleEvent",
     value: function handleEvent(event, isDocEvent, isWindowEvent) {
-      var _this$lastEvent, _tmodel, _tmodel2, _this$currentHandlers2, _this$currentHandlers3, _this$currentHandlers4, _this$currentHandlers5, _this$currentHandlers7, _this$currentHandlers8;
+      var _this$lastEvent,
+        _tmodel,
+        _tmodel2,
+        _this$currentHandlers2,
+        _this$currentHandlers3,
+        _this$currentHandlers4,
+        _this$currentHandlers5,
+        _this$currentHandlers7,
+        _this$currentHandlers8,
+        _this7 = this;
       if (!event) {
         return;
       }
@@ -435,7 +456,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
             }
             if (this.touchCount > 0) {
               var _this$currentHandlers6;
-              this.touchTimeStamp = now + 10;
+              this.scrollEndTimeStamp.x = 0;
+              this.scrollEndTimeStamp.y = 0;
               this.move(event);
               event.stopPropagation();
               (_this$currentHandlers6 = this.currentHandlers.swipe) === null || _this$currentHandlers6 === void 0 || _this$currentHandlers6.markLayoutDirty('swipe-event');
@@ -485,7 +507,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
             event.preventDefault();
             event.stopPropagation();
           }
-          this.touchTimeStamp = now + 500;
+          this.touchCount = 0;
           this.wheel(event);
           break;
         case 'mouseleave':
@@ -528,20 +550,85 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           });
           break;
         case 'scroll':
+          clearTimeout(this.windowScrollEndTimer);
+          this.windowScrollEndTimer = setTimeout(function () {
+            _this7.queueWindowScrollEndEvent('x', tmodel);
+            _this7.queueWindowScrollEndEvent('y', tmodel);
+            _this7.windowScrollEndTimer = 0;
+          }, 120);
           if (isWindowEvent) {
             this.windowEpoch++;
             this.windowScrollX = window.scrollX | 0;
             this.windowScrollY = window.scrollY | 0;
             (0, _App.getLocationManager)().domIslandSet.forEach(function (t) {
-              t.markLayoutDirty('winScroll-event');
+              t.markLayoutDirty('window-scroll-event');
             });
           } else {
-            tmodel.markLayoutDirty('winScroll-event');
+            tmodel.markLayoutDirty('container-scroll-event');
+            clearTimeout(tmodel.scrollEndTimer);
+            tmodel.scrollEndTimer = setTimeout(function () {
+              _this7.queueWindowScrollEndEvent('x', tmodel, 'container');
+              _this7.queueWindowScrollEndEvent('y', tmodel, 'container');
+              tmodel.scrollEndTimer = 0;
+            }, 120);
           }
           break;
       }
       (0, _App.getRunScheduler)().schedule(0, "".concat(originalName, "-").concat(eventName, "-").concat((event.target.tagName || '').toUpperCase()));
     }
+  }, {
+    key: "queueScrollEndEvent",
+    value: function queueScrollEndEvent(axis, handler) {
+      if (!handler) {
+        return;
+      }
+      var eventType = axis === 'x' ? 'scrollleftend' : 'scrolltopend';
+      this.removeScrollEndEvents(axis);
+      this.eventQueue.push({
+        eventName: eventType,
+        eventType: eventType,
+        originalName: eventType,
+        tmodel: handler,
+        originalEvent: undefined,
+        timeStamp: _TUtil.TUtil.now(),
+        synthetic: true
+      });
+      this.eventEpoch++;
+      handler.markEventDirty();
+      handler.markLayoutDirty(eventType);
+      (0, _App.getRunScheduler)().schedule(0, eventType);
+    }
+  }, {
+    key: "queueWindowScrollEndEvent",
+    value: function queueWindowScrollEndEvent(axis, tmodel) {
+      var scrollSource = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'window';
+      var eventType = axis === 'x' ? 'windowscrollleftend' : 'windowscrolltopend';
+      this.removeScrollEndEvents(axis);
+      this.eventQueue.push({
+        eventName: eventType,
+        eventType: eventType,
+        originalName: eventType,
+        tmodel: tmodel,
+        originalEvent: undefined,
+        timeStamp: _TUtil.TUtil.now(),
+        synthetic: true,
+        scrollSource: scrollSource
+      });
+      this.eventEpoch++;
+      (0, _App.getLocationManager)().domIslandSet.forEach(function (t) {
+        t.markEventDirty();
+        t.markLayoutDirty(eventType);
+      });
+      (0, _App.getRunScheduler)().schedule(0, eventType);
+    }
+  }, {
+    key: "removeScrollEndEvents",
+    value: function removeScrollEndEvents(axis) {
+      var types = axis === 'x' ? new Set(['scrollleftend', 'windowscrollleftend']) : new Set(['scrolltopend', 'windowscrolltopend']);
+      this.eventQueue = this.eventQueue.filter(function (event) {
+        return !types.has(event.eventType);
+      });
+    }
   }, {
     key: "resizeRoot",
     value: function resizeRoot() {
@@ -607,7 +694,6 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       this.clearEnd();
       this.clearTouch();
       this.eventQueue.length = 0;
-      this.touchTimeStamp = 0;
       this.touchCount = 0;
       this.canFindHandlers = true;
       this.lastEvent = undefined;
@@ -616,6 +702,10 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       this.swipeStartX = 0;
       this.swipeStartY = 0;
       this.hovered.clear();
+      clearTimeout(this.windowScrollEndTimer);
+      this.windowScrollEndTimer = 0;
+      this.scrollEndTimeStamp.x = 0;
+      this.scrollEndTimeStamp.y = 0;
     }
   }, {
     key: "deltaX",
@@ -760,6 +850,11 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     value: function getEventType() {
       return this.currentEventType;
     }
+  }, {
+    key: "getEventTModel",
+    value: function getEventTModel() {
+      return this.currentEventTModel;
+    }
   }, {
     key: "isClickHandler",
     value: function isClickHandler(handler) {
@@ -834,6 +929,26 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     value: function isScrollTopHandler(handler) {
       return this.currentHandlers.scrollTop === handler;
     }
+  }, {
+    key: "isScrollLeftEndHandler",
+    value: function isScrollLeftEndHandler(handler) {
+      return this.currentHandlers.scrollLeft === handler && this.currentEventType === 'scrollleftend';
+    }
+  }, {
+    key: "isScrollTopEndHandler",
+    value: function isScrollTopEndHandler(handler) {
+      return this.currentHandlers.scrollTop === handler && this.currentEventType === 'scrolltopend';
+    }
+  }, {
+    key: "isScrolling",
+    value: function isScrolling() {
+      return this.scrollEndTimeStamp.x > 0 || this.scrollEndTimeStamp.y > 0;
+    }
+  }, {
+    key: "isWindowScrolling",
+    value: function isWindowScrolling() {
+      return this.windowScrollEndTimer > 0;
+    }
   }, {
     key: "isPinchHandler",
     value: function isPinchHandler(handler) {
@@ -919,15 +1034,15 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         var momentum;
         if (this.currentTouch.orientation === 'horizontal' && Math.abs(deltaX) > 0 && period > 0) {
           momentum = _TUtil.TUtil.momentum(0, deltaX, period);
-          this.touchTimeStamp = this.end0.timeStamp + momentum.duration;
-          if (this.touchTimeStamp - _TUtil.TUtil.now() > 0) {
+          this.scrollEndTimeStamp.x = this.end0.timeStamp + momentum.duration;
+          if (this.scrollEndTimeStamp.x - _TUtil.TUtil.now() > 0) {
             this.currentTouch.deltaX = momentum.distance;
             this.currentTouch.manualMomentumFlag = true;
           }
         } else if (this.currentTouch.orientation === 'vertical' && Math.abs(deltaY) > 0 && period > 0) {
           momentum = _TUtil.TUtil.momentum(0, deltaY, period);
-          this.touchTimeStamp = this.end0.timeStamp + momentum.duration;
-          if (this.touchTimeStamp - _TUtil.TUtil.now() > 0) {
+          this.scrollEndTimeStamp.y = this.end0.timeStamp + momentum.duration;
+          if (this.scrollEndTimeStamp.y - _TUtil.TUtil.now() > 0) {
             this.currentTouch.deltaY = momentum.distance;
             this.currentTouch.manualMomentumFlag = true;
           }
@@ -945,10 +1060,16 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       } else if (this.currentTouch.orientation === 'none' || this.currentTouch.orientation === 'horizontal' && diff <= -2 || this.currentTouch.orientation === 'vertical') {
         this.currentTouch.orientation = 'vertical';
       }
+      var now = _TUtil.TUtil.now();
+      var endDelay = source === 'touch' ? 0 : 500;
       if (this.currentTouch.orientation === 'horizontal') {
         this.currentTouch.dir = deltaX < 0 ? 'left' : deltaX > 0 ? 'right' : this.currentTouch.dir;
+        this.scrollEndTimeStamp.x = now + endDelay;
+        this.removeScrollEndEvents('x');
       } else {
         this.currentTouch.dir = deltaY < 0 ? 'up' : deltaY > 0 ? 'down' : this.currentTouch.dir;
+        this.scrollEndTimeStamp.y = now + endDelay;
+        this.removeScrollEndEvents('y');
       }
       this.currentTouch.source = source;
 
@@ -957,6 +1078,9 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       this.currentTouch.prevDeltaY += deltaY;
       this.currentTouch.deltaX = this.currentTouch.prevDeltaX;
       this.currentTouch.deltaY = this.currentTouch.prevDeltaY;
+      if (this.scrollEndTimeStamp.x > 0 || this.scrollEndTimeStamp.y > 0) {
+        (0, _App.getRunScheduler)().schedule(endDelay, 'scroll-end-check');
+      }
     }
   }, {
     key: "wheel",