@leafer/display 1.0.0-rc.22 → 1.0.0-rc.24

package/package.json

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

package/src/Leaf.ts

@@ -80,7 +80,7 @@ export class Leaf implements ILeaf {
     public get __onlyHitMask(): boolean { return this.__hasMask && !this.__.hitChildren }
     public get __ignoreHitWorld(): boolean { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren }
 
-    public get pathInputed(): boolean { return !!this.__.__pathInputed }
+    public get pathInputed(): boolean { return this.__.__pathInputed as unknown as boolean }
 
     // event
     public __captureMap?: IEventListenerMap
@@ -198,8 +198,12 @@ export class Leaf implements ILeaf {
 
     public find(_condition: number | string | IFindMethod, _options?: any): ILeaf[] { return undefined }
 
+    public findTag(_tag: string | string[]): ILeaf[] { return undefined }
+
     public findOne(_condition: number | string | IFindMethod, _options?: any): ILeaf { return undefined }
 
+    public findId(_id: number | string): ILeaf { return undefined }
+
     // ---
 
 
@@ -248,12 +252,17 @@ export class Leaf implements ILeaf {
 
     public __updateBoxBounds(): void { }
 
+    public __updateContentBounds(): void { }
+
     public __updateStrokeBounds(): void { }
 
     public __updateRenderBounds(): void { }
 
 
     public __updateAutoLayout(): void { }
+
+    public __updateFlowLayout(): void { }
+
     public __updateNaturalSize(): void { }
 
 
@@ -266,16 +275,24 @@ export class Leaf implements ILeaf {
     // ---
 
 
-    // LeafMask rewrite
-
     public __updateEraser(value?: boolean): void {
         this.__hasEraser = value ? true : this.children.some(item => item.__.eraser)
     }
 
+    public __renderEraser(canvas: ILeaferCanvas, options: IRenderOptions): void {  // path eraser
+        canvas.save()
+        this.__clip(canvas, options)
+        const { renderBounds: r } = this.__layout
+        canvas.clearRect(r.x, r.y, r.width, r.height)
+        canvas.restore()
+    }
+
     public __updateMask(value?: boolean): void {
         this.__hasMask = value ? true : this.children.some(item => item.__.mask)
     }
 
+    // LeafMask rewrite
+
     public __renderMask(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
 
 
@@ -533,7 +550,7 @@ export class Leaf implements ILeaf {
 
     public on(_type: string | string[], _listener: IEventListener, _options?: IEventListenerOptions | boolean): void { }
 
-    public off(_type: string | string[], _listener: IEventListener, _options?: IEventListenerOptions | boolean): void { }
+    public off(_type?: string | string[], _listener?: IEventListener, _options?: IEventListenerOptions | boolean): void { }
 
     public on_(_type: string | string[], _listener: IEventListener, _bind?: IObject, _options?: IEventListenerOptions | boolean): IEventListenerId { return undefined }
 
@@ -549,8 +566,8 @@ export class Leaf implements ILeaf {
 
     // ---
 
-    static changeAttr(attrName: string, defaultValue: IValue): void {
-        defineDataProcessor(this.prototype, attrName, defaultValue)
+    static changeAttr(attrName: string, defaultValue: IValue, fn?: IAttrDecorator): void {
+        fn ? this.addAttr(attrName, defaultValue, fn) : defineDataProcessor(this.prototype, attrName, defaultValue)
     }
 
     static addAttr(attrName: string, defaultValue: IValue, fn?: IAttrDecorator): void {

package/types/index.d.ts

@@ -66,7 +66,9 @@ declare class Leaf implements ILeaf {
     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;
     focus(_value?: boolean): void;
     forceUpdate(attrName?: string): void;
     updateLayout(): void;
@@ -78,14 +80,17 @@ declare class Leaf implements ILeaf {
     __updateLocalStrokeBounds(): void;
     __updateLocalRenderBounds(): void;
     __updateBoxBounds(): void;
+    __updateContentBounds(): void;
     __updateStrokeBounds(): void;
     __updateRenderBounds(): void;
     __updateAutoLayout(): void;
+    __updateFlowLayout(): void;
     __updateNaturalSize(): void;
     __updateStrokeSpread(): number;
     __updateRenderSpread(): number;
     __onUpdateSize(): void;
     __updateEraser(value?: boolean): void;
+    __renderEraser(canvas: ILeaferCanvas, options: IRenderOptions): void;
     __updateMask(value?: boolean): void;
     __renderMask(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
@@ -143,14 +148,14 @@ declare class Leaf implements ILeaf {
     remove(_child?: ILeaf, destroy?: boolean): void;
     dropTo(parent: ILeaf, index?: number, resize?: boolean): void;
     on(_type: string | string[], _listener: IEventListener, _options?: IEventListenerOptions | boolean): void;
-    off(_type: string | string[], _listener: IEventListener, _options?: IEventListenerOptions | boolean): void;
+    off(_type?: string | string[], _listener?: IEventListener, _options?: IEventListenerOptions | boolean): void;
     on_(_type: string | string[], _listener: IEventListener, _bind?: IObject, _options?: IEventListenerOptions | boolean): IEventListenerId;
     off_(_id: IEventListenerId | IEventListenerId[]): void;
     once(_type: string | string[], _listener: IEventListener, _capture?: boolean): void;
     emit(_type: string, _event?: IEvent | IObject, _capture?: boolean): void;
     emitEvent(_event?: IEvent, _capture?: boolean): void;
     hasEvent(_type: string, _capture?: boolean): boolean;
-    static changeAttr(attrName: string, defaultValue: IValue): void;
+    static changeAttr(attrName: string, defaultValue: IValue, fn?: IAttrDecorator): void;
     static addAttr(attrName: string, defaultValue: IValue, fn?: IAttrDecorator): void;
     destroy(): void;
 }