@leafer-ui/interaction 1.0.0-rc.20 → 1.0.0-rc.22

package/package.json

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

package/src/Dragger.ts

@@ -1,4 +1,4 @@
-import { IPointerEvent, IDragEvent, ILeaf, ILeafList, ITimer, IFunction } from '@leafer/interface'
+import { IPointerEvent, IDragEvent, ILeaf, ILeafList, ITimer, IFunction, IPointDataMap } from '@leafer/interface'
 import { BoundsHelper, PointHelper, LeafList } from '@leafer/core'
 
 import { MoveEvent, DragEvent, DropEvent, PointerButton } from '@leafer-ui/event'
@@ -21,9 +21,11 @@ export class Dragger {
     protected downData: IPointerEvent
 
     public dragableList: ILeafList
+    public realDragableList: ILeafList
     protected dragOverPath: ILeafList
     protected dragEnterPath: ILeafList
 
+    protected dragStartPoints: IPointDataMap
     protected autoMoveTimer: ITimer
 
     public canAnimate: boolean
@@ -72,10 +74,16 @@ export class Dragger {
             if (this.dragging) {
                 this.interaction.emit(DragEvent.START, this.dragData)
                 this.getDragableList(this.dragData.path)
+                this.setDragStartPoints(this.realDragableList = this.getList())
             }
         }
     }
 
+    protected setDragStartPoints(list: ILeafList | ILeaf[]): void {
+        this.dragStartPoints = {}
+        list.forEach(leaf => this.dragStartPoints[leaf.innerId] = { x: leaf.x, y: leaf.y })
+    }
+
     protected getDragableList(path: ILeafList): void {
         let leaf: ILeaf
         for (let i = 0, len = path.length; i < len; i++) {
@@ -106,10 +114,10 @@ export class Dragger {
 
     protected dragReal(): void {
         const { running } = this.interaction
-        const list = this.getList()
+        const list = this.realDragableList
         if (list.length && running) {
-            const { moveX, moveY } = this.dragData
-            list.forEach(leaf => leaf.draggable && leaf.moveWorld(moveX, moveY))
+            const { totalX, totalY } = this.dragData
+            list.forEach(leaf => leaf.draggable && leaf.move(DragEvent.getValidMove(leaf, this.dragStartPoints[leaf.innerId], { x: totalX, y: totalY })))
         }
     }
 

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 } from '@leafer/interface'
+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 { LeaferEvent, ResizeEvent, LeafList, Bounds, PointHelper, DataHelper } from '@leafer/core'
 
 import { IApp } from '@leafer-ui/interface'
@@ -35,6 +35,8 @@ export class InteractionBase implements IInteraction {
     public cursor: ICursorType | ICursorType[]
     public get hitRadius(): number { return this.config.pointer.hitRadius }
 
+    public bottomList?: IPickBottom[]
+
     public shrinkCanvasBounds: IBounds
 
     public downData: IPointerEvent
@@ -346,7 +348,8 @@ export class InteractionBase implements IInteraction {
     // update
     public findPath(data: IPointerEvent, options?: IPickOptions): ILeafList {
         const { hitRadius, through } = this.config.pointer
-        const find = this.selector.getByPoint(data, hitRadius, options || { through })
+        const { bottomList } = this
+        const find = this.selector.getByPoint(data, hitRadius, { bottomList, name: data.type, ...(options || { through }) })
         if (find.throughPath) data.throughPath = find.throughPath
         data.path = find.path
         return find.path
@@ -359,7 +362,7 @@ export class InteractionBase implements IInteraction {
     public isTreePath(data: IPointerEvent): boolean {
         const app = this.target.app as IApp
         if (!app || !app.isApp) return false
-        return app.editor && (!data.path.has(app.editor) && data.path.has(app.tree)) // 当dragEmpty为true时，在手机端(pointer.hover为false)可以拖动tree层（编辑器选中的元素除外）
+        return app.editor && (!data.path.has(app.editor) && data.path.has(app.tree) && !(data.target as ILeaf).syncEventer) // 当dragEmpty为true时，在手机端(pointer.hover为false)可以拖动tree层（编辑器选中的元素除外）
     }
 
     protected checkPath(data: IPointerEvent, useDefaultPath?: boolean): void {
@@ -432,7 +435,7 @@ export class InteractionBase implements IInteraction {
         const { path } = data
         for (let i = 0, len = path.length; i < len; i++) {
             leaf = path.list[i]
-            cursor = leaf.cursor
+            cursor = leaf.syncEventer ? leaf.syncEventer.cursor : leaf.cursor
             if (cursor) break
         }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IMoveEvent, IZoomEvent, IRotateEvent, ITimer, IDragEvent, IPointerEvent, ILeafList, IFunction, IInteraction, ILeaf, IInteractionCanvas, ISelector, IInteractionConfig, ICursorType, 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, IPointData, IEvent, IObject, IDropEvent, ISwipeEvent, IMultiTouchData, ICursorTypeMap, IHitCanvasManager, ILeaferCanvasConfig, IHitCanvas } from '@leafer/interface';
 import { LeafList, CanvasManager } from '@leafer/core';
 
 declare class Transformer {
@@ -26,8 +26,10 @@ declare class Dragger {
     dragData: IDragEvent;
     protected downData: IPointerEvent;
     dragableList: ILeafList;
+    realDragableList: ILeafList;
     protected dragOverPath: ILeafList;
     protected dragEnterPath: ILeafList;
+    protected dragStartPoints: IPointDataMap;
     protected autoMoveTimer: ITimer;
     canAnimate: boolean;
     canDragOut: boolean;
@@ -37,6 +39,7 @@ declare class Dragger {
     getList(): ILeafList;
     checkDrag(data: IPointerEvent, canDrag: boolean): void;
     dragStart(data: IPointerEvent, canDrag: boolean): void;
+    protected setDragStartPoints(list: ILeafList | ILeaf[]): void;
     protected getDragableList(path: ILeafList): void;
     protected drag(data: IPointerEvent): void;
     protected dragReal(): void;
@@ -69,6 +72,7 @@ declare class InteractionBase implements IInteraction {
     config: IInteractionConfig;
     cursor: ICursorType | ICursorType[];
     get hitRadius(): number;
+    bottomList?: IPickBottom[];
     shrinkCanvasBounds: IBounds;
     downData: IPointerEvent;
     hoverData: IPointerEvent;