@leafer-ui/interaction 1.0.2 → 1.0.4

package/package.json

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

package/src/Interaction.ts

@@ -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

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;