@leafer/display 1.0.0-rc.28 → 1.0.0-rc.30

package/package.json

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

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, IAlign } 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, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAlign, IJSONOptions } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
@@ -179,12 +179,13 @@ export class Leaf implements ILeaf {
 
     public getComputedAttr(name: string): any { return (this.__ as IObject)[name] }
 
-    public toJSON(): IObject {
-        return this.__.__getInputData()
+    public toJSON(options?: IJSONOptions): IObject {
+        if (options) this.__layout.update()
+        return this.__.__getInputData(null, options)
     }
 
-    public toString(): string {
-        return JSON.stringify(this.toJSON())
+    public toString(options?: IJSONOptions): string {
+        return JSON.stringify(this.toJSON(options))
     }
 
     public toSVG(): string { return undefined }
@@ -327,14 +328,6 @@ export class Leaf implements ILeaf {
         }
     }
 
-
-    public getWorld(attrName: ILayoutAttr): number {
-        this.__layout.update()
-        if (attrName === 'x') return this.__world.e
-        if (attrName === 'y') return this.__world.f
-        return this.getLayoutBounds()[attrName]
-    }
-
     public getTransform(relative?: ILocationType | ILeaf): IMatrixData {
         return this.__layout.getTransform(relative || 'local')
     }
@@ -492,15 +485,9 @@ 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 resizeWidth(_width: number): void { }
 
-    public resizeHeight(height: number): void {
-        const scale = height / this.__localBoxBounds.height
-        this.scaleResize(this.__.lockRatio ? scale : 1, scale)
-    }
+    public resizeHeight(_height: number): void { }
 
 
     // @leafer-ui/hit LeafHit rewrite

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, IAlign, 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, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, IAlign, IRadiusPointData, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -63,8 +63,8 @@ declare class Leaf implements ILeaf {
     setAttr(name: string, value: any): void;
     getAttr(name: string): any;
     getComputedAttr(name: string): any;
-    toJSON(): IObject;
-    toString(): string;
+    toJSON(options?: IJSONOptions): IObject;
+    toString(options?: IJSONOptions): string;
     toSVG(): string;
     __SVG(_data: IObject): void;
     toHTML(): string;
@@ -102,7 +102,6 @@ declare class Leaf implements ILeaf {
     __updateMask(value?: boolean): void;
     __renderMask(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
-    getWorld(attrName: ILayoutAttr): number;
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
@@ -133,8 +132,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;
+    resizeWidth(_width: number): void;
+    resizeHeight(_height: number): void;
     __hitWorld(_point: IRadiusPointData): boolean;
     __hit(_local: IRadiusPointData): boolean;
     __hitFill(_inner: IRadiusPointData): boolean;