@leafer-ui/hit 1.0.0-alpha.23 → 1.0.0-alpha.31

package/package.json

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

package/src/UIHit.ts

@@ -3,31 +3,40 @@ import { IRadiusPointData } from '@leafer/interface'
 import { IUIHitModule } from '@leafer-ui/interface'
 
 
-const fillVisibleType = ['visible', 'fill-visible']
-const fillType = ['all', 'fill']
-const strokeVisibleType = ['visible', 'stroke-visible']
-const strokeType = ['all', 'stroke']
-
 export const UIHit: IUIHitModule = {
 
+    __updateHitCanvas(): void {
+        if (!this.__hitCanvas) this.__hitCanvas = this.leafer.hitCanvasManager.getPathType(this)
+        this.__drawHitPath(this.__hitCanvas)
+        this.__hitCanvas.setStrokeOptions(this.__)
+    },
+
     __hit(inner: IRadiusPointData): boolean {
         const { __hitCanvas: h } = this
 
-        const { fill, hitType } = this.__
-        const hitFill = (fill && fillVisibleType.includes(hitType)) || fillType.includes(hitType)
-        if (hitFill && h.hitFill(inner, this.__.windingRule)) return true
-
-        const { stroke, __strokeOuterWidth: outerWidth } = this.__
-        const hitStroke = (stroke && strokeVisibleType.includes(hitType)) || strokeType.includes(hitType)
-        if (!hitFill && !hitStroke) return false
-
-        const strokeWidth = ((hitStroke ? (outerWidth || 0) : 0) + inner.radiusX) * 2
-        if (h.strokeWidth !== strokeWidth) {
-            h.strokeWidth = strokeWidth
-            h.stroke()
+        const { fill, hitFill, windingRule } = this.__
+        const needHitFill = (fill && hitFill === 'visible') || hitFill === 'always'
+        if (needHitFill && h.hitFill(inner, windingRule)) return true
+
+        const { stroke, hitStroke, strokeWidth, strokeAlign } = this.__
+        const needHitStroke = (stroke && hitStroke === 'visible') || hitStroke === 'always'
+        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
+                    hitWidth = radiusWidth
+                }
         }
 
-        return h.hitStroke(inner)
+        return hitWidth ? h.hitStroke(inner, hitWidth) : false
     }
 
 }