@leafer/layout 1.0.0-rc.22 → 1.0.0-rc.24

package/package.json

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

package/src/LeafLayout.ts

@@ -6,6 +6,8 @@ import { Platform } from '@leafer/platform'
 
 const { getRelativeWorld } = LeafHelper
 const { toOuterOf, getPoints, copy } = BoundsHelper
+const localContent = '_localContentBounds'
+const worldContent = '_worldContentBounds', worldBox = '_worldBoxBounds', worldStroke = '_worldStrokeBounds'
 
 export class LeafLayout implements ILeafLayout {
 
@@ -15,26 +17,34 @@ export class LeafLayout implements ILeafLayout {
 
     // inner
 
+    public get contentBounds(): IBoundsData { return this._contentBounds || this.boxBounds }
+    public set contentBounds(bounds: IBoundsData) { this._contentBounds = bounds }
     public boxBounds: IBoundsData
     public get strokeBounds(): IBoundsData { return this._strokeBounds || this.boxBounds }
     public get renderBounds(): IBoundsData { return this._renderBounds || this.boxBounds }
 
+    public _contentBounds: IBoundsData
     public _strokeBounds: IBoundsData
     public _renderBounds: IBoundsData
 
-    // auto layout
-    public marginBounds: IBoundsData
-    public contentBounds: IBoundsData
-
     // local
 
+    public get localContentBounds(): IBoundsData { toOuterOf(this.contentBounds, this.leaf.__localMatrix, this[localContent] || (this[localContent] = {} as IBoundsData)); return this[localContent] }
+    // localBoxBounds: IBoundsData // use leaf.__localBoxBounds
     public get localStrokeBounds(): IBoundsData { return this._localStrokeBounds || this }
     public get localRenderBounds(): IBoundsData { return this._localRenderBounds || this }
 
+    protected _localContentBounds?: IBoundsData
     protected _localStrokeBounds?: IBoundsData
     protected _localRenderBounds?: IBoundsData
 
-    // world temp
+    // world
+
+    public get worldContentBounds(): IBoundsData { toOuterOf(this.contentBounds, this.leaf.__world, this[worldContent] || (this[worldContent] = {} as IBoundsData)); return this[worldContent] }
+    public get worldBoxBounds(): IBoundsData { toOuterOf(this.boxBounds, this.leaf.__world, this[worldBox] || (this[worldBox] = {} as IBoundsData)); return this[worldBox] }
+    public get worldStrokeBounds(): IBoundsData { toOuterOf(this.strokeBounds, this.leaf.__world, this[worldStroke] || (this[worldStroke] = {} as IBoundsData)); return this[worldStroke] }
+    // worldRenderBounds: IBoundsData // use leaf.__world
+
     protected _worldContentBounds: IBoundsData
     protected _worldBoxBounds: IBoundsData
     protected _worldStrokeBounds: IBoundsData
@@ -72,8 +82,8 @@ export class LeafLayout implements ILeafLayout {
     public affectChildrenSort?: boolean
 
     public strokeSpread: number
-    public renderSpread: number
     public strokeBoxSpread: number
+    public renderSpread: number
     public renderShapeSpread: number
 
     // temp local
@@ -157,7 +167,6 @@ export class LeafLayout implements ILeafLayout {
                 return this.renderBounds
             case 'content':
                 if (this.contentBounds) return this.contentBounds
-            case 'margin':
             case 'box':
                 return this.boxBounds
             case 'stroke':
@@ -171,8 +180,8 @@ export class LeafLayout implements ILeafLayout {
                 return this.localRenderBounds
             case 'stroke':
                 return this.localStrokeBounds
-            case 'margin':
             case 'content':
+                if (this.contentBounds) return this.localContentBounds
             case 'box':
                 return this.leaf.__localBoxBounds
         }
@@ -182,14 +191,12 @@ export class LeafLayout implements ILeafLayout {
         switch (type) {
             case 'render':
                 return this.leaf.__world
+            case 'stroke':
+                return this.worldStrokeBounds
             case 'content':
-                if (this.contentBounds) return this.getWorldContentBounds()
-            case 'margin':
+                if (this.contentBounds) return this.worldContentBounds
             case 'box':
-                return this.getWorldBoxBounds()
-            case 'margin':
-            case 'stroke':
-                return this.getWorldStrokeBounds()
+                return this.worldBoxBounds
         }
     }
 
@@ -258,25 +265,28 @@ export class LeafLayout implements ILeafLayout {
         return points
     }
 
-    protected getWorldContentBounds(): IBoundsData {
-        this._worldContentBounds || (this._worldContentBounds = {} as IBoundsData)
-        toOuterOf(this.contentBounds, this.leaf.__world, this._worldContentBounds)
-        return this._worldContentBounds
-    }
+    // 独立 / 引用 boxBounds
 
-    protected getWorldBoxBounds(): IBoundsData {
-        this._worldBoxBounds || (this._worldBoxBounds = {} as IBoundsData)
-        toOuterOf(this.boxBounds, this.leaf.__world, this._worldBoxBounds)
-        return this._worldBoxBounds
+    public shrinkContent(): void {
+        const { x, y, width, height } = this.boxBounds
+        this._contentBounds = { x, y, width, height }
     }
 
-    protected getWorldStrokeBounds(): IBoundsData {
-        this._worldStrokeBounds || (this._worldStrokeBounds = {} as IBoundsData)
-        toOuterOf(this.strokeBounds, this.leaf.__world, this._worldStrokeBounds)
-        return this._worldStrokeBounds
+    public spreadStroke(): void {
+        const { x, y, width, height } = this.strokeBounds
+        this._strokeBounds = { x, y, width, height }
+        this._localStrokeBounds = { x, y, width, height }
+        if (!this.renderSpread) this.spreadRenderCancel()
+    }
+    public spreadRender(): void {
+        const { x, y, width, height } = this.renderBounds
+        this._renderBounds = { x, y, width, height }
+        this._localRenderBounds = { x, y, width, height }
     }
 
-    // 独立 / 引用 boxBounds
+    public shrinkContentCancel(): void {
+        this._contentBounds = undefined
+    }
 
     public spreadStrokeCancel(): void {
         const same = this.renderBounds === this.strokeBounds
@@ -289,18 +299,6 @@ export class LeafLayout implements ILeafLayout {
         this._localRenderBounds = this._localStrokeBounds
     }
 
-    public spreadStroke(): void {
-        const { x, y, width, height } = this.strokeBounds
-        this._strokeBounds = { x, y, width, height }
-        this._localStrokeBounds = { x, y, width, height }
-        if (!this.renderSpread) this.spreadRenderCancel()
-    }
-    public spreadRender(): void {
-        const { x, y, width, height } = this.renderBounds
-        this._renderBounds = { x, y, width, height }
-        this._localRenderBounds = { x, y, width, height }
-    }
-
 
     // bounds
 

package/types/index.d.ts

@@ -3,17 +3,23 @@ import { ILeafLayout, ILeaf, IBoundsData, ILocationType, IMatrixData, IBoundsTyp
 declare class LeafLayout implements ILeafLayout {
     leaf: ILeaf;
     proxyZoom: boolean;
+    get contentBounds(): IBoundsData;
+    set contentBounds(bounds: IBoundsData);
     boxBounds: IBoundsData;
     get strokeBounds(): IBoundsData;
     get renderBounds(): IBoundsData;
+    _contentBounds: IBoundsData;
     _strokeBounds: IBoundsData;
     _renderBounds: IBoundsData;
-    marginBounds: IBoundsData;
-    contentBounds: IBoundsData;
+    get localContentBounds(): IBoundsData;
     get localStrokeBounds(): IBoundsData;
     get localRenderBounds(): IBoundsData;
+    protected _localContentBounds?: IBoundsData;
     protected _localStrokeBounds?: IBoundsData;
     protected _localRenderBounds?: IBoundsData;
+    get worldContentBounds(): IBoundsData;
+    get worldBoxBounds(): IBoundsData;
+    get worldStrokeBounds(): IBoundsData;
     protected _worldContentBounds: IBoundsData;
     protected _worldBoxBounds: IBoundsData;
     protected _worldStrokeBounds: IBoundsData;
@@ -35,8 +41,8 @@ declare class LeafLayout implements ILeafLayout {
     affectRotation: boolean;
     affectChildrenSort?: boolean;
     strokeSpread: number;
-    renderSpread: number;
     strokeBoxSpread: number;
+    renderSpread: number;
     renderShapeSpread: number;
     get a(): number;
     get b(): number;
@@ -58,13 +64,12 @@ declare class LeafLayout implements ILeafLayout {
     getWorldBounds(type?: IBoundsType): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
     getLayoutPoints(type?: IBoundsType, relative?: ILocationType | ILeaf): IPointData[];
-    protected getWorldContentBounds(): IBoundsData;
-    protected getWorldBoxBounds(): IBoundsData;
-    protected getWorldStrokeBounds(): IBoundsData;
-    spreadStrokeCancel(): void;
-    spreadRenderCancel(): void;
+    shrinkContent(): void;
     spreadStroke(): void;
     spreadRender(): void;
+    shrinkContentCancel(): void;
+    spreadStrokeCancel(): void;
+    spreadRenderCancel(): void;
     boxChange(): void;
     localBoxChange(): void;
     strokeChange(): void;