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

package/package.json

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

package/src/Interaction.ts

@@ -1,4 +1,4 @@
-import { IObject, IPointData, ITimer, IKeepTouchData, ICursorType } from '@leafer/interface'
+import { IObject, IPointData, ITimer, IKeepTouchData, ICursorType, IClientPointData } from '@leafer/interface'
 import { MathHelper } from '@leafer/core'
 import { InteractionBase, InteractionHelper, Cursor } from '@leafer-ui/core'
 
@@ -7,12 +7,7 @@ import { WheelEventHelper } from './WheelEventHelper'
 import { KeyEventHelper } from './KeyEventHelper'
 
 
-interface IClientPoint {
-    clientX: number
-    clientY: number
-}
-
-interface IGestureEvent extends IClientPoint, UIEvent {
+interface IGestureEvent extends IClientPointData, UIEvent {
     scale: number
     rotation: number
     preventDefault(): void
@@ -104,12 +99,6 @@ export class Interaction extends InteractionBase {
         }
     }
 
-    protected getLocal(p: IClientPoint, updateClient?: boolean): IPointData {
-        if (updateClient) this.canvas.updateClientBounds()
-        const { clientBounds } = this.canvas
-        return { x: p.clientX - clientBounds.x, y: p.clientY - clientBounds.y }
-    }
-
     protected getTouches(touches: TouchList): Touch[] {
         const list: Touch[] = []
         for (let i = 0, len = touches.length; i < len; i++) {

package/types/index.d.ts

@@ -1,11 +1,7 @@
-import { IObject, ITimer, IPointData, IKeepTouchData, ICursorType } from '@leafer/interface';
+import { IObject, ITimer, IKeepTouchData, IPointData, ICursorType, IClientPointData } from '@leafer/interface';
 import { InteractionBase } from '@leafer-ui/core';
 
-interface IClientPoint {
-    clientX: number;
-    clientY: number;
-}
-interface IGestureEvent extends IClientPoint, UIEvent {
+interface IGestureEvent extends IClientPointData, UIEvent {
     scale: number;
     rotation: number;
     preventDefault(): void;
@@ -23,7 +19,6 @@ declare class Interaction extends InteractionBase {
     protected lastGestureRotation: number;
     protected __listenEvents(): void;
     protected __removeListenEvents(): void;
-    protected getLocal(p: IClientPoint, updateClient?: boolean): IPointData;
     protected getTouches(touches: TouchList): Touch[];
     protected preventDefaultPointer(e: UIEvent): void;
     protected preventDefaultWheel(e: UIEvent): void;