targetj 1.0.218 → 1.0.220

package/README.md

@@ -40,11 +40,11 @@ This creates a blue box that grows, then turns red, and then logs "Hello World"
 import { App } from "targetj";
 
 App({
-  backgroundColor: 'blue',
-  height: 100,
-  width: { value: [100, 200], steps: 100 }, // 1. Animate width in 100 steps using the default 8 ms interval per step.
-  backgroundColor$$: { value: 'red', steps: 100 }, // 2. Wait ($$) then turn red in 100 steps
-  done$$() { console.log("Hello World!"); } // 3. Wait ($$) then log
+  backgroundColor: 'blue', // Starts immediately
+  width: { value: [100, 200], steps: 100 }, // Starts immediately: animate width from 100px to 200px in 100 steps with 8 ms interval per step.
+  height: { value: [100, 200], steps: 100 }, // Starts immediately: animate height.
+  backgroundColor$$: { value: 'red', steps: 100 }, // Wait ($$) for width/height to finish
+  done$$() { console.log("Hello World!"); } // 3. Waits ($$) for the background color
 }).mount("#app");
 ```
 
@@ -170,7 +170,7 @@ App({
 
 ### Summary
 
-Instead of wiring callbacks and effects, you write a sequence of targets. All targets execute automatically in the order they are written. `$$` defers execution until all prior sibling steps finish. Animations, API calls, event handling, and child creation are all treated as the same kind of thing: targets. Complex asynchronous flows are expressed by organizing work into parent and child targets. In addition, targets also provide built-in capabilities such as `onComplete` callback, enabledOn, looping with delays, and more as explained below.
+Each target has its own state and lifecycle. Targets execute automatically in the order they are written. `$$` defers execution until all prior sibling targets (including their children) are fully complete. Animations, API calls, event handling, and child creation are all treated uniformly as targets. Complex asynchronous flows can be structured by organizing work into parent and child targets. In addition, targets provide built-in capabilities such as `onComplete` callbacks, `enabledOn`, looping with delays, and more. This also makes the code more compact, as it avoids using extra variables to track progress and reduces the need for loops and conditional statements.
 
 ---
 

package/build/$Dom.js

@@ -496,9 +496,9 @@ var $Dom = exports.$Dom = /*#__PURE__*/function () {
     }
   }, {
     key: "detachEvent",
-    value: function detachEvent(type, fn) {
+    value: function detachEvent(type, fn, capture) {
       if (this.element.removeEventListener) {
-        this.element.removeEventListener(type, fn, false);
+        this.element.removeEventListener(type, fn, capture);
       } else if (this.element.detachEvent) {
         this.element.detachEvent("on".concat(type), fn);
       } else {

package/build/App.js

@@ -93,9 +93,6 @@ var AppFn = function AppFn() {
       return tmodel;
     };
     my.tRoot = my.tRootFactory();
-    window.history.pushState({
-      link: document.URL
-    }, "", document.URL);
     return my;
   };
   my.start = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -177,8 +174,9 @@ var AppFn = function AppFn() {
         case 3:
           my.manager.clearAll();
           my.locationManager.clear();
+          my.loader.clear();
           _SearchUtil.SearchUtil.clear();
-        case 6:
+        case 7:
         case "end":
           return _context3.stop();
       }
@@ -212,6 +210,51 @@ App.mount = function (child, elemTarget) {
   }
   return tmodel;
 };
+App.unmount = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+  var root, children;
+  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+    while (1) switch (_context4.prev = _context4.next) {
+      case 0:
+        if (tApp) {
+          _context4.next = 2;
+          break;
+        }
+        return _context4.abrupt("return");
+      case 2:
+        _context4.next = 4;
+        return tApp.stop();
+      case 4:
+        root = tApp.tRoot;
+        children = root.getChildren();
+        children.forEach(function (child) {
+          var _child$$dom2;
+          if (child.val('sourceDom')) {
+            var _child$$dom;
+            _DomInit.DomInit.restoreDomState((_child$$dom = child.$dom) === null || _child$$dom === void 0 ? void 0 : _child$$dom.element, child.domState);
+            return;
+          }
+          if ((_child$$dom2 = child.$dom) !== null && _child$$dom2 !== void 0 && _child$$dom2.attr('tgjs')) {
+            root.$dom.removeElement(child.$dom.element);
+          }
+        });
+        root.allChildrenList = [];
+        root.allChildrenMap = {};
+        root.clearUpdatingChildren();
+        root.clearActiveChildren();
+        root.clearAnimatingChildren();
+        _context4.next = 14;
+        return tApp.reset();
+      case 14:
+        App.oids = {};
+        App.tmodelIdMap = {};
+        queuedAppCalls.length = 0;
+        exports.tApp = tApp = undefined;
+      case 18:
+      case "end":
+        return _context4.stop();
+    }
+  }, _callee4);
+}));
 App.oids = {};
 App.tmodelIdMap = {};
 App.getOid = function (type) {

package/build/BaseModel.js

@@ -428,7 +428,8 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "addTargets",
     value: function addTargets(targets) {
-      var _this2 = this;
+      var _this2 = this,
+        _getRunScheduler;
       Object.keys(targets).forEach(function (key) {
         _this2.targets[key] = targets[key];
         _this2.removeFromUpdatingTargets(key);
@@ -441,7 +442,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       if (this.hasDom()) {
         (0, _App.getEvents)().attachEvents([this]);
       }
-      (0, _App.getRunScheduler)().schedule(1, 'addTargets-' + this.oid);
+      (_getRunScheduler = (0, _App.getRunScheduler)()) === null || _getRunScheduler === void 0 || _getRunScheduler.schedule(1, 'addTargets-' + this.oid);
     }
   }, {
     key: "getTargetStepPercent",

package/build/DomInit.js

@@ -9,6 +9,10 @@ var _TUtil = require("./TUtil.js");
 var _App = require("./App.js");
 var _TargetData = require("./TargetData.js");
 var _TModelUtil = require("./TModelUtil.js");
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -72,6 +76,7 @@ var DomInit = exports.DomInit = /*#__PURE__*/function () {
       if (elemTarget !== undefined) {
         var $dom = _TModelUtil.TModelUtil.normalizeDomHolder(elemTarget);
         if ($dom) {
+          tmodel.domState = DomInit.snapshotDomState($dom.element);
           tmodel.targets.$dom = $dom;
           tmodel.val('$dom', $dom);
           var tag = $dom.getTagName().toLowerCase();
@@ -80,6 +85,7 @@ var DomInit = exports.DomInit = /*#__PURE__*/function () {
             patch.element = tag;
           }
           patch.position = $dom.getStyleValue('position') || 'relative';
+          patch.sourceDom = true;
           patch.domIsland = true;
           if (!_TUtil.TUtil.isDefined(tmodel.targets.reuseDomDefinition)) {
             patch.reuseDomDefinition = true;
@@ -281,5 +287,55 @@ var DomInit = exports.DomInit = /*#__PURE__*/function () {
       } catch (_unused3) {}
       return rawValue;
     }
+  }, {
+    key: "snapshotDomState",
+    value: function snapshotDomState(element) {
+      if (!element || element.nodeType !== 1) {
+        return;
+      }
+      var attrs = {};
+      for (var _i2 = 0, _Array$from = Array.from(element.attributes); _i2 < _Array$from.length; _i2++) {
+        var _Array$from$_i = _Array$from[_i2],
+          name = _Array$from$_i.name,
+          value = _Array$from$_i.value;
+        attrs[name] = value;
+      }
+      var styleAttr = element.getAttribute("style");
+      var html = element.innerHTML;
+      return {
+        attrs: attrs,
+        styleAttr: styleAttr,
+        html: html
+      };
+    }
+  }, {
+    key: "restoreDomState",
+    value: function restoreDomState(element, domState) {
+      if (!element || element.nodeType !== 1 || !domState) {
+        return;
+      }
+      var originalAttrs = domState.attrs,
+        originalStyleAttr = domState.styleAttr;
+      for (var _i3 = 0, _Array$from2 = Array.from(element.attributes); _i3 < _Array$from2.length; _i3++) {
+        var name = _Array$from2[_i3].name;
+        if (!(name in originalAttrs)) {
+          element.removeAttribute(name);
+        }
+      }
+      for (var _i4 = 0, _Object$entries = Object.entries(originalAttrs); _i4 < _Object$entries.length; _i4++) {
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i4], 2),
+          _name = _Object$entries$_i[0],
+          value = _Object$entries$_i[1];
+        if (element.getAttribute(_name) !== value) {
+          element.setAttribute(_name, value);
+        }
+      }
+      if (!originalStyleAttr) {
+        element.removeAttribute("style");
+      } else {
+        element.setAttribute("style", originalStyleAttr);
+      }
+      element.innerHTML = domState.html;
+    }
   }]);
 }();

package/build/EventListener.js

@@ -84,6 +84,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     this.windowScrollX = window.scrollX | 0;
     this.windowScrollY = window.scrollY | 0;
     this.windowEpoch = 0;
+    this.eventEpoch = 0;
     Object.values(_TargetData.TargetData.events).forEach(function (group) {
       Object.assign(_this.allEvents, group);
     });
@@ -110,18 +111,22 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     }
   }, {
     key: "detachDocumentEvents",
-    value: function detachDocumentEvents() {
+    value: function detachDocumentEvents(groupName) {
       var _this4 = this;
-      Object.keys(_TargetData.TargetData.events.documentEvents).forEach(function (key) {
-        _this4.$document.detachEvent(key, _this4.bindedParentHandleEvent);
+      var group = _TargetData.TargetData.events[groupName];
+      Object.keys(group).forEach(function (type) {
+        var spec = group[type];
+        _this4.$document.detachEvent(type, _this4.bindedParentHandleEvent, spec.capture);
       });
     }
   }, {
     key: "attachDocumentEvents",
-    value: function attachDocumentEvents() {
+    value: function attachDocumentEvents(groupName) {
       var _this5 = this;
-      Object.keys(_TargetData.TargetData.events.documentEvents).forEach(function (key) {
-        _this5.$document.addEvent(key, _this5.bindedParentHandleEvent);
+      var group = _TargetData.TargetData.events[groupName];
+      Object.keys(group).forEach(function (type) {
+        var spec = group[type];
+        _this5.$document.addEvent(type, _this5.bindedParentHandleEvent, spec.capture, spec.passive);
       });
     }
   }, {
@@ -169,7 +174,11 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         if (!eventMap) {
           return undefined;
         }
+        var hasPointer = typeof window !== 'undefined' && !!window.PointerEvent;
         Object.keys(eventMap).forEach(function (key) {
+          if (hasPointer && key.startsWith('mouse')) {
+            return;
+          }
           var eventSpec = eventMap[key];
           var isWindow = !!eventSpec.windowEvent;
           var $dom = isWindow ? _App.tApp.$window : tmodel.hasDom() ? tmodel.$dom : null;
@@ -181,12 +190,13 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           var attachedKey = "".concat(tmodel.oid, " ").concat(key, " ").concat(isWindow ? 'win' : 'dom');
           var alreadyAttached = _this6.attachedEventMap[attachedKey] && _this6.attachedEventMap[attachedKey].$dom === $dom;
           if (force || !alreadyMarked || !alreadyAttached) {
-            $dom.detachEvent(key, _this6.bindedHandleEvent);
+            $dom.detachEvent(key, _this6.bindedHandleEvent, eventSpec.capture);
             $dom.addEvent(key, _this6.bindedHandleEvent, eventSpec.capture, eventSpec.passive);
             _this6.eventTargetMap[attachMarkerKey] = $dom;
             _this6.attachedEventMap[attachedKey] = {
               $dom: $dom,
-              event: key
+              event: key,
+              capture: !!eventSpec.capture
             };
           }
         });
@@ -195,16 +205,16 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "detachAll",
     value: function detachAll() {
-      var _this7 = this;
-      var eventKeys = Object.keys(this.attachedEventMap);
-      eventKeys.forEach(function (eventKey) {
-        var _this7$attachedEventM = _this7.attachedEventMap[eventKey],
-          $dom = _this7$attachedEventM.$dom,
-          event = _this7$attachedEventM.event;
+      for (var _i = 0, _Object$keys = Object.keys(this.attachedEventMap); _i < _Object$keys.length; _i++) {
+        var k = _Object$keys[_i];
+        var _this$attachedEventMa = this.attachedEventMap[k],
+          $dom = _this$attachedEventMa.$dom,
+          event = _this$attachedEventMa.event,
+          capture = _this$attachedEventMa.capture;
         if ($dom.exists()) {
-          $dom.detachEvent(event, _this7.bindedHandleEvent);
+          $dom.detachEvent(event, this.bindedHandleEvent, capture);
         }
-      });
+      }
       this.attachedEventMap = {};
       this.eventTargetMap = {};
     }
@@ -322,7 +332,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "handleEvent",
     value: function handleEvent(event, isDocEvent, isWindowEvent) {
-      var _tmodel, _this$lastEvent, _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;
       if (!event) {
         return;
       }
@@ -344,7 +354,6 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       } else {
         tmodel = this.getTModelFromEvent(event);
       }
-      (_tmodel = tmodel) === null || _tmodel === void 0 || _tmodel.markLayoutDirty('event');
       var newEvent = {
         eventName: eventName,
         eventItem: eventItem,
@@ -359,7 +368,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           lastEventItem = _this$lastEvent2.eventItem,
           lastTimeStamp = _this$lastEvent2.timeStamp;
         var rate = now - lastTimeStamp;
-        if (inputType && lastEventItem.inputType && lastEventItem.inputType !== inputType && eventOrder > lastEventItem.order) {
+        var isTerminal = eventType === 'end' || eventType === 'cancel' || eventType === 'start';
+        if (!isTerminal && inputType && lastEventItem.inputType && lastEventItem.inputType !== inputType && eventOrder > lastEventItem.order) {
           return;
         }
         if (this.eventQueue.length > EventListener.MAX_EVENT_QUEUE_SIZE && rateLimit > 0 && rate < rateLimit) {
@@ -381,6 +391,9 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           }
         }
       }
+      this.eventEpoch++;
+      (_tmodel = tmodel) === null || _tmodel === void 0 || _tmodel.markEventDirty();
+      (_tmodel2 = tmodel) === null || _tmodel2 === void 0 || _tmodel2.markLayoutDirty('event');
       this.lastEvent = newEvent;
       if (queue) {
         this.eventQueue.push(this.lastEvent);
@@ -392,6 +405,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           this.clearStart();
           this.clearEnd();
           this.clearTouch();
+          this.eventQueue.length = 0;
+          this.eventQueue.push(this.lastEvent);
           this.touchCount = this.countTouches(event) || 1;
           if (this.preventDefault(tmodel, eventName) && event.cancelable) {
             event.preventDefault();
@@ -406,8 +421,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           this.swipeStartX = this.start0.x - ((_this$currentHandlers2 = (_this$currentHandlers3 = this.currentHandlers.swipe) === null || _this$currentHandlers3 === void 0 ? void 0 : _this$currentHandlers3.getX()) !== null && _this$currentHandlers2 !== void 0 ? _this$currentHandlers2 : 0);
           this.swipeStartY = this.start0.y - ((_this$currentHandlers4 = (_this$currentHandlers5 = this.currentHandlers.swipe) === null || _this$currentHandlers5 === void 0 ? void 0 : _this$currentHandlers5.getY()) !== null && _this$currentHandlers4 !== void 0 ? _this$currentHandlers4 : 0);
           event.stopPropagation();
-          this.detachDocumentEvents();
-          this.attachDocumentEvents();
+          this.detachDocumentEvents('documentDragEvents');
+          this.attachDocumentEvents('documentDragEvents');
           break;
         case 'mousemove':
         case 'touchmove':
@@ -431,7 +446,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           }
         case 'mouseup':
         case 'touchend':
-          this.detachDocumentEvents();
+          this.detachDocumentEvents('documentDragEvents');
           if (this.preventDefault(tmodel, eventName) && event.cancelable) {
             event.preventDefault();
           }
@@ -475,7 +490,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           break;
         case 'mouseleave':
           if (isDocEvent && this.touchCount > 0) {
-            this.detachDocumentEvents();
+            this.detachDocumentEvents('documentDragEvents');
             touch = this.getTouch(event);
             this.cursor.x = touch.x;
             this.cursor.y = touch.y;
@@ -485,6 +500,16 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
             event.stopPropagation();
           }
           break;
+        case 'mousecancel':
+        case 'touchcancel':
+          this.canFindHandlers = true;
+          this.detachDocumentEvents('documentDragEvents');
+          this.clearStart();
+          this.clearEnd();
+          this.clearTouch();
+          this.touchCount = 0;
+          event.stopPropagation();
+          break;
         case 'key':
           this.currentTouch.key = event.which || event.keyCode;
           (_this$currentHandlers7 = this.currentHandlers.focus) === null || _this$currentHandlers7 === void 0 || _this$currentHandlers7.markLayoutDirty('key-event');
@@ -496,7 +521,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         case 'resize':
           this.windowEpoch++;
           this.resizeRoot();
-          _App.tApp.manager.getVisibles().forEach(function (t) {
+          (0, _App.getManager)().getVisibles().forEach(function (t) {
             if (t.targets['onResize']) {
               t.markLayoutDirty('resize-event');
             }
@@ -541,11 +566,11 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       }
       if (!oid || !_App.tApp.manager.visibleOidMap[oid]) {
         oid = el === null || el === void 0 ? void 0 : el.id;
-        if (!oid || !_App.tApp.manager.visibleOidMap[oid]) {
+        if (!oid || !(0, _App.getManager)().visibleOidMap[oid]) {
           oid = _$Dom.$Dom.findNearestParentWithId(event.target);
         }
       }
-      return _App.tApp.manager.visibleOidMap[oid];
+      return (0, _App.getManager)().visibleOidMap[oid];
     }
   }, {
     key: "clearStart",

package/build/LoadingManager.js

@@ -236,7 +236,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           tmodelEntry.accessIndex += result.length;
         } else if (_TUtil.TUtil.isDefined(targetValue[tmodelEntry.accessIndex])) {
           result = targetValue[tmodelEntry.accessIndex];
-          tmodelEntry.accessIndex++;
+          tmodelEntry.accessIndex = Math.min(tmodelEntry.accessIndex + 1, tmodelEntry.entryCount - 1);
         }
       }
       return result;

package/build/LocationManager.js

@@ -17,12 +17,12 @@ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLim
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -154,24 +154,9 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               processAfterAllChildren = function processAfterAllChildren(job) {
-                var container = job.container,
-                  children = job.children;
+                var container = job.container;
                 container.adjustViewport();
                 container.calcContentWidthHeight();
-                if ((0, _App.getEvents)().getEventType() || (0, _App.getEvents)().hasDelta()) {
-                  var _iterator = _createForOfIteratorHelper(children),
-                    _step;
-                  try {
-                    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                      var child = _step.value;
-                      _this.checkExternalEvents(child);
-                    }
-                  } catch (err) {
-                    _iterator.e(err);
-                  } finally {
-                    _iterator.f();
-                  }
-                }
               };
               resetDirtyLayout = function resetDirtyLayout(job) {
                 var children = job.children,
@@ -213,6 +198,12 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
                     }
                     container.calcContentWidthHeight();
                   }
+                  if (child.hasEventDirty() || (0, _App.getEvents)().getEventType() || (0, _App.getEvents)().hasDelta()) {
+                    _this.checkExternalEvents(child);
+                    if (child.hasEventDirty()) {
+                      child.processedEventEpoch = child.eventDirtyEpoch;
+                    }
+                  }
                 }
                 job.index++;
                 if (job.index < job.children.length) {
@@ -339,7 +330,7 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
                   container.backupDirtyLayout = _objectSpread({}, container.dirtyLayout);
                 }
                 container.visibleChildren.length = 0;
-                job.children = allChildrenList;
+                job.children = allChildrenList.slice(0);
                 job.index = 0;
                 job.viewport = container.createViewport();
                 job.stage = 'child';
@@ -358,7 +349,9 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
               stack.pop();
               return _context2.abrupt("continue", 4);
             case 18:
-              processChild(job);
+              if (job.stage === 'child') {
+                processChild(job);
+              }
               _context2.next = 4;
               break;
             case 21:
@@ -501,17 +494,17 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
       while (tmodel.activatedTargets.length && guard++ < 50) {
         var batch = tmodel.activatedTargets.slice(0);
         tmodel.activatedTargets.length = 0;
-        var _iterator2 = _createForOfIteratorHelper(batch),
-          _step2;
+        var _iterator = _createForOfIteratorHelper(batch),
+          _step;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var key = _step2.value;
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var key = _step.value;
             (0, _App.getTargetManager)().applyTargetValue(tmodel, key);
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator.e(err);
         } finally {
-          _iterator2.f();
+          _iterator.f();
         }
       }
       (0, _App.getTargetManager)().applyTargetValues(tmodel);
@@ -550,11 +543,11 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
           var list = _this3.resumePausedList.slice();
           _this3.resumePausedList.length = 0;
           _this3.resumePausedMap = {};
-          var _iterator3 = _createForOfIteratorHelper(list),
-            _step3;
+          var _iterator2 = _createForOfIteratorHelper(list),
+            _step2;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var tmodel = _step3.value;
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var tmodel = _step2.value;
               var batch = tmodel.pausedBatch;
               if (!batch || !tmodel.hasDom()) {
                 continue;
@@ -566,9 +559,9 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator3.e(err);
+            _iterator2.e(err);
           } finally {
-            _iterator3.f();
+            _iterator2.f();
           }
         });
       });
@@ -580,20 +573,20 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
       if ((externalEventMap === null || externalEventMap === void 0 ? void 0 : externalEventMap.size) > 0) {
         var eventTargets = [];
         var eventMap = _TargetData.TargetData.allEventMap;
-        var _iterator4 = _createForOfIteratorHelper(externalEventMap),
-          _step4;
+        var _iterator3 = _createForOfIteratorHelper(externalEventMap),
+          _step3;
         try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var _step4$value = _slicedToArray(_step4.value, 1),
-              targetName = _step4$value[0];
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var _step3$value = _slicedToArray(_step3.value, 1),
+              targetName = _step3$value[0];
             if (eventMap[targetName](tmodel)) {
               eventTargets.push(tmodel.allTargetMap[targetName]);
             }
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator4.f();
+          _iterator3.f();
         }
         this.runEventTargets(tmodel, eventTargets);
       }
@@ -605,20 +598,20 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
       var eventMap = _TargetData.TargetData.internalEventMap;
       var internalEventMap = tmodel.internalEventMap;
       if ((internalEventMap === null || internalEventMap === void 0 ? void 0 : internalEventMap.size) > 0) {
-        var _iterator5 = _createForOfIteratorHelper(internalEventMap),
-          _step5;
+        var _iterator4 = _createForOfIteratorHelper(internalEventMap),
+          _step4;
         try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var _step5$value = _slicedToArray(_step5.value, 1),
-              targetName = _step5$value[0];
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var _step4$value = _slicedToArray(_step4.value, 1),
+              targetName = _step4$value[0];
             if (eventMap[targetName](tmodel)) {
               eventTargets.push(tmodel.allTargetMap[targetName]);
             }
           }
         } catch (err) {
-          _iterator5.e(err);
+          _iterator4.e(err);
         } finally {
-          _iterator5.f();
+          _iterator4.f();
         }
       }
       this.runEventTargets(tmodel, eventTargets);