@leafer-ui/interaction 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interaction",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "@leafer-ui/interaction",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -13,21 +13,21 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/leaferjs/ui.git"
+    "url": "https://github.com/leaferjs/leafer-ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/interaction/interaction",
-  "bugs": "https://github.com/leaferjs/ui/issues",
+  "homepage": "https://github.com/leaferjs/leafer-ui/tree/main/packages/interaction/interaction",
+  "bugs": "https://github.com/leaferjs/leafer-ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.4",
-    "@leafer-ui/draw": "1.0.4",
-    "@leafer-ui/event": "1.0.4"
+    "@leafer/core": "1.0.5",
+    "@leafer-ui/draw": "1.0.5",
+    "@leafer-ui/event": "1.0.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.4",
-    "@leafer-ui/interface": "1.0.4"
+    "@leafer/interface": "1.0.5",
+    "@leafer-ui/interface": "1.0.5"
   }
 }

package/src/Dragger.ts

@@ -20,8 +20,8 @@ export class Dragger {
     public dragData: IDragEvent
     protected downData: IPointerEvent
 
-    public dragableList: ILeafList
-    public realDragableList: ILeafList
+    public draggableList: ILeafList
+    public realDraggableList: ILeafList
     protected dragOverPath: ILeafList
     protected dragEnterPath: ILeafList
 
@@ -43,9 +43,10 @@ export class Dragger {
         this.canAnimate = this.canDragOut = true
     }
 
-    public getList(): ILeafList {
+    public getList(realDraggable?: boolean, hover?: boolean): ILeafList {
         const { proxy } = this.interaction.selector
-        return this.dragging && (!proxy || !proxy.list.length) ? (DragEvent.list || this.dragableList || emptyList) : emptyList
+        const hasProxyList = proxy && proxy.list.length, dragList = DragEvent.list || this.draggableList || emptyList
+        return this.dragging && (hasProxyList ? (realDraggable ? emptyList : new LeafList(hover ? [...proxy.list, ...proxy.dragHoverExclude] : proxy.list)) : dragList) // realDraggable 需排除代理选择器，它有自身的拖拽逻辑
     }
 
     public checkDrag(data: IPointerEvent, canDrag: boolean): void {
@@ -76,8 +77,8 @@ export class Dragger {
             this.dragging = canDrag && PointerButton.left(data)
             if (this.dragging) {
                 this.interaction.emit(DragEvent.START, this.dragData)
-                this.getDragableList(this.dragData.path)
-                this.setDragStartPoints(this.realDragableList = this.getList())
+                this.getDraggableList(this.dragData.path)
+                this.setDragStartPoints(this.realDraggableList = this.getList(true))
             }
         }
     }
@@ -87,12 +88,12 @@ export class Dragger {
         list.forEach(leaf => this.dragStartPoints[leaf.innerId] = { x: leaf.x, y: leaf.y })
     }
 
-    protected getDragableList(path: ILeafList): void {
+    protected getDraggableList(path: ILeafList): void {
         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) {
-                this.dragableList = new LeafList(leaf)
+            if ((leaf.draggable || leaf.editable) && leaf.hitSelf && !leaf.locked) {
+                this.draggableList = new LeafList(leaf)
                 break
             }
         }
@@ -118,7 +119,7 @@ export class Dragger {
 
     protected dragReal(): void {
         const { running } = this.interaction
-        const list = this.realDragableList
+        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 })))
@@ -221,7 +222,7 @@ export class Dragger {
     }
 
     protected dragReset(): void {
-        DragEvent.list = DragEvent.data = this.dragableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null
+        DragEvent.list = DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null
     }
 
 

package/src/Interaction.ts

@@ -201,6 +201,7 @@ export class InteractionBase implements IInteraction {
 
 
     public multiTouch(data: IUIEvent, list: IKeepTouchData[]): void {
+        if (this.config.multiTouch.disabled) return
         const { move, angle, scale, center } = MultiTouchHelper.getData(list)
         this.rotate(getRotateEventData(center, angle, data))
         this.zoom(getZoomEventData(center, scale, data))
@@ -425,7 +426,7 @@ export class InteractionBase implements IInteraction {
     public updateHoverData(data?: IPointerEvent): void {
         if (!data) data = this.hoverData
         if (!data) return
-        this.findPath(data, { exclude: this.dragger.getList(), name: PointerEvent.MOVE })
+        this.findPath(data, { exclude: this.dragger.getList(false, true), name: PointerEvent.MOVE })
         this.hoverData = data
     }
 
@@ -448,7 +449,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.syncEventer ? leaf.syncEventer.cursor : leaf.cursor
+            cursor = (leaf.syncEventer && leaf.syncEventer.cursor) || leaf.cursor
             if (cursor) break
         }
 

package/src/config.ts

@@ -22,6 +22,7 @@ export const config: IInteractionConfig = {
     touch: {
         preventDefault: true
     },
+    multiTouch: {},
     cursor: true,
     keyEvent: true
 }

package/types/index.d.ts

@@ -26,8 +26,8 @@ declare class Dragger {
     dragging: boolean;
     dragData: IDragEvent;
     protected downData: IPointerEvent;
-    dragableList: ILeafList;
-    realDragableList: ILeafList;
+    draggableList: ILeafList;
+    realDraggableList: ILeafList;
     protected dragOverPath: ILeafList;
     protected dragEnterPath: ILeafList;
     protected dragStartPoints: IPointDataMap;
@@ -37,11 +37,11 @@ declare class Dragger {
     protected animateWait: IFunction;
     constructor(interaction: InteractionBase);
     setDragData(data: IPointerEvent): void;
-    getList(): ILeafList;
+    getList(realDraggable?: boolean, hover?: boolean): 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 getDraggableList(path: ILeafList): void;
     protected drag(data: IPointerEvent): void;
     protected dragReal(): void;
     dragOverOrOut(data: IPointerEvent): void;