@leafer/display-module 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display-module",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "@leafer/display-module",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/helper": "1.9.1",
-    "@leafer/event": "1.9.1",
-    "@leafer/math": "1.9.1",
-    "@leafer/data": "1.9.1",
-    "@leafer/debug": "1.9.1"
+    "@leafer/helper": "1.9.2",
+    "@leafer/event": "1.9.2",
+    "@leafer/math": "1.9.2",
+    "@leafer/data": "1.9.2",
+    "@leafer/debug": "1.9.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.9.1"
+    "@leafer/interface": "1.9.2"
   }
 }

package/src/LeafBounds.ts

@@ -1,4 +1,4 @@
-import { ILeafBoundsModule } from '@leafer/interface'
+import { ILeafBoundsModule, IBoundsData } from '@leafer/interface'
 import { BoundsHelper } from '@leafer/math'
 import { PathBounds } from '@leafer/path'
 import { BranchHelper, LeafHelper } from '@leafer/helper'
@@ -119,7 +119,7 @@ export const LeafBounds: ILeafBoundsModule = {
     },
 
 
-    __updateBoxBounds(): void {
+    __updateBoxBounds(_secondLayout?: boolean, _bounds?: IBoundsData): void {
         const b = this.__layout.boxBounds
         const data = this.__
         if (data.__pathInputed) {
@@ -166,12 +166,12 @@ export const LeafBounds: ILeafBoundsModule = {
         data.__naturalHeight = layout.boxBounds.height
     },
 
-    __updateStrokeBounds(): void {
+    __updateStrokeBounds(_bounds?: IBoundsData): void {
         const layout = this.__layout
         copyAndSpread(layout.strokeBounds, layout.boxBounds, layout.strokeBoxSpread)
     },
 
-    __updateRenderBounds(): void {
+    __updateRenderBounds(_bounds?: IBoundsData): void {
         const layout = this.__layout
         layout.renderSpread > 0 ? copyAndSpread(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy(layout.renderBounds, layout.strokeBounds) // Box use -1
     }

package/src/LeafDataProxy.ts

@@ -1,5 +1,5 @@
 import { ILeafDataProxyModule, IObject, IValue } from '@leafer/interface'
-import { PropertyEvent, LeaferEvent, leaferTransformAttrMap } from '@leafer/event'
+import { PropertyEvent, extraPropertyEventMap, LeaferEvent, leaferTransformAttrMap } from '@leafer/event'
 import { isObject, isFinite, isUndefined } from '@leafer/data'
 import { Debug } from '@leafer/debug'
 
@@ -22,21 +22,20 @@ export const LeafDataProxy: ILeafDataProxyModule = {
 
                 this.__realSetAttr(name, newValue)
 
-                const { CHANGE } = PropertyEvent
-                const event = new PropertyEvent(CHANGE, this, name, oldValue, newValue)
-
                 if (this.isLeafer) {
                     this.emitEvent(new PropertyEvent(PropertyEvent.LEAFER_CHANGE, this, name, oldValue, newValue))
+
                     const transformEventName = leaferTransformAttrMap[name]
                     if (transformEventName) {
                         this.emitEvent(new LeaferEvent(transformEventName, this))
                         this.emitEvent(new LeaferEvent(LeaferEvent.TRANSFORM, this))
                     }
-                } else {
-                    if (this.hasEvent(CHANGE)) this.emitEvent(event)
                 }
 
-                this.leafer.emitEvent(event)
+                this.emitPropertyEvent(PropertyEvent.CHANGE, name, oldValue, newValue)
+
+                const extraPropertyEvent = extraPropertyEventMap[name]
+                if (extraPropertyEvent) this.emitPropertyEvent(extraPropertyEvent, name, oldValue, newValue)
 
                 return true
             } else {
@@ -52,6 +51,12 @@ export const LeafDataProxy: ILeafDataProxyModule = {
         }
     },
 
+    emitPropertyEvent(type: string, name: string, oldValue: unknown, newValue: unknown): void {
+        const event = new PropertyEvent(type, this, name, oldValue, newValue)
+        this.isLeafer || (this.hasEvent(type) && this.emitEvent(event))
+        this.leafer.emitEvent(event)
+    },
+
     __realSetAttr(name: string, newValue: IValue): void {
         const data = this.__ as IObject
         data[name] = newValue

package/src/LeafMatrix.ts

@@ -1,4 +1,4 @@
-import { ILeafMatrixModule, ILayoutData, IScrollPointData } from '@leafer/interface'
+import { ILeafMatrixModule, ILayoutData } from '@leafer/interface'
 import { AroundHelper, MatrixHelper } from '@leafer/math'
 
 
@@ -9,9 +9,10 @@ export const LeafMatrix: ILeafMatrixModule = {
 
     __updateWorldMatrix(): void {
 
-        const { parent, __layout } = this
-        multiplyParent(this.__local || __layout, parent ? parent.__world : defaultWorld, this.__world, !!__layout.affectScaleOrRotation, this.__ as ILayoutData, parent && (parent.scrollY || parent.scrollX) && parent.__ as IScrollPointData)
+        const { parent, __layout, __world, __scrollWorld, __ } = this
+        multiplyParent(this.__local || __layout, parent ? (parent.__scrollWorld || parent.__world) : defaultWorld, __world, !!__layout.affectScaleOrRotation, __ as ILayoutData)
 
+        if (__scrollWorld) translateInner(Object.assign(__scrollWorld, __world), __.scrollX, __.scrollY)
     },
 
     __updateLocalMatrix(): void {