@leafer/helper 1.0.0 → 1.0.2

package/package.json

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

package/src/LeafHelper.ts

@@ -1,8 +1,8 @@
-import { IAlign, ILeaf, IMatrixData, IPointData } from '@leafer/interface'
-import { MathHelper, MatrixHelper, PointHelper, AroundHelper } from '@leafer/math'
+import { IAlign, ILeaf, IMatrixData, IPointData, IAxis } from '@leafer/interface'
+import { MathHelper, MatrixHelper, PointHelper, AroundHelper, getMatrixData } from '@leafer/math'
 
 
-const { copy, toInnerPoint, scaleOfOuter, rotateOfOuter, skewOfOuter, multiplyParent, divideParent, getLayout } = MatrixHelper
+const { copy, toInnerPoint, toOuterPoint, scaleOfOuter, rotateOfOuter, skewOfOuter, multiplyParent, divideParent, getLayout } = MatrixHelper
 const matrix = {} as IMatrixData
 
 export const LeafHelper = {
@@ -76,9 +76,9 @@ export const LeafHelper = {
 
     // transform
 
-    moveWorld(t: ILeaf, x: number | IPointData, y = 0): void {
+    moveWorld(t: ILeaf, x: number | IPointData, y = 0, isInnerPoint?: boolean): void {
         const local = typeof x === 'object' ? { ...x } : { x, y }
-        if (t.parent) toInnerPoint(t.parent.worldTransform, local, local, true)
+        isInnerPoint ? toOuterPoint(t.localTransform, local, local, true) : (t.parent && toInnerPoint(t.parent.worldTransform, local, local, true))
         L.moveLocal(t, local.x, local.y)
     },
 
@@ -99,8 +99,12 @@ export const LeafHelper = {
     zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY: number = scaleX, resize?: boolean): void {
         copy(matrix, t.__localMatrix)
         scaleOfOuter(matrix, origin, scaleX, scaleY)
-        moveByMatrix(t, matrix)
-        t.scaleResize(scaleX, scaleY, resize !== true)
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix, resize)
+        } else {
+            moveByMatrix(t, matrix)
+            t.scaleResize(scaleX, scaleY, resize !== true)
+        }
     },
 
     rotateOfWorld(t: ILeaf, origin: IPointData, angle: number): void {
@@ -110,8 +114,12 @@ export const LeafHelper = {
     rotateOfLocal(t: ILeaf, origin: IPointData, angle: number): void {
         copy(matrix, t.__localMatrix)
         rotateOfOuter(matrix, origin, angle)
-        moveByMatrix(t, matrix)
-        t.rotation = MathHelper.formatRotation(t.rotation + angle)
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix)
+        } else {
+            moveByMatrix(t, matrix)
+            t.rotation = MathHelper.formatRotation(t.rotation + angle)
+        }
     },
 
     skewOfWorld(t: ILeaf, origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void {
@@ -138,7 +146,7 @@ export const LeafHelper = {
     },
 
     setTransform(t: ILeaf, transform: IMatrixData, resize?: boolean): void {
-        const layout = getLayout(transform)
+        const layout = getLayout(transform, t.origin && L.getInnerOrigin(t, t.origin), t.around && L.getInnerOrigin(t, t.around))
         if (resize) {
             const scaleX = layout.scaleX / t.scaleX
             const scaleY = layout.scaleY / t.scaleY
@@ -151,13 +159,21 @@ export const LeafHelper = {
         }
     },
 
+    getFlipTransform(t: ILeaf, axis: IAxis): IMatrixData {
+        const m = getMatrixData()
+        const sign = axis === 'x' ? 1 : -1
+        scaleOfOuter(m, L.getLocalOrigin(t, 'center'), -1 * sign, 1 * sign)
+        return m
+    },
+
     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
+        const innerOrigin = {} as IPointData
+        AroundHelper.toPoint(origin, t.boxBounds, innerOrigin)
+        return innerOrigin
     },
 
     getRelativeWorld(t: ILeaf, relative: ILeaf, temp?: boolean): IMatrixData {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, IPointData, IMatrixData, IAlign, IBoundsData, IRenderOptions, ILeafList, ILeafLevelList, IFunction } from '@leafer/interface';
+import { ILeaf, IPointData, IMatrixData, IAxis, IAlign, IBoundsData, IRenderOptions, ILeafList, ILeafLevelList, IFunction } from '@leafer/interface';
 
 declare const LeafHelper: {
     updateAllMatrix(leaf: ILeaf, checkAutoLayout?: boolean, waitAutoLayout?: boolean): void;
@@ -7,7 +7,7 @@ declare const LeafHelper: {
     updateAllWorldOpacity(leaf: ILeaf): void;
     updateAllChange(leaf: ILeaf): void;
     worldHittable(t: ILeaf): boolean;
-    moveWorld(t: ILeaf, x: number | IPointData, y?: number): void;
+    moveWorld(t: ILeaf, x: number | IPointData, y?: number, isInnerPoint?: boolean): void;
     moveLocal(t: ILeaf, x: number | IPointData, y?: number): void;
     zoomOfWorld(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
     zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
@@ -18,6 +18,7 @@ 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;
+    getFlipTransform(t: ILeaf, axis: IAxis): IMatrixData;
     getLocalOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData;
     getInnerOrigin(t: ILeaf, origin: IPointData | IAlign): IPointData;
     getRelativeWorld(t: ILeaf, relative: ILeaf, temp?: boolean): IMatrixData;