@leafer-ui/data 1.0.0-rc.3 → 1.0.0-rc.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/data",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.30",
   "description": "@leafer-ui/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -15,18 +15,18 @@
     "type": "git",
     "url": "https://github.com/leaferjs/ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/data",
+  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/display-module/data",
   "bugs": "https://github.com/leaferjs/ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.3",
-    "@leafer-ui/external": "1.0.0-rc.3"
+    "@leafer/core": "1.0.0-rc.30",
+    "@leafer-ui/external": "1.0.0-rc.30"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.3",
-    "@leafer-ui/interface": "1.0.0-rc.3"
+    "@leafer/interface": "1.0.0-rc.30",
+    "@leafer-ui/interface": "1.0.0-rc.30"
   }
 }

package/src/BoxData.ts

@@ -4,5 +4,5 @@ import { GroupData } from "./GroupData"
 
 
 export class BoxData extends GroupData implements IBoxData {
-    get __boxStroke(): boolean { return true }
+    get __boxStroke(): boolean { return !this.__pathInputed }
 }

package/src/EllipseData.ts

@@ -4,5 +4,5 @@ import { UIData } from "./UIData"
 
 
 export class EllipseData extends UIData implements IEllipseData {
-    get __boxStroke(): boolean { return true }
+    get __boxStroke(): boolean { return !this.__pathInputed }
 }

package/src/ImageData.ts

@@ -1,8 +1,33 @@
-import { IImageData } from '@leafer-ui/interface'
+import { IImageData, IImageInputData, IImage, IObject } from '@leafer-ui/interface'
 
 import { RectData } from './RectData'
 
 
 export class ImageData extends RectData implements IImageData {
 
+    declare public __leaf: IImage
+
+    protected _url: string
+
+    protected setUrl(value: string) {
+        this.__setImageFill(value)
+        this._url = value
+    }
+
+    public __setImageFill(value: string): void {
+        if (this.__leaf.image) this.__leaf.image = null;
+        (this as IImageInputData).fill = value ? { type: 'image', mode: 'strench', url: value } : undefined
+    }
+
+    public __getData(): IObject {
+        const data = super.__getData()
+        delete data.fill
+        return data
+    }
+
+    public __getInputData(): IObject {
+        const data = super.__getInputData()
+        delete data.fill
+        return data
+    }
 }

package/src/PathData.ts

@@ -1,24 +1,8 @@
-import { IPathCommandData } from '@leafer/interface'
-import { PathConvert } from '@leafer/core'
+import { IPathData } from '@leafer-ui/interface'
 
-import { IPathString } from '@leafer-ui/interface'
 import { UIData } from "./UIData"
 
 
-const { parse } = PathConvert
-
-export class PathData extends UIData {
-
-    protected _path: IPathCommandData
-
-    protected setPath(value: IPathCommandData | IPathString) {
-        if (typeof value === 'string') {
-            this.__setInput('path', value)
-            this._path = parse(value)
-        } else {
-            if (this.__input) this.__removeInput('path')
-            this._path = value
-        }
-    }
+export class PathData extends UIData implements IPathData {
 
 }

package/src/RectData.ts

@@ -4,5 +4,5 @@ import { UIData } from "./UIData"
 
 
 export class RectData extends UIData implements IRectData {
-    get __boxStroke(): boolean { return true }
+    get __boxStroke(): boolean { return !this.__pathInputed }
 }

package/src/TextData.ts

@@ -17,6 +17,8 @@ const fontWeightMap = {
 
 export class TextData extends UIData implements ITextData {
 
+    public get __useNaturalRatio() { return false }
+
     protected _fontWeight?: number
 
     setFontWeight(value: IFontWeight): void {

package/src/UIData.ts

@@ -1,39 +1,63 @@
-import { __Number, __Value, __Boolean } from '@leafer/interface'
-import { LeafData, Debug } from '@leafer/core'
+import { INumber, IValue, IBoolean, IPathCommandData, IPathString } from '@leafer/interface'
+import { PathConvert, LeafData, Debug } from '@leafer/core'
 
 import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
-import { Paint } from '@leafer-ui/external'
+import { Paint, PaintImage } from '@leafer-ui/external'
 
 
+const { parse } = PathConvert
 const emptyPaint: ILeafPaint = {}
 const debug = Debug.get('UIData')
 export class UIData extends LeafData implements IUIData {
 
     declare public __leaf: IUI
 
-    public __blendLayer?: boolean
+    public __blendLayer?: boolean // 非元素属性必须以两个下划线开头
 
     public __isFills?: boolean
     public __isStrokes?: boolean
 
-    protected _visible?: __Boolean
+    public get __strokeWidth(): number {
+        const { strokeWidth, strokeWidthFixed } = this as IUIData
+        if (strokeWidthFixed) {
+            const ui = this.__leaf
+            let { scaleX } = ui.__nowWorld || ui.__world
+            if (scaleX < 0) scaleX = -scaleX
+            return scaleX > 1 ? strokeWidth / scaleX : strokeWidth
+        } else {
+            return strokeWidth
+        }
+    }
+
+    public __pixelFill?: boolean // png / svg / webp
+    public __pixelStroke?: boolean
 
-    protected _width?: __Number
-    protected _height?: __Number
+    public __needComputePaint: boolean
 
-    protected _fill?: __Value
-    protected _stroke?: __Value
+    protected _visible?: IBoolean
 
-    protected _shadow?: __Value
-    protected _innerShadow?: __Value
+    protected _width?: INumber
+    protected _height?: INumber
 
+    protected _fill?: IValue
+    protected _stroke?: IValue
 
-    protected setVisible(value: __Boolean) {
+    protected _path: IPathCommandData
+
+    protected _shadow?: IValue
+    protected _innerShadow?: IValue
+
+    public get __autoWidth() { return !this._width }
+    public get __autoHeight() { return !this._height }
+    public get __autoSide() { return !this._width || !this._height }
+    public get __autoSize() { return !this._width && !this._height }
+
+    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
@@ -43,7 +67,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
@@ -54,13 +78,14 @@ export class UIData extends LeafData implements IUIData {
     }
 
 
-    protected setFill(value: __Value) {
-        if (this.__naturalWidth) this.__naturalWidth = this.__naturalHeight = undefined
+    protected setFill(value: IValue) {
+        if (this.__naturalWidth) this.__removeNaturalSize()
         if (typeof value === 'string' || !value) {
             if (this.__isFills) {
                 this.__removeInput('fill')
-                Paint.recycleImage(this, 'fill')
+                PaintImage.recycleImage('fill', this)
                 this.__isFills = false
+                if (this.__pixelFill) this.__pixelFill = false
             }
             this._fill = value
         } else if (typeof value === 'object') {
@@ -71,12 +96,13 @@ 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')
-                Paint.recycleImage(this, 'stroke')
+                PaintImage.recycleImage('stroke', this)
                 this.__isStrokes = false
+                if (this.__pixelStroke) this.__pixelStroke = false
             }
             this._stroke = value
         } else if (typeof value === 'object') {
@@ -88,7 +114,18 @@ export class UIData extends LeafData implements IUIData {
     }
 
 
-    protected setShadow(value: __Value) {
+    protected setPath(value: IPathCommandData | IPathString) {
+        if (typeof value === 'string') {
+            this.__setInput('path', value)
+            this._path = parse(value)
+        } else {
+            if (this.__input) this.__removeInput('path')
+            this._path = 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)
@@ -100,7 +137,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)
@@ -112,13 +149,22 @@ export class UIData extends LeafData implements IUIData {
         }
     }
 
+    // custom
+
+    public __computePaint(): void {
+        const { fill, stroke } = this.__input
+        if (fill) Paint.compute('fill', this.__leaf)
+        if (stroke) Paint.compute('stroke', this.__leaf)
+        this.__needComputePaint = false
+    }
+
 }
 
 
 export const UnitConvert = {
 
     number(value: number | IUnitData, percentRefer?: number): number {
-        if (typeof value === 'object') return value.type === 'percent' ? value.value / 100 * percentRefer : value.value
+        if (typeof value === 'object') return value.type === 'percent' ? value.value * percentRefer : value.value
         return value
     }
 

package/types/index.d.ts

@@ -1,26 +1,37 @@
-import { __Boolean, __Number, __Value, IPathCommandData } from '@leafer/interface';
+import { IBoolean, INumber, IValue, IPathCommandData, IPathString } 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';
+import { IUIData, IUI, IUnitData, IGroupData, IBoxData, ILeaferData, IFrameData, ILineData, IRectData, IEllipseData, IPolygonData, IStarData, IPathData, IPenData, ITextData, IFontWeight, IImageData, IImage, IObject, 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;
+    get __strokeWidth(): number;
+    __pixelFill?: boolean;
+    __pixelStroke?: boolean;
+    __needComputePaint: boolean;
+    protected _visible?: IBoolean;
+    protected _width?: INumber;
+    protected _height?: INumber;
+    protected _fill?: IValue;
+    protected _stroke?: IValue;
+    protected _path: IPathCommandData;
+    protected _shadow?: IValue;
+    protected _innerShadow?: IValue;
+    get __autoWidth(): boolean;
+    get __autoHeight(): boolean;
+    get __autoSide(): boolean;
+    get __autoSize(): 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 setPath(value: IPathCommandData | IPathString): void;
+    protected setShadow(value: IValue): void;
+    protected setInnerShadow(value: IValue): void;
+    __computePaint(): void;
 }
 declare const UnitConvert: {
     number(value: number | IUnitData, percentRefer?: number): number;
@@ -56,20 +67,25 @@ 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 PathData extends UIData implements IPathData {
 }
 
 declare class PenData extends GroupData implements IPenData {
 }
 
 declare class TextData extends UIData implements ITextData {
+    get __useNaturalRatio(): boolean;
     protected _fontWeight?: number;
     setFontWeight(value: IFontWeight): void;
 }
 
 declare class ImageData extends RectData implements IImageData {
+    __leaf: IImage;
+    protected _url: string;
+    protected setUrl(value: string): void;
+    __setImageFill(value: string): void;
+    __getData(): IObject;
+    __getInputData(): IObject;
 }
 
 declare class CanvasData extends RectData implements ICanvasData {