@leafer-ui/interaction 1.0.0-rc.23 → 1.0.0-rc.25

package/package.json

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

package/src/Interaction.ts

@@ -1,4 +1,4 @@
-import { IUIEvent, IPointerEvent, ILeaf, IInteraction, IInteractionConfig, ILeafList, IMoveEvent, IZoomEvent, IRotateEvent, ISelector, IBounds, IEventListenerId, IInteractionCanvas, ITimer, IKeepTouchData, IKeyEvent, IPickOptions, ICursorType, IBooleanMap, IPickBottom } from '@leafer/interface'
+import { IUIEvent, IPointerEvent, ILeaf, IInteraction, IInteractionConfig, ILeafList, IMoveEvent, IZoomEvent, IRotateEvent, ISelector, IBounds, IEventListenerId, IInteractionCanvas, ITimer, IKeepTouchData, IKeyEvent, IPickOptions, ICursorType, IBooleanMap, IPickBottom, IClientPointData, IPointData } from '@leafer/interface'
 import { LeaferEvent, ResizeEvent, LeafList, Bounds, PointHelper, DataHelper } from '@leafer/core'
 
 import { IApp } from '@leafer-ui/interface'
@@ -309,8 +309,8 @@ export class InteractionBase implements IInteraction {
     protected tap(data: IPointerEvent): void {
         const { pointer } = this.config
 
-        const longTap = this.longTap(data)
-        if (!pointer.tapMore && longTap) return
+        const hasLong = this.longTap(data)
+        if (!pointer.tapMore && hasLong) return // long_press / long_tap
 
         if (!this.waitTap) return
         if (pointer.tapMore) this.emitTap(data)
@@ -446,6 +446,11 @@ export class InteractionBase implements IInteraction {
         this.cursor = cursor
     }
 
+    public getLocal(clientPoint: IClientPointData, updateClient?: boolean): IPointData {
+        const clientBounds = this.canvas.getClientBounds(updateClient)
+        return { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y }
+    }
+
 
     protected emitTap(data: IPointerEvent) {
         this.emit(PointerEvent.TAP, data)
@@ -482,13 +487,13 @@ export class InteractionBase implements IInteraction {
     }
 
     protected longTap(data: IPointerEvent): boolean {
-        let longTap
+        let hasLong
         if (this.longPressed) {
             this.emit(PointerEvent.LONG_TAP, data)
-            if (pathHasEventType(data.path, PointerEvent.LONG_TAP)) longTap = true
+            if (pathHasEventType(data.path, PointerEvent.LONG_TAP) || pathHasEventType(data.path, PointerEvent.LONG_PRESS)) hasLong = true
         }
         this.longPressWaitCancel()
-        return longTap
+        return hasLong
     }
 
     protected longPressWaitCancel(): void {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IMoveEvent, IZoomEvent, IRotateEvent, ITimer, IDragEvent, IPointerEvent, ILeafList, IPointDataMap, IFunction, ILeaf, IInteraction, IInteractionCanvas, ISelector, IInteractionConfig, ICursorType, IPickBottom, IBounds, IEventListenerId, IBooleanMap, IUIEvent, IKeepTouchData, IKeyEvent, IPickOptions, IPointData, IEvent, IObject, IDropEvent, ISwipeEvent, IMultiTouchData, ICursorTypeMap, IHitCanvasManager, ILeaferCanvasConfig, IHitCanvas } from '@leafer/interface';
+import { IMoveEvent, IZoomEvent, IRotateEvent, ITimer, IDragEvent, IPointerEvent, ILeafList, IPointDataMap, IFunction, ILeaf, IInteraction, IInteractionCanvas, ISelector, IInteractionConfig, ICursorType, IPickBottom, IBounds, IEventListenerId, IBooleanMap, IUIEvent, IKeepTouchData, IKeyEvent, IPickOptions, IClientPointData, IPointData, IEvent, IObject, IDropEvent, ISwipeEvent, IMultiTouchData, ICursorTypeMap, IHitCanvasManager, ILeaferCanvasConfig, IHitCanvas } from '@leafer/interface';
 import { LeafList, CanvasManager } from '@leafer/core';
 
 declare class Transformer {
@@ -128,6 +128,7 @@ declare class InteractionBase implements IInteraction {
     updateHoverData(data?: IPointerEvent): void;
     updateCursor(data?: IPointerEvent): void;
     setCursor(cursor: ICursorType | ICursorType[]): void;
+    getLocal(clientPoint: IClientPointData, updateClient?: boolean): IPointData;
     protected emitTap(data: IPointerEvent): void;
     protected emitDoubleTap(data: IPointerEvent): void;
     pointerWaitCancel(): void;