@leafer-ui/data 1.3.3 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/data",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "description": "@leafer-ui/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.3.3",
-    "@leafer-ui/external": "1.3.3"
+    "@leafer/core": "1.4.1",
+    "@leafer-ui/external": "1.4.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.3.3",
-    "@leafer-ui/interface": "1.3.3"
+    "@leafer/interface": "1.4.1",
+    "@leafer-ui/interface": "1.4.1"
   }
 }

package/src/UIData.ts

@@ -1,7 +1,7 @@
-import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData, IPathCommandObject } from '@leafer/interface'
+import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData, IPathCommandObject, IObject, IFilter } from '@leafer/interface'
 import { PathConvert, LeafData, Debug } from '@leafer/core'
 
-import { IShadowEffect, IUI, IUIData, ILeafPaint } from '@leafer-ui/interface'
+import { IUI, IUIData, ILeafPaint } from '@leafer-ui/interface'
 import { Paint, PaintImage } from '@leafer-ui/external'
 
 
@@ -136,21 +136,18 @@ export class UIData extends LeafData implements IUIData {
 
 
     protected setShadow(value: IValue) {
-        this.__setInput('shadow', value)
-        if (value instanceof Array) {
-            if (value.some((item: IShadowEffect) => item.visible === false)) value = value.filter((item: IShadowEffect) => item.visible !== false)
-            this._shadow = value.length ? value : null
-        } else this._shadow = value && (value as IShadowEffect).visible !== false ? [value] : null
+        setArray(this, 'shadow', value)
     }
 
     protected setInnerShadow(value: IValue) {
-        this.__setInput('innerShadow', value)
-        if (value instanceof Array) {
-            if (value.some((item: IShadowEffect) => item.visible === false)) value = value.filter((item: IShadowEffect) => item.visible !== false)
-            this._innerShadow = value.length ? value : null
-        } else this._innerShadow = value && (value as IShadowEffect).visible !== false ? [value] : null
+        setArray(this, 'innerShadow', value)
     }
 
+    protected setFilter(value: IValue) {
+        setArray(this, 'filter', value)
+    }
+
+
     // custom
 
     public __computePaint(): void {
@@ -160,4 +157,14 @@ export class UIData extends LeafData implements IUIData {
         this.__needComputePaint = false
     }
 
-}
+}
+
+
+function setArray(data: IUIData, key: string, value: IValue) {
+    data.__setInput(key, value)
+    if (value instanceof Array) {
+        if (value.some((item: IFilter) => item.visible === false)) value = value.filter((item: IFilter) => item.visible !== false)
+        value.length || (value = null)
+    } else value = value && (value as IFilter).visible !== false ? [value] : null;
+    (data as IObject)['_' + key] = value
+}

package/types/index.d.ts

@@ -36,6 +36,7 @@ declare class UIData extends LeafData implements IUIData {
     protected setPath(value: IPathCommandData | IPathCommandObject[] | IPathString): void;
     protected setShadow(value: IValue): void;
     protected setInnerShadow(value: IValue): void;
+    protected setFilter(value: IValue): void;
     __computePaint(): void;
 }