@leafer-ui/interaction 1.5.3 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interaction",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "@leafer-ui/interaction",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,12 +22,12 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.5.3",
-    "@leafer-ui/draw": "1.5.3",
-    "@leafer-ui/event": "1.5.3"
+    "@leafer/core": "1.6.1",
+    "@leafer-ui/draw": "1.6.1",
+    "@leafer-ui/event": "1.6.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.5.3",
-    "@leafer-ui/interface": "1.5.3"
+    "@leafer/interface": "1.6.1",
+    "@leafer-ui/interface": "1.6.1"
   }
 }

package/src/Interaction.ts

@@ -96,8 +96,8 @@ export class InteractionBase implements IInteraction {
     public pointerDown(data?: IPointerEvent, useDefaultPath?: boolean): void {
         if (!data) data = this.hoverData
         if (!data) return
-        PointerButton.defaultLeft(data)
 
+        PointerButton.defaultLeft(data)
         this.updateDownData(data)
         this.checkPath(data, useDefaultPath)
 
@@ -137,7 +137,7 @@ export class InteractionBase implements IInteraction {
         if (this.downData) {
             const canDrag = PointHelper.getDistance(this.downData, data) > this.p.dragDistance
             if (canDrag) {
-                if (this.waitTap) this.pointerWaitCancel()
+                this.pointerWaitCancel()
                 this.waitRightTap = false
             }
 
@@ -454,7 +454,9 @@ export class InteractionBase implements IInteraction {
 
     public getLocal(clientPoint: IClientPointData, updateClient?: boolean): IPointData {
         const clientBounds = this.canvas.getClientBounds(updateClient)
-        return { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y }
+        const point = { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y }
+        if (this.p.snap) PointHelper.round(point)
+        return point
     }
 
 
@@ -479,9 +481,11 @@ export class InteractionBase implements IInteraction {
     }
 
     protected tapWaitCancel(): void {
-        clearTimeout(this.tapTimer)
-        this.waitTap = false
-        this.tapCount = 0
+        if (this.waitTap) {
+            clearTimeout(this.tapTimer)
+            this.waitTap = false
+            this.tapCount = 0
+        }
     }
 
     protected longPressWait(data: IPointerEvent): void {
@@ -503,8 +507,10 @@ export class InteractionBase implements IInteraction {
     }
 
     protected longPressWaitCancel(): void {
-        clearTimeout(this.longPressTimer)
-        this.longPressed = false
+        if (this.longPressTimer) {
+            clearTimeout(this.longPressTimer)
+            this.longPressed = false
+        }
     }
 
     protected __onResize(): void {

package/src/config.ts

@@ -8,6 +8,7 @@ export const config: IInteractionConfig = {
         delta: { x: 80 / 4, y: 8.0 }, // 基准速度（会影响zoomSpeed)，可根据不同系统、浏览器细化定制
     },
     pointer: {
+        snap: true,
         hitRadius: 5,
         tapTime: 120,
         longPressTime: 800,