@leafer/decorator 1.0.0-alpha.21 → 1.0.0-alpha.23

package/package.json

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

package/src/class.ts

@@ -7,7 +7,7 @@ export function registerUI() {
     }
 }
 
-export function registerEvent() {
+export function registerUIEvent() {
     return (target: IObject) => {
         EventCreator.register(target)
     }

package/src/data.ts

@@ -6,76 +6,72 @@ import { defineKey, getDescriptor } from './object'
 export function aliasType(name: string) {
     return (target: ILeaf, key: string) => {
         defineKey(target, key, {
-            get() { return this.__get(name) },
+            get() { return this.__getAttr(name) },
             set(value: __Value) {
-                this.__set(name, value)
+                this.__setAttr(name, value)
             }
         })
     }
 }
 
+
+export function defineLeafAttr(target: ILeaf, key: string, defaultValue: __Value, mergeDescriptor?: IObject & ThisType<ILeaf>): void {
+    const defaultDescriptor: IObject & ThisType<ILeaf> = {
+        get() { return this.__getAttr(key) },
+        set(value: __Value) { this.__setAttr(key, value) }
+    }
+    defineKey(target, key, Object.assign(defaultDescriptor, mergeDescriptor || {}))
+    defineDataProcessor(target, key, defaultValue)
+}
+
 export function dataType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
-            set(value: __Value) {
-                this.__set(key, value)
-            }
-        })
-        defineDataProcessor(target, key, defaultValue)
+        defineLeafAttr(target, key, defaultValue)
     }
 }
 
 export function positionType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
+                this.__setAttr(key, value)
                 this.__layout.positionChanged || this.__layout.positionChange()
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
 export function scaleType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
+                this.__setAttr(key, value)
                 this.__layout.scaleChanged || this.__layout.scaleChange()
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
 export function rotationType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
+                this.__setAttr(key, value)
                 this.__layout.rotationChanged || this.__layout.rotationChange()
 
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
 export function boundsType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
+                this.__setAttr(key, value)
                 this.__layout.boxBoundsChanged || this.__layout.boxBoundsChange()
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
@@ -84,62 +80,53 @@ export const pathType = boundsType
 
 export function affectEventBoundsType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
-                this.__layout.eventBoundsChanged || this.__layout.eventBoundsChange()
+                this.__setAttr(key, value)
+                this.__layout.strokeBoundsChanged || this.__layout.strokeBoundsChange()
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
 export function affectRenderBoundsType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
+                this.__setAttr(key, value)
                 this.__layout.renderBoundsChanged || this.__layout.renderBoundsChange()
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
 export function surfaceType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
+                this.__setAttr(key, value)
                 this.__layout.surfaceChanged || this.__layout.surfaceChange()
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
 export function opacityType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.root ? this.__set(key, value) : this.__[key] = value
+                this.__setAttr(key, value)
                 this.__layout.opacityChanged || this.__layout.opacityChange()
             }
         })
-        defineDataProcessor(target, key, defaultValue)
     }
 }
 
 export function sortType(defaultValue?: __Value) {
     return (target: ILeaf, key: string) => {
-        defineKey(target, key, {
-            get() { return this.__get(key) },
+        defineLeafAttr(target, key, defaultValue, {
             set(value: __Value) {
-                this.__set(key, value)
+                this.__setAttr(key, value)
                 this.__layout.surfaceChanged || this.__layout.surfaceChange()
 
                 if (this.parent) {
@@ -149,7 +136,23 @@ export function sortType(defaultValue?: __Value) {
                 }
             }
         })
-        defineDataProcessor(target, key, defaultValue)
+    }
+}
+
+export function maskType(defaultValue?: __Value) {
+    return (target: ILeaf, key: string) => {
+        defineLeafAttr(target, key, defaultValue, {
+            set(value: __Value) {
+                this.__setAttr(key, value)
+                this.__layout.boxBoundsChanged || this.__layout.boxBoundsChange()
+
+                if (this.parent) {
+                    this.parent.__hasMask = value ? true : this.parent.children.some(item => item.isMask)
+                } else {
+                    this.__addParentWait(() => { this.parent.__hasMask = value ? true : this.parent.children.some(item => item.isMask) })
+                }
+            }
+        })
     }
 }
 

package/src/index.ts

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