@leafer-ui/decorator 1.0.0-rc.19 → 1.0.0-rc.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/decorator",
-  "version": "1.0.0-rc.19",
+  "version": "1.0.0-rc.20",
   "description": "@leafer-ui/decorator",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.19"
+    "@leafer/core": "1.0.0-rc.20"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.19",
-    "@leafer-ui/interface": "1.0.0-rc.19"
+    "@leafer/interface": "1.0.0-rc.20",
+    "@leafer-ui/interface": "1.0.0-rc.20"
   }
 }

package/src/data.ts

@@ -1,57 +1,48 @@
 import { IStateStyleType, IValue, IObject } from '@leafer/interface'
-import { defineKey, defineLeafAttr, doStrokeType } from '@leafer/core'
+import { defineKey, decorateLeafAttr, attr, doStrokeType } from '@leafer/core'
 
 import { ICanvas, IUI } from '@leafer-ui/interface'
 import { State } from '@leafer-ui/external'
 
 
 export function stateType(defaultValue?: IValue) {
-    return (target: IUI, key: string) => {
-        const stateType = key + 'Style' as IStateStyleType
-        defineLeafAttr(target, key, defaultValue, {
-            set(value: IValue) {
-                this.__setAttr(key, value)
-                this.waitLeafer(() => { if (State.setStyle) State.setStyle(this, stateType, value as boolean) })
-            }
-        })
-    }
+    return decorateLeafAttr(defaultValue, (key: string) => attr({
+        set(value: IValue) {
+            this.__setAttr(key, value)
+            this.waitLeafer(() => { if (State.setStyle) State.setStyle(this, key + 'Style' as IStateStyleType, value as boolean) })
+        }
+    }))
 }
 
 export function arrowType(defaultValue?: IValue) {
-    return (target: IUI, key: string) => {
-        defineLeafAttr(target, key, defaultValue, {
-            set(value: IValue) {
-                this.__setAttr(key, value)
-                const data = (this as IUI).__
-                data.__useArrow = data.startArrow !== 'none' || data.endArrow !== 'none'
-                doStrokeType(this)
-            }
-        })
-    }
+    return decorateLeafAttr(defaultValue, (key: string) => attr({
+        set(value: IValue) {
+            this.__setAttr(key, value)
+            const data = (this as IUI).__
+            data.__useArrow = data.startArrow !== 'none' || data.endArrow !== 'none'
+            doStrokeType(this)
+        }
+    }))
 }
 
 export function effectType(defaultValue?: IValue) {
-    return (target: IUI, key: string) => {
-        defineLeafAttr(target, key, defaultValue, {
-            set(value: IValue) {
-                this.__setAttr(key, value)
-                if (value) (this as IUI).__.__useEffect = true
-                this.__layout.renderChanged || this.__layout.renderChange()
-            }
-        })
-    }
+    return decorateLeafAttr(defaultValue, (key: string) => attr({
+        set(value: IValue) {
+            this.__setAttr(key, value)
+            if (value) (this as IUI).__.__useEffect = true
+            this.__layout.renderChanged || this.__layout.renderChange()
+        }
+    }))
 }
 
 export function resizeType(defaultValue?: IValue) {
-    return (target: IUI, key: string) => {
-        defineLeafAttr(target, key, defaultValue, {
-            set(value: IValue) {
-                this.__setAttr(key, value)
-                this.__layout.boxChanged || this.__layout.boxChange();
-                (this as ICanvas).__updateSize()
-            }
-        })
-    }
+    return decorateLeafAttr(defaultValue, (key: string) => attr({
+        set(value: IValue) {
+            this.__setAttr(key, value)
+            this.__layout.boxChanged || this.__layout.boxChange();
+            (this as ICanvas).__updateSize()
+        }
+    }))
 }
 
 export function zoomLayerType() {

package/types/index.d.ts

@@ -1,10 +1,11 @@
+import * as _leafer_interface from '@leafer/interface';
 import { IValue } from '@leafer/interface';
 import { IUI } from '@leafer-ui/interface';
 
-declare function stateType(defaultValue?: IValue): (target: IUI, key: string) => void;
-declare function arrowType(defaultValue?: IValue): (target: IUI, key: string) => void;
-declare function effectType(defaultValue?: IValue): (target: IUI, key: string) => void;
-declare function resizeType(defaultValue?: IValue): (target: IUI, key: string) => void;
+declare function stateType(defaultValue?: IValue): (target: _leafer_interface.ILeaf, key: string) => void;
+declare function arrowType(defaultValue?: IValue): (target: _leafer_interface.ILeaf, key: string) => void;
+declare function effectType(defaultValue?: IValue): (target: _leafer_interface.ILeaf, key: string) => void;
+declare function resizeType(defaultValue?: IValue): (target: _leafer_interface.ILeaf, key: string) => void;
 declare function zoomLayerType(): (target: IUI, key: string) => void;
 
 export { arrowType, effectType, resizeType, stateType, zoomLayerType };