@leafer-ui/data 1.0.0-alpha.30 → 1.0.0-alpha.31

package/package.json

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

package/src/TextData.ts

@@ -21,8 +21,10 @@ export class TextData extends UIData implements ITextData {
 
     setFontWeight(value: IFontWeight): void {
         if (typeof value === 'string') {
+            this.__setInput('fontWeight', value)
             this._fontWeight = fontWeightMap[value] || 400
         } else {
+            if (this.__input) this.__removeInput('fontWeight')
             this._fontWeight = value
         }
     }

package/src/UIData.ts

@@ -1,7 +1,7 @@
-import { __Value } from '@leafer/interface'
+import { IBlendMode, __Value } from '@leafer/interface'
 import { LeafData } from '@leafer/core'
 
-import { IUI, IUIData, IUnitData } from '@leafer-ui/interface'
+import { IShadowEffect, IUI, IUIData, IUnitData } from '@leafer-ui/interface'
 import { Paint } from '@leafer-ui/external'
 
 
@@ -9,6 +9,9 @@ export class UIData extends LeafData implements IUIData {
 
     public __leaf: IUI
 
+    public __blendLayer?: boolean
+    public _blendMode: string
+
     public __isFills?: boolean
     public __isStrokes?: boolean
 
@@ -18,6 +21,15 @@ export class UIData extends LeafData implements IUIData {
     protected _shadow?: __Value
     protected _innerShadow?: __Value
 
+    protected setBlendMode(value: IBlendMode) {
+        this._blendMode = value
+        if (value === 'pass-through' || !value) {
+            if (this.__blendLayer) this.__blendLayer = false
+        } else {
+            this.__blendLayer = true
+        }
+    }
+
     protected setFill(value: __Value) {
         if (typeof value === 'string' || !value) {
             this._fill = value
@@ -43,30 +55,32 @@ export class UIData extends LeafData implements IUIData {
     }
 
     protected setShadow(value: __Value) {
+        this.__setInput('shadow', value)
         if (value instanceof Array) {
-            this._shadow = value
+            if (value.some((item: IShadowEffect) => item.visible === false)) value = value.filter((item: IShadowEffect) => item.visible !== false)
+            this._shadow = value.length ? value : null
         } else if (value) {
-            this._shadow = [value]
+            this._shadow = (value as IShadowEffect).visible === false ? null : [value]
         } else {
-            this._shadow = value
+            this._shadow = null
         }
     }
 
     protected setInnerShadow(value: __Value) {
+        this.__setInput('innerShadow', value)
         if (value instanceof Array) {
-            this._innerShadow = value
+            if (value.some((item: IShadowEffect) => item.visible === false)) value = value.filter((item: IShadowEffect) => item.visible !== false)
+            this._innerShadow = value.length ? value : null
         } else if (value) {
-            this._innerShadow = [value]
+            this._innerShadow = (value as IShadowEffect).visible === false ? null : [value]
         } else {
-            this._shadow = value
+            this._innerShadow = null
         }
     }
 
 }
 
 
-
-
 export const UnitConvert = {
 
     number(value: number | IUnitData, percentRefer?: number): number {