@leafer-ui/interaction-web 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interaction-web",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "@leafer-ui/interaction-web",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0",
-    "@leafer-ui/core": "1.0.0"
+    "@leafer/core": "1.0.2",
+    "@leafer-ui/core": "1.0.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0"
+    "@leafer/interface": "1.0.2"
   }
 }

package/src/Interaction.ts

@@ -14,7 +14,7 @@ interface IGestureEvent extends IClientPointData, UIEvent {
 }
 
 
-const { getMoveEventData, getZoomEventData, getRotateEventData } = InteractionHelper
+const { getMoveEventData, getZoomEventData, getRotateEventData, pathCanDrag } = InteractionHelper
 
 export class Interaction extends InteractionBase {
 
@@ -146,20 +146,20 @@ export class Interaction extends InteractionBase {
     protected onPointerDown(e: PointerEvent): void {
         this.preventDefaultPointer(e)
 
+        if (this.config.pointer.touch || this.useMultiTouch) return
         this.usePointer || (this.usePointer = true)
-        if (this.useMultiTouch) return
         this.pointerDown(PointerEventHelper.convert(e, this.getLocal(e)))
     }
 
     protected onPointerMove(e: PointerEvent): void {
+        if (this.config.pointer.touch || this.useMultiTouch || this.preventWindowPointer(e)) return
         this.usePointer || (this.usePointer = true)
-        if (this.useMultiTouch || this.preventWindowPointer(e)) return
         this.pointerMove(PointerEventHelper.convert(e, this.getLocal(e, true)))
     }
 
     protected onPointerUp(e: PointerEvent): void {
         if (this.downData) this.preventDefaultPointer(e)
-        if (this.useMultiTouch || this.preventWindowPointer(e)) return
+        if (this.config.pointer.touch || this.useMultiTouch || this.preventWindowPointer(e)) return
         this.pointerUp(PointerEventHelper.convert(e, this.getLocal(e)))
     }
 
@@ -196,7 +196,10 @@ export class Interaction extends InteractionBase {
 
     // touch
     protected onTouchStart(e: TouchEvent): void {
-        e.preventDefault()
+        const touch = PointerEventHelper.getTouch(e)
+        const local = this.getLocal(touch, true)
+        const { preventDefault } = this.config.touch
+        if (preventDefault === true || (preventDefault === 'auto' && pathCanDrag(this.findPath(local)))) e.preventDefault()
 
         this.multiTouchStart(e)
 
@@ -206,8 +209,7 @@ export class Interaction extends InteractionBase {
             this.touchTimer = 0
         }
         this.useTouch = true
-        const touch = PointerEventHelper.getTouch(e)
-        this.pointerDown(PointerEventHelper.convertTouch(e, this.getLocal(touch, true)))
+        this.pointerDown(PointerEventHelper.convertTouch(e, local))
     }
 
     protected onTouchMove(e: TouchEvent): void {
@@ -238,7 +240,7 @@ export class Interaction extends InteractionBase {
 
     // multiTouch
     protected multiTouchStart(e: TouchEvent): void {
-        this.useMultiTouch = (e.touches.length >= 2)
+        this.useMultiTouch = (e.touches.length > 1)
         this.touches = this.useMultiTouch ? this.getTouches(e.touches) : undefined
         if (this.useMultiTouch) this.pointerCancel()
     }

package/src/PointerEventHelper.ts

@@ -48,6 +48,7 @@ export const PointerEventHelper = {
             width: 1,
             height: 1,
             pointerType: 'touch',
+            multiTouch: e.touches.length > 1,
             pressure: touch.force,
         }
     },