targetj 1.0.246 → 1.0.247

package/build/App.js

@@ -145,8 +145,6 @@ var AppFn = function AppFn() {
         case 0:
           my.manager.getVisibles().forEach(function (tmodel) {
             var _tmodel$allStyleTarge;
-            tmodel.tfMap = {};
-            tmodel.styleMap = {};
             if ((_tmodel$allStyleTarge = tmodel.allStyleTargetMap) !== null && _tmodel$allStyleTarge !== void 0 && _tmodel$allStyleTarge.size) {
               var _iterator = _createForOfIteratorHelper(tmodel.allStyleTargetMap),
                 _step;
@@ -246,10 +244,11 @@ App.unmount = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime()
         _context4.next = 14;
         return tApp.reset();
       case 14:
+        tApp.loader.clearAll();
         App.oids = {};
         App.tmodelIdMap = {};
         tApp = undefined;
-      case 17:
+      case 18:
       case "end":
         return _context4.stop();
     }

package/build/EventListener.js

@@ -60,6 +60,7 @@ var EventListener = /*#__PURE__*/function () {
     this.currentKey = '';
     this.currentHandlers = {
       touch: null,
+      click: null,
       scrollLeft: null,
       scrollTop: null,
       swipe: null,
@@ -311,20 +312,48 @@ var EventListener = /*#__PURE__*/function () {
       if (this.canFindHandlers && !lastEvent.synthetic) {
         this.findEventHandlers(lastEvent);
       }
-      if (lastEvent.eventType === 'end' || lastEvent.eventType === 'click') {
-        if (lastEvent.eventType === 'end') {
-          var _this$currentHandlers;
-          this.currentHandlers.end = this.currentHandlers.start;
-          (_this$currentHandlers = this.currentHandlers.end) === null || _this$currentHandlers === void 0 || _this$currentHandlers.markLayoutDirty('end-event');
-          this.currentHandlers.start = undefined;
-        }
-        this.canFindHandlers = true;
+      if (lastEvent.eventType === 'end') {
+        this.currentHandlers.end = this.currentHandlers.start;
+        this.currentHandlers.start = undefined;
       }
       this.currentEventName = lastEvent.eventName;
       this.currentEventType = lastEvent.eventType;
       this.currentEventTModel = lastEvent.tmodel;
       this.currentOriginalEvent = lastEvent.originalEvent;
       this.currentTouch.key = '';
+      this.markCapturedEventDirty(lastEvent);
+      if (lastEvent.eventType === 'end' || lastEvent.eventType === 'click') {
+        this.canFindHandlers = true;
+      }
+    }
+  }, {
+    key: "markCapturedEventDirty",
+    value: function markCapturedEventDirty(lastEvent) {
+      var mark = function mark(tmodel, reason) {
+        if (!tmodel) {
+          return;
+        }
+        tmodel.markEventDirty();
+        tmodel.markLayoutDirty(reason);
+      };
+      mark(lastEvent.tmodel, "".concat(lastEvent.eventType, "-event"));
+      switch (lastEvent.eventType) {
+        case "click":
+          mark(this.currentHandlers.click, "click-event");
+          break;
+        case "start":
+          mark(this.currentHandlers.start, "start-event");
+          break;
+        case "end":
+          mark(this.currentHandlers.end, "end-event");
+          break;
+        case "move":
+          mark(this.currentHandlers.swipe, "swipe-event");
+          mark(this.currentHandlers.scrollLeft, "scrollleft-event");
+          mark(this.currentHandlers.scrollTop, "scrolltop-event");
+          mark(this.currentHandlers.pinch, "pinch-event");
+          break;
+      }
     }
   }, {
     key: "handleDocEvent",
@@ -342,12 +371,12 @@ var EventListener = /*#__PURE__*/function () {
       var _this$lastEvent,
         _tmodel,
         _tmodel2,
+        _this$currentHandlers,
         _this$currentHandlers2,
         _this$currentHandlers3,
         _this$currentHandlers4,
-        _this$currentHandlers5,
+        _this$currentHandlers6,
         _this$currentHandlers7,
-        _this$currentHandlers8,
         _this7 = this,
         _tmodel3;
       if (!event) {
@@ -435,8 +464,8 @@ var EventListener = /*#__PURE__*/function () {
           this.currentHandlers.start = tmodel;
           this.findEventHandlers(newEvent);
           this.canFindHandlers = false;
-          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);
+          this.swipeStartX = this.start0.x - ((_this$currentHandlers = (_this$currentHandlers2 = this.currentHandlers.swipe) === null || _this$currentHandlers2 === void 0 ? void 0 : _this$currentHandlers2.getX()) !== null && _this$currentHandlers !== void 0 ? _this$currentHandlers : 0);
+          this.swipeStartY = this.start0.y - ((_this$currentHandlers3 = (_this$currentHandlers4 = this.currentHandlers.swipe) === null || _this$currentHandlers4 === void 0 ? void 0 : _this$currentHandlers4.getY()) !== null && _this$currentHandlers3 !== void 0 ? _this$currentHandlers3 : 0);
           event.stopPropagation();
           this.detachDocumentEvents('documentDragEvents');
           this.attachDocumentEvents('documentDragEvents');
@@ -451,12 +480,12 @@ var EventListener = /*#__PURE__*/function () {
               event.preventDefault();
             }
             if (this.touchCount > 0) {
-              var _this$currentHandlers6;
+              var _this$currentHandlers5;
               this.scrollEndTimeStamp.x = 0;
               this.scrollEndTimeStamp.y = 0;
               this.move(event);
               event.stopPropagation();
-              (_this$currentHandlers6 = this.currentHandlers.swipe) === null || _this$currentHandlers6 === void 0 || _this$currentHandlers6.markLayoutDirty('swipe-event');
+              (_this$currentHandlers5 = this.currentHandlers.swipe) === null || _this$currentHandlers5 === void 0 || _this$currentHandlers5.markLayoutDirty('swipe-event');
             } else if (this.isCurrentSource('wheel')) {
               this.clearTouch();
             }
@@ -482,8 +511,6 @@ var EventListener = /*#__PURE__*/function () {
             var clickHandler = SearchUtil.findFirstClickHandler(tmodel);
             var canAcceptClick = !this.start0 || clickHandler === this.currentHandlers.click && (clickHandler !== this.currentHandlers.swipe || this.getSwipeDistance() < 5);
             if (clickHandler && canAcceptClick) {
-              clickHandler.markEventDirty();
-              clickHandler.markLayoutDirty('event');
               this.eventQueue.length = 0;
               this.eventQueue.push({
                 eventName: eventName,
@@ -533,11 +560,11 @@ var EventListener = /*#__PURE__*/function () {
           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');
+          (_this$currentHandlers6 = this.currentHandlers.focus) === null || _this$currentHandlers6 === void 0 || _this$currentHandlers6.markLayoutDirty('key-event');
           break;
         case 'keydown':
           this.currentTouch.key = event.which || event.keyCode;
-          (_this$currentHandlers8 = this.currentHandlers.focus) === null || _this$currentHandlers8 === void 0 || _this$currentHandlers8.markLayoutDirty('keydown-event');
+          (_this$currentHandlers7 = this.currentHandlers.focus) === null || _this$currentHandlers7 === void 0 || _this$currentHandlers7.markLayoutDirty('keydown-event');
           break;
         case 'resize':
           this.windowEpoch++;
@@ -699,6 +726,22 @@ var EventListener = /*#__PURE__*/function () {
       this.windowScrollEndTimer = 0;
       this.scrollEndTimeStamp.x = 0;
       this.scrollEndTimeStamp.y = 0;
+      this.currentHandlers = {
+        touch: null,
+        click: null,
+        scrollLeft: null,
+        scrollTop: null,
+        swipe: null,
+        pinch: null,
+        focus: null,
+        justFocused: null,
+        blur: null,
+        leave: null,
+        enter: null,
+        start: null,
+        end: null,
+        hover: null
+      };
     }
   }, {
     key: "deltaX",

package/build/LoadingManager.js

@@ -31,20 +31,48 @@ var LoadingManager = /*#__PURE__*/function () {
     this.tmodelKeyMap = {};
     this.fetchingAPIMap = {};
     this.fetchingImageMap = {};
+    this.targetPageKeyMap = new WeakMap();
     this.fetchSeq = 0;
   }
   return _createClass(LoadingManager, [{
     key: "clear",
     value: function clear() {
+      this.fetchingAPIMap = {};
+      this.fetchingImageMap = {};
+    }
+  }, {
+    key: "clearAll",
+    value: function clearAll() {
+      this.cacheMap = {};
       this.tmodelKeyMap = {};
       this.fetchingAPIMap = {};
       this.fetchingImageMap = {};
+      this.targetPageKeyMap = new WeakMap();
       this.fetchSeq = 0;
     }
+  }, {
+    key: "setTargetPageKey",
+    value: function setTargetPageKey(tmodel, targetName, pageKey) {
+      var map = this.targetPageKeyMap.get(tmodel);
+      if (!map) {
+        map = new Map();
+        this.targetPageKeyMap.set(tmodel, map);
+      }
+      map.set(targetName, pageKey);
+    }
+  }, {
+    key: "getTargetPageKey",
+    value: function getTargetPageKey(tmodel, targetName) {
+      var _this$targetPageKeyMa, _this$targetPageKeyMa2;
+      return (_this$targetPageKeyMa = (_this$targetPageKeyMa2 = this.targetPageKeyMap.get(tmodel)) === null || _this$targetPageKeyMa2 === void 0 ? void 0 : _this$targetPageKeyMa2.get(targetName)) !== null && _this$targetPageKeyMa !== void 0 ? _this$targetPageKeyMa : document.URL;
+    }
   }, {
     key: "fetchCommon",
     value: function fetchCommon(fetchId, cacheId, tmodel, fetchMap, fetchFn) {
       TargetUtil.markFetchAction(tmodel);
+      var pageKey = document.URL;
+      var targetName = tmodel.key;
+      this.setTargetPageKey(tmodel, targetName, pageKey);
       if (!this.isFetched(cacheId)) {
         if (!fetchMap[fetchId]) {
           fetchMap[fetchId] = {
@@ -71,7 +99,7 @@ var LoadingManager = /*#__PURE__*/function () {
           fetchMap: fetchMap
         };
       }
-      this.addToTModelKeyMap(tmodel, tmodel.key, fetchId, cacheId);
+      this.addToTModelKeyMap(tmodel, tmodel.key, fetchId, cacheId, fetchMap);
       return fetchId;
     }
   }, {
@@ -120,11 +148,12 @@ var LoadingManager = /*#__PURE__*/function () {
   }, {
     key: "getTModelKey",
     value: function getTModelKey(tmodel, targetName) {
-      return "".concat(document.URL, "_").concat(tmodel.oid, "_").concat(targetName);
+      var pageKey = this.getTargetPageKey(tmodel, targetName);
+      return "".concat(pageKey, "_").concat(tmodel.oid, "_").concat(targetName);
     }
   }, {
     key: "addToTModelKeyMap",
-    value: function addToTModelKeyMap(tmodel, targetName, fetchId, cacheId) {
+    value: function addToTModelKeyMap(tmodel, targetName, fetchId, cacheId, fetchMap) {
       var key = this.getTModelKey(tmodel, targetName);
       var loadTargetName = TUtil.getLoadTargetName(targetName);
       var loadingComplete = this.isLoadingComplete(tmodel, targetName);
@@ -149,8 +178,8 @@ var LoadingManager = /*#__PURE__*/function () {
       this.tmodelKeyMap[key].entryCount++;
       tmodel.val(loadTargetName).push(undefined);
       if (cacheId && this.isFetched(cacheId)) {
-        this.fetchingAPIMap[fetchId].startTime = TUtil.now();
-        this.handleSuccess(this.fetchingAPIMap[fetchId], this.cacheMap[cacheId].result);
+        fetchMap[fetchId].startTime = TUtil.now();
+        this.handleSuccess(fetchMap[fetchId], this.cacheMap[cacheId].result);
       }
     }
   }, {

package/build/PageManager.js

@@ -85,7 +85,7 @@ var PageManager = /*#__PURE__*/function () {
               _context.next = 16;
               return tApp.start();
             case 16:
-              _context.next = 34;
+              _context.next = 35;
               break;
             case 18:
               tApp.tRoot = this.pageCache[link].tRoot;
@@ -101,17 +101,20 @@ var PageManager = /*#__PURE__*/function () {
               tApp.manager.activatePendingTargetsAfterDom(visibles, {
                 restoredDoneTargets: true
               });
+              tApp.manager.activatePendingTargetsAfterDom(newVisibles, {
+                restoredDoneTargets: true
+              });
               tApp.manager.visibleOidMap = _objectSpread({}, this.pageCache[link].visibleOidMap);
               newVisibles.forEach(function (visible) {
                 tApp.manager.visibleOidMap[visible.oid] = visible;
               });
               window.scrollTo(this.pageCache[link].scrollLeft, this.pageCache[link].scrollTop);
               this.lastLink = link;
-              _context.next = 33;
+              _context.next = 34;
               return tApp.start();
-            case 33:
-              getRunScheduler().restoreSnapshot(this.pageCache[link].runSnapshot);
             case 34:
+              getRunScheduler().restoreSnapshot(this.pageCache[link].runSnapshot);
+            case 35:
             case "end":
               return _context.stop();
           }

package/build/TModel.js

@@ -590,6 +590,8 @@ var TModel = /*#__PURE__*/function (_BaseModel) {
         targets: this.originalTargetNames
       }, {
         activeTargetList: this.activeTargetList
+      }, {
+        activatedTargets: this.activatedTargets
       }, {
         updatingTargetList: this.updatingTargetList
       }, {

package/build/TModelManager.js

@@ -505,7 +505,7 @@ var TModelManager = /*#__PURE__*/function () {
     value: function activatePendingTargetsAfterDom(tmodels) {
       var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
         _ref$restoredDoneTarg = _ref.restoredDoneTargets,
-        restoredDoneTargets = _ref$restoredDoneTarg === void 0 ? false : _ref$restoredDoneTarg;
+        restoredDoneTargets = _ref$restoredDoneTarg === void 0 ? true : _ref$restoredDoneTarg;
       var _iterator8 = _createForOfIteratorHelper(tmodels),
         _step8;
       try {
@@ -522,19 +522,20 @@ var TModelManager = /*#__PURE__*/function () {
             tmodel.noDomUpdatingTargets = undefined;
           }
           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];
+              visited.add(key);
               TargetUtil.cleanupTarget(tmodel, key);
               TargetUtil.shouldActivateNextTarget(tmodel, key);
             }
-            tmodel.pendingTargets = undefined;
           }
           if (restoredDoneTargets) {
             for (var _i3 = 0, _Object$keys = Object.keys(tmodel.targetValues); _i3 < _Object$keys.length; _i3++) {
               var _key = _Object$keys[_i3];
               var targetValue = tmodel.targetValues[_key];
-              if (targetValue.status !== 'done') {
+              if (targetValue.status !== 'done' || visited.has(_key)) {
                 continue;
               }
               if (tmodel.isTargetInLoop(_key) || tmodel.isTargetPassiveLoop(_key)) {

package/build/TargetUtil.js

@@ -217,7 +217,6 @@ var TargetUtil = /*#__PURE__*/function () {
             }
           } else if (isEndTrigger) {
             if (prevOk === true) {
-              tmodel.removeFromActiveTargets(nextTarget);
               TargetUtil.activateTarget(tmodel, nextTarget);
               nextTargetActivated = true;
               TargetUtil.clearPendingTargetsForNextTarget(tmodel, nextTarget);