@leafer-ui/hit 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/hit",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "@leafer-ui/hit",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.7.0",
-    "@leafer-ui/draw": "1.7.0"
+    "@leafer/core": "1.9.0",
+    "@leafer-ui/draw": "1.9.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.7.0",
-    "@leafer-ui/interface": "1.7.0"
+    "@leafer/interface": "1.9.0",
+    "@leafer-ui/interface": "1.9.0"
   }
 }

package/src/LeafHit.ts

@@ -1,12 +1,25 @@
-import { IRadiusPointData, ILeaferCanvas } from '@leafer/interface'
-import { Leaf, PointHelper, BoundsHelper } from '@leafer/core'
+import { IRadiusPointData, ILeaferCanvas, IPointData, IBranch } from '@leafer/interface'
+import { Leaf, PointHelper, BoundsHelper, Platform } from '@leafer/core'
 
 
 const { toInnerRadiusPointOf, copy, setRadius } = PointHelper
-const inner = {} as IRadiusPointData
+const { hitRadiusPoint, hitPoint } = BoundsHelper
+const inner = {} as IRadiusPointData, worldRadiusPoint = {} as IRadiusPointData
 
 const leaf = Leaf.prototype
 
+leaf.hit = function (worldPoint: IPointData, hitRadius: number = 0): boolean {
+    this.updateLayout()
+
+    copy(worldRadiusPoint, worldPoint)
+    setRadius(worldRadiusPoint, hitRadius)
+
+    const world = this.__world
+    if (hitRadius ? !hitRadiusPoint(world, worldRadiusPoint) : !hitPoint(world, worldRadiusPoint)) return false
+
+    return this.isBranch ? Platform.getSelector(this).hitPoint({ ...worldRadiusPoint }, hitRadius, { target: this as unknown as IBranch }) : this.__hitWorld(worldRadiusPoint)
+}
+
 leaf.__hitWorld = function (point: IRadiusPointData): boolean {
     const data = this.__
     if (!data.hitSelf) return false
@@ -34,10 +47,10 @@ leaf.__hitWorld = function (point: IRadiusPointData): boolean {
     return this.__hit(inner)
 }
 
-leaf.__hitFill = function (inner: IRadiusPointData): boolean { return this.__hitCanvas?.hitFill(inner, this.__.windingRule) }
+leaf.__hitFill = function (inner: IRadiusPointData): boolean { const h = this.__hitCanvas; return h && h.hitFill(inner, this.__.windingRule) }
 
-leaf.__hitStroke = function (inner: IRadiusPointData, strokeWidth: number): boolean { return this.__hitCanvas?.hitStroke(inner, strokeWidth) }
+leaf.__hitStroke = function (inner: IRadiusPointData, strokeWidth: number): boolean { const h = this.__hitCanvas; return h && h.hitStroke(inner, strokeWidth) }
 
-leaf.__hitPixel = function (inner: IRadiusPointData): boolean { return this.__hitCanvas?.hitPixel(inner, this.__layout.renderBounds, this.__hitCanvas.hitScale) }
+leaf.__hitPixel = function (inner: IRadiusPointData): boolean { const h = this.__hitCanvas; return h && h.hitPixel(inner, this.__layout.renderBounds, h.hitScale) }
 
-leaf.__drawHitPath = function (canvas: ILeaferCanvas): void { if (canvas) this.__drawRenderPath(canvas) }
+leaf.__drawHitPath = function (canvas: ILeaferCanvas): void { canvas && this.__drawRenderPath(canvas) }

package/src/UIHit.ts

@@ -10,7 +10,10 @@ ui.__updateHitCanvas = function (): void {
 
     if (this.__box) this.__box.__updateHitCanvas()
 
-    const data = this.__, { hitCanvasManager } = this.leafer || this.parent.leafer // 兼容 boxStyle
+    const leafer = this.leafer || (this.parent && this.parent.leafer) // 兼容 boxStyle
+    if (!leafer) return
+
+    const data = this.__, { hitCanvasManager } = leafer
     const isHitPixelFill = (data.__isAlphaPixelFill || data.__isCanvas) && data.hitFill === 'pixel'
     const isHitPixelStroke = data.__isAlphaPixelStroke && data.hitStroke === 'pixel'
     const isHitPixel = isHitPixelFill || isHitPixelStroke
@@ -55,7 +58,7 @@ ui.__hit = function (inner: IRadiusPointData): boolean {
     const needHitFillPath = ((data.fill || data.__isCanvas) && (hitFill === 'path' || (hitFill === 'pixel' && !(data.__isAlphaPixelFill || data.__isCanvas)))) || hitFill === 'all'
     if (needHitFillPath && this.__hitFill(inner)) return true
 
-    const { hitStroke, __strokeWidth } = data
+    const { hitStroke, __maxStrokeWidth: strokeWidth } = data
     const needHitStrokePath = (data.stroke && (hitStroke === 'path' || (hitStroke === 'pixel' && !data.__isAlphaPixelStroke))) || hitStroke === 'all'
     if (!needHitFillPath && !needHitStrokePath) return false
 
@@ -65,15 +68,15 @@ ui.__hit = function (inner: IRadiusPointData): boolean {
     if (needHitStrokePath) {
         switch (data.strokeAlign) {
             case 'inside':
-                hitWidth += __strokeWidth * 2
+                hitWidth += strokeWidth * 2
                 if (!needHitFillPath && this.__hitFill(inner) && this.__hitStroke(inner, hitWidth)) return true
                 hitWidth = radiusWidth
                 break
             case 'center':
-                hitWidth += __strokeWidth
+                hitWidth += strokeWidth
                 break
             case 'outside':
-                hitWidth += __strokeWidth * 2
+                hitWidth += strokeWidth * 2
                 if (!needHitFillPath) {
                     if (!this.__hitFill(inner) && this.__hitStroke(inner, hitWidth)) return true
                     hitWidth = radiusWidth

package/src/index.ts

@@ -1,5 +1,7 @@
 export { HitCanvasManager } from './HitCanvasManager'
 
+import './selector'
+
 import './LeafHit'
 import './UIHit'
 import './RectHit'

package/src/pick.ts

@@ -1,14 +1,11 @@
-import { Platform, Creator } from '@leafer/core'
+import { Platform } from '@leafer/core'
 
-import { IPointData, IPickOptions, IPickResult, ISelector, IUI } from '@leafer-ui/interface'
+import { IPointData, IPickOptions, IPickResult } from '@leafer-ui/interface'
 import { Group, emptyData } from '@leafer-ui/draw'
 
-function getSelector(ui: IUI): ISelector {
-    return ui.leafer ? ui.leafer.selector : (Platform.selector || (Platform.selector = Creator.selector()))
-}
 
 Group.prototype.pick = function (hitPoint: IPointData, options?: IPickOptions): IPickResult {
     options || (options = emptyData)
     this.updateLayout()
-    return getSelector(this).getByPoint(hitPoint, options.hitRadius || 0, { ...options, target: this })
+    return Platform.getSelector(this).getByPoint(hitPoint, options.hitRadius || 0, { ...options, target: this })
 }

package/src/selector.ts

@@ -0,0 +1,8 @@
+import { Platform, Creator } from '@leafer/core'
+
+import { ISelector, ILeaf } from '@leafer-ui/interface'
+
+
+Platform.getSelector = function (leaf: ILeaf): ISelector {
+    return leaf.leafer ? leaf.leafer.selector : (Platform.selector || (Platform.selector = Creator.selector()))
+}