targetj 1.0.158 → 1.0.159

package/README.md

@@ -1,7 +1,7 @@
 # TargetJS: A Novel JavaScript UI Framework for Simplified Development and Enhanced User Experience
 
 **[targetjs.io](https://targetjs.io)** 
-[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/livetrails/targetjs/blob/main/License) 
+[![MIT LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/livetrails/targetjs/blob/main/LICENSE) 
 [![Stars](https://img.shields.io/github/stars/livetrails/targetjs.svg)](https://github.com/livetrails/targetjs/stargazers)
 [![npm version](https://img.shields.io/npm/v/targetj.svg)](https://www.npmjs.com/package/targetj)
 

package/build/$Dom.js

@@ -393,11 +393,6 @@ var $Dom = exports.$Dom = /*#__PURE__*/function () {
     value: function findFirstByTag(tagName) {
       return $Dom.findFirstByTag(tagName, this.element);
     }
-  }, {
-    key: "stamp",
-    value: function stamp() {
-      this.attr('data-tgjs', 'true');
-    }
   }], [{
     key: "createTemplate",
     value: function createTemplate(html) {
@@ -406,11 +401,6 @@ var $Dom = exports.$Dom = /*#__PURE__*/function () {
       $dom.innerHTML(html.trim());
       return $dom;
     }
-  }, {
-    key: "getAllStamped",
-    value: function getAllStamped() {
-      return document.querySelectorAll('[data-tgjs="true"]');
-    }
   }, {
     key: "query",
     value: function query(selector) {

package/build/App.js

@@ -22,7 +22,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var tApp;
-var AppFn = function AppFn(firstChild) {
+var AppFn = function AppFn() {
   var my = {};
   my.throttle = 0;
   my.debugLevel = 0;
@@ -47,22 +47,8 @@ var AppFn = function AppFn(firstChild) {
     my.runScheduler = new _RunScheduler.RunScheduler();
     my.tRootFactory = function () {
       var tmodel = new _TModel.TModel('tRoot', {
-        start: function start() {
-          if (!_$Dom.$Dom.query('#tgjs-root')) {
-            this.$dom = new _$Dom.$Dom();
-            this.$dom.create('div');
-            this.$dom.setSelector('#tgjs-root');
-            this.$dom.setId('#tgjs-root');
-            this.$dom.attr("tabindex", "0");
-            new _$Dom.$Dom('body').insertFirst$Dom(this.$dom);
-          } else {
-            this.$dom = new _$Dom.$Dom('#tgjs-root');
-          }
-        },
         styling: false,
-        domHolder: function domHolder() {
-          return this.$dom;
-        },
+        domHolder: true,
         isVisible: true,
         width: function width() {
           var width = _$Dom.$Dom.getScreenWidth();
@@ -77,9 +63,12 @@ var AppFn = function AppFn(firstChild) {
             my.resizeLastUpdate = _TUtil.TUtil.now();
           }
           return height;
+        },
+        initPageDom: function initPageDom() {
+          _TUtil.TUtil.initPageDoms(this.$dom);
         }
       });
-      tmodel.oids = {};
+      tmodel.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
       tmodel.val('width', _$Dom.$Dom.getScreenWidth());
       tmodel.val('height', _$Dom.$Dom.getScreenHeight());
       if (my.tRoot) {
@@ -91,9 +80,6 @@ var AppFn = function AppFn(firstChild) {
       return tmodel;
     };
     my.tRoot = my.tRootFactory();
-    if (firstChild) {
-      my.tRoot.addChild(firstChild);
-    }
     window.history.pushState({
       link: document.URL
     }, "", document.URL);
@@ -163,9 +149,16 @@ var AppFn = function AppFn(firstChild) {
   };
   return my;
 };
-var App = exports.App = function App(tmodel) {
-  exports.tApp = tApp = AppFn(tmodel);
-  tApp.init().start();
+var App = exports.App = function App(firstChild) {
+  if (tApp) {
+    if (firstChild) {
+      tApp.tRoot.addChild(firstChild);
+      tApp.runScheduler.schedule(0, "appStart");
+    }
+  } else {
+    exports.tApp = tApp = AppFn();
+    tApp.init().start();
+  }
 };
 App.oids = {};
 App.getOid = function (type) {
@@ -179,6 +172,7 @@ App.getOid = function (type) {
     num: num
   };
 };
+App();
 var isRunning = exports.isRunning = function isRunning() {
   return tApp ? tApp.runningFlag : false;
 };

package/build/BaseModel.js

@@ -29,7 +29,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * It provides the target state and associated logic to the TModel.
  */
 var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
-  function BaseModel(type, targets) {
+  function BaseModel(type, targets, oid) {
     _classCallCheck(this, BaseModel);
     if (_typeof(type) === 'object' && typeof targets === 'undefined') {
       targets = type;
@@ -37,9 +37,14 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     }
     this.type = type || 'blank';
     this.targets = Object.assign({}, targets);
-    var uniqueId = _App.App.getOid(this.type);
-    this.oid = uniqueId.oid;
-    this.oidNum = uniqueId.num;
+    if (!oid) {
+      var uniqueId = _App.App.getOid(this.type);
+      this.oid = uniqueId.oid;
+      this.oidNum = uniqueId.num;
+    } else {
+      this.oid = oid;
+      this.oidNum = 0;
+    }
     this._state = {};
   }
   return _createClass(BaseModel, [{
@@ -259,7 +264,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       this.activeTargetMap = {};
       this.activeTargetList = [];
       this.originalTargetNames = Object.keys(this.targets);
-      var domExists = _$Dom.$Dom.query("#".concat(this.oid));
+      var domExists = _$Dom.$Dom.query("#".concat(this.oid)) || this.originalTargetNames.indexOf('$dom') >= 0;
       if (!domExists && !this.excludeDefaultStyling()) {
         Object.entries(_TargetData.TargetData.defaultTargetStyles).forEach(function (_ref) {
           var _ref2 = _slicedToArray(_ref, 2),
@@ -271,6 +276,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         });
       } else if (domExists && !_TUtil.TUtil.isDefined(this.targets['reuseDomDefinition'])) {
         this.targets['reuseDomDefinition'] = true;
+        this.targets['excludeXYCalc'] = true;
         this.targets['excludeX'] = true;
         this.targets['excludeY'] = true;
         this.targets['position'] = 'relative';
@@ -370,8 +376,8 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     }
   }, {
     key: "addToStyleTargetList",
-    value: function addToStyleTargetList(key) {
-      if (this.excludeStyling() || this.targets["exclude".concat(_TUtil.TUtil.capitalizeFirstLetter(key))]) {
+    value: function addToStyleTargetList(key, enforce) {
+      if (!enforce && (this.excludeStyling() || this.targets["exclude".concat(_TUtil.TUtil.capitalizeFirstLetter(key))])) {
         return;
       }
       var isAsyncStyleTarget = _TargetData.TargetData.asyncStyleTargetMap[key];

package/build/EventListener.js

@@ -306,9 +306,6 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         rateLimit = eventItem.rateLimit;
       var now = _TUtil.TUtil.now();
       var tmodel = this.getTModelFromEvent(event);
-
-      //console.log("originalName: " + originalName + ", " + eventItem + ", " + tmodel?.oid);
-
       var newEvent = {
         eventName: eventName,
         eventItem: eventItem,
@@ -366,7 +363,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           this.swipeStartY = this.start0.y - ((_this$currentHandlers2 = this.currentHandlers.swipe) === null || _this$currentHandlers2 === void 0 ? void 0 : _this$currentHandlers2.getY());
           event.stopPropagation();
           this.detachDocumentEvents();
-          this.attachDocumentEvents(tmodel.getDomParent());
+          this.attachDocumentEvents();
           return;
         case 'mousemove':
         case 'touchmove':
@@ -374,7 +371,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
             touch = this.getTouch(event);
             this.cursor.x = touch.x;
             this.cursor.y = touch.y;
-            if (this.preventDefault(tmodel, eventName)) {
+            if (this.preventDefault(tmodel, eventName) && event.cancelable) {
               event.preventDefault();
             }
             if (this.touchCount > 0) {
@@ -389,7 +386,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         case 'mouseup':
         case 'touchend':
           this.detachDocumentEvents();
-          if (this.preventDefault(tmodel, eventName)) {
+          if (this.preventDefault(tmodel, eventName) && event.cancelable) {
             event.preventDefault();
           }
           touch = this.getTouch(event);
@@ -407,7 +404,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           this.end0 = this.getTouch(event);
           if (this.start0) {
             var clickHandler = _SearchUtil.SearchUtil.findFirstClickHandler(tmodel);
-            if (clickHandler && clickHandler === this.currentHandlers.click) {
+            if (clickHandler && clickHandler === this.currentHandlers.click && (clickHandler !== this.currentHandlers.swipe || this.getSwipeDistance() < 5)) {
               this.eventQueue.length = 0;
               this.eventQueue.push({
                 eventName: eventName,
@@ -550,6 +547,14 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     value: function swipeY() {
       return this.cursor.y - this.swipeStartY;
     }
+  }, {
+    key: "getSwipeDistance",
+    value: function getSwipeDistance() {
+      if (this.start0 && this.end0) {
+        return _TUtil.TUtil.distance(this.start0.originalX, this.start0.originalY, this.end0.x, this.end0.y);
+      }
+      return 0;
+    }
   }, {
     key: "pinchDelta",
     value: function pinchDelta() {

package/build/LoadingManager.js

@@ -178,8 +178,8 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
     value: function getLoadingItemValue(tmodel, targetName) {
       var target = tmodel.targets[targetName];
       var key = this.getTModelKey(tmodel, targetName);
-      var modelEntry = this.tmodelKeyMap[key];
-      if (!modelEntry || !target) {
+      var tmodelEntry = this.tmodelKeyMap[key];
+      if (!tmodelEntry || !target || tmodelEntry.accessIndex >= tmodelEntry.resultCount) {
         return undefined;
       }
       var loadTargetName = this.getLoadTargetName(targetName);
@@ -187,11 +187,11 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
       var result;
       if (targetValue) {
         if (target.fetchAction === 'onEnd') {
-          result = targetValue.slice(modelEntry.accessIndex);
-          modelEntry.accessIndex += result.length;
+          result = targetValue.slice(tmodelEntry.accessIndex);
+          tmodelEntry.accessIndex += result.length;
         } else {
-          result = targetValue[modelEntry.accessIndex];
-          modelEntry.accessIndex++;
+          result = targetValue[tmodelEntry.accessIndex];
+          tmodelEntry.accessIndex++;
         }
       }
       return result;

package/build/LocationManager.js

@@ -138,11 +138,13 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
           }
           _this3.locationListStats.push(child.oid);
           viewport.setCurrentChild(child);
-          viewport.setLocation();
+          if (!child.targets['excludeXYCalc']) {
+            viewport.setLocation();
+          }
           if (child.isIncluded() && container.manageChildTargetExecution(child, shouldCalculateChildTargets)) {
             _this3.calculateTargets(child);
           }
-          if (container.getContainerOverflowMode() === 'always' || child.getItemOverflowMode() === 'always' || container.getContainerOverflowMode() === 'auto' && child.getItemOverflowMode() === 'auto' && viewport.isOverflow()) {
+          if (container.getContainerOverflowMode() === 'always' || container.getContainerOverflowMode() === 'auto' && child.getItemOverflowMode() === 'auto' && viewport.isOverflow()) {
             viewport.overflow();
             viewport.setLocation();
           }
@@ -201,6 +203,10 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
             if (_TUtil.TUtil.isNumber(child.val('appendNewLine'))) {
               viewport.appendNewLine();
               container.calcContentWidthHeight();
+            } else if (child.getItemOverflowMode() === 'always') {
+              viewport.nextLocation();
+              viewport.overflow();
+              container.calcContentWidthHeight();
             } else {
               container.calcContentWidthHeight();
               viewport.nextLocation();

package/build/PageManager.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PageManager = void 0;
 var _TUtil = require("./TUtil.js");
-var _$Dom = require("./$Dom.js");
 var _App = require("./App.js");
+var _$Dom = require("./$Dom.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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -36,6 +36,13 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
     this.pageCache = {};
   }
   return _createClass(PageManager, [{
+    key: "initPage",
+    value: function initPage(html) {
+      _App.tApp.tRoot.$dom.outerHTML(html);
+      _App.tApp.tRoot.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
+      _TUtil.TUtil.initPageDoms(_App.tApp.tRoot.$dom);
+    }
+  }, {
     key: "openPage",
     value: function () {
       var _openPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(link) {
@@ -48,9 +55,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
               _App.tApp.reset();
               link = _TUtil.TUtil.getFullLink(link);
               if (!this.pageCache[link]) {
-                if (_App.tApp.tRoot.hasDom()) {
-                  _App.tApp.tRoot.$dom.innerHTML("");
-                }
+                _App.tApp.tRoot.$dom.innerHTML("");
                 _App.tApp.tRoot = _App.tApp.tRootFactory();
                 _App.App.oids = {};
                 _App.tApp.pageIsEmpty = true;
@@ -59,9 +64,9 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
               } else {
                 _App.tApp.tRoot = this.pageCache[link].tRoot;
                 _App.App.oids = this.pageCache[link].oids;
-                _App.tApp.tRoot.$dom = new _$Dom.$Dom('#tgjs-root');
+                _App.tApp.tRoot.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
                 _App.tApp.tRoot.$dom.innerHTML(this.pageCache[link].html);
-                _TUtil.TUtil.initDoms(this.pageCache[link].visibleList);
+                _TUtil.TUtil.initCacheDoms(this.pageCache[link].visibleList);
                 this.pageCache[link].visibleList.forEach(function (tmodel) {
                   tmodel.visibilityStatus = undefined;
                 });
@@ -108,7 +113,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
       var updateHistory = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       link = _TUtil.TUtil.getFullLink(link);
       if (this.lastLink) {
-        _App.tApp.tRoot.$dom = new _$Dom.$Dom('#tgjs-root');
+        _App.tApp.tRoot.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
         var html = _App.tApp.tRoot.$dom.innerHTML();
         this.onPageClose();
         this.pageCache[this.lastLink] = {
@@ -132,7 +137,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
     value: function updateBrowserUrl(link) {
       var currentState = window.history.state;
       if (!currentState.browserUrl) {
-        _App.tApp.tRoot.$dom = new _$Dom.$Dom('#tgjs-root');
+        _App.tApp.tRoot.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
         this.pageCache[document.URL] = {
           link: document.URL,
           html: _App.tApp.tRoot.$dom.innerHTML(),

package/build/TModel.js

@@ -28,10 +28,10 @@ function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf
  * These objects typically have a DOM but can also operate without one.
  */
 var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
-  function TModel(type, targets) {
+  function TModel(type, targets, oid) {
     var _this;
     _classCallCheck(this, TModel);
-    _this = _callSuper(this, TModel, [type, targets]);
+    _this = _callSuper(this, TModel, [type, targets, oid]);
     _this.allChildrenList = [];
     _this.allChildrenMap = {};
     _this.childrenUpdateFlag = false;
@@ -49,7 +49,6 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
     _this.styleMap = {};
     _this.transformMap = {};
     _this.visibilityStatus = undefined;
-    _this.isNowInvisible = false;
     _this.hasDomNow = false;
     _this.isNowVisible = false;
     _this.currentStatus = 'new';
@@ -111,8 +110,10 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
           if (foundKey) {
             child = new TModel(child.id || foundKey, child);
             this.actualValues[foundKey] = child;
-          } else if (child.id) {
-            child = new TModel(child.id, child);
+          } else if (_TUtil.TUtil.isDefined(child.otype)) {
+            child = new TModel(child.otype, child);
+          } else if (_TUtil.TUtil.isDefined(child.id)) {
+            child = new TModel(child.id, child, child.id);
           } else {
             child = new TModel("".concat(this.oid, "_"), child);
           }
@@ -359,9 +360,10 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "val",
     value: function val(key, value) {
+      var _key;
       var actual = this.actualValues;
       var lastActual = this.lastActualValues;
-      if (key.startsWith('_')) {
+      if ((_key = key) !== null && _key !== void 0 && _key.startsWith('_')) {
         actual = this;
         key = key.slice(1);
       }

package/build/TModelManager.js

@@ -358,9 +358,9 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           } else {
             tmodel.$dom = new _$Dom.$Dom();
             _TModelUtil.TModelUtil.createDom(tmodel);
+            tmodel.getDomHolder(tmodel).appendTModel$Dom(tmodel);
+            tmodel.hasDomNow = true;
           }
-          tmodel.getDomHolder(tmodel).appendTModel$Dom(tmodel);
-          tmodel.hasDomNow = true;
         }
       }
       (0, _App.getEvents)().attachEvents(this.lists.noDom);

package/build/TModelUtil.js

@@ -71,7 +71,7 @@ var TModelUtil = exports.TModelUtil = /*#__PURE__*/function () {
       tmodel.$dom.create(tmodel.getBaseElement());
       tmodel.$dom.setSelector("#".concat(tmodel.oid));
       tmodel.$dom.setId(tmodel.oid);
-      tmodel.$dom.stamp();
+      tmodel.$dom.attr('tg', 'true');
       tmodel.isTextOnly() ? tmodel.$dom.text(tmodel.getHtml()) : tmodel.$dom.html(tmodel.getHtml());
       tmodel.setActualValueLastUpdate('html');
       tmodel.domHeightTimestamp = 0;

package/build/TUtil.js

@@ -6,11 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.TUtil = void 0;
 var _$Dom = require("./$Dom.js");
 var _App = require("./App.js");
+var _TargetData = require("./TargetData.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."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 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; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -53,13 +57,15 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
       status.parentY = parentY;
       status.parentWidth = parentWidth;
       status.parentHeight = parentHeight;
+      status.x = x;
+      status.y = y;
       child.val('isVisible', status.left && status.right && status.top && status.bottom);
       return child.val('isVisible');
     }
   }, {
-    key: "initDoms",
-    value: function initDoms(visibleList) {
-      var elements = _$Dom.$Dom.getAllStamped();
+    key: "initCacheDoms",
+    value: function initCacheDoms(visibleList) {
+      var elements = (0, _App.tRoot)().$dom.queryAll('[tg]');
       visibleList.forEach(function (tmodel) {
         tmodel.$dom = null;
       });
@@ -85,6 +91,118 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
         _iterator.f();
       }
     }
+  }, {
+    key: "initPageDoms",
+    value: function initPageDoms($dom) {
+      var elementToModel = new Map();
+      var elements = $dom.queryAll('*');
+      var _iterator2 = _createForOfIteratorHelper(elements),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var element = _step2.value;
+          var newModel = void 0;
+          var attrs = Array.from(element.attributes);
+          var isTargetElement = attrs.some(function (attr) {
+            return attr.name === 'tg' || attr.name.startsWith('tg-');
+          });
+          var attributeSet = {};
+          if (isTargetElement) {
+            var _iterator3 = _createForOfIteratorHelper(attrs),
+              _step3;
+            try {
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var attr = _step3.value;
+                if (attr.name.startsWith("tg-")) {
+                  var rawKey = attr.name.slice(3);
+                  var key = _TargetData.TargetData.attributesToTargets[rawKey] || rawKey;
+                  var rawValue = attr.value.trim();
+                  var value = TUtil.parseString(rawValue);
+                  attributeSet[key] = value;
+                }
+              }
+            } catch (err) {
+              _iterator3.e(err);
+            } finally {
+              _iterator3.f();
+            }
+          }
+          var parentEl = element.parentElement;
+          var parentModel = elementToModel.get(parentEl);
+          var id = void 0;
+          if (Object.keys(attributeSet).length > 0) {
+            id = element.getAttribute('id');
+            if (!id && !parentModel) {
+              id = _App.App.getOid('blank').oid;
+              element.setAttribute('id', id);
+            }
+            if (!element.getAttribute('tg')) {
+              element.setAttribute('tg', true);
+            }
+            newModel = _objectSpread({
+              id: id,
+              $dom: new _$Dom.$Dom(element)
+            }, attributeSet);
+          }
+          if (parentModel) {
+            if (!newModel) {
+              newModel = {
+                textOnly: false,
+                html: element.outerHTML,
+                $dom: new _$Dom.$Dom(element)
+              };
+            }
+            newModel.shouldBeBracketed = false;
+            newModel.otype = newModel.id || (parentModel.id || _App.App.getOid('blank').oid) + "_";
+            newModel.$dom.detach();
+            delete newModel.$dom;
+            delete newModel.id;
+            newModel.isVisible = function () {
+              return this.getParent().isVisible();
+            };
+            newModel.domParent = function () {
+              return this.getParent();
+            };
+            if (parentModel.children) {
+              if (Array.isArray(parentModel.children.value)) {
+                parentModel.children.value.push(newModel);
+              } else {
+                parentModel.children.value = [newModel];
+              }
+            } else {
+              parentModel.children = {
+                value: [newModel]
+              };
+            }
+            elementToModel.set(element, newModel);
+          } else if (newModel) {
+            newModel.isVisible = true;
+            (0, _App.tRoot)().addChild(newModel);
+            elementToModel.set(element, newModel);
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+  }, {
+    key: "parseString",
+    value: function parseString(rawValue) {
+      try {
+        return eval("(".concat(rawValue, ")"));
+      } catch (_unused) {}
+      if (typeof rawValue === 'string' && (rawValue.includes('return') || rawValue.includes('setTarget'))) {
+        try {
+          return new Function(rawValue);
+        } catch (_unused2) {}
+      }
+      try {
+        return JSON.parse(rawValue);
+      } catch (_unused3) {}
+      return rawValue;
+    }
   }, {
     key: "contains",
     value: function contains(container, tmodel) {
@@ -221,11 +339,11 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
       var tmodel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (0, _App.tRoot)();
       var tab = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
       var list = (0, _App.getLocationManager)().getChildren(tmodel);
-      var _iterator2 = _createForOfIteratorHelper(list),
-        _step2;
+      var _iterator4 = _createForOfIteratorHelper(list),
+        _step4;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var g = _step2.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var g = _step4.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()), ", absY:").concat(Math.floor(g.absY), " yy:").concat(Math.floor(g.absY + g.getDomParent().absY), " w:").concat(Math.floor(g.getWidth()), " h:").concat(Math.floor(g.getHeight()), " hc:").concat(Math.floor(g.getContentHeight())));
@@ -237,9 +355,9 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator2.f();
+        _iterator4.f();
       }
     }
   }]);

package/build/TargetData.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TargetData = void 0;
 var _App = require("./App.js");
+var _TUtil = require("./TUtil.js");
 var _TargetData;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -509,6 +510,59 @@ _defineProperty(TargetData, "events", {
     }
   }
 });
+_defineProperty(TargetData, "attributesToTargets", {
+  onstart: 'onStart',
+  onend: 'onEnd',
+  onKkey: 'onKey',
+  onclick: 'onClick',
+  onanyclick: 'onAnyClick',
+  onhover: 'onHover',
+  onswipe: 'onSwipe',
+  onanyswipe: 'onAnySwipe',
+  onpinch: 'onPinch',
+  onenter: 'onEnter',
+  onleave: 'onLeave',
+  onscroll: 'onScroll',
+  onscrollleft: 'onScrollLeft',
+  onscrolltop: 'onScrollTop',
+  onwindowscroll: 'onWindowScroll',
+  onvisible: 'onVisible',
+  onresize: 'onResize',
+  textalign: 'textAlign',
+  preventdefault: 'preventDefault',
+  translatex: 'translateX',
+  translatey: 'translateY',
+  translatez: 'translateZ',
+  rotate3dx: 'rotate3DX',
+  rotate3dy: 'rotate3DY',
+  rotate3dz: 'rotate3DZ',
+  rotate3dangle: 'rotate3DAngle',
+  scale3dx: 'scale3DX',
+  scale3dy: 'scale3DY',
+  scale3dz: 'scale3DZ',
+  skewx: 'skewX',
+  skewy: 'skewY',
+  fontsize: 'fontSize',
+  borderradius: 'borderRadius',
+  letterspacing: 'letterSpacing',
+  backgroundcolor: 'backgroundColor',
+  bordertop: 'borderTop',
+  borderleft: 'borderLeft',
+  borderright: 'borderRight',
+  borderbottom: 'borderBottom',
+  boxsizing: 'boxSizing',
+  transformstyle: 'transformStyle',
+  transformorigin: 'transformOrigin',
+  justifycontent: 'justifyContent',
+  alignitems: 'alignItems',
+  fontfamily: 'fontFamily',
+  overflowx: 'overflowX',
+  overflowy: 'overflowY',
+  textdecoration: 'textDecoration',
+  boxshadow: 'boxShadow',
+  fontweight: 'fontWeight',
+  willchange: 'willChange'
+});
 _defineProperty(TargetData, "targetToEventsMapping", {
   onStart: ['touchStart', 'mouseStart'],
   onEnd: [],
@@ -534,7 +588,7 @@ _defineProperty(TargetData, "touchEventMap", {
     return (0, _App.getEvents)().isEndEvent() && (0, _App.getEvents)().isEndHandler(tmodel);
   },
   onAnySwipe: function onAnySwipe() {
-    return (0, _App.getEvents)().isSwipeEvent();
+    return (0, _App.getEvents)().isSwipeEvent() && _TUtil.TUtil.isDefined((0, _App.getEvents)().swipeStartX);
   },
   onHover: function onHover(tmodel) {
     return (0, _App.getEvents)().isMoveEvent() && (0, _App.getEvents)().isHoverHandler(tmodel);
@@ -552,7 +606,7 @@ _defineProperty(TargetData, "touchEventMap", {
     return (0, _App.getEvents)().isLeaveHandler(tmodel);
   },
   onSwipe: function onSwipe(tmodel) {
-    return (0, _App.getEvents)().isSwipeHandler(tmodel) && (0, _App.getEvents)().isSwipeEvent();
+    return (0, _App.getEvents)().isSwipeHandler(tmodel) && (0, _App.getEvents)().isSwipeEvent() && _TUtil.TUtil.isDefined((0, _App.getEvents)().swipeStartX);
   }
 });
 _defineProperty(TargetData, "internalEventMap", {

package/build/TargetExecutor.js

@@ -29,7 +29,7 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
     key: "executeDeclarativeTarget",
     value: function executeDeclarativeTarget(tmodel, key, cycle) {
       TargetExecutor.resolveTargetValue(tmodel, key, cycle);
-      TargetExecutor.updateTarget(tmodel, tmodel.targetValues[key], key);
+      TargetExecutor.updateTarget(tmodel, tmodel.targetValues[key], key, false);
       _TargetUtil.TargetUtil.shouldActivateNextTarget(tmodel, key);
     }
   }, {
@@ -71,18 +71,18 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
           targetValue.step = 0;
         }
       }
-      TargetExecutor.updateTarget(tmodel, targetValue, key);
+      TargetExecutor.updateTarget(tmodel, targetValue, key, true);
     }
   }, {
     key: "updateTarget",
-    value: function updateTarget(tmodel, targetValue, key) {
+    value: function updateTarget(tmodel, targetValue, key, enforce) {
       targetValue.executionCount++;
       targetValue.executionFlag = true;
       tmodel.setActualValueLastUpdate(key);
       if (tmodel.getTargetSteps(key) === 0) {
         TargetExecutor.snapActualToTarget(tmodel, key);
       }
-      tmodel.addToStyleTargetList(key);
+      tmodel.addToStyleTargetList(key, enforce);
       tmodel.setTargetMethodName(key, 'value');
       tmodel.updateTargetStatus(key);
     }
@@ -155,6 +155,9 @@ var TargetExecutor = exports.TargetExecutor = /*#__PURE__*/function () {
           return tmodel.addedChildren.at(-1).child;
         });
         TargetExecutor.assignSingleTarget(targetValue, Array.isArray(newValue) ? tmodelChildren : tmodelChildren[0], undefined, 0, newCycles, newInterval);
+      } else if (_TargetUtil.TargetUtil.isFetchTarget(key, newValue)) {
+        (0, _App.getLoader)().fetch(tmodel, newValue);
+        TargetExecutor.assignSingleTarget(targetValue, newValue, undefined, 0, newCycles, newInterval);
       } else if (_TargetUtil.TargetUtil.isListTarget(newValue)) {
         TargetExecutor.assignListTarget(targetValue, newValue.list, newValue.list[0], newSteps, newInterval, easing);
       } else {

package/build/TargetUtil.js

@@ -61,7 +61,7 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
       var nextKey = keyIndex < keys.length - 1 ? keys[keyIndex + 1] : undefined;
       var getPrevValue = function getPrevValue() {
         if (prevKey) {
-          if ((0, _App.getLoader)().isLoading(tmodel, prevKey)) {
+          if (_App.getLoader && (0, _App.getLoader)().isLoading(tmodel, prevKey)) {
             return (0, _App.getLoader)().getLoadingItemValue(tmodel, prevKey);
           } else {
             return tmodel.val(prevKey);
@@ -252,6 +252,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
     value: function isListTarget(value) {
       return _typeof(value) === 'object' && value !== null && Array.isArray(value.list);
     }
+  }, {
+    key: "isFetchTarget",
+    value: function isFetchTarget(key, value) {
+      return key === 'fetch' && typeof value === 'string';
+    }
   }, {
     key: "isObjectTarget",
     value: function isObjectTarget(key, value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.158",
+  "version": "1.0.159",
   "description": "TargetJS is a JavaScript framework designed for creating animated and efficient web user interfaces.",
   "keywords": ["targetjs"],
   "main": "Export.js",