@leafer-ui/hit 1.5.3 → 1.6.1

package/package.json

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

package/src/LeafHit.ts

@@ -8,26 +8,27 @@ const inner = {} as IRadiusPointData
 const leaf = Leaf.prototype
 
 leaf.__hitWorld = function (point: IRadiusPointData): boolean {
-    if (!this.__.hitSelf) return false
+    const data = this.__
+    if (!data.hitSelf) return false
 
-    if (this.__.hitRadius) {
+    const world = this.__world, layout = this.__layout
+    const isSmall = world.width < 10 && world.height < 10
+
+    if (data.hitRadius) {
         copy(inner, point), point = inner
-        setRadius(point, this.__.hitRadius)
+        setRadius(point, data.hitRadius)
     }
 
-    toInnerRadiusPointOf(point, this.__world, inner)
-
-    const { width, height } = this.__world
-    const isSmall = width < 10 && height < 10
+    toInnerRadiusPointOf(point, world, inner)
 
-    if (this.__.hitBox || isSmall) {
-        if (BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner)) return true
+    if (data.hitBox || isSmall) {
+        if (BoundsHelper.hitRadiusPoint(layout.boxBounds, inner)) return true
         if (isSmall) return false
     }
 
-    if (this.__layout.hitCanvasChanged || !this.__hitCanvas) {
+    if (layout.hitCanvasChanged || !this.__hitCanvas) {
         this.__updateHitCanvas()
-        if (!this.__layout.boundsChanged) this.__layout.hitCanvasChanged = false
+        if (!layout.boundsChanged) layout.hitCanvasChanged = false
     }
 
     return this.__hit(inner)

package/src/TextHit.ts

@@ -0,0 +1,13 @@
+import { ILeaferCanvas } from '@leafer/interface'
+import { Text } from '@leafer-ui/draw'
+
+
+Text.prototype.__drawHitPath = function (canvas: ILeaferCanvas): void {
+    const { __lineHeight, fontSize, __baseLine, __letterSpacing, __textDrawData: data } = this.__
+
+    canvas.beginPath()
+
+    if (__letterSpacing < 0) this.__drawPathByBox(canvas)
+    else data.rows.forEach(row => canvas.rect(row.x, row.y - __baseLine, row.width, __lineHeight < fontSize ? fontSize : __lineHeight))
+}
+

package/src/UIHit.ts

@@ -1,14 +1,16 @@
 import { IRadiusPointData } from '@leafer/interface'
-import { Platform, Matrix, tempBounds } from '@leafer/core'
-import { UI, ImageManager } from '@leafer-ui/draw'
+import { Platform, Matrix, ImageManager, tempBounds } from '@leafer/core'
+import { UI } from '@leafer-ui/draw'
 
 
 const matrix = new Matrix()
 const ui = UI.prototype
 
 ui.__updateHitCanvas = function (): void {
-    const data = this.__, { hitCanvasManager } = this.leafer
 
+    if (this.__box) this.__box.__updateHitCanvas()
+
+    const data = this.__, { hitCanvasManager } = this.leafer || this.parent.leafer // 兼容 boxStyle
     const isHitPixelFill = (data.__pixelFill || data.__isCanvas) && data.hitFill === 'pixel'
     const isHitPixelStroke = data.__pixelStroke && data.hitStroke === 'pixel'
     const isHitPixel = isHitPixelFill || isHitPixelStroke
@@ -41,13 +43,14 @@ ui.__updateHitCanvas = function (): void {
 }
 
 ui.__hit = function (inner: IRadiusPointData): boolean {
-    // hit pixel
 
+    if (this.__box && this.__box.__hit(inner)) return true
+
+    // hit pixel
     const data = this.__
     if (data.__isHitPixel && this.__hitPixel(inner)) return true
 
     // hit path
-
     const { hitFill } = data
     const needHitFillPath = ((data.fill || data.__isCanvas) && (hitFill === 'path' || (hitFill === 'pixel' && !(data.__pixelFill || data.__isCanvas)))) || hitFill === 'all'
     if (needHitFillPath && this.__hitFill(inner)) return true

package/src/index.ts

@@ -3,6 +3,7 @@ export { HitCanvasManager } from './HitCanvasManager'
 import './LeafHit'
 import './UIHit'
 import './RectHit'
+import './TextHit'
 
 import './pick'
 import './canvas'