@leafer-ui/interaction 1.8.0 → 1.9.1

package/package.json

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

package/src/Dragger.ts

@@ -1,5 +1,5 @@
 import { IPointerEvent, IDragEvent, ILeaf, ILeafList, ITimer, IFunction, IPointDataMap, IMoveEvent } from '@leafer/interface'
-import { PointHelper, LeafList } from '@leafer/core'
+import { PointHelper, LeafList, LeafHelper, isNumber } from '@leafer/core'
 
 import { MoveEvent, DragEvent, DropEvent, PointerButton } from '@leafer-ui/event'
 
@@ -90,7 +90,7 @@ export class Dragger {
         let leaf: ILeaf
         for (let i = 0, len = path.length; i < len; i++) {
             leaf = path.list[i]
-            if ((leaf.draggable || leaf.editable) && leaf.hitSelf && !leaf.locked) {
+            if (LeafHelper.draggable(leaf)) {
                 this.draggableList = new LeafList(leaf)
                 break
             }
@@ -115,12 +115,19 @@ export class Dragger {
         }
     }
 
-    protected dragReal(): void {
-        const { running } = this.interaction
+    protected dragReal(isDragEnd?: boolean): void {
+        const { interaction } = this, { running } = interaction
         const list = this.realDraggableList
         if (list.length && running) {
-            const { totalX, totalY } = this.dragData
-            list.forEach(leaf => leaf.draggable && leaf.move(DragEvent.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY })))
+            const { totalX, totalY } = this.dragData, { dragLimitAnimate } = interaction.p
+            const checkLimitMove = !dragLimitAnimate || !!isDragEnd
+            list.forEach(leaf => {
+                if (leaf.draggable) {
+                    const move = DragEvent.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY }, checkLimitMove)
+                    if (dragLimitAnimate && isDragEnd) LeafHelper.animateMove(leaf, move, isNumber(dragLimitAnimate) ? dragLimitAnimate : 0.3)
+                    else leaf.move(move)
+                }
+            })
         }
     }
 
@@ -172,6 +179,7 @@ export class Dragger {
             const dropList = this.getList()
 
             this.dragging = false
+            if (interaction.p.dragLimitAnimate) this.dragReal(true)
             interaction.emit(DragEvent.END, endDragData)
 
             this.swipe(data, downData, dragData, endDragData)
@@ -206,7 +214,7 @@ export class Dragger {
 
     // @leafer-in/viewport will rewrite
 
-    public checkDragEndAnimate(_data: IPointerEvent, _speed?: number): boolean { return false }
+    public checkDragEndAnimate(_data: IPointerEvent, _speed?: number): boolean | number { return false }
 
     public animate(_func?: IFunction, _off?: 'off'): void { }  // dragEnd animation
 

package/src/Interaction.ts

@@ -1,5 +1,5 @@
 import { IUIEvent, IPointerEvent, ILeaf, IInteraction, IInteractionConfig, ITransformer, ILeafList, IMoveEvent, IZoomEvent, IRotateEvent, IWheelEvent, ISelector, IBounds, IEventListenerId, IInteractionCanvas, ITimer, IKeepTouchData, IKeyEvent, IPickOptions, ICursorType, IBooleanMap, IPickBottom, IClientPointData, IPointData, ILeaferConfig, IMoveConfig, IPointerConfig } from '@leafer/interface'
-import { LeaferEvent, ResizeEvent, LeafList, Bounds, PointHelper, DataHelper, Platform } from '@leafer/core'
+import { LeaferEvent, ResizeEvent, LeafList, Bounds, PointHelper, DataHelper, Platform, isNumber } from '@leafer/core'
 
 import { IApp } from '@leafer-ui/interface'
 import { PointerEvent, DropEvent, KeyEvent, PointerButton, Keyboard } from '@leafer-ui/event'
@@ -237,6 +237,8 @@ export class InteractionBase implements IInteraction {
     public keyDown(data: IKeyEvent): void {
         if (!this.config.keyEvent) return
 
+        this.emit(KeyEvent.BEFORE_DOWN, data, this.defaultPath) // 键盘按下前出发，还没有setDownCode
+
         const { code } = data
         if (!this.downKeyMap[code]) {
             this.downKeyMap[code] = true
@@ -254,6 +256,8 @@ export class InteractionBase implements IInteraction {
     public keyUp(data: IKeyEvent): void {
         if (!this.config.keyEvent) return
 
+        this.emit(KeyEvent.BEFORE_UP, data, this.defaultPath) // 键盘弹起前出发，还没有setUpCode
+
         const { code } = data
         this.downKeyMap[code] = false
         Keyboard.setUpCode(code)
@@ -455,6 +459,12 @@ export class InteractionBase implements IInteraction {
     public getLocal(clientPoint: IClientPointData, updateClient?: boolean): IPointData {
         const clientBounds = this.canvas.getClientBounds(updateClient)
         const point = { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y }
+
+        // 兼容clientBounds进行了transform的情况
+        const { bounds } = this.canvas
+        point.x *= bounds.width / clientBounds.width
+        point.y *= bounds.height / clientBounds.height
+
         if (this.p.snap) PointHelper.round(point)
         return point
     }
@@ -516,7 +526,7 @@ export class InteractionBase implements IInteraction {
     protected __onResize(): void {
         const { dragOut } = this.m
         this.shrinkCanvasBounds = new Bounds(this.canvas.bounds)
-        this.shrinkCanvasBounds.spread(-(typeof dragOut === 'number' ? dragOut : 2))
+        this.shrinkCanvasBounds.spread(-(isNumber(dragOut) ? dragOut : 2))
     }
 
     protected __listenEvents(): void {

package/src/InteractionHelper.ts

@@ -1,5 +1,5 @@
 import { IPointerEvent, IDragEvent, ISwipeEvent, IUIEvent, IPointData, ILeafList, IDropEvent, IObject } from '@leafer/interface'
-import { PointHelper, LeafList } from '@leafer/core'
+import { PointHelper, LeafList, isUndefined, LeafHelper } from '@leafer/core'
 
 import { SwipeEvent, DragEvent } from '@leafer-ui/event'
 
@@ -52,7 +52,7 @@ export const InteractionHelper = {
             ctrlKey: e.ctrlKey,
             shiftKey: e.shiftKey,
             metaKey: e.metaKey,
-            buttons: e.buttons === undefined ? 1 : (e.buttons === 0 ? pointerUpButtons : e.buttons), // touchEvent no button and buttons, set default
+            buttons: isUndefined(e.buttons) ? 1 : (e.buttons === 0 ? pointerUpButtons : e.buttons), // touchEvent no button and buttons, set default
             origin: e
         } as IUIEvent
     },
@@ -75,7 +75,7 @@ export const InteractionHelper = {
     },
 
     pathCanDrag(path: ILeafList): boolean {
-        return path && path.list.some(item => item.draggable || item.editable || (!item.isLeafer && item.hasEvent(DragEvent.DRAG)))
+        return path && path.list.some(item => LeafHelper.draggable(item) || (!item.isLeafer && item.hasEvent(DragEvent.DRAG)))
     },
 
     pathHasOutside(path: ILeafList): boolean { // 滚动条元素

package/types/index.d.ts

@@ -24,7 +24,7 @@ declare class Dragger {
     protected setDragStartPoints(list: ILeafList | ILeaf[]): void;
     protected getDraggableList(path: ILeafList): void;
     drag(data: IPointerEvent): void;
-    protected dragReal(): void;
+    protected dragReal(isDragEnd?: boolean): void;
     dragOverOrOut(data: IPointerEvent): void;
     dragEnterOrLeave(data: IPointerEvent): void;
     dragEnd(data: IPointerEvent, speed?: number): void;
@@ -32,7 +32,7 @@ declare class Dragger {
     protected swipe(data: IPointerEvent, downData: IPointerEvent, dragData: IDragEvent, endDragData: IDragEvent): void;
     protected drop(data: IPointerEvent, dropList: ILeafList, dragEnterPath: ILeafList): void;
     protected dragReset(): void;
-    checkDragEndAnimate(_data: IPointerEvent, _speed?: number): boolean;
+    checkDragEndAnimate(_data: IPointerEvent, _speed?: number): boolean | number;
     animate(_func?: IFunction, _off?: 'off'): void;
     checkDragOut(_data: IPointerEvent): void;
     autoMoveOnDragOut(_data: IPointerEvent): void;