@leafer/display 1.0.0-beta.2 → 1.0.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.5",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,15 +19,15 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-beta.2",
-    "@leafer/data": "1.0.0-beta.2",
-    "@leafer/layout": "1.0.0-beta.2",
-    "@leafer/display-module": "1.0.0-beta.2",
-    "@leafer/event": "1.0.0-beta.2",
-    "@leafer/decorator": "1.0.0-beta.2",
-    "@leafer/helper": "1.0.0-beta.2"
+    "@leafer/math": "1.0.0-beta.5",
+    "@leafer/data": "1.0.0-beta.5",
+    "@leafer/layout": "1.0.0-beta.5",
+    "@leafer/display-module": "1.0.0-beta.5",
+    "@leafer/event": "1.0.0-beta.5",
+    "@leafer/decorator": "1.0.0-beta.5",
+    "@leafer/helper": "1.0.0-beta.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.2"
+    "@leafer/interface": "1.0.0-beta.5"
   }
 }

package/src/Branch.ts

@@ -1,9 +1,9 @@
-import { ILeaf, ILeaferCanvas, IRenderOptions } from '@leafer/interface'
+import { ILeaf } from '@leafer/interface'
 import { ChildEvent } from '@leafer/event'
 import { BoundsHelper } from '@leafer/math'
 import { BranchHelper, LeafBoundsHelper, WaitHelper } from '@leafer/helper'
 import { useModule } from '@leafer/decorator'
-import { LeafMask } from '@leafer/display-module'
+import { BranchRender, LeafMask } from '@leafer/display-module'
 
 import { Leaf } from './Leaf'
 
@@ -12,6 +12,8 @@ const { setByListWithHandle } = BoundsHelper
 const { sort } = BranchHelper
 const { localBoxBounds, localEventBounds, localRenderBounds, maskLocalBoxBounds, maskLocalEventBounds, maskLocalRenderBounds } = LeafBoundsHelper
 
+
+@useModule(BranchRender)
 @useModule(LeafMask)
 export class Branch extends Leaf {
 
@@ -51,14 +53,6 @@ export class Branch extends Leaf {
         setByListWithHandle(this.__layout.renderBounds, this.children, this.__hasMask ? maskLocalRenderBounds : localRenderBounds)
     }
 
-    public __updateChange(): void {
-        const { __layout: layout } = this
-        if (layout.childrenSortChanged) {
-            this.__updateSortChildren()
-            layout.childrenSortChanged = false
-        }
-    }
-
 
     // own
 
@@ -72,60 +66,6 @@ export class Branch extends Leaf {
         }
     }
 
-    public __render(canvas: ILeaferCanvas, options: IRenderOptions): void {
-
-        if (this.__worldOpacity) {
-
-            let child: ILeaf
-            const { children } = this
-
-            if (this.__hasMask && children.length > 1) {
-
-                let mask: boolean
-                let maskCanvas = canvas.getSameCanvas()
-                let contentCanvas = canvas.getSameCanvas()
-
-                for (let i = 0, len = children.length; i < len; i++) {
-                    child = children[i]
-
-                    if (child.isMask) {
-                        if (mask) {
-                            this.__renderMask(canvas, contentCanvas, maskCanvas)
-                            maskCanvas.clear()
-                            contentCanvas.clear()
-                        } else {
-                            mask = true
-                        }
-
-                        child.__render(maskCanvas, options)
-                        continue
-                    }
-
-                    child.__render(contentCanvas, options)
-                }
-
-                this.__renderMask(canvas, contentCanvas, maskCanvas)
-                maskCanvas.recycle()
-                contentCanvas.recycle()
-
-            } else {
-
-                const { bounds, hideBounds } = options
-
-                for (let i = 0, len = children.length; i < len; i++) {
-                    child = children[i]
-
-                    if (bounds && !bounds.hit(child.__world, options.matrix)) continue
-                    if (hideBounds && hideBounds.includes(child.__world, options.matrix)) continue
-
-                    child.__render(canvas, options)
-                }
-
-            }
-        }
-
-    }
-
     public add(child: ILeaf, index?: number): void {
 
         if (child.parent) child.parent.remove(child)

package/src/Leaf.ts

@@ -4,7 +4,7 @@ import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
 import { LeafDataProxy, LeafMatrix, LeafBounds, LeafHit, LeafEventer, LeafRender } from '@leafer/display-module'
 import { useModule } from '@leafer/decorator'
-import { WaitHelper } from '@leafer/helper'
+import { LeafHelper, WaitHelper } from '@leafer/helper'
 
 
 const { LEAF, create } = IncrementId
@@ -18,6 +18,8 @@ const { LEAF, create } = IncrementId
 export class Leaf implements ILeaf {
 
     public get tag(): string { return this.__tag }
+    public set tag(_value: string) { }
+
     public get __tag(): string { return 'Leaf' }
 
     public readonly innerId: InnerId  // 内部唯一标识
@@ -56,10 +58,11 @@ export class Leaf implements ILeaf {
     public __tempNumber: number // temp sort
 
     public __hasMask?: boolean
+    public __hasEraser?: boolean
     public __hitCanvas?: IHitCanvas
 
     public get __onlyHitMask(): boolean { return this.__hasMask && !this.__.hitChildren }
-    public get __ignoreHitWorld(): boolean { return this.__hasMask && this.__.hitChildren }
+    public get __ignoreHitWorld(): boolean { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren }
 
     // event
     public __captureMap?: IEventListenerMap
@@ -88,11 +91,11 @@ export class Leaf implements ILeaf {
 
 
     public waitParent(item: IFunction): void {
-        this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item]
+        this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item])
     }
 
     public waitLeafer(item: IFunction): void {
-        this.__leaferWait ? this.__leaferWait.push(item) : this.__leaferWait = [item]
+        this.leafer ? item() : (this.__leaferWait ? this.__leaferWait.push(item) : this.__leaferWait = [item])
     }
 
 
@@ -172,7 +175,9 @@ export class Leaf implements ILeaf {
 
     // LeafMask rewrite
 
-    public __updateMask(): void { }
+    public __updateEraser(_value?: boolean): void { }
+
+    public __updateMask(_value?: boolean): void { }
 
     public __renderMask(_canvas: ILeaferCanvas, _content: ILeaferCanvas, _mask: ILeaferCanvas): void { }
 
@@ -217,6 +222,24 @@ export class Leaf implements ILeaf {
     }
 
 
+    // transform
+
+    public move(x: number, y?: number): void {
+        LeafHelper.moveLocal(this, x, y)
+    }
+
+    public scaleOf(origin: IPointData, x: number, y?: number): void {
+        this.__layout.checkUpdate()
+        if (y === undefined) y = x
+        LeafHelper.zoomOfLocal(this, PointHelper.tempToOuterOf(origin, this.__local), x, y)
+    }
+
+    public rotateOf(origin: IPointData, angle: number): void {
+        this.__layout.checkUpdate()
+        LeafHelper.rotateOfLocal(this, PointHelper.tempToOuterOf(origin, this.__local), angle)
+    }
+
+
     // LeafHit rewrite
 
     public __hitWorld(_point: IRadiusPointData): boolean { return true }