@leafer/decorator 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/decorator",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "@leafer/decorator",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/platform": "1.0.2",
-    "@leafer/debug": "1.0.2"
+    "@leafer/platform": "1.0.3",
+    "@leafer/data": "1.0.3",
+    "@leafer/debug": "1.0.3"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.2"
+    "@leafer/interface": "1.0.3"
   }
 }

package/src/data.ts

@@ -1,7 +1,9 @@
 import { ILeafData, ILeaf, IObject, IValue, ILeafAttrDescriptor, ILeafAttrDescriptorFn } from '@leafer/interface'
-import { defineKey, getDescriptor } from './object'
+import { DataHelper } from '@leafer/data'
 import { Debug } from '@leafer/debug'
 
+import { defineKey, getDescriptor } from './object'
+
 
 // name
 
@@ -41,7 +43,7 @@ export function autoLayoutType(defaultValue?: IValue) {
         set(value: IValue) {
             if (this.__setAttr(key, value)) {
                 this.__layout.matrixChanged || this.__layout.matrixChange()
-                this.__hasAutoLayout = !!value
+                this.__hasAutoLayout = !!(this.origin || this.around || this.flow)
                 if (!this.__local) this.__layout.createLocal()
             }
         }
@@ -146,14 +148,23 @@ 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
+            if (oldValue === true && value === 0) {
+                if (this.animationOut) return this.__runAnimation('out', () => doVisible(this, key, value, oldValue)) // hide
+            } else if (oldValue === 0 && value === true) {
+                if (this.animation) this.__runAnimation('in') // show
             }
+            doVisible(this, key, value, oldValue)
         }
     }))
 }
 
+function doVisible(leaf: ILeaf, key: string, value: IValue, oldValue: IValue): void {
+    if (leaf.__setAttr(key, value)) {
+        leaf.__layout.opacityChanged || leaf.__layout.opacityChange()
+        if (oldValue === 0 || value === 0) doBoundsType(leaf) // 0 = display: none
+    }
+}
+
 export function sortType(defaultValue?: IValue) {
     return decorateLeafAttr(defaultValue, (key: string) => attr({
         set(value: IValue) {
@@ -251,7 +262,16 @@ export function defineDataProcessor(target: ILeaf, key: string, defaultValue?: I
 
     if (defaultValue === undefined) {
         property.get = function () { return this[computedKey] }
-    } else if (key === 'width') {
+    } else if (typeof defaultValue === 'object') {
+        const { clone } = DataHelper
+        property.get = function () {
+            let v = this[computedKey]
+            if (v === undefined) this[computedKey] = v = clone(defaultValue)
+            return v
+        }
+    }
+
+    if (key === 'width') {
         property.get = function () {
             const v = this[computedKey]
             if (v === undefined) {