@leafer-ui/data 1.0.0-beta.9 → 1.0.0-rc.10

package/package.json

@@ -1,28 +1,32 @@
 {
   "name": "@leafer-ui/data",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.10",
   "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",
     "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-beta.9"
+    "@leafer/core": "1.0.0-rc.10",
+    "@leafer-ui/external": "1.0.0-rc.10"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.9",
-    "@leafer-ui/interface": "1.0.0-beta.9"
+    "@leafer/interface": "1.0.0-rc.10",
+    "@leafer-ui/interface": "1.0.0-rc.10"
   }
 }

package/src/ArrowData.ts

@@ -0,0 +1,8 @@
+import { IArrowData } from "@leafer-ui/interface"
+
+import { LineData } from "./LineData"
+
+
+export class ArrowData extends LineData implements IArrowData {
+
+}

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/UIData.ts

@@ -1,52 +1,115 @@
-import { __Value } from '@leafer/interface'
-import { LeafData } from '@leafer/core'
+import { INumber, IValue, IBoolean } from '@leafer/interface'
+import { LeafData, Debug } from '@leafer/core'
 
-import { IShadowEffect, IUI, IUIData, IUnitData } from '@leafer-ui/interface'
-import { Paint } from '@leafer-ui/external'
+import { IShadowEffect, IUI, IUIData, IUnitData, ILeafPaint } from '@leafer-ui/interface'
+import { Paint, PaintImage } 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 __blendLayer?: boolean // 非元素属性必须以两个下划线开头
 
     public __isFills?: boolean
     public __isStrokes?: boolean
 
-    protected _fill?: __Value
-    protected _stroke?: __Value
+    public get __strokeWidth(): number {
+        const { strokeWidth, strokeWidthFixed } = this as IUIData
+        if (strokeWidthFixed) {
+            let { scaleX } = this.__leaf.__world
+            if (scaleX < 0) scaleX = -scaleX
+            return scaleX > 1 ? strokeWidth / scaleX : strokeWidth
+        } else {
+            return strokeWidth
+        }
+    }
+
+    public __pixelFill?: boolean // png / svg / webp
+    public __pixelStroke?: boolean
+
+    public __needComputePaint: boolean
+
+    protected _visible?: IBoolean
+
+    protected _width?: INumber
+    protected _height?: INumber
 
-    protected _shadow?: __Value
-    protected _innerShadow?: __Value
+    protected _fill?: IValue
+    protected _stroke?: IValue
 
+    protected _shadow?: IValue
+    protected _innerShadow?: IValue
 
-    protected setFill(value: __Value) {
+    public get __autoWidth() { return !this._width }
+    public get __autoHeight() { return !this._height }
+    public get __autoBounds() { 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: INumber) {
+        if (value < 0) {
+            this._width = -value
+            this.__leaf.scaleX *= -1
+            debug.warn('width < 0, instead -scaleX ', this)
+        } else {
+            this._width = value
+        }
+    }
+
+    protected setHeight(value: INumber) {
+        if (value < 0) {
+            this._height = -value
+            this.__leaf.scaleY *= -1
+            debug.warn('height < 0, instead -scaleY', this)
+        } else {
+            this._height = value
+        }
+    }
+
+
+    protected setFill(value: IValue) {
+        if (this.__naturalWidth) this.__naturalWidth = this.__naturalHeight = undefined
         if (typeof value === 'string' || !value) {
+            if (this.__isFills) {
+                this.__removeInput('fill')
+                PaintImage.recycleImage('fill', this)
+                this.__isFills = false
+                if (this.__pixelFill) this.__pixelFill = 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) {
+    protected setStroke(value: IValue) {
         if (typeof value === 'string' || !value) {
+            if (this.__isStrokes) {
+                this.__removeInput('stroke')
+                PaintImage.recycleImage('stroke', this)
+                this.__isStrokes = false
+                if (this.__pixelStroke) this.__pixelStroke = 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) {
+
+    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)
@@ -58,7 +121,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)
@@ -70,6 +133,15 @@ 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
+    }
+
 }
 
 

package/src/index.ts

@@ -6,6 +6,7 @@ export { LeaferData } from './LeaferData'
 export { FrameData } from './FrameData'
 
 export { LineData } from './LineData'
+export { ArrowData } from './ArrowData'
 export { RectData } from './RectData'
 export { EllipseData } from './EllipseData'
 export { PolygonData } from './PolygonData'

package/types/index.d.ts

@@ -0,0 +1,95 @@
+import { IBoolean, INumber, IValue, IPathCommandData } from '@leafer/interface';
+import { LeafData } from '@leafer/core';
+import { IUIData, IUI, IUnitData, IGroupData, IBoxData, ILeaferData, IFrameData, ILineData, IArrowData, IRectData, IEllipseData, IPolygonData, IStarData, IPathString, 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;
+    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 _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;
+    __computePaint(): 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 ArrowData extends LineData implements IArrowData {
+}
+
+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 {
+    __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 {
+}
+
+export { ArrowData, BoxData, CanvasData, EllipseData, FrameData, GroupData, ImageData, LeaferData, LineData, PathData, PenData, PolygonData, RectData, StarData, TextData, UIData, UnitConvert };