@leafer/display-module 1.0.0-alpha.1 → 1.0.0-alpha.21

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@leafer/display-module",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.21",
   "description": "@leafer/display-module",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
-  "files": ["src"],
+  "files": [
+    "src"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/leaferjs/leafer.git"
@@ -17,10 +19,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/event": "1.0.0-alpha.1",
-    "@leafer/math": "1.0.0-alpha.1"
+    "@leafer/event": "1.0.0-alpha.21",
+    "@leafer/math": "1.0.0-alpha.21"
   },
   "devDependencies": {
-     "@leafer/interface": "1.0.0-alpha.1"
+    "@leafer/interface": "1.0.0-alpha.21"
   }
-}
+}

package/src/LeafBounds.ts

@@ -2,7 +2,7 @@ import { ILeafBoundsModule } from '@leafer/interface'
 import { BoundsHelper } from '@leafer/math'
 
 
-const { setByBoundsTimesMatrix } = BoundsHelper
+const { toWorld, copyAndSpread } = BoundsHelper
 
 export const LeafBounds: ILeafBoundsModule = {
 
@@ -85,26 +85,26 @@ export const LeafBounds: ILeafBoundsModule = {
 
             layout.boundsChanged = false
 
-            setByBoundsTimesMatrix(this.__world, this.__layout.renderBounds, this.__world)
+            toWorld(this.__layout.renderBounds, this.__world, this.__world)
 
             if (resize) this.__onUpdateSize()
 
         } else {
-            setByBoundsTimesMatrix(this.__world, this.__layout.renderBounds, this.__world)
+            toWorld(this.__layout.renderBounds, this.__world, this.__world)
         }
 
     },
 
     __updateRelativeBoxBounds(): void {
-        setByBoundsTimesMatrix(this.__relative, this.__layout.boxBounds, this.__relative)
+        toWorld(this.__layout.boxBounds, this.__relative, this.__relative)
     },
 
     __updateRelativeEventBounds(): void {
-        setByBoundsTimesMatrix(this.__layout.relativeEventBounds, this.__layout.eventBounds, this.__relative)
+        toWorld(this.__layout.eventBounds, this.__relative, this.__layout.relativeEventBounds)
     },
 
     __updateRelativeRenderBounds(): void {
-        setByBoundsTimesMatrix(this.__layout.relativeRenderBounds, this.__layout.renderBounds, this.__relative)
+        toWorld(this.__layout.renderBounds, this.__relative, this.__layout.relativeRenderBounds)
     },
 
 
@@ -114,6 +114,14 @@ export const LeafBounds: ILeafBoundsModule = {
         b.y = 0
         b.width = this.__.width
         b.height = this.__.height
-    }
+    },
+
+    __updateEventBounds(): void {
+        copyAndSpread(this.__layout.eventBounds, this.__layout.boxBounds, this.__layout.eventBoundsSpreadWidth)
+    },
+
+    __updateRenderBounds(): void {
+        copyAndSpread(this.__layout.renderBounds, this.__layout.eventBounds, this.__layout.renderBoundsSpreadWidth)
+    },
 
 }

package/src/LeafDataProxy.ts

@@ -5,10 +5,14 @@ import { AttrEvent } from '@leafer/event'
 export const LeafDataProxy: ILeafDataProxyModule = {
 
     __set(attrName: string, newValue: unknown): void {
-        const oldValue = this.__.__getInput(attrName)
-        if (oldValue !== newValue) {
+        if (this.root) {
+            const oldValue = this.__.__getInput(attrName)
+            if (oldValue !== newValue) {
+                this.__[attrName] = newValue
+                this.root.emitEvent(new AttrEvent(AttrEvent.CHANGE, this, attrName, oldValue, newValue))
+            }
+        } else {
             this.__[attrName] = newValue
-            this.root.emitEvent(new AttrEvent(AttrEvent.CHANGE, this, attrName, oldValue, newValue))
         }
     },
 
@@ -17,8 +21,10 @@ export const LeafDataProxy: ILeafDataProxyModule = {
     },
 
     __updateAttr(attrName: string): void {
-        const value = this.__.__getInput(attrName)
-        this.root?.emitEvent(new AttrEvent(AttrEvent.CHANGE, this, attrName, value, value))
+        if (this.root) {
+            const value = this.__.__getInput(attrName)
+            this.root.emitEvent(new AttrEvent(AttrEvent.CHANGE, this, attrName, value, value))
+        }
     }
 
 }

package/src/LeafEventer.ts

@@ -1,6 +1,7 @@
 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 = {
@@ -70,6 +71,8 @@ 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) {
@@ -77,7 +80,10 @@ export const LeafEventer: ILeafEventerModule = {
             for (let i = 0, len = list.length; i < len; i++) {
                 item = list[i]
                 item.listener(event)
-                if (item.once) this.off(type, item.listener, capture)
+                if (item.once) {
+                    this.off(type, item.listener, capture)
+                    i--, len--
+                }
                 if (event && (event as IEvent).isStopNow) break
             }
         }

package/src/LeafHit.ts

@@ -3,7 +3,7 @@ import { PointHelper } from '@leafer/math'
 
 
 const { toLocalRadiusPoint } = PointHelper
-const innerPoint = {} as IRadiusPointData
+const local = {} as IRadiusPointData
 
 export const LeafHit: ILeafHitModule = {
 
@@ -17,8 +17,8 @@ export const LeafHit: ILeafHitModule = {
             this.__updateHitCanvas()
             this.__layout.hitCanvasChanged = false
         }
-        toLocalRadiusPoint(point, this.__world, innerPoint)
-        return this.__hit(innerPoint)
+        toLocalRadiusPoint(point, this.__world, local)
+        return this.__hit(local)
     }
 
 }

package/src/LeafRender.ts

@@ -7,7 +7,7 @@ export const LeafRender: ILeafRenderModule = {
         if (this.__worldOpacity) {
             canvas.setWorld(this.__world, options.matrix)
             canvas.opacity = this.__worldOpacity
-            this.__complex ? this.__draw(canvas, options) : this.__drawFast(canvas, options)
+            this.__draw(canvas, options)
         }
     },