targetj 1.0.249 → 1.0.251

package/build/TModelManager.js

@@ -52,6 +52,7 @@ var TModelManager = /*#__PURE__*/function () {
       this.targetMethodMap = {};
       this.noDomMap = {};
       this.domPolicyMap = new Map();
+      this.deletedTModelRoots = new Set();
     }
   }, {
     key: "clearFrameLists",
@@ -86,6 +87,7 @@ var TModelManager = /*#__PURE__*/function () {
       var lastVisibleMap = _objectSpread({}, this.visibleOidMap);
       var lastPreservedMap = _objectSpread({}, this.preservedDomMap);
       this.clearFrameLists();
+      this.collectDeletedTModels();
       var activated = [];
       var _iterator = _createForOfIteratorHelper(getLocationManager().hasLocationList),
         _step;
@@ -294,6 +296,55 @@ var TModelManager = /*#__PURE__*/function () {
         this.lists.deletedDom.push(tmodel);
       }
     }
+  }, {
+    key: "markTModelDeleted",
+    value: function markTModelDeleted(tmodel) {
+      if (tmodel) {
+        this.deletedTModelRoots.add(tmodel);
+      }
+    }
+  }, {
+    key: "collectDeletedTModels",
+    value: function collectDeletedTModels() {
+      var _iterator2 = _createForOfIteratorHelper(this.deletedTModelRoots),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var root = _step2.value;
+          if (root.exists()) {
+            continue;
+          }
+          this.addDeletedTree(root);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      this.deletedTModelRoots.clear();
+    }
+  }, {
+    key: "addDeletedTree",
+    value: function addDeletedTree(tmodel) {
+      delete this.visibleOidMap[tmodel.oid];
+      delete this.preservedDomMap[tmodel.oid];
+      this.domPolicyMap.delete(tmodel.oid);
+      if (tmodel.hasDom() && !this.lists.deletedDom.includes(tmodel)) {
+        this.lists.deletedDom.push(tmodel);
+      }
+      var _iterator3 = _createForOfIteratorHelper(tmodel.getChildren()),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var child = _step3.value;
+          this.addDeletedTree(child);
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+    }
   }, {
     key: "getVisibles",
     value: function getVisibles() {
@@ -344,32 +395,32 @@ var TModelManager = /*#__PURE__*/function () {
   }, {
     key: "renderTModels",
     value: function renderTModels() {
-      var _iterator2 = _createForOfIteratorHelper(this.lists.rerender),
-        _step2;
+      var _iterator4 = _createForOfIteratorHelper(this.lists.rerender),
+        _step4;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           var _tmodel$$dom, _tmodel$$dom2;
-          var tmodel = _step2.value;
+          var tmodel = _step4.value;
           tmodel.isTextOnly() ? (_tmodel$$dom = tmodel.$dom) === null || _tmodel$$dom === void 0 ? void 0 : _tmodel$$dom.text(tmodel.getHtml()) : (_tmodel$$dom2 = tmodel.$dom) === null || _tmodel$$dom2 === void 0 ? void 0 : _tmodel$$dom2.html(tmodel.getHtml());
           tmodel.setLastUpdate('html');
           tmodel.domHeightTimestamp = 0;
           tmodel.domWidthTimestamp = 0;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator2.f();
+        _iterator4.f();
       }
     }
   }, {
     key: "reattachTModels",
     value: function reattachTModels() {
       var reattached = [];
-      var _iterator3 = _createForOfIteratorHelper(this.lists.reattach),
-        _step3;
+      var _iterator5 = _createForOfIteratorHelper(this.lists.reattach),
+        _step5;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var tmodel = _step3.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var tmodel = _step5.value;
           var changed = tmodel.hasBaseElementChanged();
           var domParent = tmodel.getDomParent();
           if (!domParent || !domParent.$dom) {
@@ -393,9 +444,9 @@ var TModelManager = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator3.f();
+        _iterator5.f();
       }
       this.activatePendingTargetsAfterDom(reattached);
     }
@@ -405,11 +456,11 @@ var TModelManager = /*#__PURE__*/function () {
       this.lists.relocation.sort(function (a, b) {
         return b.domOrderIndex - a.domOrderIndex;
       });
-      var _iterator4 = _createForOfIteratorHelper(this.lists.relocation),
-        _step4;
+      var _iterator6 = _createForOfIteratorHelper(this.lists.relocation),
+        _step6;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var tmodel = _step4.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var tmodel = _step6.value;
           var domParent = tmodel.getDomParent();
           if (!domParent || !domParent.$dom) {
             continue;
@@ -418,9 +469,9 @@ var TModelManager = /*#__PURE__*/function () {
           tmodel.domOrderIndex = undefined;
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator4.f();
+        _iterator6.f();
       }
     }
   }, {
@@ -435,20 +486,20 @@ var TModelManager = /*#__PURE__*/function () {
   }, {
     key: "deleteDoms",
     value: function deleteDoms() {
-      var _iterator5 = _createForOfIteratorHelper(this.lists.deletedDom),
-        _step5;
+      var _iterator7 = _createForOfIteratorHelper(this.lists.deletedDom),
+        _step7;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var tmodel = _step5.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var tmodel = _step7.value;
           if (tmodel.val('sourceDom')) {
             continue;
           }
           this.deleteDom(tmodel);
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator5.f();
+        _iterator7.f();
       }
       this.lists.deletedDom.length = 0;
     }
@@ -467,37 +518,37 @@ var TModelManager = /*#__PURE__*/function () {
   }, {
     key: "fixStyles",
     value: function fixStyles() {
-      var _iterator6 = _createForOfIteratorHelper(this.lists.restyle),
-        _step6;
+      var _iterator8 = _createForOfIteratorHelper(this.lists.restyle),
+        _step8;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var tmodel = _step6.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var tmodel = _step8.value;
           if (tmodel.hasDom()) {
             TModelUtil.fixStyle(tmodel);
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator6.f();
+        _iterator8.f();
       }
     }
   }, {
     key: "fixAsyncStyles",
     value: function fixAsyncStyles() {
-      var _iterator7 = _createForOfIteratorHelper(this.lists.reasyncStyle),
-        _step7;
+      var _iterator9 = _createForOfIteratorHelper(this.lists.reasyncStyle),
+        _step9;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var tmodel = _step7.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var tmodel = _step9.value;
           if (tmodel.hasDom()) {
             TModelUtil.fixAsyncStyle(tmodel);
           }
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator7.f();
+        _iterator9.f();
       }
     }
   }, {
@@ -506,11 +557,11 @@ var TModelManager = /*#__PURE__*/function () {
       var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
         _ref$restoredDoneTarg = _ref.restoredDoneTargets,
         restoredDoneTargets = _ref$restoredDoneTarg === void 0 ? true : _ref$restoredDoneTarg;
-      var _iterator8 = _createForOfIteratorHelper(tmodels),
-        _step8;
+      var _iterator10 = _createForOfIteratorHelper(tmodels),
+        _step10;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var tmodel = _step8.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var tmodel = _step10.value;
           if (!tmodel.hasDom()) {
             tmodel.markLayoutDirty('noDom');
             continue;
@@ -549,9 +600,9 @@ var TModelManager = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator8.f();
+        _iterator10.f();
       }
     }
   }, {
@@ -580,12 +631,12 @@ var TModelManager = /*#__PURE__*/function () {
       this.lists.noDom.sort(function (a, b) {
         return a.getUIDepth() < b.getUIDepth() ? -1 : 1;
       });
-      var _iterator9 = _createForOfIteratorHelper(this.lists.noDom),
-        _step9;
+      var _iterator11 = _createForOfIteratorHelper(this.lists.noDom),
+        _step11;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
           var _tmodel2$domId;
-          var _tmodel2 = _step9.value;
+          var _tmodel2 = _step11.value;
           var domId = (_tmodel2$domId = _tmodel2.domId) !== null && _tmodel2$domId !== void 0 ? _tmodel2$domId : _tmodel2.oid;
           if ($Dom.query("#".concat(domId))) {
             _tmodel2.$dom = new $Dom("#".concat(domId));
@@ -606,9 +657,9 @@ var TModelManager = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator9.f();
+        _iterator11.f();
       }
       for (var _i5 = 0, _needsDom = needsDom; _i5 < _needsDom.length; _i5++) {
         var tmodel = _needsDom[_i5];
@@ -640,31 +691,31 @@ var TModelManager = /*#__PURE__*/function () {
           entry.tmodels.push(tmodel);
         }
       }
-      var _iterator10 = _createForOfIteratorHelper(holdersMap.values()),
-        _step10;
+      var _iterator12 = _createForOfIteratorHelper(holdersMap.values()),
+        _step12;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var _step10$value = _step10.value,
-            _domHolder = _step10$value.domHolder,
-            fragment = _step10$value.fragment;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var _step12$value = _step12.value,
+            _domHolder = _step12$value.domHolder,
+            fragment = _step12$value.fragment;
           _domHolder.appendElement(fragment);
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator10.f();
+        _iterator12.f();
       }
-      var _iterator11 = _createForOfIteratorHelper(this.lists.noDom),
-        _step11;
+      var _iterator13 = _createForOfIteratorHelper(this.lists.noDom),
+        _step13;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var _tmodel3 = _step11.value;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var _tmodel3 = _step13.value;
           this.catchupNoDomTargetsBeforeStyle(_tmodel3);
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator11.f();
+        _iterator13.f();
       }
       for (var _i6 = 0, _styleBatch = styleBatch; _i6 < _styleBatch.length; _i6++) {
         var _tmodel = _styleBatch[_i6];

package/build/TargetManager.js

@@ -271,7 +271,6 @@ var TargetManager = /*#__PURE__*/function () {
         tmodel.addToStyleTargetList(key);
         targetValue.step = steps;
         targetValue.valuePointer = (_targetValue$valueLis2 = (_targetValue$valueLis3 = targetValue.valueList) === null || _targetValue$valueLis3 === void 0 ? void 0 : _targetValue$valueLis3.length) !== null && _targetValue$valueLis2 !== void 0 ? _targetValue$valueLis2 : valuePointer;
-        targetValue.value = finalValue;
         targetValue.cycle = cycles;
         delete targetValue.catchupAt;
         if (fireEnd) {