targetj 1.1.0 → 1.1.2

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 { getLocationManager, getEvents, getTargetManager, tRoot } from "./App.js";
+import { App, getLocationManager, getEvents, getTargetManager, tRoot } from "./App.js";
 import { TModelUtil } from "./TModelUtil.js";
 import { TargetUtil } from "./TargetUtil.js";
 import { AnimationUtil } from "./AnimationUtil.js";
@@ -137,7 +137,7 @@ var TModelManager = /*#__PURE__*/function () {
               delete _this.preservedDomMap[tmodel.oid];
             }
             if (tmodel.hasDom()) {
-              if (!tmodel.canHaveDom() || !tmodel.isIncluded() || tmodel.canDeleteDom() && !visible && !preserveDom) {
+              if (!tmodel.canHaveDom() || !tmodel.isIncluded() || !visible && !preserveDom) {
                 _this.addToDeletedDom(tmodel);
                 tmodel.getChildren().forEach(function (child) {
                   if (child.isLightweightChild) {
@@ -240,32 +240,20 @@ var TModelManager = /*#__PURE__*/function () {
       if (!tmodel.isIncluded()) {
         return false;
       }
-      if (this.getDomPolicy(tmodel) === "keep") {
+      if (tmodel.reuseDomDefinition()) {
         return true;
       }
-      if (!tmodel.isVisible() && TUtil.isDefined(tmodel.targets.isVisible)) {
-        return false;
-      }
-      var parent = tmodel.parent;
-      while (parent && parent !== tRoot()) {
-        if (TUtil.isDefined(parent.targets.canDeleteDom)) {
-          return parent.val('canDeleteDom') === false;
-        }
-        if (TUtil.isDefined(parent.targets.isVisible)) {
-          return parent.val('isVisible') === true;
-        }
-        parent = parent.parent;
-      }
-      return false;
+      var policy = this.getDomPolicy(tmodel);
+      return policy === "keep" || policy === "required";
     }
   }, {
     key: "shouldHaveDom",
     value: function shouldHaveDom(tmodel) {
       var visible = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tmodel.isVisible();
-      if (!tmodel.canHaveDom() || !tmodel.isIncluded()) {
+      if (tmodel.isLightweightChild || !tmodel.canHaveDom() || !tmodel.isIncluded()) {
         return false;
       }
-      return visible || tmodel.requiresDom() || this.getDomPolicy(tmodel) === "keep";
+      return visible || tmodel.reuseDomDefinition() || this.getDomPolicy(tmodel) === "required";
     }
   }, {
     key: "shouldCreateDom",
@@ -365,22 +353,24 @@ var TModelManager = /*#__PURE__*/function () {
   }, {
     key: "addDeletedTree",
     value: function addDeletedTree(tmodel) {
+      var _tmodel$disposeRuntim, _tmodel$childHandles;
       if (tmodel.isLightweightChild) {
         return;
       }
+      (_tmodel$disposeRuntim = tmodel.disposeRuntimeDerivedState) === null || _tmodel$disposeRuntim === void 0 || _tmodel$disposeRuntim.call(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);
+      if (App.tmodelIdMap[tmodel.oid] === tmodel) {
+        delete App.tmodelIdMap[tmodel.oid];
       }
-      var _iterator3 = _createForOfIteratorHelper(tmodel.getChildren()),
+      var _iterator3 = _createForOfIteratorHelper((_tmodel$childHandles = tmodel.childHandles) !== null && _tmodel$childHandles !== void 0 ? _tmodel$childHandles : []),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           var child = _step3.value;
-          if (!child.isLightweightChild) {
-            this.addDeletedTree(child);
+          if (App.tmodelIdMap[child.oid] === child) {
+            delete App.tmodelIdMap[child.oid];
           }
         }
       } catch (err) {
@@ -388,6 +378,24 @@ var TModelManager = /*#__PURE__*/function () {
       } finally {
         _iterator3.f();
       }
+      getLocationManager().domIslandSet.delete(tmodel);
+      if (tmodel.hasDom() && !this.lists.deletedDom.includes(tmodel)) {
+        this.lists.deletedDom.push(tmodel);
+      }
+      var _iterator4 = _createForOfIteratorHelper(tmodel.getChildren()),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _child = _step4.value;
+          if (!_child.isLightweightChild) {
+            this.addDeletedTree(_child);
+          }
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
     }
   }, {
     key: "getVisibles",
@@ -439,32 +447,32 @@ var TModelManager = /*#__PURE__*/function () {
   }, {
     key: "renderTModels",
     value: function renderTModels() {
-      var _iterator4 = _createForOfIteratorHelper(this.lists.rerender),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(this.lists.rerender),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var _tmodel$$dom, _tmodel$$dom2;
-          var tmodel = _step4.value;
+          var tmodel = _step5.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) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
     }
   }, {
     key: "reattachTModels",
     value: function reattachTModels() {
       var reattached = [];
-      var _iterator5 = _createForOfIteratorHelper(this.lists.reattach),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper(this.lists.reattach),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var tmodel = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var tmodel = _step6.value;
           var changed = tmodel.hasBaseElementChanged();
           var domParent = tmodel.getDomParent();
           if (!domParent || !domParent.$dom) {
@@ -488,9 +496,9 @@ var TModelManager = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
       this.activatePendingTargetsAfterDom(reattached);
     }
@@ -500,11 +508,11 @@ var TModelManager = /*#__PURE__*/function () {
       this.lists.relocation.sort(function (a, b) {
         return b.domOrderIndex - a.domOrderIndex;
       });
-      var _iterator6 = _createForOfIteratorHelper(this.lists.relocation),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper(this.lists.relocation),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var tmodel = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var tmodel = _step7.value;
           var domParent = tmodel.getDomParent();
           if (!domParent || !domParent.$dom) {
             continue;
@@ -513,9 +521,9 @@ var TModelManager = /*#__PURE__*/function () {
           tmodel.domOrderIndex = undefined;
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
     }
   }, {
@@ -530,69 +538,84 @@ var TModelManager = /*#__PURE__*/function () {
   }, {
     key: "deleteDoms",
     value: function deleteDoms() {
-      var _iterator7 = _createForOfIteratorHelper(this.lists.deletedDom),
-        _step7;
+      var _iterator8 = _createForOfIteratorHelper(this.lists.deletedDom),
+        _step8;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var tmodel = _step7.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var tmodel = _step8.value;
           if (tmodel.val('sourceDom')) {
             continue;
           }
           this.deleteDom(tmodel);
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator7.f();
+        _iterator8.f();
       }
       this.lists.deletedDom.length = 0;
     }
   }, {
     key: "deleteDom",
     value: function deleteDom(tmodel) {
+      var _tmodel$$dom3, _tmodel$particleRende;
+      var element = (_tmodel$$dom3 = tmodel.$dom) === null || _tmodel$$dom3 === void 0 ? void 0 : _tmodel$$dom3.element;
+      var canvas = (_tmodel$particleRende = tmodel.particleRenderer) === null || _tmodel$particleRende === void 0 ? void 0 : _tmodel$particleRende.canvasLayer;
       if (tmodel.hasAnimatingTargets()) {
         AnimationUtil.detachAnimationsOnDeleteDom(tmodel);
       }
-      var domParent = tmodel.getDomParent();
-      if (domParent && domParent.$dom) {
-        domParent.$dom.removeElement(tmodel.$dom.element);
-      }
+      canvas === null || canvas === void 0 || canvas.remove();
+      element === null || element === void 0 || element.remove();
       this.resetTModelDom(tmodel);
     }
   }, {
     key: "fixStyles",
     value: function fixStyles() {
-      var _iterator8 = _createForOfIteratorHelper(this.lists.restyle),
-        _step8;
+      var _iterator9 = _createForOfIteratorHelper(this.lists.restyle),
+        _step9;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var tmodel = _step8.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var tmodel = _step9.value;
           if (tmodel.hasDom()) {
             TModelUtil.fixStyle(tmodel);
+            this.retryPendingTargetsAfterStyle(tmodel);
           }
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator8.f();
+        _iterator9.f();
       }
     }
   }, {
     key: "fixAsyncStyles",
     value: function fixAsyncStyles() {
-      var _iterator9 = _createForOfIteratorHelper(this.lists.reasyncStyle),
-        _step9;
+      var _iterator10 = _createForOfIteratorHelper(this.lists.reasyncStyle),
+        _step10;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var tmodel = _step9.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var tmodel = _step10.value;
           if (tmodel.hasDom()) {
             TModelUtil.fixAsyncStyle(tmodel);
+            this.retryPendingTargetsAfterStyle(tmodel);
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator9.f();
+        _iterator10.f();
+      }
+    }
+  }, {
+    key: "retryPendingTargetsAfterStyle",
+    value: function retryPendingTargetsAfterStyle(tmodel) {
+      if (TargetUtil.hasPendingStyles(tmodel)) {
+        return;
+      }
+      for (var _i = 0, _arr = _toConsumableArray((_tmodel$pendingTarget = tmodel.pendingTargets) !== null && _tmodel$pendingTarget !== void 0 ? _tmodel$pendingTarget : []); _i < _arr.length; _i++) {
+        var _tmodel$pendingTarget;
+        var key = _arr[_i];
+        TargetUtil.shouldActivateNextTarget(tmodel, key);
       }
     }
   }, {
@@ -601,18 +624,18 @@ 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 _iterator10 = _createForOfIteratorHelper(tmodels),
-        _step10;
+      var _iterator11 = _createForOfIteratorHelper(tmodels),
+        _step11;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var tmodel = _step10.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var tmodel = _step11.value;
           if (!tmodel.hasDom()) {
             tmodel.markLayoutDirty('noDom');
             continue;
           }
           if (tmodel.noDomUpdatingTargets) {
-            for (var _i = 0, _arr = _toConsumableArray(tmodel.noDomUpdatingTargets); _i < _arr.length; _i++) {
-              var target = _arr[_i];
+            for (var _i2 = 0, _arr2 = _toConsumableArray(tmodel.noDomUpdatingTargets); _i2 < _arr2.length; _i2++) {
+              var target = _arr2[_i2];
               tmodel.addTargetToStatusList(target);
             }
             tmodel.noDomUpdatingTargets = undefined;
@@ -620,16 +643,16 @@ var TModelManager = /*#__PURE__*/function () {
           var pending = tmodel.pendingTargets;
           var visited = new Set();
           if (pending) {
-            for (var _i2 = 0, _arr2 = _toConsumableArray(pending); _i2 < _arr2.length; _i2++) {
-              var key = _arr2[_i2];
+            for (var _i3 = 0, _arr3 = _toConsumableArray(pending); _i3 < _arr3.length; _i3++) {
+              var key = _arr3[_i3];
               visited.add(key);
               TargetUtil.cleanupTarget(tmodel, key);
               TargetUtil.shouldActivateNextTarget(tmodel, key);
             }
           }
           if (restoredDoneTargets) {
-            for (var _i3 = 0, _Object$keys = Object.keys(tmodel.targetValues); _i3 < _Object$keys.length; _i3++) {
-              var _key = _Object$keys[_i3];
+            for (var _i4 = 0, _Object$keys = Object.keys(tmodel.targetValues); _i4 < _Object$keys.length; _i4++) {
+              var _key = _Object$keys[_i4];
               var targetValue = tmodel.targetValues[_key];
               if (targetValue.status !== 'done' || visited.has(_key)) {
                 continue;
@@ -637,16 +660,15 @@ var TModelManager = /*#__PURE__*/function () {
               if (tmodel.isTargetInLoop(_key) || tmodel.isTargetPassiveLoop(_key)) {
                 continue;
               }
-              if (TargetUtil.cleanupTarget(tmodel, _key)) {
-                TargetUtil.shouldActivateNextTarget(tmodel, _key);
-              }
+              TargetUtil.cleanupTarget(tmodel, _key);
+              TargetUtil.shouldActivateNextTarget(tmodel, _key);
             }
           }
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator10.f();
+        _iterator11.f();
       }
     }
   }, {
@@ -656,8 +678,8 @@ var TModelManager = /*#__PURE__*/function () {
       if (!((_tmodel$noDomUpdating2 = tmodel.noDomUpdatingTargets) !== null && _tmodel$noDomUpdating2 !== void 0 && _tmodel$noDomUpdating2.size)) {
         return;
       }
-      for (var _i4 = 0, _arr3 = _toConsumableArray(tmodel.noDomUpdatingTargets); _i4 < _arr3.length; _i4++) {
-        var key = _arr3[_i4];
+      for (var _i5 = 0, _arr4 = _toConsumableArray(tmodel.noDomUpdatingTargets); _i5 < _arr4.length; _i5++) {
+        var key = _arr4[_i5];
         var targetValue = tmodel.targetValues[key];
         if (!targetValue) {
           continue;
@@ -684,12 +706,12 @@ var TModelManager = /*#__PURE__*/function () {
       this.lists.noDom.sort(function (a, b) {
         return a.getUIDepth() - b.getUIDepth();
       });
-      var _iterator11 = _createForOfIteratorHelper(this.lists.noDom),
-        _step11;
+      var _iterator12 = _createForOfIteratorHelper(this.lists.noDom),
+        _step12;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
           var _tmodel4$domId;
-          var _tmodel4 = _step11.value;
+          var _tmodel4 = _step12.value;
           var domId = (_tmodel4$domId = _tmodel4.domId) !== null && _tmodel4$domId !== void 0 ? _tmodel4$domId : _tmodel4.oid;
           if ($Dom.query("#".concat(domId))) {
             _tmodel4.$dom = new $Dom("#".concat(domId));
@@ -711,12 +733,12 @@ var TModelManager = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator11.f();
+        _iterator12.f();
       }
-      for (var _i5 = 0, _needsDom = needsDom; _i5 < _needsDom.length; _i5++) {
-        var tmodel = _needsDom[_i5];
+      for (var _i6 = 0, _needsDom = needsDom; _i6 < _needsDom.length; _i6++) {
+        var tmodel = _needsDom[_i6];
         var domHolder = tmodel.getDomHolder();
         if (!domHolder) {
           tmodel.markLayoutDirty('noDomHolder');
@@ -747,27 +769,27 @@ var TModelManager = /*#__PURE__*/function () {
         entry.fragment.appendChild(tmodel.$dom.element);
         entry.tmodels.push(tmodel);
       }
-      var _iterator12 = _createForOfIteratorHelper(holdersMap.values()),
-        _step12;
+      var _iterator13 = _createForOfIteratorHelper(holdersMap.values()),
+        _step13;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var _step12$value = _step12.value,
-            _domHolder = _step12$value.domHolder,
-            fragment = _step12$value.fragment;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var _step13$value = _step13.value,
+            _domHolder = _step13$value.domHolder,
+            fragment = _step13$value.fragment;
           _domHolder.appendElement(fragment);
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator12.f();
+        _iterator13.f();
       }
-      for (var _i6 = 0, _attached = attached; _i6 < _attached.length; _i6++) {
-        var _tmodel = _attached[_i6];
+      for (var _i7 = 0, _attached = attached; _i7 < _attached.length; _i7++) {
+        var _tmodel = _attached[_i7];
         this.catchupNoDomTargetsBeforeStyle(_tmodel);
       }
       var domReady = [];
-      for (var _i7 = 0, _styleBatch = styleBatch; _i7 < _styleBatch.length; _i7++) {
-        var _tmodel2 = _styleBatch[_i7];
+      for (var _i8 = 0, _styleBatch = styleBatch; _i8 < _styleBatch.length; _i8++) {
+        var _tmodel2 = _styleBatch[_i8];
         if (_tmodel2.hasDom()) {
           _tmodel2.hasDomNow = true;
           _tmodel2.markLayoutDirty('hasDomNow');
@@ -777,15 +799,12 @@ var TModelManager = /*#__PURE__*/function () {
         TModelUtil.fixStyle(_tmodel2);
         TModelUtil.fixAsyncStyle(_tmodel2);
       }
-      for (var _i8 = 0, _domReady = domReady; _i8 < _domReady.length; _i8++) {
-        var _tmodel3 = _domReady[_i8];
-        _tmodel3.onDomReady();
+      for (var _i9 = 0, _domReady = domReady; _i9 < _domReady.length; _i9++) {
+        var _tmodel3 = _domReady[_i9];
+        _tmodel3.onDomAvailable();
       }
       this.activatePendingTargetsAfterDom(attached);
-      getEvents().attachEvents(attached.filter(function (t) {
-        var _t$externalEventMap;
-        return ((_t$externalEventMap = t.externalEventMap) === null || _t$externalEventMap === void 0 ? void 0 : _t$externalEventMap.size) > 0;
-      }));
+      getEvents().attachEvents(attached);
     }
   }]);
 }();