@leafer/display 1.0.0-rc.12 → 1.0.0-rc.17

package/package.json

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

package/src/Branch.ts

@@ -16,12 +16,6 @@ const { localBoxBounds, localStrokeBounds, localRenderBounds, maskLocalBoxBounds
 @useModule(BranchRender)
 export class Branch extends Leaf {
 
-    constructor() {
-        super()
-        this.isBranch = true
-        this.children = []
-    }
-
     // overwrite
 
     public __updateStrokeSpread(): number {
@@ -69,6 +63,8 @@ export class Branch extends Leaf {
     }
 
     public add(child: ILeaf, index?: number): void {
+        if (child === this) return
+
         if (child.parent) child.parent.remove(child)
         child.parent = this
 
@@ -90,7 +86,7 @@ export class Branch extends Leaf {
         children.forEach(child => this.add(child))
     }
 
-    public remove(child?: Leaf, destroy?: boolean): void {
+    public remove(child?: ILeaf, destroy?: boolean): void {
         if (child) {
             const index = this.children.indexOf(child)
             if (index > -1) {

package/src/Leaf.ts

@@ -1,10 +1,11 @@
-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 } 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 } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
 import { LeafDataProxy, LeafMatrix, LeafBounds, LeafEventer, LeafRender } from '@leafer/display-module'
 import { boundsType, useModule, defineDataProcessor } from '@leafer/decorator'
 import { LeafHelper, WaitHelper } from '@leafer/helper'
+import { ChildEvent } from '@leafer/event'
 
 
 const { LEAF, create } = IncrementId
@@ -34,9 +35,9 @@ export class Leaf implements ILeaf {
     public leafer?: ILeaferBase
     public parent?: ILeaf
 
-    public isLeafer: boolean
-    public isBranch: boolean
-    public isBranchLeaf: boolean
+    public get isLeafer(): boolean { return false }
+    public get isBranch(): boolean { return false }
+    public get isBranchLeaf(): boolean { return false }
 
     public __: ILeafData
     public __layout: ILeafLayout
@@ -53,7 +54,7 @@ export class Leaf implements ILeaf {
     public __worldOpacity: number
 
     // now transform
-    public get worldTransform(): IMatrixData { return this.__layout.getTransform('world') }
+    public get worldTransform(): IMatrixWithScaleData { return this.__layout.getTransform('world') as IMatrixWithScaleData }
     public get localTransform(): IMatrixData { return this.__layout.getTransform('local') }
 
     // now bounds
@@ -79,6 +80,9 @@ 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 pathClosed: boolean
+
     // event
     public __captureMap?: IEventListenerMap
     public __bubbleMap?: IEventListenerMap
@@ -159,7 +163,7 @@ export class Leaf implements ILeaf {
     // data
 
     public set(_data: IObject): void { }
-    public get(): ILeafInputData { return undefined }
+    public get(_name?: string): ILeafInputData | IValue { return undefined }
 
     public toJSON(): IObject {
         return this.__.__getInputData()
@@ -510,8 +514,10 @@ export class Leaf implements ILeaf {
 
     public destroy(): void {
         if (!this.destroyed) {
-            if (this.parent) this.remove()
+            const { parent } = this
+            if (parent) this.remove()
             if (this.children) (this as unknown as IBranch).removeAll(true)
+            if (this.hasEvent(ChildEvent.DESTROY)) this.emitEvent(new ChildEvent(ChildEvent.DESTROY, this, parent))
 
             this.__.destroy()
             this.__layout.destroy()

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, 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, IBoundsType, ILocationType, ILayoutBoundsData, IPointData, IRadiusPointData, IEventListener, IEventListenerOptions, IEventListenerId, IEvent, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -12,9 +12,9 @@ declare class Leaf implements ILeaf {
     get __LayoutProcessor(): typeof LeafLayout;
     leafer?: ILeaferBase;
     parent?: ILeaf;
-    isLeafer: boolean;
-    isBranch: boolean;
-    isBranchLeaf: boolean;
+    get isLeafer(): boolean;
+    get isBranch(): boolean;
+    get isBranchLeaf(): boolean;
     __: ILeafData;
     __layout: ILeafLayout;
     __world: IMatrixWithBoundsScaleData;
@@ -24,7 +24,7 @@ declare class Leaf implements ILeaf {
     get __localMatrix(): IMatrixData;
     get __localBoxBounds(): IBoundsData;
     __worldOpacity: number;
-    get worldTransform(): IMatrixData;
+    get worldTransform(): IMatrixWithScaleData;
     get localTransform(): IMatrixData;
     get boxBounds(): IBoundsData;
     get renderBounds(): IBoundsData;
@@ -41,6 +41,8 @@ declare class Leaf implements ILeaf {
     __hitCanvas?: IHitCanvas;
     get __onlyHitMask(): boolean;
     get __ignoreHitWorld(): boolean;
+    get pathInputed(): boolean;
+    pathClosed: boolean;
     __captureMap?: IEventListenerMap;
     __bubbleMap?: IEventListenerMap;
     __parentWait?: IFunction[];
@@ -56,7 +58,7 @@ declare class Leaf implements ILeaf {
     nextRender(item: IFunction, off?: 'off'): void;
     __bindLeafer(leafer: ILeaferBase | null): void;
     set(_data: IObject): void;
-    get(): ILeafInputData;
+    get(_name?: string): ILeafInputData | IValue;
     toJSON(): IObject;
     toString(): string;
     __setAttr(_attrName: string, _newValue: IValue): void;
@@ -145,7 +147,6 @@ declare class Leaf implements ILeaf {
 }
 
 declare class Branch extends Leaf {
-    constructor();
     __updateStrokeSpread(): number;
     __updateRenderSpread(): number;
     __updateBoxBounds(): void;
@@ -154,7 +155,7 @@ declare class Branch extends Leaf {
     __updateSortChildren(): void;
     add(child: ILeaf, index?: number): void;
     addMany(...children: ILeaf[]): void;
-    remove(child?: Leaf, destroy?: boolean): void;
+    remove(child?: ILeaf, destroy?: boolean): void;
     removeAll(destroy?: boolean): void;
     clear(): void;
     protected __preRemove(): void;