@leafer/display 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

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

package/src/Branch.ts

@@ -75,7 +75,7 @@ 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.positionChange() // layouted(removed), need update
+        child.__layout.boundsChanged || child.__layout.matrixChange() // layouted(removed), need update
 
         if (child.__parentWait) WaitHelper.run(child.__parentWait)
 

package/src/Leaf.ts

@@ -1,4 +1,4 @@
-import { ILeafer, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IMatrixWithBoundsData, __Number, __Boolean, __Value, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IObject, IFunction, __String, IPointData, IMatrixDecompositionAttr, ILayoutBoundsType, ILayoutLocationType, IBoundsData, IBranch, IMatrixWithLayoutData } from '@leafer/interface'
+import { ILeafer, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IMatrixWithBoundsData, __Number, __Boolean, __Value, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IObject, IFunction, __String, IPointData, IMatrixDecompositionAttr, ILayoutBoundsType, ILayoutLocationType, IBoundsData, IBranch, IMatrixWithLayoutData, IFindMethod, ILeafDataOptions } from '@leafer/interface'
 import { IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
@@ -88,8 +88,12 @@ export class Leaf implements ILeaf {
 
 
     constructor(data?: ILeafInputData) {
-
         this.innerId = create(LEAF)
+        this.reset(data)
+    }
+
+
+    public reset(data?: ILeafInputData): void {
 
         this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1, rotation: 0, skewX: 0, skewY: 0 }
         this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 }
@@ -99,6 +103,8 @@ export class Leaf implements ILeaf {
         this.__ = new this.__DataProcessor(this)
         this.__layout = new this.__LayoutProcessor(this)
 
+        if (this.__level) this.resetCustom()
+
         if (data) {
             if (data.children) {
                 this.set(data)
@@ -108,6 +114,11 @@ export class Leaf implements ILeaf {
         }
     }
 
+    public resetCustom(): void {
+        this.__hasMask = this.__hasEraser = null
+        this.forceUpdate()
+    }
+
 
     public waitParent(item: IFunction): void {
         this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item])
@@ -126,9 +137,12 @@ export class Leaf implements ILeaf {
             if (leafer !== null) leafer = this as unknown as ILeafer
         }
 
+        if (this.leafer && !leafer) this.leafer.leafs--
+
         this.leafer = leafer
 
         if (leafer) {
+            leafer.leafs++
             this.__level = this.parent ? this.parent.__level + 1 : 1
             if (this.__leaferWait) WaitHelper.run(this.__leaferWait)
         }
@@ -144,6 +158,7 @@ export class Leaf implements ILeaf {
     // data
 
     public set(_data: IObject): void { }
+    get(_options?: ILeafDataOptions): ILeafInputData { return undefined }
 
     public toJSON(): IObject {
         return this.__.__getInputData()
@@ -159,10 +174,23 @@ export class Leaf implements ILeaf {
 
     public __getAttr(_attrName: string): __Value { return undefined }
 
+    public setProxyAttr(_attrName: string, _newValue: __Value): void { }
+
+    public getProxyAttr(_attrName: string): __Value { return undefined }
+
+    // ---
+
+
+    // find
+
+    public find(_condition: number | string | IFindMethod): ILeaf[] { return undefined }
+
+    public findOne(_condition: number | string | IFindMethod): ILeaf { return undefined }
+
     // ---
 
     public forceUpdate(attrName?: string): void {
-        if (attrName === undefined) attrName = 'scaleX'
+        if (attrName === undefined) attrName = 'width'
         else if (attrName === 'surface') attrName = 'blendMode'
         const value = this.__.__getInput(attrName)
         this.__[attrName] = value === undefined ? null : undefined;
@@ -216,7 +244,7 @@ export class Leaf implements ILeaf {
 
     public __updateMask(_value?: boolean): void { }
 
-    public __renderMask(_canvas: ILeaferCanvas, _content: ILeaferCanvas, _mask: ILeaferCanvas): void { }
+    public __renderMask(_canvas: ILeaferCanvas, _content: ILeaferCanvas, _mask: ILeaferCanvas, _recycle?: boolean): void { }
 
     public __removeMask(_child?: ILeaf): void { }
 

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, InnerId, ILeafer, ILeafData, ILeafLayout, IMatrixWithLayoutData, IMatrixWithBoundsData, IBoundsData, IHitCanvas, IEventListenerMap, IFunction, ILeafInputData, IObject, __Value, ILeaferCanvas, IMatrixDecompositionAttr, ILayoutBoundsType, ILayoutLocationType, IPointData, IRadiusPointData, IRenderOptions, IEventListener, IEventListenerOptions, IEventListenerId, IEvent } from '@leafer/interface';
+import { ILeaf, InnerId, ILeafer, ILeafData, ILeafLayout, IMatrixWithLayoutData, IMatrixWithBoundsData, IBoundsData, IHitCanvas, IEventListenerMap, IFunction, ILeafInputData, IObject, ILeafDataOptions, __Value, IFindMethod, ILeaferCanvas, IMatrixDecompositionAttr, ILayoutBoundsType, ILayoutLocationType, IPointData, IRadiusPointData, IRenderOptions, IEventListener, IEventListenerOptions, IEventListenerId, IEvent } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -43,15 +43,22 @@ declare class Leaf implements ILeaf {
     children?: ILeaf[];
     destroyed: boolean;
     constructor(data?: ILeafInputData);
+    reset(data?: ILeafInputData): void;
+    resetCustom(): void;
     waitParent(item: IFunction): void;
     waitLeafer(item: IFunction): void;
     nextRender(item: IFunction): void;
     __bindLeafer(leafer: ILeafer | null): void;
     set(_data: IObject): void;
+    get(_options?: ILeafDataOptions): ILeafInputData;
     toJSON(): IObject;
     toString(): string;
     __setAttr(_attrName: string, _newValue: __Value): void;
     __getAttr(_attrName: string): __Value;
+    setProxyAttr(_attrName: string, _newValue: __Value): void;
+    getProxyAttr(_attrName: string): __Value;
+    find(_condition: number | string | IFindMethod): ILeaf[];
+    findOne(_condition: number | string | IFindMethod): ILeaf;
     forceUpdate(attrName?: string): void;
     __updateWorldMatrix(): void;
     __updateLocalMatrix(): void;
@@ -68,7 +75,7 @@ declare class Leaf implements ILeaf {
     __onUpdateSize(): void;
     __updateEraser(_value?: boolean): void;
     __updateMask(_value?: boolean): void;
-    __renderMask(_canvas: ILeaferCanvas, _content: ILeaferCanvas, _mask: ILeaferCanvas): void;
+    __renderMask(_canvas: ILeaferCanvas, _content: ILeaferCanvas, _mask: ILeaferCanvas, _recycle?: boolean): void;
     __removeMask(_child?: ILeaf): void;
     getWorld(attrName: IMatrixDecompositionAttr): number;
     getBounds(type: ILayoutBoundsType, locationType?: ILayoutLocationType): IBoundsData;