@leafer-ui/interaction 1.0.7 → 1.0.9

package/package.json

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

package/src/Dragger.ts

@@ -137,10 +137,7 @@ export class Dragger {
                 interaction.emit(DragEvent.OUT, data, dragOverPath)
                 interaction.emit(DragEvent.OVER, data, path)
             }
-        } else {
-            interaction.emit(DragEvent.OVER, data, path)
-        }
-
+        } else interaction.emit(DragEvent.OVER, data, path)
     }
 
     public dragEnterOrLeave(data: IPointerEvent): void {
@@ -165,9 +162,7 @@ export class Dragger {
             this.drag(data)
             this.animate(() => { this.dragEnd(data, 1) })
 
-        } else {
-            this.dragEndReal(data)
-        }
+        } else this.dragEndReal(data)
     }
 
     protected dragEndReal(data?: IPointerEvent): void {

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, IPickBottom, IClientPointData, IPointData, ILeaferConfig } from '@leafer/interface'
+import { IUIEvent, IPointerEvent, ILeaf, IInteraction, IInteractionConfig, ILeafList, IMoveEvent, IZoomEvent, IRotateEvent, 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 { IApp } from '@leafer-ui/interface'
@@ -24,19 +24,21 @@ 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 === 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 moveMode(): boolean { return this.m.drag === true || this.isHoldSpaceKey || this.isHoldMiddleKey || (this.isHoldRightKey && this.dragger.moving) || this.isDragEmpty }
+    public get canHover(): boolean { return this.p.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)) }
-    public get isMobileDragEmpty(): boolean { return this.config.move.dragEmpty && !this.canHover && this.downData && this.isTreePath(this.downData) }
-    public get isHoldMiddleKey(): boolean { return this.config.move.holdMiddleKey && this.downData && PointerButton.middle(this.downData) }
-    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 get isDragEmpty(): boolean { return this.m.dragEmpty && this.isRootPath(this.hoverData) && (!this.downData || this.isRootPath(this.downData)) }
+    public get isMobileDragEmpty(): boolean { return this.m.dragEmpty && !this.canHover && this.downData && this.isTreePath(this.downData) }
+    public get isHoldMiddleKey(): boolean { return this.m.holdMiddleKey && this.downData && PointerButton.middle(this.downData) }
+    public get isHoldRightKey(): boolean { return this.m.holdRightKey && this.downData && PointerButton.right(this.downData) }
+    public get isHoldSpaceKey(): boolean { return this.m.holdSpaceKey && Keyboard.isHoldSpaceKey() }
 
     public config: IInteractionConfig = DataHelper.clone(config)
+    protected get m(): IMoveConfig { return this.config.move }
+    protected get p(): IPointerConfig { return this.config.pointer }
 
     public cursor: ICursorType | ICursorType[]
-    public get hitRadius(): number { return this.config.pointer.hitRadius }
+    public get hitRadius(): number { return this.p.hitRadius }
 
     public bottomList?: IPickBottom[]
 
@@ -132,7 +134,7 @@ export class InteractionBase implements IInteraction {
     }
 
     public pointerMoveReal(data: IPointerEvent): void {
-        const { dragHover, dragDistance } = this.config.pointer
+        const { dragHover, dragDistance } = this.p
         this.emit(PointerEvent.BEFORE_MOVE, data, this.defaultPath)
 
         if (this.downData) {
@@ -361,7 +363,7 @@ export class InteractionBase implements IInteraction {
 
     // update
     public findPath(data: IPointerEvent, options?: IPickOptions): ILeafList {
-        const { hitRadius, through } = this.config.pointer
+        const { hitRadius, through } = this.p
         const { bottomList } = this
         const find = this.selector.getByPoint(data, hitRadius, { bottomList, name: data.type, ...(options || { through }) })
         if (find.throughPath) data.throughPath = find.throughPath
@@ -384,7 +386,7 @@ export class InteractionBase implements IInteraction {
     }
 
     public canMove(data: IPointerEvent): boolean { // moveMode and path can move
-        return data && (this.moveMode || (this.config.move.drag === 'auto' && !pathCanDrag(data.path))) && !pathHasOutside(data.path)
+        return data && (this.moveMode || (this.m.drag === 'auto' && !pathCanDrag(data.path))) && !pathHasOutside(data.path)
     }
 
 
@@ -497,7 +499,7 @@ export class InteractionBase implements IInteraction {
         this.longPressTimer = setTimeout(() => {
             this.longPressed = true
             this.emit(PointerEvent.LONG_PRESS, data)
-        }, this.config.pointer.longPressTime)
+        }, this.p.longPressTime)
     }
 
     protected longTap(data: IPointerEvent): boolean {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IMoveEvent, IZoomEvent, IRotateEvent, ITimer, IDragEvent, IPointerEvent, ILeafList, IPointDataMap, IFunction, ILeaf, IInteraction, IInteractionCanvas, ISelector, IInteractionConfig, ICursorType, IPickBottom, IBounds, IEventListenerId, IBooleanMap, IUIEvent, IKeepTouchData, IKeyEvent, IPickOptions, IClientPointData, IPointData, IEvent, IObject, IDropEvent, ISwipeEvent, IMultiTouchData, ICursorTypeMap } from '@leafer/interface';
+import { IMoveEvent, IZoomEvent, IRotateEvent, ITimer, IDragEvent, IPointerEvent, ILeafList, IPointDataMap, IFunction, ILeaf, IInteraction, IInteractionCanvas, ISelector, IInteractionConfig, IMoveConfig, IPointerConfig, ICursorType, IPickBottom, IBounds, IEventListenerId, IBooleanMap, IUIEvent, IKeepTouchData, IKeyEvent, IPickOptions, IClientPointData, IPointData, IEvent, IObject, IDropEvent, ISwipeEvent, IMultiTouchData, ICursorTypeMap } from '@leafer/interface';
 import { LeafList } from '@leafer/core';
 
 declare class Transformer {
@@ -73,6 +73,8 @@ declare class InteractionBase implements IInteraction {
     get isHoldRightKey(): boolean;
     get isHoldSpaceKey(): boolean;
     config: IInteractionConfig;
+    protected get m(): IMoveConfig;
+    protected get p(): IPointerConfig;
     cursor: ICursorType | ICursorType[];
     get hitRadius(): number;
     bottomList?: IPickBottom[];