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

package/package.json

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

package/src/UIBounds.ts

@@ -7,20 +7,21 @@ export const UIBounds: IUIBoundsModule = {
 
     __updateStrokeBoundsSpreadWidth(): number {
         let width: number = 0
-        const { stroke, strokeAlign } = this.__
+        const { stroke, hitStroke, strokeAlign, strokeWidth } = this.__
 
-        if (stroke && strokeAlign !== 'inside') {
-
-            const { strokeWidth, miterLimit, path } = this.__
-            const miterLength = path ? 1 / Math.sin(miterLimit * OneRadian / 2) * Math.sqrt(strokeWidth) : 0 // miterlimit 导致增加的长度
+        if ((stroke || hitStroke === 'always') && strokeWidth && strokeAlign !== 'inside') {
             width = strokeAlign === 'center' ? strokeWidth / 2 : strokeWidth
-            this.__.__strokeOuterWidth = width
-
-            if (miterLength) width += (miterLength - width)
-
+            this.__layout.shapeStrokeSpreadWidth = width
+
+            const { miterLimit, strokeCap, path } = this.__
+            if (path) {
+                const miterLimitAddWidth = 1 / Math.sin(miterLimit * OneRadian / 2) * Math.sqrt(strokeWidth) - width
+                const storkeCapAddWidth = strokeCap === 'none' ? 0 : strokeWidth
+                width += Math.max(miterLimitAddWidth, storkeCapAddWidth)
+            }
         }
 
-        if (!width) this.__.__strokeOuterWidth = 0
+        if (!width) this.__layout.shapeStrokeSpreadWidth = 0
 
         return width
     },
@@ -35,15 +36,15 @@ export const UIBounds: IUIBoundsModule = {
 
         if (blur) width = Math.max(width, blur)
 
-
         let other = width = Math.ceil(width)
 
         if (innerShadow) innerShadow.forEach(item => {
             other = Math.max(other, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread < 0 ? -item.spread : 0) + item.blur * 1.5)
         })
 
+
         if (backgroundBlur) other = Math.max(other, backgroundBlur)
-        this.__layout.renderShapeBoundsSpreadWidth = other
+        this.__layout.shapeRenderSpreadWidth = other
 
         return width
     }