@leafer-ui/data 1.0.0-alpha.7 → 1.0.0-bate

package/package.json

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

package/src/BoxData.ts

@@ -0,0 +1,8 @@
+import { IBoxData } from '@leafer-ui/interface'
+
+import { GroupData } from "./GroupData"
+
+
+export class BoxData extends GroupData implements IBoxData {
+
+}

package/src/CanvasData.ts

@@ -0,0 +1,8 @@
+import { ICanvasData } from '@leafer-ui/interface'
+
+import { UIData } from "./UIData"
+
+
+export class CanvasData extends UIData implements ICanvasData {
+
+}

package/src/FrameData.ts

@@ -1,8 +1,8 @@
 import { IFrameData } from '@leafer-ui/interface'
 
-import { GroupData } from "./GroupData"
+import { BoxData } from './BoxData'
 
 
-export class FrameData extends GroupData implements IFrameData {
+export class FrameData extends BoxData implements IFrameData {
 
 }

package/src/LeaferData.ts

@@ -0,0 +1,8 @@
+import { ILeaferData } from '@leafer-ui/interface'
+
+import { GroupData } from './GroupData'
+
+
+export class LeaferData extends GroupData implements ILeaferData {
+
+}

package/src/PathData.ts

@@ -12,7 +12,13 @@ export class PathData extends UIData {
     protected _path: IPathCommandData
 
     protected setPath(value: IPathCommandData | IPathString) {
-        this._path = (typeof value === 'string') ? parse(value) : value
+        if (typeof value === 'string') {
+            this.__setInput('path', value)
+            this._path = parse(value)
+        } else {
+            if (this.__input) this.__removeInput('path')
+            this._path = value
+        }
     }
 
 }

package/src/PenData.ts

@@ -0,0 +1,8 @@
+import { IPenData } from '@leafer-ui/interface'
+
+import { GroupData } from './GroupData'
+
+
+export class PenData extends GroupData implements IPenData {
+
+}

package/src/TextData.ts

@@ -1,8 +1,32 @@
-import { ITextData } from '@leafer-ui/interface'
+import { IFontWeight, ITextData } from '@leafer-ui/interface'
 
 import { UIData } from "./UIData"
 
 
+const fontWeightMap = {
+    'thin': 100,
+    'extra-light': 200,
+    'light': 300,
+    'normal': 400,
+    'medium': 500,
+    'semi-bold': 600,
+    'bold': 700,
+    'extra-bold': 800,
+    'black': 900
+}
+
 export class TextData extends UIData implements ITextData {
 
+    protected _fontWeight?: number
+
+    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,74 +1,91 @@
-import { __Value } from '@leafer/interface'
+import { IBlendMode, __Value } from '@leafer/interface'
 import { LeafData } from '@leafer/core'
 
-import { IUIData } from '@leafer-ui/interface'
+import { IShadowEffect, IUI, IUIData, IUnitData } from '@leafer-ui/interface'
+import { Paint } from '@leafer-ui/external'
 
 
 export class UIData extends LeafData implements IUIData {
 
+    public __leaf: IUI
+
+    public __blendLayer?: boolean
+    public _blendMode: string
+
     public __isFills?: boolean
     public __isStrokes?: boolean
 
     protected _fill?: __Value
     protected _stroke?: __Value
 
-    protected _borderWidth?: __Value
-    protected _strokeWidth?: number
-
     protected _shadow?: __Value
     protected _innerShadow?: __Value
 
-    protected setBorderWidth(value: __Value) {
-        if (typeof value === 'number') this._strokeWidth = value
-        this._borderWidth = 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') {
+        if (typeof value === 'string' || !value) {
             this._fill = value
-            if (this.__isFills) this.__isFills = false
-        } else if (value instanceof Array) {
-            this._fill = value
-            this.__isFills = true
+            if (this.__input) this.__removeInput('fill')
+            this.__isFills && (this.__isFills = false)
         } else if (typeof value === 'object') {
-            this._fill = [value]
+            this.__setInput('fill', value)
+            this.__leaf.__layout.boxChanged ? this._fill = value : Paint.computeFill(this.__leaf)
             this.__isFills = true
-        } else {
-            this._fill = value
-            if (this.__isFills) this.__isFills = false
         }
     }
 
     protected setStroke(value: __Value) {
-        if (typeof value === 'string') {
+        if (typeof value === 'string' || !value) {
             this._stroke = value
-            if (this.__isStrokes) this.__isStrokes = false
-        } else if (value instanceof Array) {
-            this._stroke = value
-            this.__isStrokes = true
+            if (this.__input) this.__removeInput('stroke')
+            this.__isStrokes && (this.__isStrokes = false)
         } else if (typeof value === 'object') {
-            this._stroke = [value]
+            this.__setInput('stroke', value)
+            this.__leaf.__layout.boxChanged ? this._stroke = value : Paint.computeStroke(this.__leaf)
             this.__isStrokes = true
-        } else {
-            this._stroke = value
-            if (this.__isStrokes) this.__isStrokes = false
         }
     }
 
     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 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 as IShadowEffect).visible === false ? null : [value]
         } else {
-            this._innerShadow = [value]
+            this._innerShadow = null
         }
     }
 
 }
+
+
+export const UnitConvert = {
+
+    number(value: number | IUnitData, percentRefer?: number): number {
+        if (typeof value === 'object') return value.type === 'percent' ? value.value / 100 * percentRefer : value.value
+        return value
+    }
+
+} 

package/src/index.ts

@@ -1,7 +1,8 @@
-
-export { UIData } from './UIData'
+export { UIData, UnitConvert } from './UIData'
 export { GroupData } from './GroupData'
+export { BoxData } from './BoxData'
 
+export { LeaferData } from './LeaferData'
 export { FrameData } from './FrameData'
 
 export { LineData } from './LineData'
@@ -10,8 +11,7 @@ export { EllipseData } from './EllipseData'
 export { PolygonData } from './PolygonData'
 export { StarData } from './StarData'
 export { PathData } from './PathData'
-export { VectorData } from './VectorData'
+export { PenData } from './PenData'
 export { TextData } from './TextData'
 export { ImageData } from './ImageData'
-
-
+export { CanvasData } from './CanvasData'

package/src/VectorData.ts

@@ -1,8 +0,0 @@
-import { IVectorData } from '@leafer-ui/interface'
-
-import { UIData } from "./UIData"
-
-
-export class VectorData extends UIData implements IVectorData {
-
-}