@leafer/layout 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/layout",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "@leafer/layout",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.2",
-    "@leafer/helper": "1.0.2",
-    "@leafer/platform": "1.0.2"
+    "@leafer/math": "1.0.4",
+    "@leafer/helper": "1.0.4",
+    "@leafer/platform": "1.0.4"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.2"
+    "@leafer/interface": "1.0.4"
   }
 }

package/src/LeafLayout.ts

@@ -75,6 +75,7 @@ export class LeafLayout implements ILeafLayout {
     public hitCanvasChanged: boolean
 
     public childrenSortChanged?: boolean
+    public stateStyleChanged?: boolean
 
     // keep state
     public affectScaleOrRotation: boolean
@@ -202,7 +203,7 @@ export class LeafLayout implements ILeafLayout {
 
     public getLayoutBounds(type?: IBoundsType, relative: ILocationType | ILeaf = 'world', unscale?: boolean): ILayoutBoundsData {
         const { leaf } = this
-        let point: IPointData, matrix: IMatrixData, bounds: IBoundsData = this.getInnerBounds(type)
+        let point: IPointData, matrix: IMatrixData, layoutBounds: ILayoutBoundsData, bounds: IBoundsData = this.getInnerBounds(type)
 
         switch (relative) {
             case 'world':
@@ -210,8 +211,9 @@ export class LeafLayout implements ILeafLayout {
                 matrix = leaf.__world
                 break
             case 'local':
+                const { scaleX, scaleY, rotation, skewX, skewY } = leaf.__
+                layoutBounds = { scaleX, scaleY, rotation, skewX, skewY } as ILayoutBoundsData // 更精准，务必保留
                 point = leaf.getLocalPointByInner(bounds)
-                matrix = leaf.__localMatrix
                 break
             case 'inner':
                 point = bounds
@@ -224,7 +226,7 @@ export class LeafLayout implements ILeafLayout {
                 matrix = getRelativeWorld(leaf, relative, true)
         }
 
-        const layoutBounds = MatrixHelper.getLayout(matrix) as ILayoutBoundsData
+        if (!layoutBounds) layoutBounds = MatrixHelper.getLayout(matrix) as ILayoutBoundsData
         copy(layoutBounds, bounds)
         PointHelper.copy(layoutBounds, point)
 

package/types/index.d.ts

@@ -37,6 +37,7 @@ declare class LeafLayout implements ILeafLayout {
     opacityChanged: boolean;
     hitCanvasChanged: boolean;
     childrenSortChanged?: boolean;
+    stateStyleChanged?: boolean;
     affectScaleOrRotation: boolean;
     affectRotation: boolean;
     affectChildrenSort?: boolean;