@leafer/display 1.0.10 → 1.1.1

package/package.json

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

package/src/Branch.ts

@@ -5,6 +5,7 @@ import { BranchHelper, LeafBoundsHelper } from '@leafer/helper'
 import { useModule } from '@leafer/decorator'
 import { BranchRender } from '@leafer/display-module'
 import { UICreator } from '@leafer/platform'
+import { Debug } from '@leafer/debug'
 
 import { Leaf } from './Leaf'
 
@@ -12,7 +13,7 @@ import { Leaf } from './Leaf'
 const { setListWithFn } = BoundsHelper
 const { sort } = BranchHelper
 const { localBoxBounds, localStrokeBounds, localRenderBounds, maskLocalBoxBounds, maskLocalStrokeBounds, maskLocalRenderBounds } = LeafBoundsHelper
-
+const debug = new Debug('Branch')
 
 @useModule(BranchRender)
 export class Branch extends Leaf { // tip: rewrited Group
@@ -64,7 +65,8 @@ export class Branch extends Leaf { // tip: rewrited Group
     }
 
     public add(child: ILeaf, index?: number): void {
-        if (child === this) return
+        if (child === this || child.destroyed) return debug.warn('add self or destroyed')
+
         const noIndex = index === undefined
         if (!child.__) {
             if (child instanceof Array) return child.forEach(item => { this.add(item, index); noIndex || index++ }) // add []
@@ -77,8 +79,9 @@ export class Branch extends Leaf { // tip: rewrited Group
         noIndex ? this.children.push(child) : this.children.splice(index, 0, child)
         if (child.isBranch) this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1
 
-        child.__layout.boxChanged || child.__layout.boxChange() // layouted(removed), need update
-        child.__layout.matrixChanged || child.__layout.matrixChange() // layouted(removed), need update
+        const childLayout = child.__layout
+        childLayout.boxChanged || childLayout.boxChange() // layouted(removed), need update
+        childLayout.matrixChanged || childLayout.matrixChange() // layouted(removed), need update
 
         if (child.__bubbleMap) child.__emitLifeEvent(ChildEvent.ADD)
 

package/src/Leaf.ts

@@ -314,8 +314,8 @@ export class Leaf implements ILeaf {
         canvas.restore()
     }
 
-    public __updateMask(value?: boolean): void {
-        this.__hasMask = value ? true : this.children.some(item => item.__.mask)
+    public __updateMask(_value?: boolean): void {
+        this.__hasMask = this.children.some(item => item.__.mask && item.__.visible && item.__.opacity)
     }
 
     // LeafMask rewrite
@@ -470,13 +470,13 @@ export class Leaf implements ILeaf {
         transform(this, matrix, resize)
     }
 
-    public move(x: number | IPointData, y?: number): void {
-        moveLocal(this, x, y)
+    public move(x: number | IPointData, y?: number, transition?: any): void {
+        moveLocal(this, x, y, transition)
     }
 
 
-    public moveInner(x: number | IPointData, y?: number): void {
-        moveWorld(this, x, y, true)
+    public moveInner(x: number | IPointData, y?: number, transition?: any): void {
+        moveWorld(this, x, y, true, transition)
     }
 
     public scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void {
@@ -496,8 +496,8 @@ export class Leaf implements ILeaf {
         transformWorld(this, worldTransform, resize)
     }
 
-    public moveWorld(x: number | IPointData, y?: number): void {
-        moveWorld(this, x, y)
+    public moveWorld(x: number | IPointData, y?: number, transition?: any): void {
+        moveWorld(this, x, y, false, transition)
     }
 
     public scaleOfWorld(worldOrigin: IPointData, scaleX: number, scaleY?: number, resize?: boolean): void {

package/types/index.d.ts

@@ -103,7 +103,7 @@ declare class Leaf implements ILeaf {
     __onUpdateSize(): void;
     __updateEraser(value?: boolean): void;
     __renderEraser(canvas: ILeaferCanvas, options: IRenderOptions): void;
-    __updateMask(value?: boolean): void;
+    __updateMask(_value?: boolean): void;
     __renderMask(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
@@ -129,13 +129,13 @@ declare class Leaf implements ILeaf {
     getWorldPointByPage(page: IPointData, relative?: ILeaf, distance?: boolean, change?: boolean): IPointData;
     setTransform(matrix: IMatrixData, resize?: boolean): void;
     transform(matrix: IMatrixData, resize?: boolean): void;
-    move(x: number | IPointData, y?: number): void;
-    moveInner(x: number | IPointData, y?: number): void;
+    move(x: number | IPointData, y?: number, transition?: any): void;
+    moveInner(x: number | IPointData, y?: number, transition?: any): void;
     scaleOf(origin: IPointData | IAlign, scaleX: number, scaleY?: number, resize?: boolean): void;
     rotateOf(origin: IPointData | IAlign, rotation: number): void;
     skewOf(origin: IPointData | IAlign, skewX: number, skewY?: number, resize?: boolean): void;
     transformWorld(worldTransform?: IMatrixData, resize?: boolean): void;
-    moveWorld(x: number | IPointData, y?: number): void;
+    moveWorld(x: number | IPointData, y?: number, transition?: any): 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;