@leafer-ui/hit 1.0.0-bate → 1.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/hit",
-  "version": "1.0.0-bate",
+  "version": "1.0.0-beta.10",
   "description": "@leafer-ui/hit",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.0.0-bate",
-    "@leafer-ui/interface": "1.0.0-bate"
+    "@leafer/interface": "1.0.0-beta.10",
+    "@leafer-ui/interface": "1.0.0-beta.10"
   }
 }

package/src/UIHit.ts

@@ -1,39 +1,51 @@
 import { IRadiusPointData } from '@leafer/interface'
 
 import { IUIHitModule } from '@leafer-ui/interface'
+import { Platform } from '@leafer/core'
 
 
 export const UIHit: IUIHitModule = {
 
     __updateHitCanvas(): void {
         if (!this.__hitCanvas) this.__hitCanvas = this.leafer.hitCanvasManager.getPathType(this)
-        this.__drawHitPath(this.__hitCanvas)
-        this.__hitCanvas.setStrokeOptions(this.__)
+        const h = this.__hitCanvas
+        this.__drawHitPath(h)
+        h.setStrokeOptions(this.__)
     },
 
     __hit(inner: IRadiusPointData): boolean {
         const { __hitCanvas: h } = this
+        if (Platform.name === 'miniapp') this.__drawHitPath(h) // fix: 小程序需要实时更新
 
         const { fill, hitFill, windingRule } = this.__
         const needHitFill = (fill && hitFill === 'path') || hitFill === 'all'
-        if (needHitFill && h.hitFill(inner, windingRule)) return true
+        const isHitFill = h.hitFill(inner, windingRule)
+        if (needHitFill && isHitFill) return true
 
         const { stroke, hitStroke, strokeWidth, strokeAlign } = this.__
         const needHitStroke = (stroke && hitStroke === 'path') || hitStroke === 'all'
         const radiusWidth = inner.radiusX * 2
-        let hitWidth = (needHitStroke ? (strokeAlign === 'center' ? strokeWidth / 2 : strokeWidth) : 0) * 2 + radiusWidth
-        if (!hitWidth) return false
-
-        switch (strokeAlign) {
-            case 'inside':
-                if (!needHitFill && (h.hitFill(inner, windingRule) && h.hitStroke(inner, hitWidth))) return true
-                hitWidth = radiusWidth
-                break
-            case 'outside':
-                if (!needHitFill) {
-                    if (!h.hitFill(inner, windingRule) && h.hitStroke(inner, hitWidth)) return true
+
+        let hitWidth = radiusWidth
+
+        if (needHitStroke) {
+            switch (strokeAlign) {
+                case 'inside':
+                    hitWidth += strokeWidth * 2
+                    if (!needHitFill && (isHitFill && h.hitStroke(inner, hitWidth))) return true
                     hitWidth = radiusWidth
-                }
+                    break
+                case 'center':
+                    hitWidth += strokeWidth
+                    break
+                case 'outside':
+                    hitWidth += strokeWidth * 2
+                    if (!needHitFill) {
+                        if (!isHitFill && h.hitStroke(inner, hitWidth)) return true
+                        hitWidth = radiusWidth
+                    }
+                    break
+            }
         }
 
         return hitWidth ? h.hitStroke(inner, hitWidth) : false