@leafer/layout 1.0.0-rc.16 → 1.0.0-rc.18

package/package.json

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

package/src/LeafLayout.ts

@@ -1,9 +1,10 @@
 import { ILeaf, ILeafLayout, ILocationType, IBoundsType, IBoundsData, IMatrixData, ILayoutBoundsData, IPointData } from '@leafer/interface'
-import { Bounds, BoundsHelper, Matrix, MatrixHelper, PointHelper } from '@leafer/math'
+import { Bounds, BoundsHelper, MatrixHelper, PointHelper } from '@leafer/math'
+import { LeafHelper } from '@leafer/helper'
 import { Platform } from '@leafer/platform'
 
 
-const tempMatrix = new Matrix()
+const { getRelativeWorld } = LeafHelper
 const { toOuterOf, getPoints, copy } = BoundsHelper
 
 export class LeafLayout implements ILeafLayout {
@@ -119,15 +120,18 @@ export class LeafLayout implements ILeafLayout {
 
     public getTransform(relative: ILocationType | ILeaf = 'world'): IMatrixData {
         this.update()
+        const { leaf } = this
         switch (relative) {
             case 'world':
-                return this.leaf.__world
+                return leaf.__world
             case 'local':
-                return this.leaf.__localMatrix
+                return leaf.__localMatrix
             case 'inner':
                 return MatrixHelper.defaultMatrix
+            case 'page':
+                relative = leaf.zoomLayer
             default:
-                return new Matrix(this.leaf.__world).divideParent(relative.__world)
+                return getRelativeWorld(leaf, relative)
         }
     }
 
@@ -140,6 +144,8 @@ export class LeafLayout implements ILeafLayout {
                 return this.getLocalBounds(type)
             case 'inner':
                 return this.getInnerBounds(type)
+            case 'page':
+                relative = this.leaf.zoomLayer
             default:
                 return new Bounds(this.getInnerBounds(type)).toOuterOf(this.getTransform(relative))
         }
@@ -204,9 +210,11 @@ export class LeafLayout implements ILeafLayout {
                 point = bounds
                 matrix = MatrixHelper.defaultMatrix
                 break
+            case 'page':
+                relative = leaf.zoomLayer
             default:
                 point = leaf.getWorldPoint(bounds, relative)
-                matrix = tempMatrix.set(leaf.__world).divideParent(relative.__world)
+                matrix = getRelativeWorld(leaf, relative, true)
         }
 
         const layoutBounds = MatrixHelper.getLayout(matrix) as ILayoutBoundsData
@@ -241,6 +249,8 @@ export class LeafLayout implements ILeafLayout {
                 break
             case 'inner':
                 break
+            case 'page':
+                relative = leaf.zoomLayer
             default:
                 relativeLeaf = relative
         }