@leafer/decorator 1.0.0-rc.12 → 1.0.0-rc.17

package/package.json

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

package/src/data.ts

@@ -75,8 +75,36 @@ export function boundsType(defaultValue?: IValue) {
         defineLeafAttr(target, key, defaultValue, {
             set(value: IValue) {
                 this.__setAttr(key, value)
-                this.__layout.boxChanged || this.__layout.boxChange()
-                if (this.__hasAutoLayout) this.__layout.matrixChanged || this.__layout.matrixChange()
+                doBoundsType(this)
+            }
+        })
+    }
+}
+
+export function naturalBoundsType(defaultValue?: IValue) {
+    return (target: ILeaf, key: string) => {
+        defineLeafAttr(target, key, defaultValue, {
+            set(value: IValue) {
+                this.__setAttr(key, value)
+                doBoundsType(this)
+                this.__.__removeNaturalSize()
+            }
+        })
+    }
+}
+
+export function doBoundsType(leaf: ILeaf): void {
+    leaf.__layout.boxChanged || leaf.__layout.boxChange()
+    if (leaf.__hasAutoLayout) leaf.__layout.matrixChanged || leaf.__layout.matrixChange()
+}
+
+export function pathInputType(defaultValue?: IValue) {
+    return (target: ILeaf, key: string) => {
+        defineLeafAttr(target, key, defaultValue, {
+            set(value: IValue) {
+                if (this.__.__pathInputed !== 2) this.__.__pathInputed = value ? 1 : 0
+                this.__setAttr(key, value)
+                doBoundsType(this)
             }
         })
     }
@@ -90,12 +118,16 @@ export function affectStrokeBoundsType(defaultValue?: IValue) {
         defineLeafAttr(target, key, defaultValue, {
             set(value: IValue) {
                 this.__setAttr(key, value)
-                this.__layout.strokeChanged || this.__layout.strokeChange()
+                doStrokeType(this)
             }
         })
     }
 }
 
+export function doStrokeType(leaf: ILeaf): void {
+    leaf.__layout.strokeChanged || leaf.__layout.strokeChange()
+}
+
 export const strokeType = affectStrokeBoundsType
 
 export function affectRenderBoundsType(defaultValue?: IValue) {

package/src/index.ts

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

package/types/index.d.ts

@@ -7,8 +7,12 @@ declare function autoLayoutType(defaultValue?: IValue): (target: ILeaf, key: str
 declare function scaleType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare function rotationType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare function boundsType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
+declare function naturalBoundsType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
+declare function doBoundsType(leaf: ILeaf): void;
+declare function pathInputType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare const pathType: typeof boundsType;
 declare function affectStrokeBoundsType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
+declare function doStrokeType(leaf: ILeaf): void;
 declare const strokeType: typeof affectStrokeBoundsType;
 declare function affectRenderBoundsType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare function surfaceType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
@@ -32,4 +36,4 @@ declare function getDescriptor(object: IObject, name: string): PropertyDescripto
 declare function registerUI(): (target: IObject) => void;
 declare function registerUIEvent(): (target: IObject) => void;
 
-export { affectRenderBoundsType, affectStrokeBoundsType, autoLayoutType, boundsType, cursorType, dataProcessor, dataType, defineDataProcessor, defineKey, defineLeafAttr, eraserType, getDescriptor, hitType, layoutProcessor, maskType, opacityType, pathType, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, useModule };
+export { affectRenderBoundsType, affectStrokeBoundsType, autoLayoutType, boundsType, cursorType, dataProcessor, dataType, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, eraserType, getDescriptor, hitType, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, useModule };