@leafer-ui/interaction 1.3.3 → 1.4.1

package/package.json

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

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 } from '@leafer/core'
+import { LeaferEvent, ResizeEvent, LeafList, Bounds, PointHelper, DataHelper, Platform } from '@leafer/core'
 
 import { IApp } from '@leafer-ui/interface'
 import { PointerEvent, DropEvent, KeyEvent, PointerButton, Keyboard } from '@leafer-ui/event'
@@ -132,11 +132,10 @@ export class InteractionBase implements IInteraction {
     }
 
     public pointerMoveReal(data: IPointerEvent): void {
-        const { dragHover, dragDistance } = this.p
         this.emit(PointerEvent.BEFORE_MOVE, data, this.defaultPath)
 
         if (this.downData) {
-            const canDrag = PointHelper.getDistance(this.downData, data) > dragDistance
+            const canDrag = PointHelper.getDistance(this.downData, data) > this.p.dragDistance
             if (canDrag) {
                 if (this.waitTap) this.pointerWaitCancel()
                 this.waitRightTap = false
@@ -151,9 +150,9 @@ export class InteractionBase implements IInteraction {
 
             this.emit(PointerEvent.MOVE, data)
 
-            if (!(this.dragging && !dragHover)) this.pointerHover(data)
+            this.pointerHover(data)
 
-            if (this.dragger.dragging) {
+            if (this.dragging) {
                 this.dragger.dragOverOrOut(data)
                 this.dragger.dragEnterOrLeave(data)
             }
@@ -266,7 +265,8 @@ export class InteractionBase implements IInteraction {
 
     // helper
     protected pointerHover(data: IPointerEvent): void {
-        if (this.canHover) {
+        if (this.canHover && !(this.dragging && !this.p.dragHover)) {
+            data.path || (data.path = new LeafList()) // 离开画布的情况
             this.pointerOverOrOut(data)
             this.pointerEnterOrLeave(data)
         }
@@ -353,7 +353,8 @@ export class InteractionBase implements IInteraction {
     // update
     public findPath(data: IPointerEvent, options?: IPickOptions): ILeafList {
         const { hitRadius, through } = this.p
-        const { bottomList } = this
+        const { bottomList, target } = this
+        if (!Platform.backgrounder && !data.origin) target && target.updateLayout() // 模拟交互
         const find = this.selector.getByPoint(data, hitRadius, { bottomList, name: data.type, ...(options || { through }) })
         if (find.throughPath) data.throughPath = find.throughPath
         data.path = find.path