@leafer-ui/interaction 1.12.1 → 1.12.3

package/package.json

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

package/src/Dragger.ts

@@ -20,6 +20,8 @@ export class Dragger {
     public dragData: IDragEvent
     public downData: IPointerEvent
 
+    public dragDataList: IDragEvent[] = [] // 记录列表备用
+
     public draggableList: ILeafList
     public realDraggableList: ILeafList
     protected dragOverPath: ILeafList
@@ -104,6 +106,8 @@ export class Dragger {
         if (throughPath) this.dragData.throughPath = throughPath
         this.dragData.path = path
 
+        this.dragDataList.push(this.dragData)
+
         if (this.moving) {
             data.moving = true;
             (this.dragData as IMoveEvent).moveType = 'drag'
@@ -158,13 +162,13 @@ export class Dragger {
         this.dragEnterPath = path
     }
 
-    public dragEnd(data: IPointerEvent, speed?: number): void {
+    public dragEnd(data: IPointerEvent): void {
         if (!this.dragging && !this.moving) return
-        if (this.checkDragEndAnimate(data, speed)) return
+        if (this.checkDragEndAnimate(data)) return
         this.dragEndReal(data)
     }
 
-    protected dragEndReal(data?: IPointerEvent): void {
+    public dragEndReal(data?: IPointerEvent): void {
         const { interaction, downData, dragData } = this
         if (!data) data = dragData
         const { path, throughPath } = downData
@@ -212,6 +216,7 @@ export class Dragger {
 
     protected dragReset(): void {
         DragEvent.list = DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null
+        this.dragDataList = []
     }
 
 
@@ -221,6 +226,8 @@ export class Dragger {
 
     public animate(_func?: IFunction, _off?: 'off'): void { }  // dragEnd animation
 
+    public stopAnimate(): void { }
+
     public checkDragOut(_data: IPointerEvent): void { }
 
     public autoMoveOnDragOut(_data: IPointerEvent): void { }

package/src/Interaction.ts

@@ -409,6 +409,10 @@ export class InteractionBase implements IInteraction {
         }
     }
 
+    public stopDragAnimate(): void {
+        this.dragger.stopAnimate()
+    }
+
 
     public updateDownData(data?: IPointerEvent, options?: IPickOptions, merge?: boolean): void {
         const { downData } = this

package/src/InteractionHelper.ts

@@ -52,6 +52,7 @@ export const InteractionHelper = {
             ctrlKey: e.ctrlKey,
             shiftKey: e.shiftKey,
             metaKey: e.metaKey,
+            time: Date.now(),
             buttons: isUndefined(e.buttons) ? 1 : (e.buttons === 0 ? pointerUpButtons : e.buttons), // touchEvent no button and buttons, set default
             origin: e
         } as IUIEvent

package/types/index.d.ts

@@ -7,6 +7,7 @@ declare class Dragger {
     dragging: boolean;
     dragData: IDragEvent;
     downData: IPointerEvent;
+    dragDataList: IDragEvent[];
     draggableList: ILeafList;
     realDraggableList: ILeafList;
     protected dragOverPath: ILeafList;
@@ -27,13 +28,14 @@ declare class Dragger {
     protected dragReal(isDragEnd?: boolean): void;
     dragOverOrOut(data: IPointerEvent): void;
     dragEnterOrLeave(data: IPointerEvent): void;
-    dragEnd(data: IPointerEvent, speed?: number): void;
-    protected dragEndReal(data?: IPointerEvent): void;
+    dragEnd(data: IPointerEvent): void;
+    dragEndReal(data?: IPointerEvent): void;
     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 | number;
     animate(_func?: IFunction, _off?: 'off'): void;
+    stopAnimate(): void;
     checkDragOut(_data: IPointerEvent): void;
     autoMoveOnDragOut(_data: IPointerEvent): void;
     autoMoveCancel(): void;
@@ -114,6 +116,7 @@ declare class InteractionBase implements IInteraction {
     isHover(leaf: ILeaf): boolean;
     isFocus(leaf: ILeaf): boolean;
     cancelHover(): void;
+    stopDragAnimate(): void;
     updateDownData(data?: IPointerEvent, options?: IPickOptions, merge?: boolean): void;
     updateHoverData(data?: IPointerEvent): void;
     updateCursor(data?: IPointerEvent): void;