@leafer/layout 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

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

package/src/LeafLayout.ts

@@ -9,7 +9,7 @@ export class LeafLayout implements ILeafLayout {
 
     public leaf: ILeaf
 
-    public useZoomProxy: boolean
+    public proxyZoom: boolean
 
     // local
 
@@ -35,7 +35,6 @@ export class LeafLayout implements ILeafLayout {
 
     // matrix changed
     public matrixChanged: boolean
-    public positionChanged: boolean
     public scaleChanged: boolean
     public rotationChanged: boolean
 
@@ -72,7 +71,7 @@ export class LeafLayout implements ILeafLayout {
         this.renderBounds = this.strokeBounds = this.boxBounds = { x: 0, y: 0, width: 0, height: 0 }
         this.localRenderBounds = this.localStrokeBounds = leaf.__local
         this.boxChange()
-        this.positionChange()
+        this.matrixChange()
     }
 
 
@@ -219,12 +218,6 @@ export class LeafLayout implements ILeafLayout {
 
     // matrix
 
-    public positionChange(): void {
-        this.positionChanged = true
-        this.matrixChanged = true
-        this.localBoxChanged || this.localBoxChange()
-    }
-
     public scaleChange(): void {
         this.scaleChanged = true
         this._scaleOrRotationChange()
@@ -238,6 +231,10 @@ export class LeafLayout implements ILeafLayout {
 
     protected _scaleOrRotationChange() {
         this.affectScaleOrRotation = true
+        this.matrixChange()
+    }
+
+    public matrixChange(): void {
         this.matrixChanged = true
         this.localBoxChanged || this.localBoxChange()
     }

package/types/index.d.ts

@@ -2,7 +2,7 @@ import { ILeafLayout, ILeaf, IBoundsData, ILayoutLocationType, IMatrixData, ILay
 
 declare class LeafLayout implements ILeafLayout {
     leaf: ILeaf;
-    useZoomProxy: boolean;
+    proxyZoom: boolean;
     boxBounds: IBoundsData;
     strokeBounds: IBoundsData;
     renderBounds: IBoundsData;
@@ -14,7 +14,6 @@ declare class LeafLayout implements ILeafLayout {
     protected _worldBoxBounds: IBoundsData;
     protected _worldStrokeBounds: IBoundsData;
     matrixChanged: boolean;
-    positionChanged: boolean;
     scaleChanged: boolean;
     rotationChanged: boolean;
     boundsChanged: boolean;
@@ -48,10 +47,10 @@ declare class LeafLayout implements ILeafLayout {
     localBoxChange(): void;
     strokeChange(): void;
     renderChange(): void;
-    positionChange(): void;
     scaleChange(): void;
     rotationChange(): void;
     protected _scaleOrRotationChange(): void;
+    matrixChange(): void;
     surfaceChange(): void;
     opacityChange(): void;
     childrenSortChange(): void;