@leafer/display-module 1.0.0-beta.9 → 1.0.0-rc.2

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@leafer/display-module",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.2",
   "description": "@leafer/display-module",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -19,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/event": "1.0.0-beta.9",
-    "@leafer/math": "1.0.0-beta.9"
+    "@leafer/event": "1.0.0-rc.2",
+    "@leafer/math": "1.0.0-rc.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.9"
+    "@leafer/interface": "1.0.0-rc.2"
   }
 }

package/src/LeafBounds.ts

@@ -111,10 +111,22 @@ export const LeafBounds: ILeafBoundsModule = {
 
     __updateBoxBounds(): void {
         const b = this.__layout.boxBounds
+        const { width, height } = this.__
         b.x = 0
         b.y = 0
-        b.width = this.__.width
-        b.height = this.__.height
+        b.width = width
+        b.height = height
+    },
+
+    __updateNaturalSize(): void {
+        const { __: data, __layout: layout } = this
+        data.__naturalWidth = layout.boxBounds.width
+        data.__naturalHeight = layout.boxBounds.height
+
+        if (this.around) {
+            layout.positionChanged = layout.matrixChanged = true
+            this.__updateWorldMatrix()
+        }
     },
 
     __updateStrokeBounds(): void {

package/src/LeafDataProxy.ts

@@ -5,12 +5,14 @@ import { PropertyEvent } from '@leafer/event'
 export const LeafDataProxy: ILeafDataProxyModule = {
 
     __setAttr(name: string, newValue: unknown): void {
-        if (this.leafer && this.leafer.ready) {
-            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)
+        if (this.leafer && this.leafer.created) {
+            if (typeof newValue === 'object' || this.__.__getInput(name) !== 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
         }

package/src/LeafEventer.ts

@@ -61,9 +61,7 @@ export const LeafEventer: ILeafEventerModule = {
     off_(id: IEventListenerId | IEventListenerId[]): void {
         if (!id) return
         const list = id instanceof Array ? id : [id]
-        list.forEach(item => {
-            this.off(item.type, item.listener, item.options)
-        })
+        list.forEach(item => this.off(item.type, item.listener, item.options))
         list.length = 0
     },
 

package/src/LeafHit.ts

@@ -2,16 +2,22 @@ import { ILeafHitModule, IRadiusPointData, ILeaferCanvas } from '@leafer/interfa
 import { PointHelper } from '@leafer/math'
 
 
-const { toInnerRadiusPointOf } = PointHelper
+const { toInnerRadiusPointOf, copy, setRadius } = PointHelper
 const inner = {} as IRadiusPointData
 
 export const LeafHit: ILeafHitModule = {
 
     __hitWorld(point: IRadiusPointData): boolean {
-        if (this.__layout.hitCanvasChanged) {
+        if (this.__layout.hitCanvasChanged || !this.__hitCanvas) {
             this.__updateHitCanvas()
             this.__layout.hitCanvasChanged = false
         }
+
+        if (this.__.hitRadius) {
+            copy(inner, point), point = inner
+            setRadius(point, this.__.hitRadius)
+        }
+
         toInnerRadiusPointOf(point, this.__world, inner)
         return this.__hit(inner)
     },

package/src/LeafMatrix.ts

@@ -1,15 +1,16 @@
-import { ILeafMatrixModule } from '@leafer/interface'
+import { ILeafMatrixModule, IPointData } from '@leafer/interface'
 import { OneRadian, MatrixHelper } from '@leafer/math'
 
 
-const { defaultMatrix } = MatrixHelper
 const { sin, cos } = Math
+const defaultWorld = { ...MatrixHelper.defaultMatrix, scaleX: 1, scaleY: 1, rotation: 0, skewX: 0, skewY: 0 }
+const defaultCenter: IPointData = { x: 0.5, y: 0.5 }
 
 export const LeafMatrix: ILeafMatrixModule = {
 
     __updateWorldMatrix(): void {
 
-        const pw = this.parent ? this.parent.__world : defaultMatrix
+        const pw = this.parent ? this.parent.__world : defaultWorld
         const r = this.__local
         const w = this.__world
 
@@ -22,6 +23,14 @@ export const LeafMatrix: ILeafMatrixModule = {
             w.d = r.c * pw.b + r.d * pw.d
             w.e = r.e * pw.a + r.f * pw.c + pw.e
             w.f = r.e * pw.b + r.f * pw.d + pw.f
+
+            const data = this.__
+            w.scaleX = pw.scaleX * data.scaleX
+            w.scaleY = pw.scaleY * data.scaleY
+
+            w.rotation = pw.rotation + data.rotation
+            w.skewX = pw.skewX + data.skewX
+            w.skewY = pw.skewY + data.skewY
         } else {
             w.a = pw.a
             w.b = pw.b
@@ -29,6 +38,13 @@ export const LeafMatrix: ILeafMatrixModule = {
             w.d = pw.d
             w.e = r.e * pw.a + r.f * pw.c + pw.e
             w.f = r.e * pw.b + r.f * pw.d + pw.f
+
+            w.scaleX = pw.scaleX
+            w.scaleY = pw.scaleY
+
+            w.rotation = pw.rotation
+            w.skewX = pw.skewX
+            w.skewY = pw.skewY
         }
     },
 
@@ -88,12 +104,20 @@ 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 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
     }
 
+
 }
 
 

package/src/LeafRender.ts

@@ -14,9 +14,8 @@ export const LeafRender: ILeafRenderModule = {
                 this.__draw(tempCanvas, options)
 
                 const blendMode = this.__.isEraser ? 'destination-out' : this.__.blendMode
-                if (options.matrix) {
-                    canvas.resetTransform()
-                    canvas.copyWorld(tempCanvas, null, null, blendMode)
+                if (options.matrix || this.__hasMirror) {
+                    canvas.copyWorldByReset(tempCanvas, null, null, blendMode)
                 } else {
                     canvas.copyWorldToInner(tempCanvas, this.__world, this.__layout.renderBounds, blendMode)
                 }

package/types/index.d.ts

@@ -0,0 +1,19 @@
+import { ILeafEventerModule, ILeafDataProxyModule, ILeafMatrixModule, ILeafBoundsModule, ILeafHitModule, ILeafRenderModule, ILeafMaskModule, IBranchRenderModule } from '@leafer/interface';
+
+declare const LeafEventer: ILeafEventerModule;
+
+declare const LeafDataProxy: ILeafDataProxyModule;
+
+declare const LeafMatrix: ILeafMatrixModule;
+
+declare const LeafBounds: ILeafBoundsModule;
+
+declare const LeafHit: ILeafHitModule;
+
+declare const LeafRender: ILeafRenderModule;
+
+declare const LeafMask: ILeafMaskModule;
+
+declare const BranchRender: IBranchRenderModule;
+
+export { BranchRender, LeafBounds, LeafDataProxy, LeafEventer, LeafHit, LeafMask, LeafMatrix, LeafRender };