targetj 1.0.74 → 1.0.76

package/build/TargetUtil.js

@@ -0,0 +1,299 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TargetUtil = void 0;
+var _Browser = require("./Browser.js");
+var _TModel = require("./TModel.js");
+var _App = require("./App.js");
+var _TUtil = require("./TUtil.js");
+var _ColorUtil = require("./ColorUtil.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); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
+  function TargetUtil() {
+    _classCallCheck(this, TargetUtil);
+  }
+  return _createClass(TargetUtil, null, [{
+    key: "emptyValue",
+    value: function emptyValue() {
+      return {
+        value: undefined,
+        step: 0,
+        steps: 0,
+        cycle: 0,
+        cycles: 0,
+        interval: 0,
+        initialValue: undefined,
+        scheduleTimeStamp: undefined,
+        actualValueLastUpdate: 0,
+        status: '',
+        executionCount: 0,
+        executionFlag: false,
+        isImperative: false,
+        originalTargetName: undefined,
+        easing: undefined,
+        creationTime: _Browser.browser.now()
+      };
+    }
+  }, {
+    key: "bindTargetName",
+    value: function bindTargetName(targetInstance, key) {
+      var target = targetInstance[key];
+      if (_typeof(target) === 'object') {
+        ['value', 'enabledOn', 'onStepsEnd', 'onValueChange', 'loop', 'onImperativeEnd', 'onImperativeStep'].forEach(function (method) {
+          if (typeof target[method] === 'function') {
+            var originalMethod = target[method];
+            target[method] = function () {
+              this.key = key;
+              return originalMethod.apply(this, arguments);
+            };
+          }
+        });
+      } else if (typeof target === 'function') {
+        var originalFunction = target;
+        targetInstance[key] = function () {
+          this.key = key;
+          return originalFunction.apply(this, arguments);
+        };
+      }
+    }
+  }, {
+    key: "isValueStepsCycleArray",
+    value: function isValueStepsCycleArray(arr) {
+      if (arr.length > 4 || arr.length === 0) {
+        return false;
+      }
+      var result = arr.length >= 2;
+      for (var i = 1; i < arr.length; i++) {
+        if (typeof arr[i] !== 'number') {
+          return false;
+        }
+      }
+      return result && (typeof arr[0] === 'number' || TargetUtil.isListTarget(arr[0]) || typeof arr[0] === 'string');
+    }
+  }, {
+    key: "isListTarget",
+    value: function isListTarget(value) {
+      return _typeof(value) === 'object' && Array.isArray(value.list);
+    }
+  }, {
+    key: "isAddChildTarget",
+    value: function isAddChildTarget(key, value) {
+      return value instanceof _TModel.TModel && key === 'addChild';
+    }
+  }, {
+    key: "getValueStepsCycles",
+    value: function getValueStepsCycles(tmodel, key) {
+      var _target = tmodel.targets[key];
+      var valueOnly = _target && _target.valueOnly;
+      var cycle = tmodel.getTargetCycle(key);
+      var lastValue = tmodel.val(key);
+      var value = null,
+        steps = 0,
+        interval = 0,
+        cycles = 0;
+      function getValue(target) {
+        if (Array.isArray(target)) {
+          if (valueOnly || !TargetUtil.isValueStepsCycleArray(target)) {
+            return [target, steps, interval, cycles];
+          } else if (Array.isArray(_target)) {
+            return _target;
+          } else {
+            value = target[0];
+            steps = target.length >= 2 ? target[1] : steps;
+            interval = target.length >= 3 ? target[2] : interval;
+            cycles = target.length >= 4 ? target[3] : cycles;
+            return [value, steps, interval, cycles];
+          }
+        }
+        if (_typeof(target) === 'object' && target !== null) {
+          value = typeof target.value === 'function' ? target.value.call(tmodel, cycle, lastValue) : _TUtil.TUtil.isDefined(target.value) ? target.value : target;
+          steps = typeof target.steps === 'function' ? target.steps.call(tmodel, cycle) : _TUtil.TUtil.isDefined(target.steps) ? target.steps : 0;
+          interval = typeof target.interval === 'function' ? target.interval.call(tmodel, cycle) : _TUtil.TUtil.isDefined(target.interval) ? target.interval : 0;
+          cycles = typeof target.cycles === 'function' ? target.cycles.call(tmodel, cycle, tmodel.getTargetCycles(key)) : _TUtil.TUtil.isDefined(target.cycles) ? target.cycles : 0;
+          return Array.isArray(value) ? getValue(value) : [value, steps, interval, cycles];
+        }
+        if (typeof target === 'function') {
+          return getValue(target.call(tmodel, cycle, lastValue));
+        }
+        return [target, steps, interval, cycles];
+      }
+      return getValue(_target);
+    }
+  }, {
+    key: "getIntervalValue",
+    value: function getIntervalValue(tmodel, key, interval) {
+      var intervalValue = typeof interval === 'function' ? interval.call(tmodel, key) : interval;
+      return _TUtil.TUtil.isNumber(intervalValue) ? intervalValue : 0;
+    }
+  }, {
+    key: "scheduleExecution",
+    value: function scheduleExecution(tmodel, key) {
+      var now = _Browser.browser.now();
+      var interval = tmodel.getTargetInterval(key);
+      var lastScheduledTime = tmodel.getScheduleTimeStamp(key);
+      var schedulePeriod = 0;
+      if (interval > 0) {
+        if (_TUtil.TUtil.isDefined(lastScheduledTime)) {
+          var elapsed = now - lastScheduledTime;
+          schedulePeriod = Math.max(interval - elapsed, 0);
+        } else {
+          schedulePeriod = interval;
+          tmodel.setScheduleTimeStamp(key, now);
+        }
+      }
+      if (schedulePeriod > 0 && !_TUtil.TUtil.isDefined(lastScheduledTime)) {
+        tmodel.setScheduleTimeStamp(key, now);
+      }
+      return schedulePeriod;
+    }
+  }, {
+    key: "getTargetSchedulePeriod",
+    value: function getTargetSchedulePeriod(tmodel, key, intervalValue) {
+      var now = _Browser.browser.now();
+      var pastPeriod;
+      var schedulePeriod = 0;
+      if (intervalValue > 0) {
+        if (_TUtil.TUtil.isDefined(tmodel.getTargetTimeStamp(key))) {
+          pastPeriod = now - tmodel.getTargetTimeStamp(key);
+          if (pastPeriod < intervalValue) {
+            schedulePeriod = intervalValue - pastPeriod;
+          } else {
+            schedulePeriod = 0;
+          }
+        } else {
+          tmodel.setTargetTimeStamp(key, now);
+          schedulePeriod = intervalValue;
+        }
+      } else if (_TUtil.TUtil.isDefined(tmodel.getTargetTimeStamp(key))) {
+        pastPeriod = now - tmodel.getTargetTimeStamp(key);
+        if (pastPeriod < 0) {
+          schedulePeriod = -pastPeriod;
+        } else {
+          schedulePeriod = 0;
+        }
+      }
+      return schedulePeriod;
+    }
+  }, {
+    key: "handleValueChange",
+    value: function handleValueChange(tmodel, key, newValue, lastValue, step, cycle) {
+      if (_typeof(tmodel.targets[key]) === 'object' && typeof tmodel.targets[key].onValueChange === 'function') {
+        var valueChanged = !_TUtil.TUtil.areEqual(newValue, lastValue, tmodel.targets[key].deepEquality);
+        if (valueChanged) {
+          tmodel.targets[key].onValueChange.call(tmodel, newValue, lastValue, cycle);
+          tmodel.setTargetMethodName(key, 'onValueChange');
+        }
+      }
+    }
+  }, {
+    key: "morph",
+    value: function morph(tmodel, key, fromValue, toValue, step) {
+      var easing = tmodel.getTargetEasing(key);
+      var easingStep = easing ? easing(tmodel.getTargetStepPercent(key, step)) : tmodel.getTargetStepPercent(key, step);
+      if (TargetUtil.colorMap[key]) {
+        var targetColors = _ColorUtil.ColorUtil.color2Integers(toValue);
+        var lastColors = fromValue ? _ColorUtil.ColorUtil.color2Integers(fromValue) : _ColorUtil.ColorUtil.color2Integers('#fff');
+        if (targetColors && lastColors) {
+          var red = Math.floor(targetColors[0] * easingStep + lastColors[0] * (1 - easingStep));
+          var green = Math.floor(targetColors[1] * easingStep + lastColors[1] * (1 - easingStep));
+          var blue = Math.floor(targetColors[2] * easingStep + lastColors[2] * (1 - easingStep));
+          return "rgb(".concat(red, ",").concat(green, ",").concat(blue, ")");
+        } else {
+          return toValue;
+        }
+      } else {
+        return typeof toValue === 'number' ? toValue * easingStep + fromValue * (1 - easingStep) : toValue;
+      }
+    }
+  }, {
+    key: "setWidthFromDom",
+    value: function setWidthFromDom(child) {
+      var height = _TUtil.TUtil.isDefined(child.domWidth) ? child.domWidth.height : undefined;
+      var width = _TUtil.TUtil.isDefined(child.domWidth) ? child.domWidth.width : undefined;
+      var domParent = child.getDomParent();
+      var rerender = false;
+      if ((0, _App.getManager)().needsRerender(child)) {
+        child.isTextOnly() ? child.$dom.text(child.getHtml()) : child.$dom.html(child.getHtml());
+        rerender = true;
+      }
+      if (!_TUtil.TUtil.isDefined(child.domWidth) || rerender || height !== child.getHeight() || domParent && child.getActualValueLastUpdate('width') <= domParent.getActualValueLastUpdate('width')) {
+        child.$dom.width('auto');
+        width = child.$dom.width();
+        height = child.$dom.height();
+      }
+      child.domWidth = {
+        width: width,
+        height: height
+      };
+      child.val('width', width);
+      return width;
+    }
+  }, {
+    key: "setHeightFromDom",
+    value: function setHeightFromDom(child) {
+      var height = _TUtil.TUtil.isDefined(child.domHeight) ? child.domHeight.height : undefined;
+      var width = _TUtil.TUtil.isDefined(child.domHeight) ? child.domHeight.width : undefined;
+      var domParent = child.getDomParent();
+      var rerender = false;
+      if ((0, _App.getManager)().needsRerender(child)) {
+        child.isTextOnly() ? child.$dom.text(child.getHtml()) : child.$dom.html(child.getHtml());
+        rerender = true;
+      }
+      if (!_TUtil.TUtil.isDefined(child.domHeight) || rerender || width !== child.getWidth() || domParent && child.getActualValueLastUpdate('height') <= domParent.getActualValueLastUpdate('height')) {
+        child.$dom.height('auto');
+        width = child.$dom.width();
+        height = child.$dom.height();
+      }
+      child.domHeight = {
+        height: height,
+        width: width
+      };
+      child.val('height', height);
+      return height;
+    }
+  }]);
+}();
+_defineProperty(TargetUtil, "styleTargetMap", {
+  x: true,
+  y: true,
+  width: true,
+  height: true,
+  rotate: true,
+  scale: true,
+  opacity: true,
+  zIndex: true,
+  fontSize: true,
+  lineHeight: true,
+  borderRadius: true,
+  padding: true,
+  backgroundColor: true,
+  background: true,
+  color: true,
+  css: true,
+  style: true,
+  transform: true,
+  dim: true
+});
+_defineProperty(TargetUtil, "transformMap", {
+  x: true,
+  y: true,
+  rotate: true,
+  scale: true
+});
+_defineProperty(TargetUtil, "dimMap", {
+  width: true,
+  height: true
+});
+_defineProperty(TargetUtil, "colorMap", {
+  color: true,
+  background: true,
+  backgroundColor: true
+});

package/build/Viewport.js

@@ -0,0 +1,163 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var Viewport = exports.Viewport = /*#__PURE__*/function () {
+  function Viewport(tmodel) {
+    _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();
+    }
+  }, {
+    key: "getYNext",
+    value: function getYNext() {
+      return this.yNext + this.currentChild.getTopMargin() + this.yOffset - this.tmodel.getScrollTop();
+    }
+  }, {
+    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 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;
+      }
+      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;
+    }
+  }, {
+    key: "overflow",
+    value: function overflow() {
+      this.xNext = this.xOverflow;
+      this.yNext = this.ySouth;
+    }
+  }, {
+    key: "appendNewLine",
+    value: function appendNewLine() {
+      var innerHeight = this.currentChild.getInnerHeight() * this.currentChild.getMeasuringScale();
+      this.xNext = this.xOverflow;
+      this.yNext = this.ySouth > this.yNext ? this.ySouth + this.currentChild.val('appendNewLine') : this.ySouth + innerHeight + this.currentChild.val('appendNewLine');
+      this.yEast = this.yNext;
+      this.xSouth = this.xNext;
+      this.ySouth = Math.max(this.yNext, this.ySouth);
+      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: "nextLocation",
+    value: function nextLocation() {
+      var innerWidth = this.currentChild.getInnerWidth() * this.currentChild.getMeasuringScale();
+      var innerHeight = this.currentChild.getInnerHeight() * this.currentChild.getMeasuringScale();
+      var innerContentHeight = this.currentChild.getInnerContentHeight() * this.currentChild.getMeasuringScale();
+      var ySouth = this.yNext + innerHeight + this.currentChild.getTopMargin() + this.currentChild.getBottomMargin();
+      this.xNext += innerWidth + this.currentChild.getLeftMargin() + this.currentChild.getRightMargin();
+      this.yNext += innerContentHeight;
+      this.xSouth = this.xNext;
+      this.yEast = this.yNext;
+      this.xEast = Math.max(this.xNext, this.xEast);
+      this.ySouth = Math.max(ySouth, this.ySouth);
+      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.74",
+  "version": "1.0.76",
   "keywords": [
     "targetj"
   ],
@@ -18,13 +18,20 @@
     "url": "https://github.com/livetrails/targetj.io/issues"
   },
   "scripts": {
-    "build": "webpack --mode production"
+    "prod": "webpack --mode production",
+    "dev": "webpack --mode development",
+    "build": "babel src --out-dir build"
   },
   "homepage": "http://targetj.io",
   "devDependencies": {
+    "@babel/cli": "^7.25.6",
+    "@babel/core": "^7.25.2",
+    "@babel/eslint-parser": "^7.25.0",
+    "@babel/preset-env": "^7.25.4",
+    "babel-loader": "^9.1.0",
+    "eslint-webpack-plugin": "^4.2.0",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",
-    "wepback": "^1.0.0",
-    "eslint-webpack-plugin": "^4.2.0"
+    "wepback": "^1.0.0"
   }
 }

package/webpack.config.js

@@ -8,12 +8,24 @@ module.exports = {
             name: 'TargetJ',
             type: 'window'
         },
+        environment: {
+          arrowFunction: false
+        },        
         path: path.resolve(__dirname, './dist'),
         filename: 'targetj.js'
     },
+    module: {
+        rules: [
+            {
+                test: /\.js$/,
+                exclude: /node_modules/,
+                include: path.resolve(__dirname, 'src'),          
+                use: 'babel-loader',
+            }
+        ]
+    },
     plugins: [
         new ESLintPlugin({
-            extensions: ['js'],
             exclude: 'node_modules',
             overrideConfig: {
                 env: {
@@ -23,6 +35,7 @@ module.exports = {
                 extends: [
                     'eslint:recommended'
                 ],
+                parser: "@babel/eslint-parser",
                 parserOptions: {
                     ecmaVersion: 12,
                     sourceType: 'module'