@leafer-ui/data 1.0.0-beta.8 → 1.0.0-rc.2

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@leafer-ui/data",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-rc.2",
   "description": "@leafer-ui/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -19,10 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-beta.8"
+    "@leafer/core": "1.0.0-rc.2",
+    "@leafer-ui/external": "1.0.0-rc.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.8",
-    "@leafer-ui/interface": "1.0.0-beta.8"
+    "@leafer/interface": "1.0.0-rc.2",
+    "@leafer-ui/interface": "1.0.0-rc.2"
   }
 }

package/src/UIData.ts

@@ -1,19 +1,26 @@
-import { __Value } from '@leafer/interface'
-import { LeafData } from '@leafer/core'
+import { __Number, __Value, __Boolean } from '@leafer/interface'
+import { LeafData, Debug } from '@leafer/core'
 
-import { IShadowEffect, IUI, IUIData, IUnitData } from '@leafer-ui/interface'
+import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
 import { Paint } from '@leafer-ui/external'
 
 
+const emptyPaint: ILeafPaint = {}
+const debug = Debug.get('UIData')
 export class UIData extends LeafData implements IUIData {
 
-    public __leaf: IUI
+    declare public __leaf: IUI
 
     public __blendLayer?: boolean
 
     public __isFills?: boolean
     public __isStrokes?: boolean
 
+    protected _visible?: __Boolean
+
+    protected _width?: __Number
+    protected _height?: __Number
+
     protected _fill?: __Value
     protected _stroke?: __Value
 
@@ -21,31 +28,66 @@ export class UIData extends LeafData implements IUIData {
     protected _innerShadow?: __Value
 
 
+    protected setVisible(value: __Boolean) {
+        if (this.__leaf.leafer) this.__leaf.leafer.watcher.hasVisible = true
+        this._visible = value
+    }
+
+    protected setWidth(value: __Number) {
+        if (value < 0) {
+            this._width = -value
+            this.__leaf.scaleX *= -1
+            debug.warn('width < 0, instead -scaleX ', this)
+        } else {
+            this._width = value
+        }
+    }
+
+    protected setHeight(value: __Number) {
+        if (value < 0) {
+            this._height = -value
+            this.__leaf.scaleY *= -1
+            debug.warn('height < 0, instead -scaleY', this)
+        } else {
+            this._height = value
+        }
+    }
+
+
     protected setFill(value: __Value) {
+        if (this.__naturalWidth) this.__naturalWidth = this.__naturalHeight = undefined
         if (typeof value === 'string' || !value) {
+            if (this.__isFills) {
+                this.__removeInput('fill')
+                Paint.recycleImage(this, 'fill')
+                this.__isFills = false
+            }
             this._fill = value
-            if (this.__input) this.__removeInput('fill')
-            this.__isFills && (this.__isFills = false)
         } else if (typeof value === 'object') {
             this.__setInput('fill', value)
-            this.__leaf.__layout.boxChanged ? this._fill = value : Paint.computeFill(this.__leaf)
+            this.__leaf.__layout.boxChanged || this.__leaf.__layout.boxChange()
             this.__isFills = true
+            this._fill || (this._fill = emptyPaint)
         }
-        if (this.__naturalWidth) this.__naturalWidth = this.__naturalHeight = undefined
     }
 
     protected setStroke(value: __Value) {
         if (typeof value === 'string' || !value) {
+            if (this.__isStrokes) {
+                this.__removeInput('stroke')
+                Paint.recycleImage(this, 'stroke')
+                this.__isStrokes = false
+            }
             this._stroke = value
-            if (this.__input) this.__removeInput('stroke')
-            this.__isStrokes && (this.__isStrokes = false)
         } else if (typeof value === 'object') {
             this.__setInput('stroke', value)
-            this.__leaf.__layout.boxChanged ? this._stroke = value : Paint.computeStroke(this.__leaf)
+            this.__leaf.__layout.boxChanged || this.__leaf.__layout.boxChange()
             this.__isStrokes = true
+            this._stroke || (this._stroke = emptyPaint)
         }
     }
 
+
     protected setShadow(value: __Value) {
         this.__setInput('shadow', value)
         if (value instanceof Array) {

package/types/index.d.ts

@@ -0,0 +1,78 @@
+import { __Boolean, __Number, __Value, IPathCommandData } from '@leafer/interface';
+import { LeafData } from '@leafer/core';
+import { IUIData, IUI, IUnitData, IGroupData, IBoxData, ILeaferData, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathString, IPenData, ITextData, IFontWeight, IImageData, ICanvasData } from '@leafer-ui/interface';
+
+declare class UIData extends LeafData implements IUIData {
+    __leaf: IUI;
+    __blendLayer?: boolean;
+    __isFills?: boolean;
+    __isStrokes?: boolean;
+    protected _visible?: __Boolean;
+    protected _width?: __Number;
+    protected _height?: __Number;
+    protected _fill?: __Value;
+    protected _stroke?: __Value;
+    protected _shadow?: __Value;
+    protected _innerShadow?: __Value;
+    protected setVisible(value: __Boolean): void;
+    protected setWidth(value: __Number): void;
+    protected setHeight(value: __Number): void;
+    protected setFill(value: __Value): void;
+    protected setStroke(value: __Value): void;
+    protected setShadow(value: __Value): void;
+    protected setInnerShadow(value: __Value): void;
+}
+declare const UnitConvert: {
+    number(value: number | IUnitData, percentRefer?: number): number;
+};
+
+declare class GroupData extends UIData implements IGroupData {
+}
+
+declare class BoxData extends GroupData implements IBoxData {
+    get __boxStroke(): boolean;
+}
+
+declare class LeaferData extends GroupData implements ILeaferData {
+}
+
+declare class FrameData extends BoxData implements IFrameData {
+}
+
+declare class LineData extends UIData implements ILineData {
+}
+
+declare class RectData extends UIData implements IRectData {
+    get __boxStroke(): boolean;
+}
+
+declare class EllipseData extends UIData implements IEllipseData {
+    get __boxStroke(): boolean;
+}
+
+declare class PolygonData extends UIData implements IPolygonData {
+}
+
+declare class StarData extends UIData implements IStarData {
+}
+
+declare class PathData extends UIData {
+    protected _path: IPathCommandData;
+    protected setPath(value: IPathCommandData | IPathString): void;
+}
+
+declare class PenData extends GroupData implements IPenData {
+}
+
+declare class TextData extends UIData implements ITextData {
+    protected _fontWeight?: number;
+    setFontWeight(value: IFontWeight): void;
+}
+
+declare class ImageData extends RectData implements IImageData {
+}
+
+declare class CanvasData extends RectData implements ICanvasData {
+}
+
+export { BoxData, CanvasData, EllipseData, FrameData, GroupData, ImageData, LeaferData, LineData, PathData, PenData, PolygonData, RectData, StarData, TextData, UIData, UnitConvert };