@leafer/display-module 1.0.0-alpha.23 → 1.0.0-alpha.31

package/package.json

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

package/src/LeafBounds.ts

@@ -48,15 +48,15 @@ export const LeafBounds: ILeafBoundsModule = {
 
                     this.__updateStrokeBounds()
                     this.__updateLocalStrokeBounds()
-                    layout.strokeBoundsChanged = false
-
-                    if (layout.renderBoundsSpreadWidth) layout.renderBoundsChanged = true
 
                 } else {
                     layout.strokeBoundsSpreadCancel()
                 }
 
-                this.parent?.__layout.strokeBoundsChange()
+                layout.strokeBoundsChanged = false
+                if (layout.renderBoundsSpreadWidth) layout.renderBoundsChanged = true
+
+                if (this.parent) this.parent.__layout.strokeBoundsChange()
                 resize || (resize = true)
             }
 
@@ -73,13 +73,14 @@ export const LeafBounds: ILeafBoundsModule = {
 
                     this.__updateRenderBounds()
                     this.__updateLocalRenderBounds()
-                    layout.renderBoundsChanged = false
 
                 } else {
                     layout.renderBoundsSpreadCancel()
                 }
 
-                this.parent?.__layout.renderBoundsChange()
+                layout.renderBoundsChanged = false
+
+                if (this.parent) this.parent.__layout.renderBoundsChange()
             }
 
 

package/src/LeafDataProxy.ts

@@ -6,11 +6,11 @@ export const LeafDataProxy: ILeafDataProxyModule = {
 
     __setAttr(name: string, newValue: unknown): void {
         if (this.leafer && this.leafer.ready) {
-            const oldValue = this.__.__get(name)
-            if (oldValue !== newValue) {
-                this.__[name] = newValue
-                this.leafer.emitEvent(new PropertyEvent(PropertyEvent.CHANGE, this, name, oldValue, newValue))
-            }
+            this.__[name] = newValue
+            const { CHANGE } = PropertyEvent
+            const event = new PropertyEvent(CHANGE, this, name, this.__.__get(name), newValue)
+            if (this.hasEvent(CHANGE) && !this.isLeafer) this.emitEvent(event)
+            this.leafer.emitEvent(event)
         } else {
             this.__[name] = newValue
         }
@@ -18,15 +18,6 @@ export const LeafDataProxy: ILeafDataProxyModule = {
 
     __getAttr(name: string): unknown {
         return this.__.__get(name)
-    },
-
-    __updateAttr(name?: string): void {
-        if (this.leafer && this.leafer.ready) {
-            if (!name) name = 'fill'
-            const value = this.__.__get(name);
-            (this as any)[name] = value
-            this.leafer.emitEvent(new PropertyEvent(PropertyEvent.CHANGE, this, name, value, value))
-        }
     }
 
 }

package/src/LeafEventer.ts

@@ -1,7 +1,5 @@
 import { IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId, IEvent, IObject, IEventTarget, ILeafEventerModule } from '@leafer/interface'
-import { Debug } from '@leafer/debug'
 
-const debug = Debug.get('Life')
 const empty = {}
 
 export const LeafEventer: ILeafEventerModule = {
@@ -71,8 +69,6 @@ export const LeafEventer: ILeafEventerModule = {
     },
 
     emit(type: string, event?: IEvent | IObject, capture?: boolean): void {
-        if (Debug.enable) debug.log(type)
-
         const map = __getListenerMap(this, capture)
         const list = map[type]
         if (list) {

package/src/LeafHit.ts

@@ -16,11 +16,6 @@ export const LeafHit: ILeafHitModule = {
         return this.__hit(inner)
     },
 
-    __updateHitCanvas(): void {
-        if (!this.__hitCanvas) this.__hitCanvas = this.leafer.hitCanvasManager.getPathType(this)
-        this.__drawHitPath(this.__hitCanvas)
-    },
-
     __drawHitPath(canvas: ILeaferCanvas): void {
         this.__drawRenderPath(canvas)
     }

package/src/LeafMask.ts

@@ -0,0 +1,33 @@
+import { ILeaf, ILeaferCanvas, ILeafMaskModule } from '@leafer/interface'
+
+
+export const LeafMask: ILeafMaskModule = {
+
+    __updateMask(value?: boolean): void {
+        this.__hasMask = value ? true : this.children.some(item => item.__.isMask)
+    },
+
+    __renderMask(canvas: ILeaferCanvas, content: ILeaferCanvas, mask: ILeaferCanvas): void {
+        content.resetTransform()
+        content.useMask(mask)
+        canvas.resetTransform()
+        canvas.copyWorld(content)
+    },
+
+    __removeMask(child?: ILeaf): void {
+        if (child) {
+            child.isMask = false
+            this.remove(child)
+        } else {
+            const { children } = this
+            for (let i = 0, len = children.length; i < len; i++) {
+                child = children[i]
+                if (child.isMask) {
+                    this.__removeMask(child)
+                    len--, i--
+                }
+            }
+        }
+    }
+
+}

package/src/index.ts

@@ -4,4 +4,5 @@ export { LeafMatrix } from './LeafMatrix'
 export { LeafBounds } from './LeafBounds'
 export { LeafHit } from './LeafHit'
 export { LeafRender } from './LeafRender'
+export { LeafMask } from './LeafMask'