targetj 1.0.115 → 1.0.117

package/build/EventListener.js

@@ -291,8 +291,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     key: "findEventHandlers",
     value: function findEventHandlers(_ref) {
       var tmodel = _ref.tmodel,
-        eventType = _ref.eventType,
-        eventTarget = _ref.eventTarget;
+        eventType = _ref.eventType;
       var touchHandler, scrollLeftHandler, scrollTopHandler, pinchHandler, focusHandler;
       if (tmodel) {
         touchHandler = _SearchUtil.SearchUtil.findFirstTouchHandler(tmodel);
@@ -305,9 +304,8 @@ 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 = 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;
+        this.currentHandlers.leaveEvent = this.currentHandlers.touch;
       }
       if (this.currentHandlers.focus !== focusHandler) {
         this.currentHandlers.justFocused = focusHandler;
@@ -322,10 +320,10 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "captureEvents",
     value: function captureEvents() {
-      this.currentHandlers.enterEvent = null;
-      this.currentHandlers.leaveEvent = null;
-      this.currentHandlers.justFocused = null;
-      this.currentHandlers.blur = null;
+      this.currentHandlers.enterEvent = undefined;
+      this.currentHandlers.leaveEvent = undefined;
+      this.currentHandlers.justFocused = undefined;
+      this.currentHandlers.blur = undefined;
       if (this.eventQueue.length === 0) {
         this.currentEventName = "";
         this.currentEventType = "";
@@ -336,7 +334,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       if (this.canFindHandlers) {
         this.findEventHandlers(lastEvent);
       }
-      if (lastEvent.eventType === 'end') {
+      if (lastEvent.eventType === 'end' || lastEvent.eventType === 'click') {
         this.canFindHandlers = true;
       }
       this.currentEventName = lastEvent.eventName;
@@ -351,8 +349,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       if (!event) {
         return;
       }
-      var originalName = event.type,
-        eventTarget = event.target;
+      var originalName = event.type;
       var eventItem = this.eventMap[originalName];
       if (!eventItem) {
         return;
@@ -388,8 +385,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         eventType: eventType,
         originalName: originalName,
         tmodel: tmodel,
-        timeStamp: now,
-        eventTarget: eventTarget
+        timeStamp: now
       };
       if (queue) {
         this.eventQueue.push(newEvent);
@@ -617,7 +613,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "isEndEvent",
     value: function isEndEvent() {
-      return this.getEventType() === 'end';
+      return this.getEventType() === 'end' || this.getEventType() === 'click';
     }
   }, {
     key: "isStartEvent",
@@ -644,11 +640,6 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     value: function isClickHandlerType(type) {
       return this.getTouchHandlerType() === type && this.isClickEvent();
     }
-  }, {
-    key: "isTouchEndHandler",
-    value: function isTouchEndHandler(handler) {
-      return this.getTouchHandler() === handler && this.getEventType() === 'end';
-    }
   }, {
     key: "isTouchHandler",
     value: function isTouchHandler(handler) {
@@ -657,15 +648,12 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "isEnterEventHandler",
     value: function isEnterEventHandler(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;
+      return _TUtil.TUtil.contains(handler, this.currentHandlers.enterEvent) && !_TUtil.TUtil.contains(handler, this.currentHandlers.leaveEvent);
     }
   }, {
     key: "isLeaveEventHandler",
     value: function isLeaveEventHandler(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;
+      return _TUtil.TUtil.contains(handler, this.currentHandlers.leaveEvent) && !_TUtil.TUtil.contains(handler, this.currentHandlers.enterEvent);
     }
   }, {
     key: "onFocus",
@@ -726,10 +714,9 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       return target === handler || target.getParent() === handler;
     }
   }, {
-    key: "isTouchHandlerOrChild",
-    value: function isTouchHandlerOrChild(target) {
-      var handler = this.getTouchHandler();
-      return target === handler || (handler === null || handler === void 0 ? void 0 : handler.getParent()) === target;
+    key: "containsTouchHandler",
+    value: function containsTouchHandler(tmodel) {
+      return _TUtil.TUtil.contains(tmodel, this.getTouchHandler());
     }
   }, {
     key: "countTouches",

package/build/TUtil.js

@@ -73,6 +73,18 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
         _iterator.f();
       }
     }
+  }, {
+    key: "contains",
+    value: function contains(container, tmodel) {
+      var _tmodel$getDomParent;
+      if (!container || !tmodel) {
+        return false;
+      }
+      if (container === tmodel || tmodel.getDomParent() === container || ((_tmodel$getDomParent = tmodel.getDomParent()) === null || _tmodel$getDomParent === void 0 ? void 0 : _tmodel$getDomParent.getDomParent()) === container) {
+        return true;
+      }
+      return false;
+    }
   }, {
     key: "list2map",
     value: function list2map(list, defaultValue) {

package/build/TargetUtil.js

@@ -428,16 +428,13 @@ _defineProperty(TargetUtil, "targetConditionMap", {
     return (0, _App.getEvents)().getEventType() === 'click' && (0, _App.getEvents)().isClickHandler(tmodel);
   },
   onTouchStart: function onTouchStart(tmodel) {
-    return (0, _App.getEvents)().isStartEvent() && (0, _App.getEvents)().isTouchHandlerOrChild(tmodel);
+    return (0, _App.getEvents)().isStartEvent() && (0, _App.getEvents)().containsTouchHandler(tmodel);
   },
   onTouchEnd: function onTouchEnd(tmodel) {
-    return (0, _App.getEvents)().isEndEvent() && (0, _App.getEvents)().isTouchHandlerOrChild(tmodel);
-  },
-  onKeyEvent: function onKeyEvent() {
-    return (0, _App.getEvents)().getEventType() === 'key' && (0, _App.getEvents)().currentKey;
+    return (0, _App.getEvents)().isEndEvent() && (0, _App.getEvents)().containsTouchHandler(tmodel);
   },
   onSwipeEvent: function onSwipeEvent(tmodel) {
-    return (0, _App.getEvents)().isTouchHandlerOrChild(tmodel) && (0, _App.getEvents)().isSwipeEvent();
+    return (0, _App.getEvents)().containsTouchHandler(tmodel) && (0, _App.getEvents)().isSwipeEvent();
   },
   onAnySwipeEvent: function onAnySwipeEvent() {
     return (0, _App.getEvents)().isSwipeEvent();
@@ -445,6 +442,9 @@ _defineProperty(TargetUtil, "targetConditionMap", {
   onTouchEvent: function onTouchEvent(tmodel) {
     return (0, _App.getEvents)().isTouchHandler(tmodel);
   },
+  onKeyEvent: function onKeyEvent() {
+    return (0, _App.getEvents)().getEventType() === 'key' && (0, _App.getEvents)().currentKey;
+  },
   onEnterEvent: function onEnterEvent(tmodel) {
     return (0, _App.getEvents)().isEnterEventHandler(tmodel);
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.115",
+  "version": "1.0.117",
   "keywords": [
     "targetj"
   ],