@leafer/display-module 1.0.0-rc.19 → 1.0.0-rc.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display-module",
-  "version": "1.0.0-rc.19",
+  "version": "1.0.0-rc.20",
   "description": "@leafer/display-module",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,12 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/helper": "1.0.0-rc.19",
-    "@leafer/event": "1.0.0-rc.19",
-    "@leafer/math": "1.0.0-rc.19"
+    "@leafer/helper": "1.0.0-rc.20",
+    "@leafer/event": "1.0.0-rc.20",
+    "@leafer/math": "1.0.0-rc.20",
+    "@leafer/debug": "1.0.0-rc.20"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.19"
+    "@leafer/interface": "1.0.0-rc.20"
   }
 }

package/src/LeafBounds.ts

@@ -6,7 +6,7 @@ import { BranchHelper, LeafHelper } from '@leafer/helper'
 
 const { updateMatrix, updateAllMatrix, hasParentAutoLayout } = LeafHelper
 const { updateBounds } = BranchHelper
-const { toOuterOf, copyAndSpread } = BoundsHelper
+const { toOuterOf, copyAndSpread, copy } = BoundsHelper
 const { toBounds } = PathBounds
 
 export const LeafBounds: ILeafBoundsModule = {
@@ -153,7 +153,8 @@ export const LeafBounds: ILeafBoundsModule = {
     },
 
     __updateRenderBounds(): void {
-        copyAndSpread(this.__layout.renderBounds, this.__layout.strokeBounds, this.__layout.renderSpread)
+        const { renderSpread, strokeBounds, renderBounds } = this.__layout
+        renderSpread > 0 ? copyAndSpread(renderBounds, strokeBounds, renderSpread) : copy(renderBounds, strokeBounds) // Box use -1
     },
 
 }

package/src/LeafDataProxy.ts

@@ -1,12 +1,22 @@
 import { ILeafDataProxyModule, IObject, IValue } from '@leafer/interface'
 import { PropertyEvent } from '@leafer/event'
+import { Debug } from '@leafer/debug'
 
 
+const { isFinite } = Number
+const debug = Debug.get('setAttr')
+
 export const LeafDataProxy: ILeafDataProxyModule = {
 
-    __setAttr(name: string, newValue: IValue): void {
+    __setAttr(name: string, newValue: IValue, checkFiniteNumber?: boolean): boolean {
         if (this.leafer && this.leafer.created) {
             const oldValue = this.__.__getInput(name)
+
+            if (checkFiniteNumber && !isFinite(newValue) && newValue !== undefined) { // 警告 NaN、Infinity、-Infinity、null、非有效数字
+                debug.warn(this.innerName, name, newValue)
+                newValue = undefined // must
+            }
+
             if (typeof newValue === 'object' || oldValue !== newValue) {
                 (this.__ as IObject)[name] = newValue
                 if (this.__proxyData) this.setProxyAttr(name, newValue)
@@ -21,10 +31,15 @@ export const LeafDataProxy: ILeafDataProxyModule = {
                 }
 
                 this.leafer.emitEvent(event)
+                return true
+            } else {
+                return false
             }
+
         } else {
             (this.__ as IObject)[name] = newValue
             if (this.__proxyData) this.setProxyAttr(name, newValue)
+            return true
         }
     },