targetj 1.0.112 → 1.0.113

package/build/$Dom.js

@@ -37,6 +37,11 @@ var $Dom = exports.$Dom = /*#__PURE__*/function () {
       }
       return !!this.element;
     }
+  }, {
+    key: "contains",
+    value: function contains(dom) {
+      return dom instanceof $Dom ? this.element.contains(dom.element) : this.element.contains(dom);
+    }
   }, {
     key: "create",
     value: function create(tagName) {

package/build/EventListener.js

@@ -292,7 +292,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     key: "findEventHandlers",
     value: function findEventHandlers(_ref) {
       var tmodel = _ref.tmodel,
-        eventType = _ref.eventType;
+        eventType = _ref.eventType,
+        eventTarget = _ref.eventTarget;
       var touchHandler, scrollLeftHandler, scrollTopHandler, pinchHandler, focusHandler;
       if (tmodel) {
         touchHandler = _SearchUtil.SearchUtil.findFirstTouchHandler(tmodel);
@@ -305,8 +306,9 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         this.clearTouch();
       }
       if (this.currentHandlers.touch !== touchHandler) {
+        var _this$currentHandlers;
         this.currentHandlers.enterEvent = touchHandler;
-        this.currentHandlers.leaveEvent = this.currentHandlers.touch;
+        this.currentHandlers.leaveEvent = (_this$currentHandlers = this.currentHandlers.touch) !== null && _this$currentHandlers !== void 0 && (_this$currentHandlers = _this$currentHandlers.$dom) !== null && _this$currentHandlers !== void 0 && _this$currentHandlers.contains(eventTarget) ? undefined : this.currentHandlers.touch;
       }
       if (this.currentHandlers.focus !== focusHandler) {
         this.currentHandlers.justFocused = focusHandler;
@@ -347,7 +349,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       if (!event) {
         return;
       }
-      var originalName = event.type;
+      var originalName = event.type,
+        eventTarget = event.target;
       var eventItem = this.eventMap[originalName];
       if (!eventItem) {
         return;
@@ -383,7 +386,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         eventType: eventType,
         originalName: originalName,
         tmodel: tmodel,
-        timeStamp: now
+        timeStamp: now,
+        eventTarget: eventTarget
       };
       if (queue) {
         this.eventQueue.push(newEvent);
@@ -653,12 +657,15 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "isEnterEventHandler",
     value: function isEnterEventHandler(handler) {
-      return this.currentHandlers.enterEvent === handler;
+      var _this$currentHandlers2;
+      return this.currentHandlers.enterEvent === handler || ((_this$currentHandlers2 = this.currentHandlers.enterEvent) === null || _this$currentHandlers2 === void 0 ? void 0 : _this$currentHandlers2.getDomParent()) === handler;
     }
   }, {
     key: "isLeaveEventHandler",
     value: function isLeaveEventHandler(handler) {
-      return this.currentHandlers.leaveEvent === handler;
+      var _this$currentHandlers3;
+      var parent = (_this$currentHandlers3 = this.currentHandlers.leaveEvent) === null || _this$currentHandlers3 === void 0 ? void 0 : _this$currentHandlers3.getDomParent();
+      return this.currentHandlers.leaveEvent === handler || parent === handler && this.currentHandlers.enterEvent !== parent;
     }
   }, {
     key: "onFocus",

package/build/TModelManager.js

@@ -199,6 +199,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           var tmodel = _step4.value;
           tmodel.styleMap = {};
           tmodel.transformMap = {};
+          tmodel.actualValues.isVisible = false;
           tmodel.$dom.detach();
           tmodel.$dom = null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.112",
+  "version": "1.0.113",
   "keywords": [
     "targetj"
   ],