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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.0.0-rc.16",
+  "version": "1.0.0-rc.18",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,16 +22,16 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-rc.16",
-    "@leafer/data": "1.0.0-rc.16",
-    "@leafer/layout": "1.0.0-rc.16",
-    "@leafer/display-module": "1.0.0-rc.16",
-    "@leafer/event": "1.0.0-rc.16",
-    "@leafer/decorator": "1.0.0-rc.16",
-    "@leafer/helper": "1.0.0-rc.16",
-    "@leafer/platform": "1.0.0-rc.16"
+    "@leafer/math": "1.0.0-rc.18",
+    "@leafer/data": "1.0.0-rc.18",
+    "@leafer/layout": "1.0.0-rc.18",
+    "@leafer/display-module": "1.0.0-rc.18",
+    "@leafer/event": "1.0.0-rc.18",
+    "@leafer/decorator": "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/Branch.ts

@@ -70,7 +70,9 @@ export class Branch extends Leaf {
 
         index === undefined ? this.children.push(child) : this.children.splice(index, 0, child)
         if (child.isBranch) this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1
-        child.__layout.boundsChanged || child.__layout.matrixChange() // layouted(removed), need update
+
+        child.__layout.boxChanged || child.__layout.boxChange() // layouted(removed), need update
+        child.__layout.matrixChanged || child.__layout.matrixChange() // layouted(removed), need update
 
         if (child.__parentWait) WaitHelper.run(child.__parentWait)
 

package/src/Leaf.ts

@@ -12,7 +12,7 @@ const { LEAF, create } = IncrementId
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper
 const { toOuterOf } = BoundsHelper
 const { tempToOuterOf, copy } = PointHelper
-const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, transform, setTransform, drop } = LeafHelper
+const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getRelativeWorld, drop } = LeafHelper
 
 @useModule(LeafDataProxy)
 @useModule(LeafMatrix)
@@ -116,7 +116,10 @@ export class Leaf implements ILeaf {
         this.__layout = new this.__LayoutProcessor(this)
 
         if (this.__level) this.resetCustom()
-        if (data) data.children ? this.set(data) : Object.assign(this, data)
+        if (data) {
+            if ((data as ILeaf).__) data = (data as ILeaf).toJSON()
+            data.children ? this.set(data) : Object.assign(this, data)
+        }
     }
 
     public resetCustom(): void {
@@ -125,16 +128,22 @@ export class Leaf implements ILeaf {
     }
 
 
-    public waitParent(item: IFunction): void {
+    public waitParent(item: IFunction, bind?: IObject): void {
+        if (bind) item = item.bind(bind)
         this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item])
     }
 
-    public waitLeafer(item: IFunction): void {
+    public waitLeafer(item: IFunction, bind?: IObject): void {
+        if (bind) item = item.bind(bind)
         this.leafer ? item() : (this.__leaferWait ? this.__leaferWait.push(item) : this.__leaferWait = [item])
     }
 
-    public nextRender(item: IFunction, off?: 'off'): void {
-        this.leafer ? this.leafer.nextRender(item, off) : this.waitLeafer(() => this.leafer.nextRender(item, off))
+    public nextRender(item: IFunction, bind?: IObject, off?: 'off'): void {
+        this.leafer ? this.leafer.nextRender(item, bind, off) : this.waitLeafer(() => this.leafer.nextRender(item, bind, off))
+    }
+
+    public removeNextRender(item: IFunction): void {
+        this.nextRender(item, null, 'off')
     }
 
     public __bindLeafer(leafer: ILeaferBase | null): void {
@@ -194,6 +203,14 @@ export class Leaf implements ILeaf {
 
     // ---
 
+
+    // state
+
+    public focus(_value?: boolean): void { }
+
+    // ---
+
+
     public forceUpdate(attrName?: string): void {
         if (attrName === undefined) attrName = 'width'
         else if (attrName === 'surface') attrName = 'blendMode'
@@ -288,6 +305,11 @@ export class Leaf implements ILeaf {
         return this.getLayoutBounds()[attrName]
     }
 
+    public getTransform(relative?: ILocationType | ILeaf): IMatrixData {
+        return this.__layout.getTransform(relative || 'local')
+    }
+
+
     public getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData {
         return this.__layout.getBounds(type, relative)
     }
@@ -301,6 +323,14 @@ export class Leaf implements ILeaf {
     }
 
 
+    public getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData {
+        const matrix = relative ? getRelativeWorld(this, relative) : this.worldTransform
+        const to = change ? inner : {} as IBoundsData
+        toOuterOf(inner, matrix, to)
+        return to
+    }
+
+
     public worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void {
         if (this.parent) {
             this.parent.worldToInner(world, to, distance, relative)
@@ -375,7 +405,7 @@ export class Leaf implements ILeaf {
     }
 
 
-    // transform
+    // transform 
 
     public setTransform(matrix: IMatrixData, resize?: boolean): void {
         setTransform(this, matrix, resize)
@@ -401,6 +431,28 @@ export class Leaf implements ILeaf {
         skewOfLocal(this, tempToOuterOf(origin, this.localTransform), skewX, skewY, resize)
     }
 
+
+    public transformWorld(worldTransform?: IMatrixData, resize?: boolean): void {
+        transformWorld(this, worldTransform, resize)
+    }
+
+    public moveWorld(x: number, y?: number): void {
+        moveWorld(this, x, y)
+    }
+
+    public scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void {
+        zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize)
+    }
+
+    public rotateOfWorld(worldOrigin: IPointData, rotation: number): void {
+        rotateOfWorld(this, worldOrigin, rotation)
+    }
+
+    public skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void {
+        skewOfWorld(this, worldOrigin, skewX, skewY, resize)
+    }
+
+
     // @leafer-ui/scale rewrite
 
     public scaleResize(scaleX: number, scaleY = scaleX, _noResize?: boolean): void {

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, IBoundsType, ILocationType, 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, IRadiusPointData, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -53,9 +53,10 @@ declare class Leaf implements ILeaf {
     constructor(data?: ILeafInputData);
     reset(data?: ILeafInputData): void;
     resetCustom(): void;
-    waitParent(item: IFunction): void;
-    waitLeafer(item: IFunction): void;
-    nextRender(item: IFunction, off?: 'off'): void;
+    waitParent(item: IFunction, bind?: IObject): void;
+    waitLeafer(item: IFunction, bind?: IObject): void;
+    nextRender(item: IFunction, bind?: IObject, off?: 'off'): void;
+    removeNextRender(item: IFunction): void;
     __bindLeafer(leafer: ILeaferBase | null): void;
     set(_data: IObject): void;
     get(_name?: string): ILeafInputData | IValue;
@@ -67,6 +68,7 @@ declare class Leaf implements ILeaf {
     getProxyAttr(_attrName: string): IValue;
     find(_condition: number | string | IFindMethod, _options?: any): ILeaf[];
     findOne(_condition: number | string | IFindMethod, _options?: any): ILeaf;
+    focus(_value?: boolean): void;
     forceUpdate(attrName?: string): void;
     updateLayout(): void;
     __updateWorldMatrix(): void;
@@ -89,9 +91,11 @@ declare class Leaf implements ILeaf {
     __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;
     getLayoutPoints(type?: IBoundsType, relative?: ILocationType | ILeaf): IPointData[];
+    getWorldBounds(inner: IBoundsData, relative?: ILeaf, change?: boolean): IBoundsData;
     worldToLocal(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
     localToWorld(local: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
     worldToInner(world: IPointData, to?: IPointData, distance?: boolean, relative?: ILeaf): void;
@@ -110,6 +114,11 @@ declare class Leaf implements ILeaf {
     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;
+    transformWorld(worldTransform?: IMatrixData, resize?: boolean): void;
+    moveWorld(x: number, y?: number): void;
+    scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void;
+    rotateOfWorld(worldOrigin: IPointData, rotation: number): void;
+    skewOfWorld(worldOrigin: IPointData, skewX: number, skewY?: number, resize?: boolean): void;
     scaleResize(scaleX: number, scaleY?: number, _noResize?: boolean): void;
     __scaleResize(_scaleX: number, _scaleY: number): void;
     __hitWorld(_point: IRadiusPointData): boolean;