targetj 1.0.97 → 1.0.98

package/build/App.js

@@ -26,7 +26,6 @@ var AppFn = function AppFn(firstChild) {
   my.init = function () {
     my.browser = new _Browser.Browser();
     my.browser.setup();
-    my.browser.measureScreen();
     my.$document = new _$Dom.$Dom(document);
     my.$window = new _$Dom.$Dom(window);
     my.$window.addEvent("popstate", function (event) {
@@ -42,37 +41,38 @@ var AppFn = function AppFn(firstChild) {
     my.manager = new _TModelManager.TModelManager();
     my.runScheduler = new _RunScheduler.RunScheduler();
     my.tRootFactory = function () {
-      var tRoot = new _TModel.TModel('tRoot');
-      tRoot.addChild = function (child) {
-        if (!_TUtil.TUtil.isDefined(child.targets['domHolder'])) {
-          child.addTarget('domHolder', {
-            value: function value() {
-              var $dom;
-              if (!_$Dom.$Dom.query('#tj-root')) {
-                $dom = new _$Dom.$Dom();
-                $dom.create('div');
-                $dom.setSelector('#tj-root');
-                $dom.setId('#tj-root');
-                $dom.attr("tabindex", "0");
-                new _$Dom.$Dom('body').insertFirst$Dom($dom);
-              } else {
-                $dom = new _$Dom.$Dom('#tj-root');
-              }
-              return $dom;
-            }
-          });
+      var tmodel = new _TModel.TModel('tRoot', {
+        start: function start() {
+          if (!_$Dom.$Dom.query('#tj-root')) {
+            this.$dom = new _$Dom.$Dom();
+            this.$dom.create('div');
+            this.$dom.setSelector('#tj-root');
+            this.$dom.setId('#tj-root');
+            this.$dom.attr("tabindex", "0");
+            new _$Dom.$Dom('body').insertFirst$Dom(this.$dom);
+          } else {
+            this.$dom = new _$Dom.$Dom('#tj-root');
+          }
+        },
+        domHolder: function domHolder() {
+          return this.$dom;
+        },
+        width: function width() {
+          return document.documentElement.clientWidth || document.body.clientWidth;
+        },
+        height: function height() {
+          return document.documentElement.clientHeight || document.body.clientHeight;
         }
-        _TModel.TModel.prototype.addChild.call(tRoot, child);
-      };
+      });
       if (my.tRoot) {
         my.tRoot.getChildren().forEach(function (t, num) {
           var child = new _TModel.TModel(t.type, t.targets);
           child.oidNum = num;
           child.oid = num > 0 ? "".concat(t.type).concat(num) : t.type;
-          tRoot.addChild(child);
+          tmodel.addChild(child);
         });
       }
-      return tRoot;
+      return tmodel;
     };
     my.tRoot = my.tRootFactory();
     if (firstChild) {
@@ -90,7 +90,6 @@ var AppFn = function AppFn(firstChild) {
     my.events.addHandlers(my.$document);
     my.events.removeWindowHandlers();
     my.events.addWindowHandlers();
-    my.browser.measureScreen();
     my.runScheduler.resetRuns();
     my.runningFlag = true;
     my.runScheduler.schedule(0, "appStart");
@@ -149,36 +148,47 @@ var isRunning = exports.isRunning = function isRunning() {
   return tApp ? tApp.runningFlag : false;
 };
 var tRoot = exports.tRoot = function tRoot() {
-  return tApp ? tApp.tRoot : undefined;
+  var _tApp;
+  return (_tApp = tApp) === null || _tApp === void 0 ? void 0 : _tApp.tRoot;
 };
 var getEvents = exports.getEvents = function getEvents() {
-  return tApp ? tApp.events : undefined;
+  var _tApp2;
+  return (_tApp2 = tApp) === null || _tApp2 === void 0 ? void 0 : _tApp2.events;
 };
 var getPager = exports.getPager = function getPager() {
-  return tApp ? tApp.pager : undefined;
+  var _tApp3;
+  return (_tApp3 = tApp) === null || _tApp3 === void 0 ? void 0 : _tApp3.pager;
 };
 var getLoader = exports.getLoader = function getLoader() {
-  return tApp ? tApp.loader : undefined;
+  var _tApp4;
+  return (_tApp4 = tApp) === null || _tApp4 === void 0 ? void 0 : _tApp4.loader;
 };
 var getManager = exports.getManager = function getManager() {
-  return tApp ? tApp.manager : undefined;
+  var _tApp5;
+  return (_tApp5 = tApp) === null || _tApp5 === void 0 ? void 0 : _tApp5.manager;
 };
 var getRunScheduler = exports.getRunScheduler = function getRunScheduler() {
-  return tApp ? tApp.runScheduler : undefined;
+  var _tApp6;
+  return (_tApp6 = tApp) === null || _tApp6 === void 0 ? void 0 : _tApp6.runScheduler;
 };
 var getLocationManager = exports.getLocationManager = function getLocationManager() {
-  return tApp ? tApp.locationManager : undefined;
+  var _tApp7;
+  return (_tApp7 = tApp) === null || _tApp7 === void 0 ? void 0 : _tApp7.locationManager;
 };
 var getBrowser = exports.getBrowser = function getBrowser() {
-  return tApp ? tApp.browser : undefined;
+  var _tApp8;
+  return (_tApp8 = tApp) === null || _tApp8 === void 0 ? void 0 : _tApp8.browser;
 };
 var getScreenWidth = exports.getScreenWidth = function getScreenWidth() {
-  return tApp ? tApp.browser.screen.width : 0;
+  var _tApp$tRoot$getWidth, _tApp9;
+  return (_tApp$tRoot$getWidth = (_tApp9 = tApp) === null || _tApp9 === void 0 || (_tApp9 = _tApp9.tRoot) === null || _tApp9 === void 0 ? void 0 : _tApp9.getWidth()) !== null && _tApp$tRoot$getWidth !== void 0 ? _tApp$tRoot$getWidth : 0;
 };
 var getScreenHeight = exports.getScreenHeight = function getScreenHeight() {
-  return tApp ? tApp.browser.screen.height : 0;
+  var _tApp$tRoot$getHeight, _tApp10;
+  return (_tApp$tRoot$getHeight = (_tApp10 = tApp) === null || _tApp10 === void 0 || (_tApp10 = _tApp10.tRoot) === null || _tApp10 === void 0 ? void 0 : _tApp10.getHeight()) !== null && _tApp$tRoot$getHeight !== void 0 ? _tApp$tRoot$getHeight : 0;
 };
 var getVisibles = exports.getVisibles = function getVisibles() {
-  return tApp ? tApp.manager.lists.visible : undefined;
+  var _tApp11;
+  return (_tApp11 = tApp) === null || _tApp11 === void 0 || (_tApp11 = _tApp11.manager) === null || _tApp11 === void 0 ? void 0 : _tApp11.lists.visible;
 };
 window.t = window.t || _SearchUtil.SearchUtil.find;

package/build/BaseModel.js

@@ -78,13 +78,16 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         return;
       }
       _TargetUtil.TargetUtil.bindTargetName(this.targets, key);
+      if (_TargetUtil.TargetUtil.targetConditionMap[key]) {
+        if (this.eventTargets.indexOf(key === -1)) {
+          this.eventTargets.push(key);
+        }
+        return;
+      }
       if (_TUtil.TUtil.isDefined(this.targets[key].initialValue)) {
         this.actualValues[key] = this.targets[key].initialValue;
         this.addToStyleTargetList(key);
       }
-      if (_TargetUtil.TargetUtil.targetConditionMap[key] && this.eventTargets.indexOf(key === -1)) {
-        this.eventTargets.push(key);
-      }
       if (this.targets[key].active !== false) {
         this.addToActiveTargets(key);
       }

package/build/Bracket.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Bracket = void 0;
 var _TModel2 = require("./TModel.js");
-var _TUtil = require("./TUtil.js");
+var _Viewport = require("./Viewport.js");
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -29,8 +29,10 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
     _classCallCheck(this, Bracket);
     _this = _callSuper(this, Bracket, ["BI", {
       canHaveDom: false,
-      outerXEast: 0
+      outerOverflowWidth: 0
     }]);
+    _this.innerContentWidth = 0;
+    _this.innerContentHeight = 0;
     _this.parent = parent;
     _this.newFlag = true;
     return _this;
@@ -57,60 +59,51 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
       return this.innerContentWidth;
     }
   }, {
-    key: "getInnerXEast",
-    value: function getInnerXEast() {
-      return _TUtil.TUtil.isDefined(this.getRealParent().val('innerXEast')) ? this.getRealParent().val('innerXEast') : this.getRealParent().absX + this.getRealParent().getWidth();
+    key: "getInnerOverflowWidth",
+    value: function getInnerOverflowWidth() {
+      return this.getRealParent().getInnerOverflowWidth();
     }
   }, {
     key: "getInnerContentHeight",
     value: function getInnerContentHeight() {
       return this.innerContentHeight;
     }
-  }, {
-    key: "getScrollTop",
-    value: function getScrollTop() {
-      return this.getRealParent().getScrollTop();
-    }
-  }, {
-    key: "getScrollLeft",
-    value: function getScrollLeft() {
-      return this.getRealParent().getScrollLeft();
-    }
-  }, {
-    key: "getBoundingRect",
-    value: function getBoundingRect() {
-      return _TUtil.TUtil.getBoundingRect(this.getRealParent());
-    }
-  }, {
-    key: "calculateAbsolutePosition",
-    value: function calculateAbsolutePosition(x, y) {
-      var rect = this.getBoundingRect();
-      this.absX = rect.left + x;
-      this.absY = rect.top + y;
-    }
   }, {
     key: "isVisible",
     value: function isVisible() {
       return this.visibilityStatus.top && this.visibilityStatus.bottom;
     }
-  }, {
-    key: "addToUpdatingChildren",
-    value: function addToUpdatingChildren(child) {
-      this.getRealParent().addToUpdatingChildren(child);
-    }
   }, {
     key: "addToParentVisibleChildren",
     value: function addToParentVisibleChildren() {}
   }, {
     key: "createViewport",
     value: function createViewport() {
-      return this.getRealParent().createViewport.call(this);
+      this.viewport = this.viewport || new _Viewport.Viewport();
+      this.viewport.xNext = this.x;
+      this.viewport.xNorth = this.x;
+      this.viewport.xEast = this.x;
+      this.viewport.xSouth = this.x;
+      this.viewport.xWest = this.x;
+      this.viewport.xOverflow = this.getRealParent().getXOverflow();
+      this.viewport.yNext = this.y;
+      this.viewport.yNorth = this.y;
+      this.viewport.yWest = this.y;
+      this.viewport.yEast = this.y;
+      this.viewport.ySouth = this.getRealParent().viewport.ySouth;
+      return this.viewport;
     }
   }, {
     key: "getRealParent",
     value: function getRealParent() {
       return this.realParent;
     }
+  }, {
+    key: "calculateAbsolutePosition",
+    value: function calculateAbsolutePosition(x, y) {
+      this.absX = x + this.getRealParent().absX;
+      this.absY = y + this.getRealParent().absY;
+    }
   }, {
     key: "shouldCalculateChildren",
     value: function shouldCalculateChildren() {
@@ -118,18 +111,18 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
       this.newFlag = false;
       return result;
     }
-  }, {
-    key: "indexRange",
-    value: function indexRange() {
-      return [this.startIndex, this.endIndex];
-    }
   }, {
     key: "getChildren",
     value: function getChildren() {
       return this.allChildren;
     }
   }, {
-    key: "addToParentVisibleList",
-    value: function addToParentVisibleList() {}
+    key: "calcContentWidthHeight",
+    value: function calcContentWidthHeight() {
+      this.contentHeight = this.viewport.ySouth - this.viewport.yNorth;
+      this.innerContentHeight = this.viewport.yEast - this.viewport.yNorth;
+      this.innerContentWidth = this.viewport.xSouth - this.viewport.xWest;
+      this.contentWidth = this.viewport.xEast - this.viewport.xWest;
+    }
   }]);
 }(_TModel2.TModel);

package/build/BracketGenerator.js

@@ -180,6 +180,7 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
         }
       });
       bracket.realParent = page;
+      BracketGenerator.all[bracket.oid] = bracket;
       return bracket;
     }
   }, {
@@ -208,4 +209,5 @@ var BracketGenerator = exports.BracketGenerator = /*#__PURE__*/function () {
     }
   }]);
 }();
-_defineProperty(BracketGenerator, "bracketMap", {});
+_defineProperty(BracketGenerator, "bracketMap", {});
+_defineProperty(BracketGenerator, "all", {});

package/build/Browser.js

@@ -18,12 +18,6 @@ var Browser = exports.Browser = /*#__PURE__*/function () {
   function Browser() {
     _classCallCheck(this, Browser);
     this.style = undefined;
-    this.screen = {
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0
-    };
   }
   return _createClass(Browser, [{
     key: "setup",
@@ -74,12 +68,5 @@ var Browser = exports.Browser = /*#__PURE__*/function () {
       style = vendor === '' ? style : vendor + style.charAt(0).toUpperCase() + style.substr(1);
       return style;
     }
-  }, {
-    key: "measureScreen",
-    value: function measureScreen() {
-      this.screen.width = document.documentElement.clientWidth || document.body.clientWidth;
-      this.screen.height = document.documentElement.clientHeight || document.body.clientHeight;
-      return this.screen;
-    }
   }]);
 }();

package/build/EventListener.js

@@ -61,147 +61,168 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         inputType: 'touch',
         eventType: 'start',
         order: 1,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       touchmove: {
         eventName: 'touchmove',
         inputType: 'touch',
         eventType: 'move',
         order: 1,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       touchend: {
         eventName: 'touchend',
         inputType: 'touch',
         eventType: 'end',
         order: 1,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       touchcancel: {
         eventName: 'touchend',
         inputType: 'touch',
         eventType: 'cancel',
         order: 1,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       mousedown: {
         eventName: 'mousedown',
         inputType: 'mouse',
         eventType: 'start',
         order: 2,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       mousemove: {
         eventName: 'mousemove',
         inputType: 'mouse',
         eventType: 'move',
         order: 2,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       mouseup: {
         eventName: 'mouseup',
         inputType: 'mouse',
         eventType: 'end',
         order: 2,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       mousecancel: {
         eventName: 'mouseup',
         inputType: 'mouse',
         eventType: 'cancel',
         order: 2,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       mouseleave: {
         eventName: 'mouseleave',
         inputType: 'mouse',
         eventType: 'cancel',
         order: 2,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       pointerdown: {
         eventName: 'mousedown',
         inputType: 'pointer',
         eventType: 'start',
         order: 3,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       pointermove: {
         eventName: 'mousemove',
         inputType: 'pointer',
         eventType: 'move',
         order: 3,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       pointerup: {
         eventName: 'mouseup',
         inputType: 'pointer',
         eventType: 'end',
         order: 3,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       pointercancel: {
         eventName: 'mousecancel',
         inputType: 'pointer',
         eventType: 'cancel',
         order: 3,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       wheel: {
         eventName: 'wheel',
         inputType: '',
         eventType: 'wheel',
         order: 1,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       DOMMouseScroll: {
         eventName: 'wheel',
         inputType: '',
         eventType: 'wheel',
         order: 1,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       mousewheel: {
         eventName: 'wheel',
         inputType: '',
         eventType: 'wheel',
         order: 1,
-        windowEvent: false
+        windowEvent: false,
+        queue: true
       },
       blur: {
         eventName: 'blur',
         inputType: 'mouse',
         eventType: 'cancel',
         order: 2,
-        windowEvent: true
+        windowEvent: true,
+        queue: true
       },
       keyup: {
         eventName: 'key',
         inputType: '',
         eventType: 'key',
         order: 1,
-        windowEvent: true
+        windowEvent: true,
+        queue: true
       },
       keydown: {
         eventName: 'key',
         inputType: '',
         eventType: 'key',
         order: 1,
-        windowEvent: true
+        windowEvent: true,
+        queue: true
       },
       resize: {
         eventName: 'resize',
         inputType: '',
         eventType: 'resize',
         order: 1,
-        windowEvent: true
+        windowEvent: true,
+        queue: false
       },
       orientationchange: {
         eventName: 'resize',
         inputType: '',
         eventType: 'resize',
         order: 1,
-        windowEvent: true
+        windowEvent: true,
+        queue: false
       }
     };
     this.domEvents = Object.keys(this.eventMap).filter(function (key) {
@@ -308,15 +329,11 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         return;
       }
       var lastEvent = this.eventQueue.shift();
-      if (lastEvent.eventName === 'resize') {
-        (0, _App.getBrowser)().measureScreen();
-      } else {
-        this.findEventHandlers(lastEvent);
-        this.currentEventName = lastEvent.eventName;
-        this.currentEventType = lastEvent.eventType;
-        this.currentKey = this.currentTouch.key;
-        this.currentTouch.key = "";
-      }
+      this.findEventHandlers(lastEvent);
+      this.currentEventName = lastEvent.eventName;
+      this.currentEventType = lastEvent.eventType;
+      this.currentKey = this.currentTouch.key;
+      this.currentTouch.key = "";
       (0, _App.getRunScheduler)().schedule(10, "captureEvents-".concat(lastEvent));
     }
   }, {
@@ -333,7 +350,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       var eventName = eventItem.eventName,
         inputType = eventItem.inputType,
         eventType = eventItem.eventType,
-        eventOrder = eventItem.order;
+        eventOrder = eventItem.order,
+        queue = eventItem.queue;
       var now = _TUtil.TUtil.now();
       this.touchTimeStamp = Math.max(now, this.touchTimeStamp);
       var tmodel = this.getTModelFromEvent(event);
@@ -354,14 +372,16 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           }
         }
       }
-      this.eventQueue.push({
-        eventName: eventName,
-        eventItem: eventItem,
-        eventType: eventType,
-        originalName: originalName,
-        tmodel: tmodel,
-        timeStamp: now
-      });
+      if (queue) {
+        this.eventQueue.push({
+          eventName: eventName,
+          eventItem: eventItem,
+          eventType: eventType,
+          originalName: originalName,
+          tmodel: tmodel,
+          timeStamp: now
+        });
+      }
       switch (eventName) {
         case 'mousedown':
         case 'touchstart':
@@ -430,6 +450,10 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         case 'key':
           this.currentTouch.key = event.which || event.keyCode;
           break;
+        case 'resize':
+          (0, _App.tRoot)().val('width', (0, _App.tRoot)().targets.width());
+          (0, _App.tRoot)().val('height', (0, _App.tRoot)().targets.height());
+          break;
       }
       (0, _App.getRunScheduler)().schedule(0, "".concat(originalName, "-").concat(eventName, "-").concat((event.target.tagName || "").toUpperCase()));
     }

package/build/LocationManager.js

@@ -64,36 +64,29 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
   }, {
     key: "calculateContainer",
     value: function calculateContainer(container) {
-      var _this = this;
       var allChildren = this.getChildren(container);
       var viewport = container.createViewport();
       var visibleChildrenCount = container.visibleChildren.length;
       container.visibleChildren.length = 0;
       var i = 0;
       var childrenLength = allChildren.length;
-      var _loop = function _loop() {
+      while (i < childrenLength && _App.tApp.isRunning()) {
         var child = allChildren[i++];
         if (!child) {
-          return 1; // continue
+          continue;
         }
-        var outerXEast;
-        var innerXEast;
-        var preX = child.getX();
-        var preY = child.getY();
-        _this.calculateTargets(child);
+        this.calculateTargets(child);
         viewport.setCurrentChild(child);
         child.setLocation(viewport);
         child.calculateAbsolutePosition(child.x, child.y);
-        innerXEast = _TUtil.TUtil.isDefined(container.val('innerXEast')) ? container.val('innerXEast') : container.getInnerXEast();
-        outerXEast = _TUtil.TUtil.isDefined(child.val('outerXEast')) ? child.val('outerXEast') : child.getOuterXEast();
-        if (viewport.isOverflow(outerXEast, innerXEast)) {
+        if (viewport.isOverflow(child.getOuterOverflowWidth(), container.getInnerOverflowWidth())) {
           viewport.overflow();
           child.setLocation(viewport);
         } else {
           child.setLocation(viewport);
         }
-        if (child.isIncluded() && !_this.hasLocationMap[child.oid]) {
-          _this.addToLocationList(child);
+        if (child.isIncluded() && !this.hasLocationMap[child.oid]) {
+          this.addToLocationList(child);
         }
         if (child.isTargetEnabled('x') && !child.isTargetUpdating('x') && !child.isTargetImperative('x') && child.getTargetSteps('x') === 0) {
           _TargetExecutor.TargetExecutor.resolveTargetValue(child, 'x');
@@ -107,50 +100,39 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
         } else if (!_TUtil.TUtil.isDefined(child.targetValues.y)) {
           child.val('y', child.y);
         }
-        if (preX !== child.getX()) {
-          child.addToStyleTargetList('x');
-        }
-        if (preY !== child.getY()) {
-          child.addToStyleTargetList('y');
-        }
+        child.addToStyleTargetList('x');
+        child.addToStyleTargetList('y');
         child.calculateAbsolutePosition(child.getX(), child.getY());
         viewport.isVisible(child);
         child.addToParentVisibleChildren();
         if (child.shouldCalculateChildren()) {
-          _this.calculateContainer(child);
+          this.calculateContainer(child);
         }
         if (child.isInFlow()) {
           if (_TUtil.TUtil.isNumber(child.val('appendNewLine'))) {
             viewport.appendNewLine();
-            viewport.calcContentWidthHeight();
+            container.calcContentWidthHeight();
           } else {
-            viewport.calcContentWidthHeight();
+            container.calcContentWidthHeight();
             viewport.nextLocation();
           }
         }
-        if (Array.isArray(child.val('contentHeight'))) {
-          child.val('contentHeight').forEach(function (key) {
-            var preVal = child.val(key);
-            child.val(key, child.getContentHeight());
-            if (preVal !== child.val(key)) {
-              child.addToStyleTargetList(key);
-            }
-          });
-        }
-        if (Array.isArray(child.val('contentWidth'))) {
-          child.val('contentWidth').forEach(function (key) {
-            var preVal = child.val(key);
-            child.val(key, child.getContentWidth());
-            if (preVal !== child.val(key)) {
-              child.addToStyleTargetList(key);
-            }
-          });
-        }
-        viewport.calcContentWidthHeight();
-        _this.locationListStats.push("".concat(child.oid, "-").concat(child.updatingTargetList.length, "-").concat(_TUtil.TUtil.now() - _this.startTime));
-      };
-      while (i < childrenLength && _App.tApp.isRunning()) {
-        if (_loop()) continue;
+        if (!_TUtil.TUtil.isDefined(child.targetValues.height) && !_TUtil.TUtil.isDefined(child.targets.heightFromDom) && child.getContentHeight() > 0) {
+          var preVal = child.getHeight();
+          child.val('height', child.getContentHeight());
+          if (preVal !== child.getHeight()) {
+            child.addToStyleTargetList('height');
+          }
+        }
+        if (!_TUtil.TUtil.isDefined(child.targetValues.width) && !_TUtil.TUtil.isDefined(child.targets.widthFromDom) && child.getContentWidth() > 0) {
+          var _preVal = child.getWidth();
+          child.val('width', child.getContentWidth());
+          if (_preVal !== child.getWidth()) {
+            child.addToStyleTargetList('width');
+          }
+        }
+        container.calcContentWidthHeight();
+        this.locationListStats.push("".concat(child.oid, "-").concat(child.updatingTargetList.length, "-").concat(_TUtil.TUtil.now() - this.startTime));
       }
       if (visibleChildrenCount !== container.visibleChildren.length && container.targets['onVisibleChildrenChange']) {
         this.activateTargets(container, container.targets['onVisibleChildrenChange']);
@@ -169,10 +151,10 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
       if (tmodel.hasDom()) {
         var preWidth = tmodel.getWidth();
         var preHeight = tmodel.getHeight();
-        if (!_TUtil.TUtil.isDefined(tmodel.targetValues.width) && !_TUtil.TUtil.isDefined(tmodel.targets.width) && !_TUtil.TUtil.isDefined(tmodel.targetValues.contentWidth) || tmodel.getTargetValue('widthFromDom')) {
+        if (!_TUtil.TUtil.isDefined(tmodel.targetValues.width) && !_TUtil.TUtil.isDefined(tmodel.targets.width) && !tmodel.hasChildren() || tmodel.getTargetValue('widthFromDom')) {
           _TargetUtil.TargetUtil.setWidthFromDom(tmodel);
         }
-        if (!_TUtil.TUtil.isDefined(tmodel.targetValues.height) && !_TUtil.TUtil.isDefined(tmodel.targets.height) && !_TUtil.TUtil.isDefined(tmodel.targetValues.contentHeight) || tmodel.getTargetValue('heightFromDom')) {
+        if (!_TUtil.TUtil.isDefined(tmodel.targetValues.height) && !_TUtil.TUtil.isDefined(tmodel.targets.height) && !tmodel.hasChildren() || tmodel.getTargetValue('heightFromDom')) {
           _TargetUtil.TargetUtil.setHeightFromDom(tmodel);
         }
         if (preWidth !== tmodel.getWidth()) {
@@ -197,7 +179,7 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
   }, {
     key: "activateTargets",
     value: function activateTargets(tmodel, targetList) {
-      var _this2 = this;
+      var _this = this;
       if (!Array.isArray(targetList)) {
         targetList = [targetList];
       }
@@ -210,18 +192,18 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
               if (_typeof(target) === 'object') {
                 var key = target.key,
                   handler = target.handler;
-                _this2.activateSingleTarget(handler, key);
+                _this.activateSingleTarget(handler, key);
               } else {
-                _this2.activateSingleTarget(tmodel, target);
+                _this.activateSingleTarget(tmodel, target);
               }
             });
           }
         } else if (_typeof(targetName) === 'object') {
           var key = targetName.key,
             handler = targetName.handler;
-          _this2.activateSingleTarget(handler, key);
+          _this.activateSingleTarget(handler, key);
         } else {
-          _this2.activateSingleTarget(tmodel, targetName);
+          _this.activateSingleTarget(tmodel, targetName);
         }
       });
     }

package/build/PageManager.js

@@ -31,21 +31,16 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
   return _createClass(PageManager, [{
     key: "openPage",
     value: function openPage(link) {
-      var _this = this;
       _App.tApp.stop();
       _App.tApp.reset();
       if (!this.pageCache[link]) {
-        _App.tApp.tRoot.getChildren().forEach(function (child) {
-          return child.$dom.innerHTML("");
-        });
+        _App.tApp.tRoot.$dom.innerHTML("");
         _App.tApp.tRoot = _App.tApp.tRootFactory();
         this.lastLink = link;
         setTimeout(_App.tApp.start);
       } else {
         _App.tApp.tRoot = this.pageCache[link].tRoot;
-        _App.tApp.tRoot.getChildren().forEach(function (child, index) {
-          child.$dom.innerHTML(_this.pageCache[link].htmls[index]);
-        });
+        _App.tApp.tRoot.$dom.innerHTML(this.pageCache[link].html);
         _TUtil.TUtil.initDoms(this.pageCache[link].visibleList);
         _App.tApp.manager.lists.visible = _toConsumableArray(this.pageCache[link].visibleList);
         this.lastLink = link;
@@ -72,9 +67,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
       if (this.lastLink) {
         this.pageCache[this.lastLink] = {
           link: this.lastLink,
-          htmls: _App.tApp.tRoot.getChildren().map(function (child) {
-            return child.$dom.innerHTML();
-          }),
+          html: _App.tApp.tRoot.$dom.innerHTML(),
           visibleList: _toConsumableArray(_App.tApp.manager.lists.visible),
           tRoot: _App.tApp.tRoot
         };
@@ -92,9 +85,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
       if (!currentState.browserUrl) {
         this.pageCache[document.URL] = {
           link: document.URL,
-          htmls: _App.tApp.tRoot.getChildren().map(function (child) {
-            return child.$dom.innerHTML();
-          }),
+          htms: _App.tApp.tRoot.$dom.innerHTML(),
           visibleList: _toConsumableArray(_App.tApp.manager.lists.visible),
           tRoot: _App.tApp.tRoot
         };

package/build/TModel.js

@@ -55,8 +55,6 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     _this.absY = 0;
     _this.domHeight = undefined;
     _this.domWidth = undefined;
-    _this.innerContentWidth = 0;
-    _this.innerContentHeight = 0;
     _this.contentWidth = 0;
     _this.contentHeight = 0;
     _this.styleMap = {};
@@ -76,7 +74,20 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   return _createClass(TModel, [{
     key: "createViewport",
     value: function createViewport() {
-      this.viewport = this.viewport ? this.viewport.reset() : new _Viewport.Viewport(this);
+      this.viewport = this.viewport || new _Viewport.Viewport();
+      var scrollLeft = -this.getScrollLeft();
+      var scrollTop = -this.getScrollTop();
+      this.viewport.xNext = scrollLeft;
+      this.viewport.xNorth = scrollLeft;
+      this.viewport.xEast = scrollLeft;
+      this.viewport.xSouth = scrollLeft;
+      this.viewport.xWest = scrollLeft;
+      this.viewport.xOverflow = this.getXOverflow();
+      this.viewport.yNext = scrollTop;
+      this.viewport.yNorth = scrollTop;
+      this.viewport.yWest = scrollTop;
+      this.viewport.yEast = scrollTop;
+      this.viewport.ySouth = scrollTop;
       return this.viewport;
     }
   }, {
@@ -250,12 +261,12 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getDomParent",
     value: function getDomParent() {
-      return this.actualValues.domParent ? this.actualValues.domParent : null;
+      return this.actualValues.domParent || _SearchUtil.SearchUtil.findParentByTarget(this, 'domHolder');
     }
   }, {
     key: "getDomHolder",
     value: function getDomHolder() {
-      return this.actualValues.domHolder ? this.actualValues.domHolder : this.getDomParent() ? this.getDomParent().$dom : _SearchUtil.SearchUtil.findParentByTarget(this, 'domHolder') ? _SearchUtil.SearchUtil.findParentByTarget(this, 'domHolder').$dom : null;
+      return this.actualValues.domHolder ? this.actualValues.domHolder : this.getDomParent() ? this.getDomParent().$dom : null;
     }
   }, {
     key: "bug",
@@ -318,31 +329,47 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     value: function getInnerContentHeight() {
       return 0;
     }
+  }, {
+    key: "calcContentWidthHeight",
+    value: function calcContentWidthHeight() {
+      this.contentHeight = this.viewport.ySouth - this.viewport.yNorth;
+      this.contentWidth = this.viewport.xEast - this.viewport.xWest;
+    }
   }, {
     key: "getInnerHeight",
     value: function getInnerHeight() {
-      return _TUtil.TUtil.isDefined(this.actualValues.innerHeight) ? this.actualValues.innerHeight : this.getHeight();
+      var _this$actualValues$in;
+      return (_this$actualValues$in = this.actualValues.innerHeight) !== null && _this$actualValues$in !== void 0 ? _this$actualValues$in : this.getHeight();
     }
   }, {
     key: "getInnerWidth",
     value: function getInnerWidth() {
-      return _TUtil.TUtil.isDefined(this.actualValues.innerWidth) ? this.actualValues.innerWidth : this.getWidth();
+      var _this$actualValues$in2;
+      return (_this$actualValues$in2 = this.actualValues.innerWidth) !== null && _this$actualValues$in2 !== void 0 ? _this$actualValues$in2 : this.getWidth();
     }
   }, {
-    key: "getInnerXEast",
-    value: function getInnerXEast() {
-      return this.absX + this.getInnerWidth();
+    key: "getInnerOverflowWidth",
+    value: function getInnerOverflowWidth() {
+      var _this$actualValues$in3;
+      return (_this$actualValues$in3 = this.actualValues.innerOverflowWidth) !== null && _this$actualValues$in3 !== void 0 ? _this$actualValues$in3 : this.absX + this.getInnerWidth();
     }
   }, {
-    key: "getOuterXEast",
-    value: function getOuterXEast() {
-      return this.absX + this.getInnerWidth();
+    key: "getOuterOverflowWidth",
+    value: function getOuterOverflowWidth() {
+      var _this$actualValues$ou;
+      return (_this$actualValues$ou = this.actualValues.outerOverflowWidth) !== null && _this$actualValues$ou !== void 0 ? _this$actualValues$ou : this.absX + this.getInnerWidth();
     }
   }, {
     key: "getContentWidth",
     value: function getContentWidth() {
       return this.contentWidth;
     }
+  }, {
+    key: "getXOverflow",
+    value: function getXOverflow() {
+      var _this$actualValues$xO;
+      return (_this$actualValues$xO = this.actualValues.xOverflow) !== null && _this$actualValues$xO !== void 0 ? _this$actualValues$xO : 0;
+    }
   }, {
     key: "getUIDepth",
     value: function getUIDepth() {

package/build/TModelManager.js

@@ -236,7 +236,19 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
     value: function fixStyle(tmodel) {
       var transformUpdate = false;
       tmodel.styleTargetList.forEach(function (key) {
-        if (_TargetUtil.TargetUtil.transformMap[key]) {
+        if (key === 'x') {
+          var x = tmodel.absX - tmodel.getDomParent().absX;
+          if (tmodel.transformMap['x'] !== x) {
+            tmodel.transformMap[key] = x;
+            transformUpdate = true;
+          }
+        } else if (key === 'y') {
+          var y = tmodel.absY - tmodel.getDomParent().absY;
+          if (tmodel.transformMap['y'] !== y) {
+            tmodel.transformMap[key] = y;
+            transformUpdate = true;
+          }
+        } else if (_TargetUtil.TargetUtil.transformMap[key]) {
           var value = _TargetUtil.TargetUtil.rotate3D[key] ? tmodel.val(key) : _TargetUtil.TargetUtil.scaleMap[key] ? _TUtil.TUtil.formatNum(tmodel.val(key), 2) : tmodel.floorVal(key);
           if (tmodel.transformMap[key] !== value) {
             tmodel.transformMap[key] = value;

package/build/TUtil.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.TUtil = void 0;
 var _$Dom = require("./$Dom.js");
 var _App = require("./App.js");
-var _SearchUtil = require("./SearchUtil.js");
 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 _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."); }
@@ -31,40 +30,12 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
   return _createClass(TUtil, null, [{
     key: "getBoundingRect",
     value: function getBoundingRect(tmodel) {
-      var left, top, right, bottom, oid;
-      if (tmodel.actualValues.domHolder && tmodel.actualValues.domHolder.exists()) {
-        if (tmodel.getParent() === (0, _App.tRoot)()) {
-          left = tmodel.getX();
-          top = tmodel.getY();
-          right = left + tmodel.getWidth();
-          bottom = top + tmodel.getHeight();
-          oid = tmodel.oid;
-        } else {
-          var rect = tmodel.actualValues.domHolder.getBoundingClientRect();
-          left = rect.left;
-          top = rect.top;
-          right = rect.right;
-          bottom = rect.bottom;
-          oid = tmodel.actualValues.domHolder.attr('id');
-        }
-      } else {
-        var parent = tmodel.getDomParent() ? tmodel.getDomParent() : _SearchUtil.SearchUtil.findParentByTarget(tmodel, 'domHolder');
-        if (parent) {
-          left = parent.absX;
-          top = parent.absY;
-          var width = parent.getWidth();
-          var height = parent.getHeight();
-          right = left + width;
-          bottom = top + height;
-          oid = parent.oid;
-        } else {
-          left = 0;
-          top = 0;
-          right = (0, _App.getScreenWidth)();
-          bottom = (0, _App.getScreenHeight)();
-          oid = 'screen';
-        }
-      }
+      var parent = tmodel.getParent();
+      var left = parent.absX;
+      var top = parent.absY;
+      var right = left + parent.getWidth();
+      var bottom = top + parent.getHeight();
+      var oid = parent.oid;
       return {
         left: left,
         top: top,
@@ -219,7 +190,7 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
           var g = _step2.value;
           var gtab = g.isVisible() ? tab + '|  ' : tab + 'x  ';
           if (g.type === 'BI') {
-            console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " ind:").concat(g.startIndex, "-").concat(g.endIndex));
+            console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), ", y:").concat(Math.floor(g.absY), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " hc:").concat(Math.floor(g.getContentHeight())));
           } else {
             console.log("".concat(gtab).concat(g.oid, " v:").concat(g.isVisible(), " x:").concat(Math.floor(g.getX()), " y:").concat(Math.floor(g.getY()), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " hc:").concat(Math.floor(g.getContentHeight())));
           }

package/build/TargetManager.js

@@ -130,7 +130,7 @@ var TargetManager = exports.TargetManager = /*#__PURE__*/function () {
       var originalTargetName, originalTarget, originalTModel;
       if (step <= steps) {
         if (!_TUtil.TUtil.isDefined(initialValue)) {
-          initialValue = tmodel.actualValues[key];
+          initialValue = _TUtil.TUtil.isDefined(tmodel.actualValues[key]) ? tmodel.actualValues[key] : typeof theValue === 'number' ? 0 : undefined;
           tmodel.setTargetInitialValue(key, initialValue);
         }
         tmodel.actualValues[key] = _TargetUtil.TargetUtil.morph(tmodel, key, initialValue, theValue, step, steps);

package/build/TargetUtil.js

@@ -86,7 +86,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
   }, {
     key: "isListTarget",
     value: function isListTarget(value) {
-      return _typeof(value) === 'object' && Array.isArray(value.list);
+      return _typeof(value) === 'object' && value !== null && Array.isArray(value.list);
     }
   }, {
     key: "isObjectTarget",
@@ -307,7 +307,8 @@ _defineProperty(TargetUtil, "styleWithUnitMap", {
   padding: true,
   left: true,
   top: true,
-  fontWeight: true
+  fontWeight: true,
+  letterSpacing: true
 });
 _defineProperty(TargetUtil, "colorMap", {
   color: true,
@@ -333,7 +334,10 @@ _defineProperty(TargetUtil, "styleTargetMap", _objectSpread(_objectSpread(_objec
   justifyContent: true,
   alignItems: true,
   display: true,
-  cursor: true
+  cursor: true,
+  fontFamily: true,
+  overflow: true,
+  textDecoration: true
 }));
 _defineProperty(TargetUtil, "scaleMap", {
   scale: true,

package/build/Viewport.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Viewport = void 0;
 var _TUtil = require("./TUtil.js");
-var _App = require("./App.js");
 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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
@@ -16,109 +15,56 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * It calculates the locations and visibility of objects
  */
 var Viewport = exports.Viewport = /*#__PURE__*/function () {
-  function Viewport(tmodel) {
+  function Viewport() {
     _classCallCheck(this, Viewport);
-    this.tmodel = tmodel;
     this.xNext = 0;
     this.xNorth = 0;
     this.xWest = 0;
     this.xEast = 0;
     this.xSouth = 0;
     this.xOverflow = 0;
-    this.xOffset = 0;
     this.yNext = 0;
     this.yNorth = 0;
     this.yWest = 0;
     this.yEast = 0;
     this.ySouth = 0;
-    this.yOffset = 0;
-    this.reset();
   }
   return _createClass(Viewport, [{
-    key: "reset",
-    value: function reset() {
-      var x, y;
-      if (this.tmodel.type === 'BI') {
-        x = this.tmodel.getX() + this.tmodel.getScrollLeft();
-        y = this.tmodel.getY() + this.tmodel.getScrollTop();
-        this.xOffset = 0;
-        this.yOffset = 0;
-        this.xNext = x;
-        this.xNorth = x;
-        this.xEast = x;
-        this.xSouth = x;
-        this.xWest = x;
-        this.xOverflow = this.tmodel.getRealParent().getX();
-        this.yNext = y;
-        this.yNorth = y;
-        this.yWest = y;
-        this.yEast = y;
-        this.ySouth = this.tmodel.getRealParent().viewport ? this.tmodel.getRealParent().viewport.ySouth : y;
-      } else {
-        this.xOffset = 0;
-        this.yOffset = 0;
-        x = this.tmodel.getX();
-        y = this.tmodel.getY();
-        this.xNext = x;
-        this.xNorth = x;
-        this.xEast = x;
-        this.xSouth = x;
-        this.xWest = x;
-        this.xOverflow = _TUtil.TUtil.isDefined(this.tmodel.val('xOverflow')) ? this.tmodel.val('xOverflow') : x;
-        this.yNext = y;
-        this.yNorth = y;
-        this.yWest = y;
-        this.yEast = y;
-        this.ySouth = y;
-      }
-      return this;
-    }
-  }, {
     key: "setCurrentChild",
     value: function setCurrentChild(child) {
       this.currentChild = child;
-      this.xOffset = child.getDomParent() ? -child.getDomParent().getX() : 0;
-      this.yOffset = child.getDomParent() ? -child.getDomParent().getY() : 0;
     }
   }, {
     key: "getXNext",
     value: function getXNext() {
-      return this.xNext + this.currentChild.getLeftMargin() + this.xOffset - this.tmodel.getScrollLeft();
+      return this.xNext + this.currentChild.getLeftMargin();
     }
   }, {
     key: "getYNext",
     value: function getYNext() {
-      return this.yNext + this.currentChild.getTopMargin() + this.yOffset - this.tmodel.getScrollTop();
+      return this.yNext + this.currentChild.getTopMargin();
     }
   }, {
     key: "isVisible",
     value: function isVisible(child) {
       var x = child.absX;
       var y = child.absY;
-      var parentScale = child.getDomParent() ? child.getDomParent().getMeasuringScale() : 1;
-      var scale = parentScale * child.getMeasuringScale();
+      var parent = child.getDomParent();
+      var scale = (parent.getMeasuringScale() || 1) * child.getMeasuringScale();
       var maxWidth = _TUtil.TUtil.isDefined(child.getWidth()) ? scale * child.getWidth() : 0;
       var maxHeight = _TUtil.TUtil.isDefined(child.getHeight()) ? scale * child.getHeight() : 0;
       var status = child.visibilityStatus;
-      var rect = child.getBoundingRect();
-      if (!child.hasChildren()) {
-        status.right = x <= (0, _App.getScreenWidth)() && x <= rect.right;
-        status.left = x + maxWidth >= 0 && x + maxWidth >= rect.left;
-        status.bottom = y <= (0, _App.getScreenHeight)() && y <= rect.bottom;
-        status.top = y + maxHeight >= 0 && y + maxHeight >= rect.top;
-      } else {
-        status.right = x <= rect.right;
-        status.left = x + maxWidth >= rect.left;
-        status.bottom = y <= rect.bottom;
-        status.top = y + maxHeight >= rect.top;
-      }
+      status.right = Math.floor(x) <= parent.absX + parent.getWidth();
+      status.left = Math.ceil(x + maxWidth) >= parent.absX;
+      status.bottom = Math.floor(y) <= parent.absY + parent.getHeight();
+      status.top = Math.ceil(y + maxHeight) >= parent.absY;
       child.visible = status.left && status.right && status.top && status.bottom;
       return child.isVisible();
     }
   }, {
     key: "isOverflow",
-    value: function isOverflow(outerXEast, innerXEast) {
-      return _TUtil.TUtil.isNumber(outerXEast) && _TUtil.TUtil.isNumber(innerXEast) && outerXEast > innerXEast;
+    value: function isOverflow(outerOverflowWidth, innerOverflowWidth) {
+      return _TUtil.TUtil.isNumber(outerOverflowWidth) && _TUtil.TUtil.isNumber(innerOverflowWidth) && outerOverflowWidth > innerOverflowWidth;
     }
   }, {
     key: "overflow",
@@ -154,13 +100,5 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
       this.currentChild.getRealParent().viewport.xEast = Math.max(this.currentChild.getRealParent().viewport.xEast, this.xEast);
       this.currentChild.getRealParent().viewport.ySouth = Math.max(this.currentChild.getRealParent().viewport.ySouth, this.ySouth);
     }
-  }, {
-    key: "calcContentWidthHeight",
-    value: function calcContentWidthHeight() {
-      this.tmodel.contentHeight = this.ySouth - this.yNorth;
-      this.tmodel.innerContentHeight = this.yEast - this.yNorth;
-      this.tmodel.innerContentWidth = this.xSouth - this.xWest;
-      this.tmodel.contentWidth = this.xEast - this.xWest;
-    }
   }]);
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.97",
+  "version": "1.0.098",
   "keywords": [
     "targetj"
   ],