@leafer/decorator 1.0.0-rc.23 → 1.0.0-rc.24

package/package.json

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

package/src/data.ts

@@ -17,9 +17,7 @@ export function attr(partDescriptor?: ILeafAttrDescriptor): ILeafAttrDescriptor
 export function defineLeafAttr(target: ILeaf, key: string, defaultValue?: IValue, partDescriptor?: ILeafAttrDescriptor): void {
     const defaultDescriptor: ILeafAttrDescriptor = {
         get() { return this.__getAttr(key) },
-        set(value: IValue) { this.__setAttr(key, value) },
-        configurable: true,
-        enumerable: true
+        set(value: IValue) { this.__setAttr(key, value) }
     }
     defineKey(target, key, Object.assign(defaultDescriptor, partDescriptor || {}))
     defineDataProcessor(target, key, defaultValue)
@@ -33,8 +31,7 @@ export function dataType(defaultValue?: IValue) {
 export function positionType(defaultValue?: IValue, checkFiniteNumber?: boolean) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value, checkFiniteNumber)
-            this.__layout.matrixChanged || this.__layout.matrixChange()
+            this.__setAttr(key, value, checkFiniteNumber) && (this.__layout.matrixChanged || this.__layout.matrixChange())
         }
     }))
 }
@@ -42,10 +39,11 @@ export function positionType(defaultValue?: IValue, checkFiniteNumber?: boolean)
 export function autoLayoutType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value)
-            this.__layout.matrixChanged || this.__layout.matrixChange()
-            this.__hasAutoLayout = !!value
-            if (!this.__local) this.__layout.createLocal()
+            if (this.__setAttr(key, value)) {
+                this.__layout.matrixChanged || this.__layout.matrixChange()
+                this.__hasAutoLayout = !!value
+                if (!this.__local) this.__layout.createLocal()
+            }
         }
     }))
 }
@@ -53,8 +51,8 @@ export function autoLayoutType(defaultValue?: IValue) {
 export function scaleType(defaultValue?: IValue, checkFiniteNumber?: boolean) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value, checkFiniteNumber)
-            this.__layout.scaleChanged || this.__layout.scaleChange()
+            this.__setAttr(key, value, checkFiniteNumber) && (this.__layout.scaleChanged || this.__layout.scaleChange())
+
         }
     }))
 }
@@ -62,8 +60,7 @@ export function scaleType(defaultValue?: IValue, checkFiniteNumber?: boolean) {
 export function rotationType(defaultValue?: IValue, checkFiniteNumber?: boolean) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value, checkFiniteNumber)
-            this.__layout.rotationChanged || this.__layout.rotationChange()
+            this.__setAttr(key, value, checkFiniteNumber) && (this.__layout.rotationChanged || this.__layout.rotationChange())
         }
 
     }))
@@ -80,9 +77,7 @@ export function boundsType(defaultValue?: IValue, checkFiniteNumber?: boolean) {
 export function naturalBoundsType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value)
-            doBoundsType(this)
-            this.__.__removeNaturalSize()
+            this.__setAttr(key, value) && (doBoundsType(this), this.__.__removeNaturalSize())
         }
     }))
 }
@@ -95,7 +90,9 @@ export function doBoundsType(leaf: ILeaf): void {
 export function pathInputType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            if (this.__.__pathInputed !== 2) this.__.__pathInputed = value ? 1 : 0
+            const data = this.__
+            if (data.__pathInputed !== 2) data.__pathInputed = value ? 1 : 0
+            if (!value) data.__pathForRender = undefined
             this.__setAttr(key, value)
             doBoundsType(this)
         }
@@ -132,8 +129,7 @@ export function affectRenderBoundsType(defaultValue?: IValue) {
 export function surfaceType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value)
-            this.__layout.surfaceChanged || this.__layout.surfaceChange()
+            this.__setAttr(key, value) && (this.__layout.surfaceChanged || this.__layout.surfaceChange())
         }
     }))
 }
@@ -141,8 +137,19 @@ export function surfaceType(defaultValue?: IValue) {
 export function opacityType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value)
-            this.__layout.opacityChanged || this.__layout.opacityChange()
+            this.__setAttr(key, value) && (this.__layout.opacityChanged || this.__layout.opacityChange())
+        }
+    }))
+}
+
+export function visibleType(defaultValue?: IValue) {
+    return decorateLeafAttr(defaultValue, (key: string) => attr({
+        set(value: IValue) {
+            const oldValue = this.visible
+            if (this.__setAttr(key, value)) {
+                this.__layout.opacityChanged || this.__layout.opacityChange()
+                if (oldValue === 0 || value === 0) doBoundsType(this) // 0 = display: none
+            }
         }
     }))
 }
@@ -150,9 +157,10 @@ export function opacityType(defaultValue?: IValue) {
 export function sortType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value)
-            this.__layout.surfaceChanged || this.__layout.surfaceChange()
-            this.waitParent(() => { this.parent.__layout.childrenSortChange() })
+            if (this.__setAttr(key, value)) {
+                this.__layout.surfaceChanged || this.__layout.surfaceChange()
+                this.waitParent(() => { this.parent.__layout.childrenSortChange() })
+            }
         }
     }))
 }
@@ -160,10 +168,10 @@ export function sortType(defaultValue?: IValue) {
 export function maskType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: boolean) {
-            this.__setAttr(key, value)
-            this.__layout.boxChanged || this.__layout.boxChange()
-            this.waitParent(() => { this.parent.__updateMask(value) })
-            if (typeof value === 'string') this.maskType = value
+            if (this.__setAttr(key, value)) {
+                this.__layout.boxChanged || this.__layout.boxChange()
+                this.waitParent(() => { this.parent.__updateMask(value) })
+            }
         }
     }))
 }
@@ -171,8 +179,7 @@ export function maskType(defaultValue?: IValue) {
 export function eraserType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: boolean) {
-            this.__setAttr(key, value)
-            this.waitParent(() => { this.parent.__updateEraser(value) })
+            this.__setAttr(key, value) && this.waitParent(() => { this.parent.__updateEraser(value) })
         }
     }))
 }
@@ -180,9 +187,10 @@ export function eraserType(defaultValue?: IValue) {
 export function hitType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
-            this.__setAttr(key, value)
-            if (Debug.showHitView) { this.__layout.surfaceChanged || this.__layout.surfaceChange() }
-            if (this.leafer) this.leafer.updateCursor()
+            if (this.__setAttr(key, value)) {
+                if (Debug.showHitView) { this.__layout.surfaceChanged || this.__layout.surfaceChange() }
+                if (this.leafer) this.leafer.updateCursor()
+            }
         }
     }))
 }
@@ -237,9 +245,7 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
         },
         set(value: IValue) {
             (this as IObject)[computedKey] = value
-        },
-        configurable: true,
-        enumerable: true
+        }
     }
 
     if (defaultValue === undefined) {
@@ -247,12 +253,22 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
     } else if (key === 'width') {
         property.get = function () {
             const v = this[computedKey]
-            return v === undefined ? ((this as ILeafData).__naturalWidth || defaultValue) : v
+            if (v === undefined) {
+                const t = this as ILeafData
+                return (t as IObject)._height && t.__naturalWidth && t.__useNaturalRatio ? (t as IObject)._height * t.__naturalWidth / t.__naturalHeight : t.__naturalWidth || defaultValue
+            } else {
+                return v
+            }
         }
     } else if (key === 'height') {
         property.get = function () {
             const v = this[computedKey]
-            return v === undefined ? ((this as ILeafData).__naturalHeight || defaultValue) : v
+            if (v === undefined) {
+                const t = this as ILeafData
+                return (t as IObject)._width && t.__naturalHeight && t.__useNaturalRatio ? (t as IObject)._width * t.__naturalHeight / t.__naturalWidth : t.__naturalHeight || defaultValue
+            } else {
+                return v
+            }
         }
     }
 
@@ -270,7 +286,7 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
         delete data[setMethodName]
     }
 
-    Object.defineProperty(data, key, property)
+    defineKey(data, key, property)
 
 }
 

package/src/index.ts

@@ -1,4 +1,4 @@
-export { defineLeafAttr, decorateLeafAttr, attr, 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 { defineLeafAttr, decorateLeafAttr, attr, dataType, positionType, autoLayoutType, boundsType, doBoundsType, naturalBoundsType, affectStrokeBoundsType, doStrokeType, strokeType, affectRenderBoundsType, scaleType, rotationType, surfaceType, opacityType, visibleType, 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/src/object.ts

@@ -1,6 +1,7 @@
 import { IObject } from '@leafer/interface'
 
-export function defineKey<T>(target: T, key: string, descriptor: IObject & ThisType<T>): void {
+export function defineKey<T>(target: T, key: string, descriptor: IObject & ThisType<T>, noConfigurable?: boolean): void {
+    if (!noConfigurable) descriptor.configurable = descriptor.enumerable = true
     Object.defineProperty(target, key, descriptor)
 }
 

package/types/index.d.ts

@@ -19,6 +19,7 @@ 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;
 declare function opacityType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
+declare function visibleType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare function sortType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare function maskType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
 declare function eraserType(defaultValue?: IValue): (target: ILeaf, key: string) => void;
@@ -32,10 +33,10 @@ declare function rewrite(method: IFunction): (target: IObject, key: string) => v
 declare function rewriteAble(): (_target: IObject) => void;
 declare function useModule(module: IObject, exclude?: string[]): (target: IObject) => void;
 
-declare function defineKey<T>(target: T, key: string, descriptor: IObject & ThisType<T>): void;
+declare function defineKey<T>(target: T, key: string, descriptor: IObject & ThisType<T>, noConfigurable?: boolean): void;
 declare function getDescriptor(object: IObject, name: string): PropertyDescriptor;
 
 declare function registerUI(): (target: IObject) => void;
 declare function registerUIEvent(): (target: IObject) => void;
 
-export { affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, cursorType, dataProcessor, dataType, decorateLeafAttr, 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 };
+export { affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, cursorType, dataProcessor, dataType, decorateLeafAttr, 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, visibleType };