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

package/package.json

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

package/src/UIHit.ts

@@ -3,26 +3,31 @@ 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 = {
 
-    __hit(local: IRadiusPointData): boolean {
+    __hit(inner: IRadiusPointData): boolean {
+        const { __hitCanvas: h } = this
 
-        if (this.__.fill) {
-            if (this.__hitCanvas.hitPath(local, this.__.windingRule)) return true
-        }
+        const { fill, hitType } = this.__
+        const hitFill = (fill && fillVisibleType.includes(hitType)) || fillType.includes(hitType)
+        if (hitFill && h.hitFill(inner, this.__.windingRule)) return true
 
-        if (this.__.__strokeOuterWidth) {
-            const strokeWidth = (this.__.__strokeOuterWidth + local.radiusX) * 2
+        const { stroke, __strokeOuterWidth: outerWidth } = this.__
+        const hitStroke = (stroke && strokeVisibleType.includes(hitType)) || strokeType.includes(hitType)
+        if (!hitFill && !hitStroke) return false
 
-            const { __hitCanvas: c } = this
-            if (c.strokeWidth !== strokeWidth) {
-                c.strokeWidth = strokeWidth
-                c.stroke()
-            }
-            if (c.hitStroke(local)) return true
+        const strokeWidth = ((hitStroke ? (outerWidth || 0) : 0) + inner.radiusX) * 2
+        if (h.strokeWidth !== strokeWidth) {
+            h.strokeWidth = strokeWidth
+            h.stroke()
         }
 
-        return false
+        return h.hitStroke(inner)
     }
 
 }