targetj 1.1.9 → 1.1.10

package/build/LocationManager.js

@@ -3,12 +3,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 _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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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 _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-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; }
@@ -43,8 +43,6 @@ var LocationManager = /*#__PURE__*/function () {
     this.updatedContainerMap = {};
     this.locationListStats = [];
     this.domIslandSet = new Set();
-    this.activatedList = [];
-    this.activatedMap = {};
     this.calcBusy = false;
     this.calcQueued = false;
     this.calcEpoch = 0;
@@ -54,32 +52,10 @@ var LocationManager = /*#__PURE__*/function () {
     value: function clear() {
       this.visibleChildrenLengthMap = {};
       this.updatedContainerMap = {};
-      this.activatedList = [];
-      this.activatedMap = {};
       this.domIslandSet.clear();
       this.calcBusy = false;
       this.calcQueued = false;
     }
-  }, {
-    key: "calculateActivated",
-    value: function calculateActivated() {
-      var i = 0;
-      var activatedList = this.activatedList;
-      this.activatedList = [];
-      this.activatedMap = {};
-      while (i < activatedList.length) {
-        var child = activatedList[i++];
-        var activatedTargets = child.activatedTargets.slice(0);
-        child.activatedTargets.length = 0;
-        getTargetManager().applyTargetValues(child, activatedTargets);
-        if (child.updatingTargetList.length > 0) {
-          getTargetManager().setActualValues(child, child.updatingTargetList);
-        }
-        if (!this.hasLocationMap[child.oid]) {
-          this.addToLocationList(child);
-        }
-      }
-    }
   }, {
     key: "calculateAll",
     value: function () {
@@ -193,6 +169,7 @@ var LocationManager = /*#__PURE__*/function () {
                   index = job.index;
                 var child = children[index];
                 if (child) {
+                  var _child$externalEventM;
                   if (child.useContentHeight()) {
                     if (child.actualValues.height !== child.getContentHeight()) {
                       child.actualValues.height = child.getContentHeight();
@@ -215,12 +192,17 @@ var LocationManager = /*#__PURE__*/function () {
                     }
                     container.calcContentWidthHeight();
                   }
-                  if (child.hasEventDirty() || getEvents().getEventType() || getEvents().hasDelta()) {
-                    _this.checkExternalEvents(child);
-                    if (child.hasEventDirty()) {
-                      child.processedEventEpoch = child.eventDirtyEpoch;
+                  if ((_child$externalEventM = child.externalEventMap) !== null && _child$externalEventM !== void 0 && _child$externalEventM.size) {
+                    var _child$priorityProces, _this$priorityBatchSt;
+                    var events = getEvents();
+                    var wasPrioritized = ((_child$priorityProces = child.priorityProcessedEventEpoch) !== null && _child$priorityProces !== void 0 ? _child$priorityProces : 0) > ((_this$priorityBatchSt = _this.priorityBatchStartEpoch) !== null && _this$priorityBatchSt !== void 0 ? _this$priorityBatchSt : 0);
+                    if (!wasPrioritized && (child.hasEventDirty() || events.getEventType() || events.hasDelta())) {
+                      _this.checkExternalEvents(child);
                     }
                   }
+                  if (child.hasEventDirty()) {
+                    child.processedEventEpoch = child.eventDirtyEpoch;
+                  }
                 }
                 job.index++;
                 if (job.index < job.children.length) {
@@ -493,8 +475,8 @@ var LocationManager = /*#__PURE__*/function () {
         child.calcAbsolutePosition(child.getX(), child.getY());
       }
       if (!child.excludeDefaultStyling()) {
-        this.addToTransformTargetList(child, 'x');
-        this.addToTransformTargetList(child, 'y');
+        child.addToStyleTargetList('x');
+        child.addToStyleTargetList('y');
       }
       if (((_child$styleTargetMap = child.styleTargetMap) === null || _child$styleTargetMap === void 0 ? void 0 : _child$styleTargetMap.size) > 0 || child.updatingTargetList.length > 0) {
         this.addToLocationList(child);
@@ -592,23 +574,6 @@ var LocationManager = /*#__PURE__*/function () {
         this.retryDomTargets(tmodel);
       }
       this.checkInternalEvents(tmodel);
-      var guard = 0;
-      while (tmodel.activatedTargets.length && guard++ < 50) {
-        var batch = tmodel.activatedTargets.slice(0);
-        tmodel.activatedTargets.length = 0;
-        var _iterator = _createForOfIteratorHelper(batch),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var key = _step.value;
-            getTargetManager().applyTargetValue(tmodel, key);
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      }
       ScheduleUtil.pauseResumeSchedule(tmodel);
       getTargetManager().applyTargetValues(tmodel);
       if (tmodel.updatingTargetList.length > 0) {
@@ -663,11 +628,11 @@ var LocationManager = /*#__PURE__*/function () {
         tmodel.catchupNoDomLayoutTargets();
         return;
       }
-      var _iterator2 = _createForOfIteratorHelper(tmodel.noDomUpdatingTargets),
-        _step2;
+      var _iterator = _createForOfIteratorHelper(tmodel.noDomUpdatingTargets),
+        _step;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var key = _step2.value;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var key = _step.value;
           if (!TargetData.affectsVisibility(key)) {
             continue;
           }
@@ -675,11 +640,47 @@ var LocationManager = /*#__PURE__*/function () {
             fireEnd: false
           });
         }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+  }, {
+    key: "processPriorityEvents",
+    value: function processPriorityEvents() {
+      var events = getEvents();
+      var priority = events.priorityEventTModels;
+      if (!(priority !== null && priority !== void 0 && priority.size)) {
+        return false;
+      }
+      var epoch = events.capturedEventEpoch;
+      var processed = false;
+      var hasNonBatchableEvent = false;
+      var _iterator2 = _createForOfIteratorHelper(priority),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _tmodel$externalEvent;
+          var tmodel = _step2.value;
+          if (!((_tmodel$externalEvent = tmodel.externalEventMap) !== null && _tmodel$externalEvent !== void 0 && _tmodel$externalEvent.size)) {
+            continue;
+          }
+          var result = this.checkExternalEvents(tmodel);
+          processed || (processed = result !== null);
+          hasNonBatchableEvent || (hasNonBatchableEvent = result === true);
+          tmodel.priorityProcessedEventEpoch = epoch;
+          if (tmodel.hasEventDirty()) {
+            tmodel.processedEventEpoch = tmodel.eventDirtyEpoch;
+          }
+        }
       } catch (err) {
         _iterator2.e(err);
       } finally {
         _iterator2.f();
       }
+      priority.clear();
+      return processed && !hasNonBatchableEvent;
     }
   }, {
     key: "checkExternalEvents",
@@ -703,8 +704,16 @@ var LocationManager = /*#__PURE__*/function () {
         } finally {
           _iterator3.f();
         }
+        if (!eventTargets.length) {
+          return null;
+        }
         this.runEventTargets(tmodel, eventTargets);
+        return eventTargets.some(function (key) {
+          var _tmodel$targets$key;
+          return ((_tmodel$targets$key = tmodel.targets[key]) === null || _tmodel$targets$key === void 0 ? void 0 : _tmodel$targets$key.eventBatchable) === false;
+        });
       }
+      return false;
     }
   }, {
     key: "checkInternalEvents",
@@ -750,6 +759,9 @@ var LocationManager = /*#__PURE__*/function () {
           } else if (typeof result === 'string') {
             TargetUtil.activateSingleTarget(tmodel, result);
           }
+          if (Array.isArray(result) && result.length || typeof result === 'string' && result.length) {
+            tmodel.targets[targetName].eventBatchable = false;
+          }
           TargetUtil.shouldActivateNextTarget(tmodel, targetName);
         }
       });
@@ -778,14 +790,6 @@ var LocationManager = /*#__PURE__*/function () {
         this.hasLocationMap[tmodel.oid] = tmodel;
       }
     }
-  }, {
-    key: "addToActivatedList",
-    value: function addToActivatedList(tmodel) {
-      if (!this.activatedMap[tmodel.oid]) {
-        this.activatedList.push(tmodel);
-        this.activatedMap[tmodel.oid] = tmodel;
-      }
-    }
   }, {
     key: "fixLocation",
     value: function fixLocation(tmodel, prevX, prevY) {
@@ -804,20 +808,8 @@ var LocationManager = /*#__PURE__*/function () {
           return;
         }
       }
-      this.addToTransformTargetList(tmodel, 'x');
-      this.addToTransformTargetList(tmodel, 'y');
-    }
-  }, {
-    key: "addToTransformTargetList",
-    value: function addToTransformTargetList(tmodel, key) {
-      if (TModelUtil.getTransformValue(tmodel, key) !== Math.floor(tmodel.tfMap[key])) {
-        tmodel.addToStyleTargetList(key);
-      }
-    }
-  }, {
-    key: "isActivated",
-    value: function isActivated(tmodel) {
-      return this.activatedMap[tmodel.oid];
+      tmodel.addToStyleTargetList('x');
+      tmodel.addToStyleTargetList('y');
     }
   }]);
 }();

package/build/ParticleChild.js

@@ -39,12 +39,10 @@ var ParticleChild = /*#__PURE__*/function () {
     this.noDomUpdatingTargets = undefined;
     this.updatingTargetList = [];
     this.activeTargetList = [];
-    this.activatedTargets = [];
     this.updatingTargetMap = {};
     this.runtimeState = {
       updatingTargetList: this.updatingTargetList,
       activeTargetList: this.activeTargetList,
-      activatedTargets: this.activatedTargets,
       fetchActionTargetList: [],
       lastChildrenUpdate: {
         additions: [],

package/build/ParticleTModel.js

@@ -1490,7 +1490,6 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
             targetValues: child.targetValues,
             updatingTargetList: _toConsumableArray(child.updatingTargetList),
             activeTargetList: _toConsumableArray(child.activeTargetList),
-            activatedTargets: _toConsumableArray(child.activatedTargets),
             noDomUpdatingTargets: child.noDomUpdatingTargets ? new Set(child.noDomUpdatingTargets) : undefined,
             pendingTargets: child.pendingTargets
           };
@@ -1521,7 +1520,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
         child.x = (_runtimeState$x = runtimeState === null || runtimeState === void 0 ? void 0 : runtimeState.x) !== null && _runtimeState$x !== void 0 ? _runtimeState$x : child.x;
         child.y = (_runtimeState$y = runtimeState === null || runtimeState === void 0 ? void 0 : runtimeState.y) !== null && _runtimeState$y !== void 0 ? _runtimeState$y : child.y;
         if (runtimeState) {
-          var _child$activeTargetLi, _child$activatedTarge, _runtimeState$pending;
+          var _child$activeTargetLi, _runtimeState$pending;
           Object.assign(child.targets, runtimeState.targets);
           Object.assign(child.targetValues, runtimeState.targetValues);
           var _iterator10 = _createForOfIteratorHelper(runtimeState.updatingTargetList || []),
@@ -1538,7 +1537,6 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
             _iterator10.f();
           }
           (_child$activeTargetLi = child.activeTargetList).push.apply(_child$activeTargetLi, _toConsumableArray(runtimeState.activeTargetList || []));
-          (_child$activatedTarge = child.activatedTargets).push.apply(_child$activatedTarge, _toConsumableArray(runtimeState.activatedTargets || []));
           child.noDomUpdatingTargets = runtimeState.noDomUpdatingTargets ? new Set(runtimeState.noDomUpdatingTargets) : undefined;
           child.pendingTargets = (_runtimeState$pending = runtimeState.pendingTargets) !== null && _runtimeState$pending !== void 0 ? _runtimeState$pending : false;
         }

package/build/RunScheduler.js

@@ -104,7 +104,7 @@ var RunScheduler = /*#__PURE__*/function () {
     key: "run",
     value: function () {
       var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(delay, runId) {
-        var handedOff, _this$delayProcess2, capturedEvent, type, activatedStep;
+        var handedOff, _this$delayProcess2, events, locationManager, start, i, capturedEvent, type, canBatch, activatedStep;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -133,42 +133,72 @@ var RunScheduler = /*#__PURE__*/function () {
               }
               _context2.prev = 11;
               if (!(this.phase === 0)) {
-                _context2.next = 19;
+                _context2.next = 36;
                 break;
               }
-              capturedEvent = getEvents().captureEvents();
+              events = getEvents();
+              locationManager = getLocationManager();
+              locationManager.priorityBatchStartEpoch = events.capturedEventEpoch;
+              start = TUtil.now();
+              i = 0;
+            case 18:
+              if (!(i < 5)) {
+                _context2.next = 32;
+                break;
+              }
+              if (!(i > 0 && (events.eventQueue.length === 0 || TUtil.now() - start >= 2))) {
+                _context2.next = 21;
+                break;
+              }
+              return _context2.abrupt("break", 32);
+            case 21:
+              capturedEvent = events.captureEvents();
               if (capturedEvent) {
-                type = capturedEvent.eventType;
-                this.eventSettlePending = type === 'start' || type === 'end' || type === 'click';
+                _context2.next = 24;
+                break;
               }
-              tApp.targetManager.applyTargetValues(tRoot());
+              return _context2.abrupt("break", 32);
+            case 24:
+              type = capturedEvent.eventType;
+              this.eventSettlePending || (this.eventSettlePending = type === 'start' || type === 'end' || type === 'click');
+              canBatch = locationManager.processPriorityEvents();
+              if (canBatch) {
+                _context2.next = 29;
+                break;
+              }
+              return _context2.abrupt("break", 32);
+            case 29:
+              i++;
               _context2.next = 18;
+              break;
+            case 32:
+              tApp.targetManager.applyTargetValues(tRoot());
+              _context2.next = 35;
               return getLocationManager().calculateAll();
-            case 18:
+            case 35:
               this.phase = 1;
-            case 19:
+            case 36:
               if (!(TUtil.now() - this.runStartTime > FRAME_BUDGET_MS)) {
-                _context2.next = 23;
+                _context2.next = 40;
                 break;
               }
               handedOff = true;
               this.requestNextSlice(runId);
               return _context2.abrupt("return");
-            case 23:
+            case 40:
               if (this.phase === 1) {
                 this.runningStep = tApp.manager.analyze();
                 this.phase = 2;
               }
               if (!(TUtil.now() - this.runStartTime > FRAME_BUDGET_MS)) {
-                _context2.next = 28;
+                _context2.next = 45;
                 break;
               }
               handedOff = true;
               this.requestNextSlice(runId);
               return _context2.abrupt("return");
-            case 28:
+            case 45:
               if (this.phase === 2) {
-                getLocationManager().calculateActivated();
                 tApp.events.resetEventsOnTimeout();
                 activatedStep = tApp.manager.analyze();
                 if (activatedStep >= 0) {
@@ -177,13 +207,13 @@ var RunScheduler = /*#__PURE__*/function () {
                 this.phase = 3;
               }
               if (!(TUtil.now() - this.runStartTime > FRAME_BUDGET_MS)) {
-                _context2.next = 33;
+                _context2.next = 50;
                 break;
               }
               handedOff = true;
               this.requestNextSlice(runId);
               return _context2.abrupt("return");
-            case 33:
+            case 50:
               if (this.phase === 3) {
                 if (this.runningStep >= 0) {
                   if (this.domProcessing === 0) {
@@ -199,24 +229,24 @@ var RunScheduler = /*#__PURE__*/function () {
               if (this.domProcessing === 0) {
                 this.needsRerun();
               }
-              _context2.next = 42;
+              _context2.next = 59;
               break;
-            case 38:
-              _context2.prev = 38;
+            case 55:
+              _context2.prev = 55;
               _context2.t0 = _context2["catch"](11);
               this.phase = 0;
               throw _context2.t0;
-            case 42:
-              _context2.prev = 42;
+            case 59:
+              _context2.prev = 59;
               if (!handedOff && this.domProcessing === 0) {
                 this.runningFlag = false;
               }
-              return _context2.finish(42);
-            case 45:
+              return _context2.finish(59);
+            case 62:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[11, 38, 42, 45]]);
+        }, _callee2, this, [[11, 55, 59, 62]]);
       }));
       function run(_x, _x2) {
         return _run.apply(this, arguments);
@@ -253,7 +283,7 @@ var RunScheduler = /*#__PURE__*/function () {
       } else {
         var newDelay = this.nextRuns.length > 0 ? this.nextRuns[0].delay - (TUtil.now() - this.nextRuns[0].insertTime) : undefined;
         var manager = getManager();
-        var hasImmediateWork = manager.lists.restyle.length > 0 || manager.lists.reasyncStyle.length > 0 || getLocationManager().activatedList.length > 0;
+        var hasImmediateWork = manager.lists.restyle.length > 0 || manager.lists.reasyncStyle.length > 0;
         var hasNoDomVisibilityWork = manager.lists.noDomVisibilityTModels.length > 0;
         if (newDelay === undefined || manager.lists.activeTModels.length > 0 || manager.lists.updatingTModels.length > 0 || hasImmediateWork || hasNoDomVisibilityWork) {
           if (manager.lists.updatingTModels.length > 0) {

package/build/TModel.js

@@ -732,8 +732,6 @@ var TModel = /*#__PURE__*/function (_BaseModel) {
         }).length
       }, {
         activeTargetList: this.activeTargetList
-      }, {
-        activatedTargets: this.activatedTargets
       }, {
         updatingTargetList: this.updatingTargetList
       }, {
@@ -962,7 +960,11 @@ var TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "canBeAnimated",
     value: function canBeAnimated(key) {
-      return TargetData.isGpuPreferred(key) && this.actualValues.webAnimation !== false;
+      var _target$originalTMode;
+      var target = this.targets[key];
+      var originalTarget = target === null || target === void 0 || (_target$originalTMode = target.originalTModel) === null || _target$originalTMode === void 0 ? void 0 : _target$originalTMode.targets[target.originalTargetName];
+      var renderer = originalTarget === null || originalTarget === void 0 ? void 0 : originalTarget.renderer;
+      return renderer !== 'manual' && TargetData.isWaapiSupported(key) && this.actualValues.webAnimation !== false;
     }
   }, {
     key: "isTextOnly",

package/build/TModelManager.js

@@ -16,7 +16,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { $Dom } from "./$Dom.js";
 import { TUtil } from "./TUtil.js";
-import { App, getLocationManager, getEvents, getTargetManager, tRoot } from "./App.js";
+import { App, getLocationManager, getEvents, getTargetManager, tRoot, getRunScheduler } from "./App.js";
 import { TModelUtil } from "./TModelUtil.js";
 import { TargetUtil } from "./TargetUtil.js";
 import { AnimationUtil } from "./AnimationUtil.js";
@@ -149,7 +149,7 @@ var TModelManager = /*#__PURE__*/function () {
                 });
               }
             }
-            if (visible || tmodel.isActivated()) {
+            if (visible) {
               var _state$updatingTarget, _state$activeTargetLi;
               var state = tmodel.state();
               if (((_state$updatingTarget = state.updatingTargetList) === null || _state$updatingTarget === void 0 ? void 0 : _state$updatingTarget.length) > 0 || tmodel.hasAnimatingTargets()) {
@@ -161,12 +161,12 @@ var TModelManager = /*#__PURE__*/function () {
                 _this.lists.activeTargets = [].concat(_toConsumableArray(_this.lists.activeTargets), _toConsumableArray(state.activeTargetList));
               }
             }
-            if (preserveDom && !visible && !tmodel.isActivated()) {
+            if (preserveDom && !visible) {
               if (_this.needsRestyle(tmodel)) {
                 _this.lists.restyle.push(tmodel);
               }
             }
-            if (visible || tmodel.isActivated()) {
+            if (visible) {
               if (_this.needsRerender(tmodel)) {
                 _this.lists.rerender.push(tmodel);
               }
@@ -187,9 +187,6 @@ var TModelManager = /*#__PURE__*/function () {
                 _this.targetMethodMap[tmodel.oid] = _objectSpread({}, _state.targetMethodMap);
                 _state.targetMethodMap = {};
               }
-              if (tmodel.isActivated()) {
-                activated.push(tmodel);
-              }
             }
             if (_this.shouldCreateDom(tmodel, visible) && !_this.noDomMap[tmodel.oid]) {
               var _tmodel$getDomHolder, _tmodel$getDomParent;
@@ -700,6 +697,7 @@ var TModelManager = /*#__PURE__*/function () {
         return;
       }
       var holdersMap = new Map();
+      var preStyled = new Set();
       var styleBatch = [];
       var needsDom = [];
       var attached = [];
@@ -710,26 +708,26 @@ var TModelManager = /*#__PURE__*/function () {
         _step12;
       try {
         for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var _tmodel4$domId;
-          var _tmodel4 = _step12.value;
-          var domId = (_tmodel4$domId = _tmodel4.domId) !== null && _tmodel4$domId !== void 0 ? _tmodel4$domId : _tmodel4.oid;
+          var _tmodel5$domId;
+          var _tmodel5 = _step12.value;
+          var domId = (_tmodel5$domId = _tmodel5.domId) !== null && _tmodel5$domId !== void 0 ? _tmodel5$domId : _tmodel5.oid;
           if ($Dom.query("#".concat(domId))) {
-            _tmodel4.$dom = new $Dom("#".concat(domId));
-            _tmodel4.$dom.attr('tgjs', 'true');
-            _tmodel4.hasDomNow = true;
-            _tmodel4.markLayoutDirty('hasDomNow');
-            attached.push(_tmodel4);
-            if (this.needsRerender(_tmodel4)) {
-              this.lists.rerender.push(_tmodel4);
+            _tmodel5.$dom = new $Dom("#".concat(domId));
+            _tmodel5.$dom.attr('tgjs', 'true');
+            _tmodel5.hasDomNow = true;
+            _tmodel5.markLayoutDirty('hasDomNow');
+            attached.push(_tmodel5);
+            if (this.needsRerender(_tmodel5)) {
+              this.lists.rerender.push(_tmodel5);
             }
-            if (this.needsRestyle(_tmodel4)) {
-              this.lists.restyle.push(_tmodel4);
+            if (this.needsRestyle(_tmodel5)) {
+              this.lists.restyle.push(_tmodel5);
             }
-            if (this.needsReasyncStyle(_tmodel4)) {
-              this.lists.reasyncStyle.push(_tmodel4);
+            if (this.needsReasyncStyle(_tmodel5)) {
+              this.lists.reasyncStyle.push(_tmodel5);
             }
           } else {
-            needsDom.push(_tmodel4);
+            needsDom.push(_tmodel5);
           }
         }
       } catch (err) {
@@ -755,6 +753,10 @@ var TModelManager = /*#__PURE__*/function () {
         }
         TModelUtil.createDom(tmodel);
         TModelUtil.patchDom(tmodel);
+        TModelUtil.initStyleMaps(tmodel);
+        TModelUtil.fixStyle(tmodel);
+        TModelUtil.fixAsyncStyle(tmodel);
+        preStyled.add(tmodel);
         styleBatch.push(tmodel);
         attached.push(tmodel);
         var entry = holdersMap.get(domHolder);
@@ -795,16 +797,27 @@ var TModelManager = /*#__PURE__*/function () {
           _tmodel2.markLayoutDirty('hasDomNow');
           domReady.push(_tmodel2);
         }
-        TModelUtil.initStyleMaps(_tmodel2);
-        TModelUtil.fixStyle(_tmodel2);
-        TModelUtil.fixAsyncStyle(_tmodel2);
       }
-      for (var _i9 = 0, _domReady = domReady; _i9 < _domReady.length; _i9++) {
-        var _tmodel3 = _domReady[_i9];
-        _tmodel3.onDomAvailable();
+      for (var _i9 = 0, _attached2 = attached; _i9 < _attached2.length; _i9++) {
+        var _tmodel3 = _attached2[_i9];
+        if (!_tmodel3.hasDom()) {
+          continue;
+        }
+        if (!preStyled.has(_tmodel3)) {
+          TModelUtil.initStyleMaps(_tmodel3);
+        }
+        TModelUtil.fixStyle(_tmodel3);
+        TModelUtil.fixAsyncStyle(_tmodel3);
+      }
+      for (var _i10 = 0, _domReady = domReady; _i10 < _domReady.length; _i10++) {
+        var _tmodel4 = _domReady[_i10];
+        _tmodel4.onDomAvailable();
       }
       this.activatePendingTargetsAfterDom(attached);
       getEvents().attachEvents(attached);
+      if (domReady.length) {
+        getRunScheduler().schedule(1, 'createDoms');
+      }
     }
   }]);
 }();