@leafer-ui/bounds 1.0.0-rc.9 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/bounds",
-  "version": "1.0.0-rc.9",
+  "version": "1.0.0",
   "description": "@leafer-ui/bounds",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -15,16 +15,16 @@
     "type": "git",
     "url": "https://github.com/leaferjs/ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/bounds",
+  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/display-module/bounds",
   "bugs": "https://github.com/leaferjs/ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.9"
+    "@leafer/core": "1.0.0"
   },
   "devDependencies": {
-    "@leafer-ui/interface": "1.0.0-rc.9"
+    "@leafer-ui/interface": "1.0.0"
   }
 }

package/src/UIBounds.ts

@@ -1,5 +1,3 @@
-import { OneRadian } from '@leafer/core'
-
 import { IUIBoundsModule } from "@leafer-ui/interface"
 
 
@@ -7,19 +5,20 @@ export const UIBounds: IUIBoundsModule = {
 
     __updateStrokeSpread(): number {
         let width = 0, boxWidth = 0
-        const { stroke, hitStroke, strokeAlign, strokeWidth } = this.__
+        const data = this.__, { strokeAlign, strokeWidth } = data
 
-        if ((stroke || hitStroke === 'all') && strokeWidth && strokeAlign !== 'inside') {
+        if ((data.stroke || data.hitStroke === 'all') && strokeWidth && strokeAlign !== 'inside') {
             boxWidth = width = strokeAlign === 'center' ? strokeWidth / 2 : strokeWidth
 
-            if (!this.__.__boxStroke) {
-                const { miterLimit, strokeCap } = this.__
-                const miterLimitAddWidth = this.__tag !== 'Line' ? 1 / Math.sin(miterLimit * OneRadian / 2) * Math.sqrt(strokeWidth) - width : 0
-                const storkeCapAddWidth = strokeCap === 'none' ? 0 : strokeWidth
+            if (!data.__boxStroke) {
+                const miterLimitAddWidth = data.__isLinePath ? 0 : 10 * width  // =  Math.sin((miterLimit = 10) * OneRadian / 2) * Math.sqrt(strokeWidth) - width 后期需继续精确优化
+                const storkeCapAddWidth = data.strokeCap === 'none' ? 0 : strokeWidth
                 width += Math.max(miterLimitAddWidth, storkeCapAddWidth)
             }
         }
 
+        if (data.__useArrow) width += strokeWidth * 5 // 后期需要精细化
+
         this.__layout.strokeBoxSpread = boxWidth
 
         return width
@@ -45,7 +44,7 @@ export const UIBounds: IUIBoundsModule = {
 
         this.__layout.renderShapeSpread = shapeWidth
 
-        return width
+        return width + (this.__layout.strokeSpread || 0)
     }
 
 }