@leafer-ui/data 1.0.0-rc.5 → 1.0.0-rc.7

package/package.json

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

package/src/UIData.ts

@@ -1,4 +1,4 @@
-import { __Number, __Value, __Boolean } from '@leafer/interface'
+import { INumber, IValue, IBoolean } from '@leafer/interface'
 import { LeafData, Debug } from '@leafer/core'
 
 import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
@@ -11,7 +11,7 @@ export class UIData extends LeafData implements IUIData {
 
     declare public __leaf: IUI
 
-    public __blendLayer?: boolean
+    public __blendLayer?: boolean // 非元素属性必须以两个下划线开头
 
     public __isFills?: boolean
     public __isStrokes?: boolean
@@ -19,24 +19,28 @@ export class UIData extends LeafData implements IUIData {
     public __pixelFill?: boolean // png / svg / webp
     public __pixelStroke?: boolean
 
-    protected _visible?: __Boolean
+    protected _visible?: IBoolean
 
-    protected _width?: __Number
-    protected _height?: __Number
+    protected _width?: INumber
+    protected _height?: INumber
 
-    protected _fill?: __Value
-    protected _stroke?: __Value
+    protected _fill?: IValue
+    protected _stroke?: IValue
 
-    protected _shadow?: __Value
-    protected _innerShadow?: __Value
+    protected _shadow?: IValue
+    protected _innerShadow?: IValue
 
+    public get __autoWidth() { return !this._width }
+    public get __autoHeight() { return !this._height }
+    public get __autoBounds() { return !this._width && !this._height }
 
-    protected setVisible(value: __Boolean) {
+
+    protected setVisible(value: IBoolean) {
         if (this.__leaf.leafer) this.__leaf.leafer.watcher.hasVisible = true
         this._visible = value
     }
 
-    protected setWidth(value: __Number) {
+    protected setWidth(value: INumber) {
         if (value < 0) {
             this._width = -value
             this.__leaf.scaleX *= -1
@@ -46,7 +50,7 @@ export class UIData extends LeafData implements IUIData {
         }
     }
 
-    protected setHeight(value: __Number) {
+    protected setHeight(value: INumber) {
         if (value < 0) {
             this._height = -value
             this.__leaf.scaleY *= -1
@@ -57,7 +61,7 @@ export class UIData extends LeafData implements IUIData {
     }
 
 
-    protected setFill(value: __Value) {
+    protected setFill(value: IValue) {
         if (this.__naturalWidth) this.__naturalWidth = this.__naturalHeight = undefined
         if (typeof value === 'string' || !value) {
             if (this.__isFills) {
@@ -75,7 +79,7 @@ export class UIData extends LeafData implements IUIData {
         }
     }
 
-    protected setStroke(value: __Value) {
+    protected setStroke(value: IValue) {
         if (typeof value === 'string' || !value) {
             if (this.__isStrokes) {
                 this.__removeInput('stroke')
@@ -93,7 +97,7 @@ export class UIData extends LeafData implements IUIData {
     }
 
 
-    protected setShadow(value: __Value) {
+    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)
@@ -105,7 +109,7 @@ export class UIData extends LeafData implements IUIData {
         }
     }
 
-    protected setInnerShadow(value: __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)

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { __Boolean, __Number, __Value, IPathCommandData } from '@leafer/interface';
+import { IBoolean, INumber, IValue, 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';
 
@@ -9,20 +9,23 @@ declare class UIData extends LeafData implements IUIData {
     __isStrokes?: boolean;
     __pixelFill?: boolean;
     __pixelStroke?: 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;
+    protected _visible?: IBoolean;
+    protected _width?: INumber;
+    protected _height?: INumber;
+    protected _fill?: IValue;
+    protected _stroke?: IValue;
+    protected _shadow?: IValue;
+    protected _innerShadow?: IValue;
+    get __autoWidth(): boolean;
+    get __autoHeight(): boolean;
+    get __autoBounds(): boolean;
+    protected setVisible(value: IBoolean): void;
+    protected setWidth(value: INumber): void;
+    protected setHeight(value: INumber): void;
+    protected setFill(value: IValue): void;
+    protected setStroke(value: IValue): void;
+    protected setShadow(value: IValue): void;
+    protected setInnerShadow(value: IValue): void;
 }
 declare const UnitConvert: {
     number(value: number | IUnitData, percentRefer?: number): number;