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

package/package.json

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

package/src/BranchRender.ts

@@ -49,8 +49,8 @@ export const BranchRender: IBranchRenderModule = {
         if (this.__hasMask && children.length > 1) {
 
             let mask: boolean
-            let maskCanvas = canvas.getSameCanvas()
-            let contentCanvas = canvas.getSameCanvas()
+            const maskCanvas = canvas.getSameCanvas()
+            const contentCanvas = canvas.getSameCanvas()
 
             for (let i = 0, len = children.length; i < len; i++) {
                 child = children[i]
@@ -58,8 +58,6 @@ export const BranchRender: IBranchRenderModule = {
                 if (child.isMask) {
                     if (mask) {
                         this.__renderMask(canvas, contentCanvas, maskCanvas)
-                        maskCanvas.clear()
-                        contentCanvas.clear()
                     } else {
                         mask = true
                     }
@@ -68,12 +66,10 @@ export const BranchRender: IBranchRenderModule = {
                     continue
                 }
 
-                child.__render(contentCanvas, options)
+                child.__render(mask ? contentCanvas : canvas, options)
             }
 
-            this.__renderMask(canvas, contentCanvas, maskCanvas)
-            maskCanvas.recycle()
-            contentCanvas.recycle()
+            this.__renderMask(canvas, contentCanvas, maskCanvas, true)
 
         } else {
 

package/src/LeafBounds.ts

@@ -124,7 +124,7 @@ export const LeafBounds: ILeafBoundsModule = {
         data.__naturalHeight = layout.boxBounds.height
 
         if (this.around) {
-            layout.positionChanged = layout.matrixChanged = true
+            layout.matrixChanged = true
             this.__updateWorldMatrix()
         }
     },

package/src/LeafDataProxy.ts

@@ -1,25 +1,38 @@
-import { ILeafDataProxyModule } from '@leafer/interface'
+import { ILeafDataProxyModule, __Value } from '@leafer/interface'
 import { PropertyEvent } from '@leafer/event'
 
 
 export const LeafDataProxy: ILeafDataProxyModule = {
 
-    __setAttr(name: string, newValue: unknown): void {
+    __setAttr(name: string, newValue: __Value): void {
         if (this.leafer && this.leafer.created) {
-            if (typeof newValue === 'object' || this.__.__getInput(name) !== newValue) {
+            const oldValue = this.__.__getInput(name)
+            if (typeof newValue === 'object' || oldValue !== newValue) {
                 this.__[name] = newValue
+                if (this.proxyData) this.setProxyAttr(name, newValue)
+
                 const { CHANGE } = PropertyEvent
-                const event = new PropertyEvent(CHANGE, this, name, this.__.__get(name), newValue)
+                const event = new PropertyEvent(CHANGE, this, name, oldValue, newValue)
                 if (this.hasEvent(CHANGE) && !this.isLeafer) this.emitEvent(event)
                 this.leafer.emitEvent(event)
             }
         } else {
             this.__[name] = newValue
+            if (this.proxyData) this.setProxyAttr(name, newValue)
         }
     },
 
-    __getAttr(name: string): unknown {
+    __getAttr(name: string): __Value {
+        if (this.proxyData) return this.getProxyAttr(name)
         return this.__.__get(name)
+    },
+
+    setProxyAttr(name: string, newValue: __Value): void {
+        if (this.proxyData[name] !== newValue) this.proxyData[name] = newValue
+    },
+
+    getProxyAttr(name: string): __Value {
+        return this.proxyData[name]
     }
 
 }

package/src/LeafHit.ts

@@ -1,5 +1,5 @@
 import { ILeafHitModule, IRadiusPointData, ILeaferCanvas } from '@leafer/interface'
-import { PointHelper } from '@leafer/math'
+import { PointHelper, BoundsHelper } from '@leafer/math'
 
 
 const { toInnerRadiusPointOf, copy, setRadius } = PointHelper
@@ -19,6 +19,11 @@ export const LeafHit: ILeafHitModule = {
         }
 
         toInnerRadiusPointOf(point, this.__world, inner)
+
+        if (this.__.hitBox) {
+            if (BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner)) return true
+        }
+
         return this.__hit(inner)
     },
 

package/src/LeafMask.ts

@@ -11,12 +11,22 @@ export const LeafMask: ILeafMaskModule = {
         this.__hasMask = value ? true : this.children.some(item => item.__.isMask)
     },
 
-    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void {
+    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas, recycle?: boolean): void {
+        content.opacity = 1
         content.resetTransform()
         content.useMask(mask)
-        canvas.resetTransform()
+
         canvas.opacity = this.__worldOpacity
+        canvas.resetTransform()
         canvas.copyWorld(content)
+
+        if (recycle) {
+            content.recycle()
+            mask.recycle()
+        } else {
+            content.clear()
+            mask.clear()
+        }
     },
 
     __removeMask(child?: ILeaf): void {

package/src/LeafMatrix.ts

@@ -101,17 +101,19 @@ export const LeafMatrix: ILeafMatrixModule = {
 
         }
 
-        if (layout.positionChanged) {
-            r.e = this.__.x
-            r.f = this.__.y
-            const { width, height, around } = this.__
-            if (around && width && height) {
+        const { x, y, around } = this.__
+
+        r.e = x
+        r.f = y
+
+        if (around) {
+            const { width, height } = this.__
+            if (width && height) {
                 const origin = (around === 'center') ? defaultCenter : around
                 const offsetX = width * origin.x, offsetY = height * origin.y
                 r.e -= offsetX * r.a + offsetY * r.c
                 r.f -= offsetX * r.b + offsetY * r.d
             }
-            layout.positionChanged = false
         }
 
         this.__layout.matrixChanged = false