@leafer-ui/interaction-web 1.1.0 → 1.1.2

package/package.json

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

package/src/Interaction.ts

@@ -3,7 +3,6 @@ import { MathHelper } from '@leafer/core'
 import { InteractionBase, InteractionHelper, Cursor } from '@leafer-ui/core'
 
 import { PointerEventHelper } from './PointerEventHelper'
-import { WheelEventHelper } from './WheelEventHelper'
 import { KeyEventHelper } from './KeyEventHelper'
 
 
@@ -14,7 +13,7 @@ interface IGestureEvent extends IClientPointData, UIEvent {
 }
 
 
-const { getMoveEventData, getZoomEventData, getRotateEventData, pathCanDrag } = InteractionHelper
+const { pathCanDrag } = InteractionHelper
 
 export class Interaction extends InteractionBase {
 
@@ -281,15 +280,12 @@ export class Interaction extends InteractionBase {
     // wheel
     protected onWheel(e: WheelEvent): void {
         this.preventDefaultWheel(e)
-
-        const { wheel } = this.config
-        if (wheel.disabled) return
-
-        const scale = wheel.getScale ? wheel.getScale(e, wheel) : WheelEventHelper.getScale(e, wheel)
-        const local = this.getLocal(e)
-
-        const eventBase = InteractionHelper.getBase(e)
-        scale !== 1 ? this.zoom(getZoomEventData(local, scale, eventBase)) : this.move(getMoveEventData(local, wheel.getMove ? wheel.getMove(e, wheel) : WheelEventHelper.getMove(e, wheel), eventBase))
+        this.wheel({
+            ...InteractionHelper.getBase(e),
+            ...this.getLocal(e),
+            deltaX: e.deltaX,
+            deltaY: e.deltaY
+        })
     }
 
 
@@ -306,16 +302,14 @@ export class Interaction extends InteractionBase {
         if (this.useMultiTouch) return
         this.preventDefaultWheel(e)
 
-        const local = this.getLocal(e)
         const eventBase = InteractionHelper.getBase(e)
-        const changeScale = e.scale / this.lastGestureScale
-        const changeAngle = e.rotation - this.lastGestureRotation
+        Object.assign(eventBase, this.getLocal(e))
 
-        let { rotateSpeed } = this.config.wheel
-        rotateSpeed = MathHelper.within(rotateSpeed, 0, 1)
+        const scale = (e.scale / this.lastGestureScale)
+        const rotation = (e.rotation - this.lastGestureRotation) / Math.PI * 180 * (MathHelper.within(this.config.wheel.rotateSpeed, 0, 1) / 4 + 0.1)
 
-        this.zoom(getZoomEventData(local, changeScale * changeScale, eventBase))
-        this.rotate(getRotateEventData(local, changeAngle / Math.PI * 180 * (rotateSpeed / 4 + 0.1), eventBase))
+        this.zoom({ ...eventBase, scale: scale * scale })
+        this.rotate({ ...eventBase, rotation })
 
         this.lastGestureScale = e.scale
         this.lastGestureRotation = e.rotation

package/src/WheelEventHelper.ts

@@ -1,47 +0,0 @@
-import { IPointData, IWheelConfig } from '@leafer/interface'
-import { MathHelper, Platform } from '@leafer/core'
-
-
-export const WheelEventHelper = {
-
-    getMove(e: WheelEvent, config: IWheelConfig): IPointData {
-        let { moveSpeed } = config
-        let { deltaX, deltaY } = e
-        if (e.shiftKey && !deltaX) { // Window
-            deltaX = deltaY
-            deltaY = 0
-        }
-        if (deltaX > 50) deltaX = Math.max(50, deltaX / 3)
-        if (deltaY > 50) deltaY = Math.max(50, deltaY / 3)
-        return { x: -deltaX * moveSpeed * 2, y: -deltaY * moveSpeed * 2 }
-    },
-
-    getScale(e: WheelEvent, config: IWheelConfig): number {
-
-        let zoom: boolean
-        let scale = 1
-        let { zoomMode, zoomSpeed } = config
-
-        const delta = e.deltaY || e.deltaX
-
-        if (zoomMode) {
-            // mac 触摸板滚动手势的deltaY是整数, 鼠标滚动/触摸板缩放的deltaY有小数点， firfox鼠标滚动为整数，为18或19的倍数
-            // windows 始终是整数
-            zoom = (zoomMode === 'mouse') ? true : (!e.deltaX && (Platform.intWheelDeltaY ? Math.abs(delta) > 17 : Math.ceil(delta) !== delta))
-            if (e.shiftKey || e.metaKey || e.ctrlKey) zoom = true
-        } else {
-            zoom = !e.shiftKey && (e.metaKey || e.ctrlKey)
-        }
-
-        if (zoom) {
-            zoomSpeed = MathHelper.within(zoomSpeed, 0, 1)
-            const min = e.deltaY ? config.delta.y : config.delta.x
-            scale = 1 - delta / (min * 4) * zoomSpeed // zoomSpeed
-            if (scale < 0.5) scale = 0.5
-            if (scale >= 1.5) scale = 1.5
-        }
-
-        return scale
-    }
-
-}