From 1f4b42aa9713258bfe98592197f67c4685c7628c Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 18 Feb 2020 17:56:21 +0800
Subject: [PATCH] fix: touchtrack mouseup

---
 src/core/view/mixins/touchtrack.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/view/mixins/touchtrack.js b/src/core/view/mixins/touchtrack.js
index 621e088ae..77d4cd667 100644
--- a/src/core/view/mixins/touchtrack.js
+++ b/src/core/view/mixins/touchtrack.js
@@ -51,8 +51,8 @@ export default {
       let hasTouchStart
       let hasMouseDown
       addListenerToElement(element, 'touchstart', function ($event) {
+        hasTouchStart = true
         if ($event.touches.length === 1 && !$eventOld) {
-          hasTouchStart = true
           $eventOld = $event
           x0 = x1 = $event.touches[0].pageX
           y0 = y1 = $event.touches[0].pageY
@@ -61,7 +61,7 @@ export default {
       })
       addListenerToElement(element, 'mousedown', function ($event) {
         hasMouseDown = true
-        if (!hasTouchStart) {
+        if (!hasTouchStart && !$eventOld) {
           // TODO touches changedTouches
           $eventOld = $event
           x0 = x1 = $event.pageX
@@ -78,7 +78,7 @@ export default {
         }
       })
       const mouseMoveEventListener = this.__mouseMoveEventListener = function ($event) {
-        if (!hasTouchStart && hasMouseDown) {
+        if (!hasTouchStart && hasMouseDown && $eventOld) {
           // TODO target currentTarget touches changedTouches
           const res = fn($event, 'move', $event.pageX, $event.pageY)
           x1 = $event.pageX
@@ -96,7 +96,7 @@ export default {
       })
       const mouseUpEventListener = this.__mouseUpEventListener = function ($event) {
         hasMouseDown = false
-        if (!hasTouchStart) {
+        if (!hasTouchStart && $eventOld) {
           // TODO target currentTarget touches changedTouches
           $eventOld = null
           return fn($event, 'end', $event.pageX, $event.pageY)
-- 
GitLab