@leafer/display-module 1.7.0 → 1.9.0

package/package.json

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

package/src/BranchRender.ts

@@ -28,7 +28,7 @@ export const BranchRender: IBranchRenderModule = {
             if (data.dim) options.dimOpacity = data.dim === true ? 0.2 : data.dim
             else if (data.dimskip) options.dimOpacity && (options.dimOpacity = 0)
 
-            if (data.__single) {
+            if (data.__single && !this.isBranchLeaf) { // Frame / Box 不能走 single 逻辑渲染组，需用 drawAfterFill 渲染成一个整体， 关联设置 BoxData.__drawAfterFill
 
                 if (data.eraser === 'path') return this.__renderEraser(canvas, options)
 
@@ -62,8 +62,7 @@ export const BranchRender: IBranchRenderModule = {
 
             const { children } = this
             for (let i = 0, len = children.length; i < len; i++) {
-                if (excludeRenderBounds(children[i], options)) continue
-                children[i].__render(canvas, options)
+                excludeRenderBounds(children[i], options) || children[i].__render(canvas, options)
             }
 
         }
@@ -74,8 +73,7 @@ export const BranchRender: IBranchRenderModule = {
         if (this.__worldOpacity) {
             const { children } = this
             for (let i = 0, len = children.length; i < len; i++) {
-                if (excludeRenderBounds(children[i], options)) continue
-                children[i].__clip(canvas, options)
+                excludeRenderBounds(children[i], options) || children[i].__clip(canvas, options)
             }
         }
     }

package/src/LeafDataProxy.ts

@@ -1,9 +1,9 @@
 import { ILeafDataProxyModule, IObject, IValue } from '@leafer/interface'
-import { PropertyEvent } from '@leafer/event'
+import { PropertyEvent, LeaferEvent, leaferTransformAttrMap } from '@leafer/event'
+import { isObject, isFinite, isUndefined } from '@leafer/data'
 import { Debug } from '@leafer/debug'
 
 
-const { isFinite } = Number
 const debug = Debug.get('setAttr')
 
 export const LeafDataProxy: ILeafDataProxyModule = {
@@ -13,12 +13,12 @@ export const LeafDataProxy: ILeafDataProxyModule = {
 
             const oldValue = this.__.__getInput(name)
 
-            if (checkFiniteNumber && !isFinite(newValue) && newValue !== undefined) { // 警告 NaN、Infinity、-Infinity、null、非有效数字
+            if (checkFiniteNumber && !isFinite(newValue) && !isUndefined(newValue)) { // 警告 NaN、Infinity、-Infinity、null、非有效数字
                 debug.warn(this.innerName, name, newValue)
                 newValue = undefined // must
             }
 
-            if (typeof newValue === 'object' || oldValue !== newValue) {
+            if (isObject(newValue) || oldValue !== newValue) {
 
                 this.__realSetAttr(name, newValue)
 
@@ -27,6 +27,11 @@ export const LeafDataProxy: ILeafDataProxyModule = {
 
                 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)
                 }
@@ -51,7 +56,7 @@ export const LeafDataProxy: ILeafDataProxyModule = {
         const data = this.__ as IObject
         data[name] = newValue
         if (this.__proxyData) this.setProxyAttr(name, newValue)
-        if (data.normalStyle) this.lockNormalStyle || data.normalStyle[name] === undefined || (data.normalStyle[name] = newValue)
+        if (data.normalStyle) this.lockNormalStyle || isUndefined(data.normalStyle[name]) || (data.normalStyle[name] = newValue)
     },
 
 

package/src/LeafMatrix.ts

@@ -9,7 +9,8 @@ export const LeafMatrix: ILeafMatrixModule = {
 
     __updateWorldMatrix(): void {
 
-        multiplyParent(this.__local || this.__layout, this.parent ? this.parent.__world : defaultWorld, this.__world, !!this.__layout.affectScaleOrRotation, this.__ as ILayoutData, this.parent && this.parent.__ as IScrollPointData)
+        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)
 
     },
 
@@ -21,7 +22,7 @@ export const LeafMatrix: ILeafMatrixModule = {
 
             if (layout.affectScaleOrRotation) {
 
-                if ((layout.scaleChanged && (layout.resized = 'scale')) || layout.rotationChanged) {
+                if ((layout.scaleChanged && (layout.resized || (layout.resized = 'scale'))) || layout.rotationChanged) {
                     setLayout(local, data as ILayoutData, null, null, layout.affectRotation)
                     layout.scaleChanged = layout.rotationChanged = undefined
                 }

package/src/LeafRender.ts

@@ -1,4 +1,5 @@
 import { ILeaferCanvas, IRenderOptions, ILeafRenderModule } from '@leafer/interface'
+import { LeafHelper } from '@leafer/helper'
 import { Debug } from '@leafer/debug'
 
 
@@ -22,8 +23,7 @@ export const LeafRender: ILeafRenderModule = {
                 const tempCanvas = canvas.getSameCanvas(true, true)
                 this.__draw(tempCanvas, options, canvas)
 
-                if (this.__worldFlipped) canvas.copyWorldByReset(tempCanvas, this.__nowWorld, null, data.__blendMode, true)
-                else canvas.copyWorldToInner(tempCanvas, this.__nowWorld, this.__layout.renderBounds, data.__blendMode)
+                LeafHelper.copyCanvasByWorld(this, canvas, tempCanvas, this.__nowWorld, data.__blendMode, true)
 
                 tempCanvas.recycle(this.__nowWorld)