@leafer/decorator 1.9.3 → 1.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/decorator",
-  "version": "1.9.3",
+  "version": "1.9.5",
   "description": "@leafer/decorator",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/platform": "1.9.3",
-    "@leafer/data": "1.9.3",
-    "@leafer/debug": "1.9.3"
+    "@leafer/platform": "1.9.5",
+    "@leafer/data": "1.9.5",
+    "@leafer/debug": "1.9.5"
   },
   "devDependencies": {
-    "@leafer/interface": "1.9.3"
+    "@leafer/interface": "1.9.5"
   }
 }

package/src/data.ts

@@ -281,14 +281,14 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
         property.get = function () { return this[computedKey] }
     } else if (typeof defaultValue === 'function') {
         property.get = function () {
-            let v = this[computedKey]
-            return v === undefined ? defaultValue((this as ILeafData).__leaf) : v
+            const v = this[computedKey]
+            return v == null ? defaultValue((this as ILeafData).__leaf) : v
         }
     } else if (isObject(defaultValue)) {
         const isEmpty = isEmptyData(defaultValue)
         property.get = function () {
-            let v = this[computedKey]
-            return v === undefined ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v
+            const v = this[computedKey]
+            return v == null ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v
         }
     }
 
@@ -296,7 +296,7 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
     if (key === 'width') {
         property.get = function () {
             const v = this[computedKey]
-            if (v === undefined) {
+            if (v == null) {
                 const t = this as ILeafData, naturalWidth = t.__naturalWidth, leaf = t.__leaf
                 if (!defaultValue || leaf.pathInputed) return leaf.boxBounds.width
                 if (naturalWidth) return (t as IObject)._height && t.__useNaturalRatio ? (t as IObject)._height * naturalWidth / t.__naturalHeight : naturalWidth
@@ -306,7 +306,7 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
     } else if (key === 'height') {
         property.get = function () {
             const v = this[computedKey]
-            if (v === undefined) {
+            if (v == null) {
                 const t = this as ILeafData, naturalHeight = t.__naturalHeight, leaf = t.__leaf
                 if (!defaultValue || leaf.pathInputed) return leaf.boxBounds.height
                 if (naturalHeight) return (t as IObject)._width && t.__useNaturalRatio ? (t as IObject)._width * naturalHeight / t.__naturalWidth : naturalHeight

package/src/object.ts

@@ -1,5 +1,4 @@
 import { IObject, IValue } from '@leafer/interface'
-import { isUndefined } from '@leafer/data'
 
 export function defineKey<T>(target: T, key: string, descriptor: IObject & ThisType<T>, noConfigurable?: boolean): void {
     if (!noConfigurable) descriptor.configurable = descriptor.enumerable = true
@@ -13,7 +12,7 @@ export function getDescriptor(object: IObject, name: string) {
 export function createDescriptor(key: string, defaultValue?: IValue) {
     const privateKey = '_' + key
     return {
-        get() { const v = (this as IObject)[privateKey]; return isUndefined(v) ? defaultValue : v },
+        get() { const v = (this as IObject)[privateKey]; return v == null ? defaultValue : v },
         set(value: IValue) { (this as IObject)[privateKey] = value }
     }
 }