targetj 1.0.93 → 1.0.95

package/Export.js

@@ -3,8 +3,8 @@ export * from "./build/TModel.js"
 export * from "./build/Moves.js"
 export * from "./build/SearchUtil.js"
 export * from "./build/TargetUtil.js"
+export * from "./build/TModelUtil.js"
 export * from "./build/TUtil.js"
-export * from "./build/ColorUtil.js"
 export * from "./build/$Dom.js"
 export * from "./build/Bracket.js"
 export * from "./build/BracketGenerator.js"

package/README.md

@@ -350,46 +350,44 @@ This example demonstrates how to handle scroll events and develop a simple infin
 ```bash
 import { App, TModel, getEvents, getScreenHeight, getScreenWidth, } from "targetj";
 
-App(
-  new TModel("scroller", {
-    canHandleEvents: "scrollTop",
+App(new TModel("scroller", {
+    canHandleEvents: 'scrollTop',
     innerXEast: 0,
-    addChildren: {
-      loop() {
-        return this.inFlowVisibles.length * 32 < this.getHeight();
-      },
-      value() {
-        const childrenCount = this.getChildren().length;
-        for (let i = 0; i < 10; i++) {
-          this.addChild(
-            new TModel("scrollItem", {
-              width: 300,
-              background: "brown",
-              height: 30,
-              lineHeight: 30,
-              color: "#fff",
-              style: { textAlign: "center" },
-              bottomMargin: 2,
-              x() { return (this.getParentValue("width") - this.getWidth()) / 2; },
-              html: childrenCount + i + 1,
-            })
-          );
-        }
-      },
-      enabledOn() {
-        return this.inFlowVisibles.length * 32 < this.getHeight();
-      },
-    },
-    scrollTop(cycle, lastValue) {
-      return Math.max(0, lastValue + getEvents().deltaY());
+    children: {
+        value() { 
+            const childrenCount = this.getChildren().length;
+            return Array.from({ length: 5 }, (_, i) => 
+                new TModel('scrollItem', { 
+                    width: 300,
+                    background: 'brown',                
+                    height: 30,
+                    color: '#fff',
+                    style: {
+                        textAlign: 'center',
+                        lineHeight: '30px'
+                    },                
+                    bottomMargin: 2,
+                    x() { return (this.getParentValue('width') - this.getWidth()) / 2; },                
+                    html: childrenCount + i,
+                    domParent() {
+                        return this.getParent();
+                    }
+                })
+            );
+        },
+        enabledOn() {
+            return this.visibleChildren.length * 32 < this.getHeight(); 
+        }    
     },
-    width: getScreenWidth,
-    height: getScreenHeight,
-    onResize: ["width", "height"],
-    onScrollEvent: ["scrollTop", "addChildren"],
-  })
-);
-
+    scrollTop(cycle, lastValue) {          
+        return Math.max(0, lastValue + getEvents().deltaY());
+    },           
+    width() { return getScreenWidth(); },
+    height() { return getScreenHeight(); },  
+    onResize: [ 'width', 'height' ],
+    onScrollEvent: [ 'scrollTop', 'children' ],
+    onVisibleChildrenChange: [ 'children' ]
+}));
 ```
 
 ## Simple Single Page App Example

package/build/$Dom.js

@@ -57,6 +57,11 @@ var $Dom = exports.$Dom = /*#__PURE__*/function () {
     value: function focus() {
       this.element.focus();
     }
+  }, {
+    key: "blur",
+    value: function blur() {
+      this.element.blur();
+    }
   }, {
     key: "attr",
     value: function attr(name, value) {

package/build/App.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tRoot = exports.tApp = exports.isRunning = exports.getScreenWidth = exports.getScreenHeight = exports.getRunScheduler = exports.getPager = exports.getManager = exports.getLocationManager = exports.getLoader = exports.getEvents = exports.getBrowser = exports.App = void 0;
+exports.tRoot = exports.tApp = exports.isRunning = exports.getVisibles = exports.getScreenWidth = exports.getScreenHeight = exports.getRunScheduler = exports.getPager = exports.getManager = exports.getLocationManager = exports.getLoader = exports.getEvents = exports.getBrowser = exports.App = void 0;
 var _$Dom = require("./$Dom.js");
 var _TModel = require("./TModel.js");
 var _Browser = require("./Browser.js");
@@ -149,28 +149,28 @@ var isRunning = exports.isRunning = function isRunning() {
   return tApp ? tApp.runningFlag : false;
 };
 var tRoot = exports.tRoot = function tRoot() {
-  return tApp ? tApp.tRoot : null;
+  return tApp ? tApp.tRoot : undefined;
 };
 var getEvents = exports.getEvents = function getEvents() {
-  return tApp ? tApp.events : null;
+  return tApp ? tApp.events : undefined;
 };
 var getPager = exports.getPager = function getPager() {
-  return tApp ? tApp.pager : null;
+  return tApp ? tApp.pager : undefined;
 };
 var getLoader = exports.getLoader = function getLoader() {
-  return tApp ? tApp.loader : null;
+  return tApp ? tApp.loader : undefined;
 };
 var getManager = exports.getManager = function getManager() {
-  return tApp ? tApp.manager : null;
+  return tApp ? tApp.manager : undefined;
 };
 var getRunScheduler = exports.getRunScheduler = function getRunScheduler() {
-  return tApp ? tApp.runScheduler : null;
+  return tApp ? tApp.runScheduler : undefined;
 };
 var getLocationManager = exports.getLocationManager = function getLocationManager() {
-  return tApp ? tApp.locationManager : null;
+  return tApp ? tApp.locationManager : undefined;
 };
 var getBrowser = exports.getBrowser = function getBrowser() {
-  return tApp ? tApp.browser : null;
+  return tApp ? tApp.browser : undefined;
 };
 var getScreenWidth = exports.getScreenWidth = function getScreenWidth() {
   return tApp ? tApp.browser.screen.width : 0;
@@ -178,4 +178,7 @@ var getScreenWidth = exports.getScreenWidth = function getScreenWidth() {
 var getScreenHeight = exports.getScreenHeight = function getScreenHeight() {
   return tApp ? tApp.browser.screen.height : 0;
 };
+var getVisibles = exports.getVisibles = function getVisibles() {
+  return tApp ? tApp.manager.lists.visible : undefined;
+};
 window.t = window.t || _SearchUtil.SearchUtil.find;

package/build/BaseModel.js

@@ -6,27 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.BaseModel = void 0;
 var _App = require("./App.js");
 var _TargetExecutor = require("./TargetExecutor.js");
-var _Viewport = require("./Viewport.js");
 var _TUtil = require("./TUtil.js");
-var _SearchUtil = require("./SearchUtil.js");
 var _TModelUtil = require("./TModelUtil.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 _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); }
+var _TargetUtil = require("./TargetUtil.js");
 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; }
+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 _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); }
+/**
+ * It provides the target state and associated logic to the TModel.
+ */
 var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   function BaseModel(type, targets) {
     _classCallCheck(this, BaseModel);
-    if (arguments.length === 1 && _typeof(type) === 'object') {
+    if (_typeof(type) === 'object' && typeof targets === 'undefined') {
       targets = type;
       type = "";
     }
@@ -36,6 +35,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     this.oid = uniqueId.oid;
     this.oidNum = uniqueId.num;
     this.targetValues = {};
+    this.actualValues = {};
     this.activeTargetList = [];
     this.activeTargetMap = {};
     this.updatingTargetList = [];
@@ -44,29 +44,10 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     this.updatingTargetMap = {};
     this.updatingChildrenList = [];
     this.updatingChildrenMap = {};
-    this.addedChildren = {
-      count: 0,
-      list: []
-    };
-    this.deletedChildren = [];
-    this.lastChildrenUpdate = {
-      additions: [],
-      deletions: []
-    };
-    this.allChildren = [];
-    this.x = 0;
-    this.y = 0;
-    this.absX = 0;
-    this.absY = 0;
+    this.eventTargets = [];
+    this.styleTargetList = [];
+    this.styleTargetMap = {};
     this.parent = null;
-    this.visibilityStatus = {
-      top: false,
-      right: false,
-      bottom: false,
-      left: false
-    };
-    this.visible = false;
-    this.inFlowVisibles = [];
     this.targetMethodMap = {};
   }
   return _createClass(BaseModel, [{
@@ -79,6 +60,72 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     value: function getRealParent() {
       return this.parent;
     }
+  }, {
+    key: "initTargets",
+    value: function initTargets() {
+      var _this = this;
+      this.actualValues = _TModelUtil.TModelUtil.initializeActualValues();
+      this.targetValues = {};
+      this.activeTargetMap = {};
+      this.activeTargetList = [];
+      Object.keys(this.targets).forEach(function (key) {
+        _this.processNewTarget(key);
+      });
+    }
+  }, {
+    key: "processNewTarget",
+    value: function processNewTarget(key) {
+      if (!_TUtil.TUtil.isDefined(this.targets[key])) {
+        delete this.actualValues[key];
+        return;
+      }
+      _TargetUtil.TargetUtil.bindTargetName(this.targets, key);
+      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);
+      }
+    }
+  }, {
+    key: "addToStyleTargetList",
+    value: function addToStyleTargetList(key) {
+      if (!_TargetUtil.TargetUtil.styleTargetMap[key]) {
+        return;
+      }
+      if (!this.styleTargetMap[key]) {
+        this.styleTargetList.push(key);
+        this.styleTargetMap[key] = true;
+      }
+    }
+  }, {
+    key: "removeTarget",
+    value: function removeTarget(key) {
+      delete this.targets[key];
+      this.removeFromActiveTargets(key);
+      this.removeFromUpdatingTargets(key);
+      delete this.targetValues[key];
+    }
+  }, {
+    key: "addTarget",
+    value: function addTarget(key, target) {
+      this.addTargets(_defineProperty({}, key, target));
+    }
+  }, {
+    key: "addTargets",
+    value: function addTargets(targets) {
+      var _this2 = this;
+      Object.keys(targets).forEach(function (key) {
+        _this2.targets[key] = targets[key];
+        _this2.removeFromUpdatingTargets(key);
+        _this2.processNewTarget(key);
+      });
+      (0, _App.getRunScheduler)().schedule(10, 'addTargets-' + this.oid);
+    }
   }, {
     key: "getTargetStepPercent",
     value: function getTargetStepPercent(key, step) {
@@ -217,9 +264,6 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "isTargetEnabled",
     value: function isTargetEnabled(key) {
-      if (this.isTargetImperative(key)) {
-        return true;
-      }
       var target = this.targets[key];
       if (!_TUtil.TUtil.isDefined(target)) {
         return false;
@@ -360,7 +404,7 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "addToActiveTargets",
     value: function addToActiveTargets(key) {
-      var _this = this;
+      var _this3 = this;
       if (!this.activeTargetMap[key]) {
         this.activeTargetMap[key] = true;
         var priorityOrder = ['y', 'x', 'height', 'width', 'start'];
@@ -370,8 +414,8 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
             return !priorityOrder.includes(item);
           });
           priorityOrder.forEach(function (priorityKey) {
-            if (_this.activeTargetMap[priorityKey]) {
-              _this.activeTargetList.unshift(priorityKey);
+            if (_this3.activeTargetMap[priorityKey]) {
+              _this3.activeTargetList.unshift(priorityKey);
             }
           });
         } else {
@@ -434,6 +478,30 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       }
       return false;
     }
+  }, {
+    key: "addToUpdatingChildren",
+    value: function addToUpdatingChildren(child) {
+      if (!this.updatingChildrenMap[child.oid]) {
+        this.updatingChildrenMap[child.oid] = true;
+        this.updatingChildrenList.push(child.oid);
+      }
+    }
+  }, {
+    key: "removeFromUpdatingChildren",
+    value: function removeFromUpdatingChildren(child) {
+      if (this.updatingChildrenMap[child.oid]) {
+        delete this.updatingChildrenMap[child.oid];
+        var index = this.updatingChildrenList.indexOf(child.oid);
+        if (index >= 0) {
+          this.updatingChildrenList.splice(index, 1);
+        }
+      }
+    }
+  }, {
+    key: "hasUpdatingChildren",
+    value: function hasUpdatingChildren() {
+      return this.updatingChildrenList.length > 0;
+    }
   }, {
     key: "deleteTargetValue",
     value: function deleteTargetValue(key) {
@@ -466,17 +534,17 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   }, {
     key: "activateTargets",
     value: function activateTargets(keys) {
-      var _this2 = this;
+      var _this4 = this;
       keys.forEach(function (key) {
-        var targetValue = _this2.targetValues[key];
+        var targetValue = _this4.targetValues[key];
         if (targetValue) {
           targetValue.executionFlag = false;
           targetValue.scheduleTimeStamp = undefined;
           targetValue.step = 0;
           targetValue.cycle = 0;
-          _this2.updateTargetStatus(key);
+          _this4.updateTargetStatus(key);
         } else {
-          _this2.addToActiveTargets(key);
+          _this4.addToActiveTargets(key);
         }
       });
       (0, _App.getRunScheduler)().schedule(10, 'activateTargets-' + this.oid);
@@ -492,181 +560,5 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
         this.targetMethodMap[targetName].push(methodName);
       }
     }
-  }, {
-    key: "addToUpdatingChildren",
-    value: function addToUpdatingChildren(child) {
-      if (!this.updatingChildrenMap[child.oid]) {
-        this.updatingChildrenMap[child.oid] = true;
-        this.updatingChildrenList.push(child.oid);
-      }
-    }
-  }, {
-    key: "removeFromUpdatingChildren",
-    value: function removeFromUpdatingChildren(child) {
-      if (this.updatingChildrenMap[child.oid]) {
-        delete this.updatingChildrenMap[child.oid];
-        var index = this.updatingChildrenList.indexOf(child.oid);
-        if (index >= 0) {
-          this.updatingChildrenList.splice(index, 1);
-        }
-      }
-    }
-  }, {
-    key: "hasUpdatingChildren",
-    value: function hasUpdatingChildren() {
-      return this.updatingChildrenList.length > 0;
-    }
-  }, {
-    key: "addChild",
-    value: function addChild(child) {
-      var index = this.addedChildren.count + this.allChildren.length;
-      this.addedChildren.count++;
-      _TModelUtil.TModelUtil.addItem(this.addedChildren.list, child, index);
-      (0, _App.getRunScheduler)().schedule(10, 'addChild-' + this.oid + "-" + child.oid);
-      return this;
-    }
-  }, {
-    key: "removeChild",
-    value: function removeChild(child) {
-      this.deletedChildren.push(child);
-      this.removeFromUpdatingChildren(child);
-      (0, _App.getRunScheduler)().schedule(10, 'removeChild-' + this.oid + "-" + child.oid);
-      return this;
-    }
-  }, {
-    key: "removeAllChildren",
-    value: function removeAllChildren() {
-      this.allChildren.length = 0;
-      this.updatingChildrenList.length = 0;
-      this.updatingChildrenMap = {};
-      (0, _App.getRunScheduler)().schedule(10, 'removeAllChildren-' + this.oid);
-      return this;
-    }
-  }, {
-    key: "addToParentVisibleList",
-    value: function addToParentVisibleList() {
-      if (this.isVisible() && this.isInFlow() && this.getParent()) {
-        this.getParent().inFlowVisibles.push(this);
-      }
-    }
-  }, {
-    key: "shouldCalculateChildren",
-    value: function shouldCalculateChildren() {
-      if (_TUtil.TUtil.isDefined(this.actualValues.calculateChildren)) {
-        return this.actualValues.calculateChildren;
-      }
-      return this.isVisible() && this.isIncluded() && (this.hasChildren() || this.addedChildren.count > 0 || this.getContentHeight() > 0);
-    }
-  }, {
-    key: "createViewport",
-    value: function createViewport() {
-      this.viewport = this.viewport ? this.viewport.reset() : new _Viewport.Viewport(this);
-      return this.viewport;
-    }
-  }, {
-    key: "setLocation",
-    value: function setLocation(viewport) {
-      this.x = viewport.getXNext();
-      this.y = viewport.getYNext();
-    }
-  }, {
-    key: "calculateAbsolutePosition",
-    value: function calculateAbsolutePosition(x, y) {
-      var rect = this.getBoundingRect();
-      this.absX = rect.left + x;
-      this.absY = rect.top + y;
-    }
-  }, {
-    key: "getBoundingRect",
-    value: function getBoundingRect() {
-      return _TUtil.TUtil.getBoundingRect(this);
-    }
-  }, {
-    key: "getFirstChild",
-    value: function getFirstChild() {
-      return this.hasChildren() ? this.getChildren()[0] : undefined;
-    }
-  }, {
-    key: "hasChildren",
-    value: function hasChildren() {
-      return this.getChildren().length > 0;
-    }
-  }, {
-    key: "getChildren",
-    value: function getChildren() {
-      var _this3 = this;
-      if (this.addedChildren.count > 0) {
-        this.addedChildren.list.forEach(function (_ref) {
-          var index = _ref.index,
-            segment = _ref.segment;
-          segment.forEach(function (t) {
-            return t.parent = _this3;
-          });
-          if (index >= _this3.allChildren.length) {
-            var _this3$allChildren;
-            (_this3$allChildren = _this3.allChildren).push.apply(_this3$allChildren, _toConsumableArray(segment));
-          } else {
-            var _this3$allChildren2;
-            (_this3$allChildren2 = _this3.allChildren).splice.apply(_this3$allChildren2, [index, 0].concat(_toConsumableArray(segment)));
-          }
-        });
-        this.lastChildrenUpdate.additions = this.lastChildrenUpdate.additions.concat(this.addedChildren.list);
-        this.addedChildren.list.length = 0;
-        this.addedChildren.count = 0;
-      }
-      if (this.deletedChildren.length > 0) {
-        this.deletedChildren.forEach(function (child) {
-          var index = _this3.allChildren.indexOf(child);
-          _this3.lastChildrenUpdate.deletions.push(index);
-          if (index >= 0) {
-            _this3.allChildren.splice(index, 1);
-          }
-        });
-        this.deletedChildren.length = 0;
-      }
-      return this.allChildren;
-    }
-  }, {
-    key: "getLastChild",
-    value: function getLastChild() {
-      return this.hasChildren() ? this.getChildren()[this.getChildren().length - 1] : undefined;
-    }
-  }, {
-    key: "getChild",
-    value: function getChild(index) {
-      return this.hasChildren() ? this.getChildren()[index] : undefined;
-    }
-  }, {
-    key: "getChildIndex",
-    value: function getChildIndex(child) {
-      return this.getChildren().indexOf(child);
-    }
-  }, {
-    key: "getChildrenOids",
-    value: function getChildrenOids() {
-      return this.getChildren().map(function (o) {
-        return o.oid;
-      }).join(" ");
-    }
-  }, {
-    key: "findChild",
-    value: function findChild(type) {
-      return this.getChildren().find(function (child) {
-        return typeof type === 'function' ? type.call(child) : child.type === type;
-      });
-    }
-  }, {
-    key: "findLastChild",
-    value: function findLastChild(type) {
-      return this.getChildren().findLast(function (child) {
-        return typeof type === 'function' ? type.call(child) : child.type === type;
-      });
-    }
-  }, {
-    key: "getParentValue",
-    value: function getParentValue(targetName) {
-      var parent = _SearchUtil.SearchUtil.findParentByTarget(this, targetName);
-      return parent ? parent.val(targetName) : undefined;
-    }
   }]);
 }();

package/build/Bracket.js

@@ -98,6 +98,9 @@ var Bracket = exports.Bracket = /*#__PURE__*/function (_TModel) {
     value: function addToUpdatingChildren(child) {
       this.getRealParent().addToUpdatingChildren(child);
     }
+  }, {
+    key: "addToParentVisibleChildren",
+    value: function addToParentVisibleChildren() {}
   }, {
     key: "createViewport",
     value: function createViewport() {

package/build/EventListener.js

@@ -51,8 +51,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       enterEvent: null,
       leaveEvent: null,
       focus: null,
-      focusIn: null,
-      focusOut: null
+      justFocused: null,
+      blur: null
     };
     this.eventQueue = [];
     this.eventMap = {
@@ -255,8 +255,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     key: "findEventHandlers",
     value: function findEventHandlers(tmodel) {
       var touchHandler = _SearchUtil.SearchUtil.findFirstTouchHandler(tmodel);
-      var scrollLeftHandler = this.end0 ? this.currentHandlers.scrollLeft : _SearchUtil.SearchUtil.findFirstScrollLeftHandler(tmodel);
-      var scrollTopHandler = this.end0 ? this.currentHandlers.scrollTop : _SearchUtil.SearchUtil.findFirstScrollTopHandler(tmodel);
+      var scrollLeftHandler = _SearchUtil.SearchUtil.findFirstScrollLeftHandler(tmodel);
+      var scrollTopHandler = _SearchUtil.SearchUtil.findFirstScrollTopHandler(tmodel);
       var pinchHandler = _SearchUtil.SearchUtil.findFirstPinchHandler(tmodel);
       var focusHandler = _$Dom.$Dom.hasFocus(tmodel) ? tmodel : this.currentHandlers.focus;
       if (this.currentHandlers.scrollLeft !== scrollLeftHandler || this.currentHandlers.scrollTop !== scrollTopHandler) {
@@ -264,15 +264,15 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       }
       this.currentHandlers.enterEvent = null;
       this.currentHandlers.leaveEvent = null;
-      this.currentHandlers.focusIn = null;
-      this.currentHandlers.focusOut = null;
+      this.currentHandlers.justFocused = null;
+      this.currentHandlers.blur = null;
       if (this.currentHandlers.touch !== touchHandler) {
         this.currentHandlers.enterEvent = touchHandler;
         this.currentHandlers.leaveEvent = this.currentHandlers.touch;
       }
       if (this.currentHandlers.focus !== focusHandler) {
-        this.currentHandlers.focusIn = focusHandler;
-        this.currentHandlers.focusOut = this.currentHandlers.focus;
+        this.currentHandlers.justFocused = focusHandler;
+        this.currentHandlers.blur = this.currentHandlers.focus;
         this.eventQueue.push({
           eventName: 'focus',
           eventType: 'focus',
@@ -592,12 +592,12 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "onFocus",
     value: function onFocus(handler) {
-      return this.currentHandlers.focusIn === handler;
+      return this.currentHandlers.justFocused === handler;
     }
   }, {
-    key: "onFocusOut",
-    value: function onFocusOut(handler) {
-      return this.currentHandlers.focusOut === handler;
+    key: "onBlur",
+    value: function onBlur(handler) {
+      return this.currentHandlers.blur === handler;
     }
   }, {
     key: "hasFocus",