@leafer-ui/interaction 1.0.1 → 1.0.3

package/package.json

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

package/src/Interaction.ts

@@ -12,7 +12,7 @@ import { MultiTouchHelper } from './MultiTouchHelper'
 import { config } from './config'
 
 
-const { pathHasEventType, getMoveEventData, getZoomEventData, getRotateEventData } = InteractionHelper
+const { pathHasEventType, getMoveEventData, getZoomEventData, getRotateEventData, pathCanDrag, pathHasOutside } = InteractionHelper
 export class InteractionBase implements IInteraction {
 
     public target: ILeaf
@@ -24,7 +24,7 @@ export class InteractionBase implements IInteraction {
     public get dragging(): boolean { return this.dragger.dragging }
     public get transforming(): boolean { return this.transformer.transforming }
 
-    public get moveMode(): boolean { return this.config.move.drag || this.isHoldSpaceKey || this.isHoldMiddleKey || (this.isHoldRightKey && this.dragger.moving) || this.isDragEmpty }
+    public get moveMode(): boolean { return this.config.move.drag === true || this.isHoldSpaceKey || this.isHoldMiddleKey || (this.isHoldRightKey && this.dragger.moving) || this.isDragEmpty }
     public get canHover(): boolean { return this.config.pointer.hover && !(this.config as ILeaferConfig).mobile }
 
     public get isDragEmpty(): boolean { return this.config.move.dragEmpty && this.isRootPath(this.hoverData) && (!this.downData || this.isRootPath(this.downData)) }
@@ -33,7 +33,7 @@ export class InteractionBase implements IInteraction {
     public get isHoldRightKey(): boolean { return this.config.move.holdRightKey && this.downData && PointerButton.right(this.downData) }
     public get isHoldSpaceKey(): boolean { return this.config.move.holdSpaceKey && Keyboard.isHoldSpaceKey() }
 
-    public config: IInteractionConfig = config
+    public config: IInteractionConfig = DataHelper.clone(config)
 
     public cursor: ICursorType | ICursorType[]
     public get hitRadius(): number { return this.config.pointer.hitRadius }
@@ -52,6 +52,7 @@ export class InteractionBase implements IInteraction {
     protected enterPath: LeafList
 
     protected waitMenuTap: boolean
+    protected waitRightTap: boolean
     protected waitTap: boolean
     protected longPressTimer: ITimer
     protected longPressed: boolean
@@ -110,7 +111,7 @@ export class InteractionBase implements IInteraction {
             this.longPressWait(data)
         }
 
-        this.waitMenuTap = PointerButton.right(data)
+        this.waitRightTap = PointerButton.right(data)
 
         this.dragger.setDragData(data) // must after down event
         if (!this.isHoldRightKey) this.updateCursor(data)
@@ -138,7 +139,7 @@ export class InteractionBase implements IInteraction {
             const canDrag = PointHelper.getDistance(this.downData, data) > dragDistance
             if (canDrag) {
                 if (this.waitTap) this.pointerWaitCancel()
-                this.waitMenuTap = false
+                this.waitRightTap = false
             }
 
             this.dragger.checkDrag(data, canDrag)
@@ -207,14 +208,18 @@ export class InteractionBase implements IInteraction {
     }
 
     // context menu
-
     public menu(data: IPointerEvent): void {
         this.findPath(data)
         this.emit(PointerEvent.MENU, data)
+        this.waitMenuTap = true
+        if (!this.downData && this.waitRightTap) this.menuTap(data) // fix: Windows 触摸屏双击右键菜单事件会在pointer.up之后触发
     }
 
     public menuTap(data: IPointerEvent): void {
-        if (this.waitMenuTap) this.emit(PointerEvent.MENU_TAP, data)
+        if (this.waitRightTap && this.waitMenuTap) {
+            this.emit(PointerEvent.MENU_TAP, data)
+            this.waitRightTap = this.waitMenuTap = false
+        }
     }
 
     // window transform
@@ -374,11 +379,11 @@ export class InteractionBase implements IInteraction {
     }
 
     protected checkPath(data: IPointerEvent, useDefaultPath?: boolean): void {
-        if (useDefaultPath || this.canMove(data)) data.path = this.defaultPath
+        if (useDefaultPath || (this.moveMode && !pathHasOutside(data.path))) data.path = this.defaultPath
     }
 
     public canMove(data: IPointerEvent): boolean { // moveMode and path can move
-        return this.moveMode && data && data.path.list.every(item => !item.isOutside)
+        return data && (this.moveMode || (this.config.move.drag === 'auto' && !pathCanDrag(data.path))) && !pathHasOutside(data.path)
     }
 
 

package/src/InteractionHelper.ts

@@ -1,7 +1,7 @@
 import { IEvent, IPointerEvent, IMoveEvent, IZoomEvent, IRotateEvent, IDragEvent, ISwipeEvent, IUIEvent, IPointData, ILeafList, IDropEvent, IObject } from '@leafer/interface'
 import { PointHelper, LeafList } from '@leafer/core'
 
-import { SwipeEvent } from '@leafer-ui/event'
+import { SwipeEvent, DragEvent } from '@leafer-ui/event'
 
 
 export const InteractionHelper = {
@@ -105,7 +105,15 @@ export const InteractionHelper = {
             if (list[i].hasEvent(type)) find.add(list[i])
         }
         return find
-    }
+    },
+
+    pathCanDrag(path: ILeafList): boolean {
+        return path && path.list.some(item => item.draggable || item.editable || (!item.isLeafer && item.hasEvent(DragEvent.DRAG)))
+    },
+
+    pathHasOutside(path: ILeafList): boolean { // 滚动条元素
+        return path && path.list.some(item => item.isOutside)
+    },
 }
 
 const I = InteractionHelper

package/src/config.ts

@@ -19,6 +19,9 @@ export const config: IInteractionConfig = {
         swipeDistance: 20,
         preventDefaultMenu: true
     },
+    touch: {
+        preventDefault: true
+    },
     cursor: true,
     keyEvent: true
 }

package/src/emit.ts

@@ -54,7 +54,7 @@ function emitEvent(leaf: ILeaf, type: string, data: IUIEvent, capture?: boolean,
     if (leaf.destroyed) return false
     if (leaf.__.hitSelf && !exclude(leaf, excludePath)) {
 
-        if (State.updateEventStyle) State.updateEventStyle(leaf, type) // hoverStyle / pressStyle
+        if (State.updateEventStyle && !capture) State.updateEventStyle(leaf, type) // hoverStyle / pressStyle
 
         if (leaf.hasEvent(type, capture)) {
             data.phase = capture ? 1 : ((leaf === data.target) ? 2 : 3)

package/types/index.d.ts

@@ -84,6 +84,7 @@ declare class InteractionBase implements IInteraction {
     protected overPath: LeafList;
     protected enterPath: LeafList;
     protected waitMenuTap: boolean;
+    protected waitRightTap: boolean;
     protected waitTap: boolean;
     protected longPressTimer: ITimer;
     protected longPressed: boolean;
@@ -158,6 +159,8 @@ declare const InteractionHelper: {
     getBase(e: IObject): IUIEvent;
     pathHasEventType(path: ILeafList, type: string): boolean;
     filterPathByEventType(path: ILeafList, type: string): ILeafList;
+    pathCanDrag(path: ILeafList): boolean;
+    pathHasOutside(path: ILeafList): boolean;
 };
 
 declare const MultiTouchHelper: {