targetj 1.0.240 → 1.0.242

package/build/TModel.js

@@ -1,19 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.TModel = void 0;
-var _BaseModel2 = require("./BaseModel.js");
-var _App = require("./App.js");
-var _Viewport = require("./Viewport.js");
-var _TUtil = require("./TUtil.js");
-var _VisibilityUtil = require("./VisibilityUtil.js");
-var _TargetData = require("./TargetData.js");
-var _SearchUtil = require("./SearchUtil.js");
-var _TargetUtil = require("./TargetUtil.js");
-var _TModelUtil = require("./TModelUtil.js");
-var _DomInit = require("./DomInit.js");
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -33,11 +17,22 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+import { BaseModel } from "./BaseModel.js";
+import { App, getLocationManager, getRunScheduler, getEvents } from "./App.js";
+import { Viewport } from "./Viewport.js";
+import { TUtil } from "./TUtil.js";
+import { VisibilityUtil } from "./VisibilityUtil.js";
+import { TargetData } from "./TargetData.js";
+import { SearchUtil } from "./SearchUtil.js";
+import { TargetUtil } from "./TargetUtil.js";
+import { TModelUtil } from "./TModelUtil.js";
+import { DomInit } from "./DomInit.js";
+
 /**
  * It provides the base class for all objects in an app where targets are defined. 
  * These objects typically have a DOM but can also operate without one.
  */
-var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
+var TModel = /*#__PURE__*/function (_BaseModel) {
   function TModel(type, targets, oid) {
     var _this;
     _classCallCheck(this, TModel);
@@ -71,17 +66,18 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   return _createClass(TModel, [{
     key: "createViewport",
     value: function createViewport() {
-      var _this$getParent$$dom$, _this$getParent, _this$getParent$$dom$2, _this$getParent2;
-      this.viewport = this.viewport || new _Viewport.Viewport();
-      var x = -this.getScrollLeft(),
-        y = -this.getScrollTop();
+      this.viewport = this.viewport || new Viewport();
+      var scrollTop = this.getScrollTop();
+      var scrollLeft = this.getScrollLeft();
+      var x = -scrollLeft,
+        y = -scrollTop;
       this.viewport.xNext = x;
       this.viewport.xNorth = x;
       this.viewport.xEast = x;
       this.viewport.xSouth = x;
       this.viewport.xWest = x;
-      this.viewport.scrollLeft = -(this.getScrollLeft() + ((_this$getParent$$dom$ = (_this$getParent = this.getParent()) === null || _this$getParent === void 0 || (_this$getParent = _this$getParent.$dom) === null || _this$getParent === void 0 ? void 0 : _this$getParent.getScrollLeft()) !== null && _this$getParent$$dom$ !== void 0 ? _this$getParent$$dom$ : 0));
-      this.viewport.scrollTop = -(this.getScrollTop() + ((_this$getParent$$dom$2 = (_this$getParent2 = this.getParent()) === null || _this$getParent2 === void 0 || (_this$getParent2 = _this$getParent2.$dom) === null || _this$getParent2 === void 0 ? void 0 : _this$getParent2.getScrollTop()) !== null && _this$getParent$$dom$2 !== void 0 ? _this$getParent$$dom$2 : 0));
+      this.viewport.scrollLeft = x;
+      this.viewport.scrollTop = y;
       this.viewport.absX = this.absX;
       this.viewport.absY = this.absY;
       this.viewport.xOverflowReset = x;
@@ -92,22 +88,16 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       this.viewport.yEast = y;
       this.viewport.ySouth = y;
       this.calcContentWidthHeight();
-      this.viewport.container = this;
+      this.viewport.setContainer(this);
       return this.viewport;
     }
   }, {
     key: "calcContentWidthHeight",
     value: function calcContentWidthHeight() {
-      var contentHeight = this.viewport.ySouth - this.viewport.yNorth;
-      var contentWidth = this.viewport.xEast - this.viewport.xWest;
-      var topBaseHeight = this.viewport.yEast - this.viewport.yNorth;
-      var bottomBaseWidth = this.viewport.xSouth - this.viewport.xWest;
-      if (contentHeight !== this.contentHeight || this.contentWidth !== contentWidth || this.topBaseHeight !== topBaseHeight || this.bottomBaseWidth !== bottomBaseWidth) {
-        this.contentHeight = contentHeight;
-        this.topBaseHeight = topBaseHeight;
-        this.bottomBaseWidth = bottomBaseWidth;
-        this.contentWidth = contentWidth;
-      }
+      this.contentHeight = this.viewport.ySouth - this.viewport.yNorth;
+      this.contentWidth = this.viewport.xEast - this.viewport.xWest;
+      this.topBaseHeight = this.viewport.yEast - this.viewport.yNorth;
+      this.bottomBaseWidth = this.viewport.xSouth - this.viewport.xWest;
     }
   }, {
     key: "adjustViewport",
@@ -115,13 +105,13 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "calcAbsolutePosition",
     value: function calcAbsolutePosition(x, y) {
-      this.absX = _TUtil.TUtil.isDefined(this.val('absX')) ? this.val('absX') : this.getParent().absX + x;
-      this.absY = _TUtil.TUtil.isDefined(this.val('absY')) ? this.val('absY') : this.getParent().absY + y;
+      this.absX = TUtil.isDefined(this.val('absX')) ? this.val('absX') : this.getParent().absX + x;
+      this.absY = TUtil.isDefined(this.val('absY')) ? this.val('absY') : this.getParent().absY + y;
     }
   }, {
     key: "calcAbsolutePositionFromDom",
     value: function calcAbsolutePositionFromDom() {
-      _TModelUtil.TModelUtil.calcAbsolutePositionFromDom(this);
+      TModelUtil.calcAbsolutePositionFromDom(this);
     }
   }, {
     key: "removeChild",
@@ -129,15 +119,15 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       if (!child || !this.allChildrenMap[child.oid]) {
         return;
       }
-      _TargetUtil.TargetUtil.resetBeforeDeletion(child);
+      TargetUtil.resetBeforeDeletion(child);
       this.deletedChildren.push(child);
       this.removeFromUpdatingChildren(child);
       this.removeFromActiveChildren(child);
       this.removeFromAnimatingChildren(child);
       this.childrenUpdateFlag = true;
-      (0, _App.getLocationManager)().calcChildren(this);
+      getLocationManager().calcChildren(this);
       this.markLayoutDirty('removeChild');
-      (0, _App.getRunScheduler)().schedule(1, 'removeChild-' + child.oid);
+      getRunScheduler().schedule(1, 'removeChild-' + child.oid);
       return this;
     }
   }, {
@@ -153,7 +143,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       }
       this.childrenUpdateFlag = true;
       this.markLayoutDirty('moveChild');
-      (0, _App.getRunScheduler)().schedule(1, 'moveChild-' + this.oid + "-" + child.oid);
+      getRunScheduler().schedule(1, 'moveChild-' + this.oid + "-" + child.oid);
       return this;
     }
   }, {
@@ -167,7 +157,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
           var foundKey = Object.keys(this.actualValues).find(function (key) {
             return _this2.actualValues[key] === child;
           });
-          var childDefinition = _TUtil.TUtil.cloneTargetDefinition(child);
+          var childDefinition = TUtil.cloneTargetDefinition(child);
           if (foundKey) {
             child = new TModel(childDefinition.id || foundKey, childDefinition);
           } else {
@@ -175,7 +165,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
           }
         }
         if (!child.toDiscard) {
-          _App.App.tmodelIdMap[child.oid] = child;
+          App.tmodelIdMap[child.oid] = child;
           this.addedChildren.push({
             index: index,
             child: child
@@ -188,7 +178,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
           if (child.activeTargetList.length > 0) {
             this.addToActiveChildren(child);
           }
-          _TargetUtil.TargetUtil.markChildAction(this, _TargetUtil.TargetUtil.currentTargetName, child);
+          TargetUtil.markChildAction(this, TargetUtil.currentTargetName, child);
         }
       }
       return this;
@@ -238,7 +228,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
           if (_this4.allChildrenMap[child.oid]) {
             return;
           }
-          if (!_TUtil.TUtil.isDefined(child.val('canDeleteDom')) && _this4.val('canDeleteDom') === false) {
+          if (!TUtil.isDefined(child.val('canDeleteDom')) && _this4.val('canDeleteDom') === false) {
             child.val('canDeleteDom', false);
           }
           if (index >= _this4.allChildrenList.length) {
@@ -315,7 +305,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       }
       this.markLayoutDirty('removeChildren');
       this.allChildrenList.forEach(function (t) {
-        _TargetUtil.TargetUtil.resetBeforeDeletion(t);
+        TargetUtil.resetBeforeDeletion(t);
         t.$dom = undefined;
       });
       this.allChildrenList = [];
@@ -341,7 +331,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "markEventDirty",
     value: function markEventDirty() {
-      this.eventDirtyEpoch = (0, _App.getEvents)().eventEpoch;
+      this.eventDirtyEpoch = getEvents().eventEpoch;
       if (this.bracket) {
         this.bracket.markEventDirty();
       }
@@ -415,7 +405,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "shouldCalculateChildren",
     value: function shouldCalculateChildren() {
-      if (_TUtil.TUtil.isDefined(this.val('calculateChildren'))) {
+      if (TUtil.isDefined(this.val('calculateChildren'))) {
         return this.val('calculateChildren');
       }
       if (!this.isIncluded() || this.isDomIsland() && !this.hasDom()) {
@@ -504,8 +494,8 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     value: function getParentValueAtMyIndex(targetName) {
       var parentValue = this.getParentValue(targetName);
       if (Array.isArray(parentValue)) {
-        var _this$getParent3;
-        var index = (_this$getParent3 = this.getParent()) === null || _this$getParent3 === void 0 ? void 0 : _this$getParent3.getChildIndex(this);
+        var _this$getParent;
+        var index = (_this$getParent = this.getParent()) === null || _this$getParent === void 0 ? void 0 : _this$getParent.getChildIndex(this);
         if (typeof index === 'number') {
           return parentValue[index];
         }
@@ -515,7 +505,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getLoadedItems",
     value: function getLoadedItems(targetName) {
-      return this.val(_TUtil.TUtil.getLoadTargetName(targetName));
+      return this.val(TUtil.getLoadTargetName(targetName));
     }
   }, {
     key: "delVal",
@@ -532,7 +522,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     value: function val(key, value) {
       var actual = this.actualValues;
       var lastActual = this.lastActualValues;
-      key = _TargetUtil.TargetUtil.getTargetName(key);
+      key = TargetUtil.getTargetName(key);
       if (arguments.length === 2) {
         lastActual[key] = actual[key];
         if (value !== actual[key]) {
@@ -564,7 +554,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getDomParent",
     value: function getDomParent() {
-      return this.val('domParent') || _SearchUtil.SearchUtil.findParentByTarget(this, 'domHolder', true);
+      return this.val('domParent') || SearchUtil.findParentByTarget(this, 'domHolder', true);
     }
   }, {
     key: "getDomHolder",
@@ -577,8 +567,9 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       return domParent ? domParent.$dom : null;
     }
   }, {
-    key: "bug",
-    value: function bug() {
+    key: "debug",
+    value: function debug() {
+      var _this6 = this;
       return [{
         visible: this.isVisible()
       }, {
@@ -593,6 +584,8 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
         width: this.getWidth()
       }, {
         height: this.getHeight()
+      }, {
+        tmodelComplete: TargetUtil.isTModelComplete(this)
       }, {
         targets: this.originalTargetNames
       }, {
@@ -609,6 +602,14 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
         styleTargetMap: _toConsumableArray(this.styleTargetMap ? _toConsumableArray(this.styleTargetMap.keys()) : [])
       }, {
         passiveTargetList: this.passiveTargetList
+      }, {
+        incompleteTargets: Object.keys(this.targetValues).filter(function (key) {
+          var _this6$targetValues$k;
+          return ((_this6$targetValues$k = _this6.targetValues[key]) === null || _this6$targetValues$k === void 0 ? void 0 : _this6$targetValues$k.status) !== 'complete';
+        }).map(function (key) {
+          var _this6$targetValues$k2;
+          return "".concat(key, ":").concat((_this6$targetValues$k2 = _this6.targetValues[key]) === null || _this6$targetValues$k2 === void 0 ? void 0 : _this6$targetValues$k2.status);
+        })
       }, {
         updatingChildren: this.updatingChildrenMap ? _toConsumableArray(this.updatingChildrenMap.keys()) : []
       }, {
@@ -624,7 +625,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "logTree",
     value: function logTree() {
-      _TUtil.TUtil.logTree(this);
+      TUtil.logTree(this);
     }
   }, {
     key: "isVisible",
@@ -646,20 +647,21 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "managesOwnScroll",
     value: function managesOwnScroll() {
-      if (_TUtil.TUtil.isDefined(this.val('managesOwnScroll'))) {
+      var _this$$dom$getScrollT, _this$$dom, _this$$dom$getScrollL, _this$$dom2;
+      if (TUtil.isDefined(this.val('managesOwnScroll'))) {
         return !!this.val('managesOwnScroll');
       }
-      return !!this.allTargetMap['onScroll'] || !!this.allTargetMap['onScrollLeft'] || !!this.allTargetMap['onScrollTop'] || !!this.allTargetMap['onWindowScroll'];
+      return !!this.allTargetMap['onScroll'] || !!this.allTargetMap['onScrollLeft'] || !!this.allTargetMap['onScrollTop'] || !!this.allTargetMap['onWindowScroll'] || ((_this$$dom$getScrollT = (_this$$dom = this.$dom) === null || _this$$dom === void 0 ? void 0 : _this$$dom.getScrollTop()) !== null && _this$$dom$getScrollT !== void 0 ? _this$$dom$getScrollT : 0) !== 0 || ((_this$$dom$getScrollL = (_this$$dom2 = this.$dom) === null || _this$$dom2 === void 0 ? void 0 : _this$$dom2.getScrollLeft()) !== null && _this$$dom$getScrollL !== void 0 ? _this$$dom$getScrollL : 0) !== 0;
     }
   }, {
     key: "calcVisibility",
     value: function calcVisibility() {
-      return _VisibilityUtil.VisibilityUtil.calcVisibility(this);
+      return VisibilityUtil.calcVisibility(this);
     }
   }, {
     key: "validateVisibilityInParent",
     value: function validateVisibilityInParent() {
-      return _TUtil.TUtil.isDefined(this.val('validateVisibilityInParent')) ? this.val('validateVisibilityInParent') : this.parent.managesOwnScroll();
+      return TUtil.isDefined(this.val('validateVisibilityInParent')) ? this.val('validateVisibilityInParent') : this.parent.managesOwnScroll();
     }
   }, {
     key: "hasDomHolderChanged",
@@ -674,7 +676,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "mount",
     value: function mount(elemTarget) {
-      _DomInit.DomInit.mount(this, elemTarget);
+      DomInit.mount(this, elemTarget);
       return this;
     }
   }, {
@@ -682,7 +684,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     value: function unmount() {
       var _this$parent2;
       if (this.hasDom() && this.val('sourceDom') && this.domState) {
-        _DomInit.DomInit.restoreDomState(this.$dom.element, this.domState);
+        DomInit.restoreDomState(this.$dom.element, this.domState);
       }
       (_this$parent2 = this.parent) === null || _this$parent2 === void 0 || _this$parent2.removeChild(this);
     }
@@ -714,12 +716,12 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "useContentWidth",
     value: function useContentWidth() {
-      return _TModelUtil.TModelUtil.useContentWidth(this);
+      return TModelUtil.useContentWidth(this);
     }
   }, {
     key: "useContentHeight",
     value: function useContentHeight() {
-      return _TModelUtil.TModelUtil.useContentHeight(this);
+      return TModelUtil.useContentHeight(this);
     }
   }, {
     key: "getBaseWidth",
@@ -745,11 +747,40 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       var _this$val5;
       return (_this$val5 = this.val('topBaseHeight')) !== null && _this$val5 !== void 0 ? _this$val5 : 0;
     }
+  }, {
+    key: "getLayoutHeight",
+    value: function getLayoutHeight() {
+      var height = this.getHeight();
+      if (this.usesContentBoxSizing()) {
+        height += this.getPaddingTop() + this.getPaddingBottom();
+      }
+      return height;
+    }
+  }, {
+    key: "getLayoutWidth",
+    value: function getLayoutWidth() {
+      var width = this.getWidth();
+      if (this.usesContentBoxSizing()) {
+        width += this.getPaddingLeft() + this.getPaddingRight();
+      }
+      return width;
+    }
+  }, {
+    key: "usesContentBoxSizing",
+    value: function usesContentBoxSizing() {
+      return this.getBoxSizing() !== "border-box";
+    }
+  }, {
+    key: "getBoxSizing",
+    value: function getBoxSizing() {
+      var _ref5, _ref6, _this$val6;
+      return (_ref5 = (_ref6 = (_this$val6 = this.val("boxSizing")) !== null && _this$val6 !== void 0 ? _this$val6 : this.val("box-sizing")) !== null && _ref6 !== void 0 ? _ref6 : this.getParentValue("boxSizing")) !== null && _ref5 !== void 0 ? _ref5 : "content-box";
+    }
   }, {
     key: "getContainerOverflowMode",
     value: function getContainerOverflowMode() {
-      var _this$val6;
-      return (_this$val6 = this.val('containerOverflowMode')) !== null && _this$val6 !== void 0 ? _this$val6 : 'auto';
+      var _this$val7;
+      return (_this$val7 = this.val('containerOverflowMode')) !== null && _this$val7 !== void 0 ? _this$val7 : 'auto';
     }
   }, {
     key: "getItemOverflowMode",
@@ -775,12 +806,12 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "canBeAnimated",
     value: function canBeAnimated(key) {
-      return _TargetData.TargetData.isGpuPreferred(key) && this.actualValues.webAnimation !== false;
+      return TargetData.isGpuPreferred(key) && this.actualValues.webAnimation !== false;
     }
   }, {
     key: "isTextOnly",
     value: function isTextOnly() {
-      return _TUtil.TUtil.isDefined(this.val('textOnly')) ? this.val('textOnly') : typeof this.getHtml() === 'string' && this.getHtml().trim().startsWith('<') ? false : true;
+      return TUtil.isDefined(this.val('textOnly')) ? this.val('textOnly') : typeof this.getHtml() === 'string' && this.getHtml().trim().startsWith('<') ? false : true;
     }
   }, {
     key: "getHtml",
@@ -790,7 +821,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "isInFlow",
     value: function isInFlow() {
-      return _TUtil.TUtil.isDefined(this.val('isInFlow')) ? this.val('isInFlow') : true;
+      return TUtil.isDefined(this.val('isInFlow')) ? this.val('isInFlow') : true;
     }
   }, {
     key: "canHandleEvent",
@@ -800,17 +831,17 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "preventDefault",
     value: function preventDefault() {
-      return _TUtil.TUtil.isDefined(this.val('preventDefault')) ? this.val('preventDefault') : this.getParentValue('preventDefault') || false;
+      return TUtil.isDefined(this.val('preventDefault')) ? this.val('preventDefault') : this.getParentValue('preventDefault') || false;
     }
   }, {
     key: "canDeleteDom",
     value: function canDeleteDom() {
-      return _TUtil.TUtil.isDefined(this.val('canDeleteDom')) ? this.val('canDeleteDom') : !this.reuseDomDefinition();
+      return TUtil.isDefined(this.val('canDeleteDom')) ? this.val('canDeleteDom') : !this.reuseDomDefinition();
     }
   }, {
     key: "requiresDom",
     value: function requiresDom() {
-      return _TUtil.TUtil.isDefined(this.val('requiresDom')) ? this.val('requiresDom') : this.reuseDomDefinition();
+      return TUtil.isDefined(this.val('requiresDom')) ? this.val('requiresDom') : this.reuseDomDefinition();
     }
   }, {
     key: "excludeStyling",
@@ -830,7 +861,7 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "shouldBeBracketed",
     value: function shouldBeBracketed() {
-      if (_TUtil.TUtil.isDefined(this.val('shouldBeBracketed'))) {
+      if (TUtil.isDefined(this.val('shouldBeBracketed'))) {
         return this.val('shouldBeBracketed');
       }
       return this.getChildren().length > this.getBracketThreshold();
@@ -851,13 +882,13 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "requiresDomRelocation",
     value: function requiresDomRelocation() {
-      return _TUtil.TUtil.isDefined(this.val('requiresDomRelocation')) ? this.val('requiresDomRelocation') : !_TUtil.TUtil.isDefined(this.tfMap.x) && !_TUtil.TUtil.isDefined(this.tfMap.y);
+      return TUtil.isDefined(this.val('requiresDomRelocation')) ? this.val('requiresDomRelocation') : !TUtil.isDefined(this.tfMap.x) && !TUtil.isDefined(this.tfMap.y);
     }
   }, {
     key: "getBaseElement",
     value: function getBaseElement() {
-      var _this$$dom;
-      return this.val('baseElement') || this.val('element') || ((_this$$dom = this.$dom) === null || _this$$dom === void 0 || (_this$$dom = _this$$dom.element) === null || _this$$dom === void 0 || (_this$$dom = _this$$dom.tagName) === null || _this$$dom === void 0 ? void 0 : _this$$dom.toLowerCase());
+      var _this$$dom3;
+      return this.val('baseElement') || this.val('element') || ((_this$$dom3 = this.$dom) === null || _this$$dom3 === void 0 || (_this$$dom3 = _this$$dom3.element) === null || _this$$dom3 === void 0 || (_this$$dom3 = _this$$dom3.tagName) === null || _this$$dom3 === void 0 ? void 0 : _this$$dom3.toLowerCase());
     }
   }, {
     key: "getOpacity",
@@ -952,8 +983,8 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getMeasuringScale",
     value: function getMeasuringScale() {
-      var _this$val7;
-      return (_this$val7 = this.val('measuringScale')) !== null && _this$val7 !== void 0 ? _this$val7 : 1;
+      var _this$val8;
+      return (_this$val8 = this.val('measuringScale')) !== null && _this$val8 !== void 0 ? _this$val8 : 1;
     }
   }, {
     key: "getZIndex",
@@ -961,34 +992,62 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       return this.val('zIndex');
     }
   }, {
-    key: "getTopMargin",
-    value: function getTopMargin() {
-      return this.val('topMargin');
+    key: "getMarginTop",
+    value: function getMarginTop() {
+      var _ref7, _this$val9;
+      return (_ref7 = (_this$val9 = this.val("marginTop")) !== null && _this$val9 !== void 0 ? _this$val9 : this.val("topMargin")) !== null && _ref7 !== void 0 ? _ref7 : TModelUtil.getMarginValue(this, "top");
+    }
+  }, {
+    key: "getMarginLeft",
+    value: function getMarginLeft() {
+      var _ref8, _this$val10;
+      return (_ref8 = (_this$val10 = this.val("marginLeft")) !== null && _this$val10 !== void 0 ? _this$val10 : this.val("leftMargin")) !== null && _ref8 !== void 0 ? _ref8 : TModelUtil.getMarginValue(this, "left");
+    }
+  }, {
+    key: "getMarginRight",
+    value: function getMarginRight() {
+      var _ref9, _this$val11, _this$getParentValue;
+      var margin = (_ref9 = (_this$val11 = this.val("marginRight")) !== null && _this$val11 !== void 0 ? _this$val11 : this.val("rightMargin")) !== null && _ref9 !== void 0 ? _ref9 : TModelUtil.getMarginValue(this, "right");
+      return margin + ((_this$getParentValue = this.getParentValue("gap")) !== null && _this$getParentValue !== void 0 ? _this$getParentValue : 0);
+    }
+  }, {
+    key: "getMarginBottom",
+    value: function getMarginBottom() {
+      var _ref10, _this$val12, _this$getParentValue2;
+      var margin = (_ref10 = (_this$val12 = this.val("marginBottom")) !== null && _this$val12 !== void 0 ? _this$val12 : this.val("bottomMargin")) !== null && _ref10 !== void 0 ? _ref10 : TModelUtil.getMarginValue(this, "bottom");
+      return margin + ((_this$getParentValue2 = this.getParentValue("gap")) !== null && _this$getParentValue2 !== void 0 ? _this$getParentValue2 : 0);
+    }
+  }, {
+    key: "getPaddingTop",
+    value: function getPaddingTop() {
+      var _ref11, _this$val13;
+      return (_ref11 = (_this$val13 = this.val("paddingTop")) !== null && _this$val13 !== void 0 ? _this$val13 : this.val("topPadding")) !== null && _ref11 !== void 0 ? _ref11 : TModelUtil.getPaddingValue(this, "top");
     }
   }, {
-    key: "getLeftMargin",
-    value: function getLeftMargin() {
-      return this.val('leftMargin');
+    key: "getPaddingLeft",
+    value: function getPaddingLeft() {
+      var _ref12, _this$val14;
+      return (_ref12 = (_this$val14 = this.val("paddingLeft")) !== null && _this$val14 !== void 0 ? _this$val14 : this.val("leftPadding")) !== null && _ref12 !== void 0 ? _ref12 : TModelUtil.getPaddingValue(this, "left");
     }
   }, {
-    key: "getRightMargin",
-    value: function getRightMargin() {
-      var _this$getParentValue;
-      return this.val('rightMargin') + ((_this$getParentValue = this.getParentValue('gap')) !== null && _this$getParentValue !== void 0 ? _this$getParentValue : 0);
+    key: "getPaddingRight",
+    value: function getPaddingRight() {
+      var _ref13, _this$val15;
+      return (_ref13 = (_this$val15 = this.val("paddingRight")) !== null && _this$val15 !== void 0 ? _this$val15 : this.val("rightPadding")) !== null && _ref13 !== void 0 ? _ref13 : TModelUtil.getPaddingValue(this, "right");
     }
   }, {
-    key: "getBottomMargin",
-    value: function getBottomMargin() {
-      var _this$getParentValue2;
-      return this.val('bottomMargin') + ((_this$getParentValue2 = this.getParentValue('gap')) !== null && _this$getParentValue2 !== void 0 ? _this$getParentValue2 : 0);
+    key: "getPaddingBottom",
+    value: function getPaddingBottom() {
+      var _ref14, _this$val16;
+      return (_ref14 = (_this$val16 = this.val("paddingBottom")) !== null && _this$val16 !== void 0 ? _this$val16 : this.val("bottomPadding")) !== null && _ref14 !== void 0 ? _ref14 : TModelUtil.getPaddingValue(this, "bottom");
     }
   }, {
     key: "getWidth",
     value: function getWidth() {
-      if (_TUtil.TUtil.isDefined(this.targets.width) || _TUtil.TUtil.isDefined(this.targetValues.width)) {
+      if (TUtil.isDefined(this.targets.width) || TUtil.isDefined(this.targetValues.width)) {
         return this.val("width");
       }
-      if (_TUtil.TUtil.isDefined(this.targets.dim) || _TUtil.TUtil.isDefined(this.targetValues.dim)) {
+      if (TUtil.isDefined(this.targets.dim) || TUtil.isDefined(this.targetValues.dim)) {
         return this.val("dim");
       }
       return this.val("width");
@@ -996,10 +1055,10 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getHeight",
     value: function getHeight() {
-      if (_TUtil.TUtil.isDefined(this.targets.height) || _TUtil.TUtil.isDefined(this.targetValues.height)) {
+      if (TUtil.isDefined(this.targets.height) || TUtil.isDefined(this.targetValues.height)) {
         return this.val("height");
       }
-      if (_TUtil.TUtil.isDefined(this.targets.dim) || _TUtil.TUtil.isDefined(this.targetValues.dim)) {
+      if (TUtil.isDefined(this.targets.dim) || TUtil.isDefined(this.targetValues.dim)) {
         return this.val("dim");
       }
       return this.val("height");
@@ -1047,9 +1106,9 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "isFormControl",
     value: function isFormControl() {
-      var _this$$dom2;
+      var _this$$dom4;
       var t = this.getBaseElement();
-      return t === 'input' || t === 'select' || t === 'textarea' || ((_this$$dom2 = this.$dom) === null || _this$$dom2 === void 0 || (_this$$dom2 = _this$$dom2.element) === null || _this$$dom2 === void 0 ? void 0 : _this$$dom2.isContentEditable);
+      return t === 'input' || t === 'select' || t === 'textarea' || ((_this$$dom4 = this.$dom) === null || _this$$dom4 === void 0 || (_this$$dom4 = _this$$dom4.element) === null || _this$$dom4 === void 0 ? void 0 : _this$$dom4.isContentEditable);
     }
   }, {
     key: "isOverflowHidden",
@@ -1062,4 +1121,5 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       return this.val('reuseDomDefinition');
     }
   }]);
-}(_BaseModel2.BaseModel);
+}(BaseModel);
+export { TModel };