@leafer/helper 1.0.0-rc.25 → 1.0.0-rc.27

package/package.json

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

package/src/LeafHelper.ts

@@ -1,5 +1,5 @@
-import { ILeaf, IMatrixData, IPointData } from '@leafer/interface'
-import { MathHelper, MatrixHelper, PointHelper } from '@leafer/math'
+import { IAlign, ILeaf, IMatrixData, IPointData } from '@leafer/interface'
+import { MathHelper, MatrixHelper, PointHelper, AroundHelper } from '@leafer/math'
 
 
 const { copy, toInnerPoint, scaleOfOuter, rotateOfOuter, skewOfOuter, multiplyParent, divideParent, getLayout } = MatrixHelper
@@ -140,11 +140,24 @@ export const LeafHelper = {
     setTransform(t: ILeaf, transform: IMatrixData, resize?: boolean): void {
         const layout = getLayout(transform)
         if (resize) {
-            t.scaleResize(layout.scaleX / t.scaleX, layout.scaleY / t.scaleY, resize !== true)
+            const scaleX = layout.scaleX / t.scaleX
+            const scaleY = layout.scaleY / t.scaleY
             delete layout.scaleX
             delete layout.scaleY
+            t.set(layout)
+            t.scaleResize(scaleX, scaleY, resize !== true)
+        } else {
+            t.set(layout)
         }
-        t.set(layout)
+    },
+
+    getLocalOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData {
+        return PointHelper.tempToOuterOf(L.getInnerOrigin(t, origin), t.localTransform)
+    },
+
+    getInnerOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData {
+        if (typeof origin === 'string') AroundHelper.toPoint(origin, t.boxBounds, origin = {} as IPointData)
+        return origin
     },
 
     getRelativeWorld(t: ILeaf, relative: ILeaf, temp?: boolean): IMatrixData {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, IPointData, IMatrixData, IBoundsData, IRenderOptions, ILeafList, ILeafLevelList, IFunction } from '@leafer/interface';
+import { ILeaf, IPointData, IMatrixData, IAlign, IBoundsData, IRenderOptions, ILeafList, ILeafLevelList, IFunction } from '@leafer/interface';
 
 declare const LeafHelper: {
     updateAllMatrix(leaf: ILeaf, checkAutoLayout?: boolean, waitAutoLayout?: boolean): void;
@@ -18,6 +18,8 @@ declare const LeafHelper: {
     transformWorld(t: ILeaf, transform: IMatrixData, resize?: boolean): void;
     transform(t: ILeaf, transform: IMatrixData, resize?: boolean): void;
     setTransform(t: ILeaf, transform: IMatrixData, resize?: boolean): void;
+    getLocalOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData;
+    getInnerOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData;
     getRelativeWorld(t: ILeaf, relative: ILeaf, temp?: boolean): IMatrixData;
     drop(t: ILeaf, parent: ILeaf, index?: number, resize?: boolean): void;
     hasParent(p: ILeaf, parent: ILeaf): boolean | void;