@leafer/layout 1.0.0-alpha.23 → 1.0.0-alpha.31

package/package.json

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

package/src/LeafLayout.ts

@@ -1,5 +1,6 @@
 import { ILeaf, ILeafLayout, ILayoutLocationType, ILayoutBoundsType, IBoundsData, IMatrixData, IMatrixDecompositionData } from '@leafer/interface'
 import { BoundsHelper, MatrixHelper } from '@leafer/math'
+import { Platform } from '@leafer/platform'
 
 
 const { toOuterOf } = BoundsHelper
@@ -26,6 +27,7 @@ export class LeafLayout implements ILeafLayout {
     public localRenderBounds: IBoundsData
 
     // world temp
+    protected _worldContentBounds: IBoundsData
     protected _worldBoxBounds: IBoundsData
     protected _worldStrokeBounds: IBoundsData
 
@@ -57,9 +59,11 @@ export class LeafLayout implements ILeafLayout {
     // keep state
     public affectScaleOrRotation: boolean
     public affectRotation: boolean
+
     public strokeBoundsSpreadWidth: number
     public renderBoundsSpreadWidth: number
-    public renderShapeBoundsSpreadWidth: number
+    public shapeStrokeSpreadWidth: number
+    public shapeRenderSpreadWidth: number
 
 
     constructor(leaf: ILeaf) {
@@ -70,7 +74,7 @@ export class LeafLayout implements ILeafLayout {
     }
 
 
-    public update(): void {
+    public checkUpdate(): void {
         const { leafer } = this.leaf
         if (leafer) {
             if (leafer.ready) {
@@ -79,30 +83,38 @@ export class LeafLayout implements ILeafLayout {
                 leafer.start()
                 leafer.layouter.layout()
             }
+        } else {
+            let root = this.leaf
+            while (root.parent) { root = root.parent }
+            Platform.layout(root)
         }
     }
 
     public getTransform(locationType: ILayoutLocationType): IMatrixData {
-        this.update()
+        this.checkUpdate()
         return locationType === 'world' ? this.leaf.__world : this.leaf.__local
     }
 
     public getMatrixDecompositionData(locationType: ILayoutLocationType): IMatrixDecompositionData {
-        this.update()
+        this.checkUpdate()
         return MatrixHelper.decompose(locationType === 'world' ? this.leaf.__world : this.leaf.__local)
     }
 
     public getBounds(type: ILayoutBoundsType, locationType: ILayoutLocationType): IBoundsData {
 
-        this.update()
+        this.checkUpdate()
 
         if (locationType === 'world') {
 
             switch (type) {
                 case 'render':
                     return this.leaf.__world
+                case 'content':
+                    if (this.contentBounds) return this.getWorldContentBounds()
+                case 'margin':
                 case 'box':
                     return this.getWorldBoxBounds()
+                case 'margin':
                 case 'stroke':
                     return this.getWorldStrokeBounds()
             }
@@ -112,6 +124,9 @@ export class LeafLayout implements ILeafLayout {
             switch (type) {
                 case 'render':
                     return this.renderBounds
+                case 'content':
+                    if (this.contentBounds) return this.contentBounds
+                case 'margin':
                 case 'box':
                     return this.boxBounds
                 case 'stroke':
@@ -123,6 +138,8 @@ export class LeafLayout implements ILeafLayout {
             switch (type) {
                 case 'render':
                     return this.localRenderBounds
+                case 'margin':
+                case 'content':
                 case 'box':
                     return this.leaf.__local
                 case 'stroke':
@@ -131,9 +148,13 @@ export class LeafLayout implements ILeafLayout {
 
         }
 
-        return this.leaf.__world
     }
 
+    protected getWorldContentBounds(): IBoundsData {
+        this._worldContentBounds || (this._worldContentBounds = {} as IBoundsData)
+        toOuterOf(this.contentBounds, this.leaf.__world, this._worldContentBounds)
+        return this._worldContentBounds
+    }
 
     protected getWorldBoxBounds(): IBoundsData {
         this._worldBoxBounds || (this._worldBoxBounds = {} as IBoundsData)
@@ -190,6 +211,7 @@ export class LeafLayout implements ILeafLayout {
         this.strokeBoundsChanged = true
         this.strokeBoundsSpreadWidth || (this.strokeBoundsSpreadWidth = 1)
         this.boundsChanged = true
+        this.hitCanvasChanged = true
     }
 
     public renderBoundsChange(): void {