@leafer/decorator 1.0.0-bate → 1.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/decorator",
-  "version": "1.0.0-bate",
+  "version": "1.0.0-beta.10",
   "description": "@leafer/decorator",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,10 +19,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/platform": "1.0.0-bate",
-    "@leafer/debug": "1.0.0-bate"
+    "@leafer/platform": "1.0.0-beta.10",
+    "@leafer/debug": "1.0.0-beta.10"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-bate"
+    "@leafer/interface": "1.0.0-beta.10"
   }
 }

package/src/data.ts

@@ -134,12 +134,7 @@ export function sortType(defaultValue?: __Value) {
             set(value: __Value) {
                 this.__setAttr(key, value)
                 this.__layout.surfaceChanged || this.__layout.surfaceChange()
-
-                if (this.parent) {
-                    this.parent.__layout.childrenSortChanged = true
-                } else {
-                    this.waitParent(() => { this.parent.__layout.childrenSortChanged = true })
-                }
+                this.waitParent(() => { this.parent.__layout.childrenSortChange() })
             }
         })
     }
@@ -151,12 +146,18 @@ export function maskType(defaultValue?: __Value) {
             set(value: boolean) {
                 this.__setAttr(key, value)
                 this.__layout.boxChanged || this.__layout.boxChange()
+                this.waitParent(() => { this.parent.__updateMask(value) })
+            }
+        })
+    }
+}
 
-                if (this.parent) {
-                    this.parent.__updateMask(value)
-                } else {
-                    this.waitParent(() => { this.parent.__updateMask(value) })
-                }
+export function eraserType(defaultValue?: __Value) {
+    return (target: ILeaf, key: string) => {
+        defineLeafAttr(target, key, defaultValue, {
+            set(value: boolean) {
+                this.__setAttr(key, value)
+                this.waitParent(() => { this.parent.__updateEraser(value) })
             }
         })
     }
@@ -222,7 +223,19 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: _
         enumerable: true
     }
 
-    if (defaultValue === undefined) property.get = function () { return this[computedKey] }
+    if (defaultValue === undefined) {
+        property.get = function () { return this[computedKey] }
+    } else if (key === 'width') {
+        property.get = function () {
+            const v = this[computedKey]
+            return v === undefined ? ((this as ILeafData).__naturalWidth || defaultValue) : v
+        }
+    } else if (key === 'height') {
+        property.get = function () {
+            const v = this[computedKey]
+            return v === undefined ? ((this as ILeafData).__naturalHeight || defaultValue) : v
+        }
+    }
 
     const descriptor = getDescriptor(data, key)
 

package/src/index.ts

@@ -1,4 +1,4 @@
-export { aliasType, defineLeafAttr, dataType, positionType, boundsType, affectStrokeBoundsType, strokeType, affectRenderBoundsType, scaleType, rotationType, surfaceType, opacityType, sortType, maskType, hitType, pathType, dataProcessor, layoutProcessor, setDefaultValue, defineDataProcessor } from './data'
+export { aliasType, defineLeafAttr, dataType, positionType, boundsType, affectStrokeBoundsType, strokeType, affectRenderBoundsType, scaleType, rotationType, surfaceType, opacityType, sortType, maskType, eraserType, hitType, pathType, dataProcessor, layoutProcessor, setDefaultValue, defineDataProcessor } from './data'
 export { useModule, rewrite, rewriteAble } from './rewrite'
 export { defineKey, getDescriptor } from './object'
 export { registerUI, registerUIEvent } from './class'