@leafer/display 1.0.0-rc.25 → 1.0.0-rc.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.0.0-rc.25",
+  "version": "1.0.0-rc.26",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,16 +22,16 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-rc.25",
-    "@leafer/data": "1.0.0-rc.25",
-    "@leafer/layout": "1.0.0-rc.25",
-    "@leafer/display-module": "1.0.0-rc.25",
-    "@leafer/event": "1.0.0-rc.25",
-    "@leafer/decorator": "1.0.0-rc.25",
-    "@leafer/helper": "1.0.0-rc.25",
-    "@leafer/platform": "1.0.0-rc.25"
+    "@leafer/math": "1.0.0-rc.26",
+    "@leafer/data": "1.0.0-rc.26",
+    "@leafer/layout": "1.0.0-rc.26",
+    "@leafer/display-module": "1.0.0-rc.26",
+    "@leafer/event": "1.0.0-rc.26",
+    "@leafer/decorator": "1.0.0-rc.26",
+    "@leafer/helper": "1.0.0-rc.26",
+    "@leafer/platform": "1.0.0-rc.26"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.25"
+    "@leafer/interface": "1.0.0-rc.26"
   }
 }

package/src/Leaf.ts

@@ -1,4 +1,4 @@
-import { ILeaferBase, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IBoundsType, ILocationType, IMatrixWithBoundsData, ILayoutBoundsData, IValue, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IObject, IFunction, IPointData, IBoundsData, IBranch, IFindMethod, ILayoutAttr, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData } from '@leafer/interface'
+import { ILeaferBase, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IBoundsType, ILocationType, IMatrixWithBoundsData, ILayoutBoundsData, IValue, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IObject, IFunction, IPointData, IBoundsData, IBranch, IFindMethod, ILayoutAttr, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAlign } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
@@ -11,8 +11,8 @@ import { ChildEvent } from '@leafer/event'
 const { LEAF, create } = IncrementId
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper
 const { toOuterOf } = BoundsHelper
-const { tempToOuterOf, copy } = PointHelper
-const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getRelativeWorld, drop } = LeafHelper
+const { copy } = PointHelper
+const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper
 
 @useModule(LeafDataProxy)
 @useModule(LeafMatrix)
@@ -181,6 +181,12 @@ export class Leaf implements ILeaf {
         return JSON.stringify(this.toJSON())
     }
 
+    public toSVG(): string { return undefined }
+
+    public __SVG(_data: IObject): void { }
+
+    public toHTML(): string { return undefined }
+
     // LeafDataProxy rewrite
 
     public __setAttr(_attrName: string, _newValue: IValue): boolean { return true }
@@ -200,9 +206,9 @@ export class Leaf implements ILeaf {
 
     public findTag(_tag: string | string[]): ILeaf[] { return undefined }
 
-    public findOne(_condition: number | string | IFindMethod, _options?: any): ILeaf { return undefined }
+    public findOne(_condition: number | string | IFindMethod, _options?: any): ILeaf | undefined { return undefined }
 
-    public findId(_id: number | string): ILeaf { return undefined }
+    public findId(_id: number | string): ILeaf | undefined { return undefined }
 
     // ---
 
@@ -435,19 +441,18 @@ export class Leaf implements ILeaf {
         moveLocal(this, x, y)
     }
 
-    public scaleOf(origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void {
-        zoomOfLocal(this, tempToOuterOf(origin, this.localTransform), scaleX, scaleY, resize)
+    public scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void {
+        zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize)
     }
 
-    public rotateOf(origin: IPointData, rotation: number): void {
-        rotateOfLocal(this, tempToOuterOf(origin, this.localTransform), rotation)
+    public rotateOf(origin: IPointData | IAlign, rotation: number): void {
+        rotateOfLocal(this, getLocalOrigin(this, origin), rotation)
     }
 
-    public skewOf(origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void {
-        skewOfLocal(this, tempToOuterOf(origin, this.localTransform), skewX, skewY, resize)
+    public skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void {
+        skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize)
     }
 
-
     public transformWorld(worldTransform?: IMatrixData, resize?: boolean): void {
         transformWorld(this, worldTransform, resize)
     }
@@ -478,6 +483,18 @@ export class Leaf implements ILeaf {
 
     public __scaleResize(_scaleX: number, _scaleY: number): void { }
 
+
+    public resizeWidth(width: number): void {
+        const scale = width / this.__localBoxBounds.width
+        this.scaleResize(scale, this.__.lockRatio ? scale : 1)
+    }
+
+    public resizeHeight(height: number): void {
+        const scale = height / this.__localBoxBounds.height
+        this.scaleResize(this.__.lockRatio ? scale : 1, scale)
+    }
+
+
     // @leafer-ui/hit LeafHit rewrite
 
     public __hitWorld(_point: IRadiusPointData): boolean { return true }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventListenerMap, IFunction, ILeafInputData, IObject, IValue, IFindMethod, ILeaferCanvas, IRenderOptions, ILayoutAttr, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, IRadiusPointData, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
+import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventListenerMap, IFunction, ILeafInputData, IObject, IValue, IFindMethod, ILeaferCanvas, IRenderOptions, ILayoutAttr, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, IAlign, IRadiusPointData, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -61,14 +61,17 @@ declare class Leaf implements ILeaf {
     get(_name?: string): ILeafInputData | IValue;
     toJSON(): IObject;
     toString(): string;
+    toSVG(): string;
+    __SVG(_data: IObject): void;
+    toHTML(): string;
     __setAttr(_attrName: string, _newValue: IValue): boolean;
     __getAttr(_attrName: string): IValue;
     setProxyAttr(_attrName: string, _newValue: IValue): void;
     getProxyAttr(_attrName: string): IValue;
     find(_condition: number | string | IFindMethod, _options?: any): ILeaf[];
     findTag(_tag: string | string[]): ILeaf[];
-    findOne(_condition: number | string | IFindMethod, _options?: any): ILeaf;
-    findId(_id: number | string): ILeaf;
+    findOne(_condition: number | string | IFindMethod, _options?: any): ILeaf | undefined;
+    findId(_id: number | string): ILeaf | undefined;
     focus(_value?: boolean): void;
     forceUpdate(attrName?: string): void;
     updateLayout(): void;
@@ -115,9 +118,9 @@ declare class Leaf implements ILeaf {
     setTransform(matrix: IMatrixData, resize?: boolean): void;
     transform(matrix: IMatrixData, resize?: boolean): void;
     move(x: number | IPointData, y?: number): void;
-    scaleOf(origin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
-    rotateOf(origin: IPointData, rotation: number): void;
-    skewOf(origin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
+    scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void;
+    rotateOf(origin: IPointData | IAlign, rotation: number): void;
+    skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void;
     transformWorld(worldTransform?: IMatrixData, resize?: boolean): void;
     moveWorld(x: number | IPointData, y?: number): void;
     scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
@@ -125,6 +128,8 @@ declare class Leaf implements ILeaf {
     skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
     scaleResize(scaleX: number, scaleY?: number, _noResize?: boolean): void;
     __scaleResize(_scaleX: number, _scaleY: number): void;
+    resizeWidth(width: number): void;
+    resizeHeight(height: number): void;
     __hitWorld(_point: IRadiusPointData): boolean;
     __hit(_local: IRadiusPointData): boolean;
     __hitFill(_inner: IRadiusPointData): boolean;