@leafer-ui/display 1.0.0-rc.7 → 1.0.0-rc.9

package/package.json

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

package/src/Arrow.ts

@@ -0,0 +1,24 @@
+import { registerUI, strokeType, dataProcessor } from '@leafer/core'
+
+import { IArrow, IArrowData, IArrowInputData, IArrowType } from '@leafer-ui/interface'
+import { ArrowData } from '@leafer-ui/data'
+
+import { Line } from './Line'
+
+
+@registerUI()
+export class Arrow extends Line implements IArrow {
+
+    public get __tag() { return 'Arrow' }
+
+    @dataProcessor(ArrowData)
+    declare public __: IArrowData
+
+    @strokeType('lines')
+    declare public endArrow: IArrowType
+
+    constructor(data?: IArrowInputData) {
+        super(data)
+    }
+
+}

package/src/Box.ts

@@ -2,11 +2,10 @@ import { ILeaferCanvas, IRenderOptions, IPathDrawer, IBoundsData, IPathCommandDa
 import { rewrite, rewriteAble, registerUI, BoundsHelper, dataProcessor, affectRenderBoundsType } from '@leafer/core'
 
 import { IBox, IBoxData, IBoxInputData, IOverflow } from '@leafer-ui/interface'
+import { BoxData } from '@leafer-ui/data'
 
 import { Group } from './Group'
 import { Rect } from './Rect'
-import { BoxData } from '@leafer-ui/data'
-
 
 const rect = Rect.prototype
 const group = Group.prototype

package/src/Image.ts

@@ -1,7 +1,7 @@
 import { ILeaferImage, IString } from '@leafer/interface'
 import { ImageEvent, boundsType, dataProcessor, registerUI } from '@leafer/core'
 
-import { IImage, IImageInputData, IImageData, IImagePaint } from '@leafer-ui/interface'
+import { IImage, IImageInputData, IImageData } from '@leafer-ui/interface'
 import { ImageData } from '@leafer-ui/data'
 
 import { Rect } from './Rect'
@@ -24,29 +24,9 @@ export class Image extends Rect implements IImage {
 
     constructor(data?: IImageInputData) {
         super(data)
-    }
-
-    public __updateBoxBounds(): void {
-
-        let update: boolean
-
-        const { url } = this
-        const fill = this.fill as IImagePaint
-
-        if (fill) {
-            if (fill.url !== url) update = true
-        } else {
-            if (url) update = true
-        }
-
-        if (update) {
-            if (this.image) this.image = null
-            this.fill = url ? { type: 'image', mode: 'strench', url } : undefined
-            this.once(ImageEvent.LOADED, (e) => this.image = e.image)
-        }
-
-        super.__updateBoxBounds()
-
+        this.on(ImageEvent.LOADED, (e: ImageEvent) => {
+            if (e.attrName === 'fill' && e.attrValue.url === this.url) this.image = e.image
+        })
     }
 
     public destroy(): void {

package/src/Text.ts

@@ -123,7 +123,7 @@ export class Text extends UI implements IText {
 
         const data = this.__
         const layout = this.__layout
-        const { lineHeight, letterSpacing, fontFamily, fontSize, fontWeight, italic, textCase, textOverflow } = data
+        const { lineHeight, letterSpacing, fontFamily, fontSize, fontWeight, italic, textCase, textOverflow, padding } = data
 
         const autoWidth = data.__autoWidth
         const autoHeight = data.__autoHeight
@@ -132,6 +132,7 @@ export class Text extends UI implements IText {
 
         data.__lineHeight = UnitConvert.number(lineHeight, fontSize)
         data.__letterSpacing = UnitConvert.number(letterSpacing, fontSize)
+        data.__padding = padding ? MathHelper.fourNumber(padding) : undefined
         data.__baseLine = data.__lineHeight - (data.__lineHeight - fontSize * 0.7) / 2
         data.__font = `${italic ? 'italic ' : ''}${textCase === 'small-caps' ? 'small-caps ' : ''}${fontWeight !== 'normal' ? fontWeight + ' ' : ''}${fontSize}px ${fontFamily}`
         data.__clipText = textOverflow !== 'show' && !data.__autoBounds
@@ -149,9 +150,8 @@ export class Text extends UI implements IText {
             b.width = autoWidth ? bounds.width : data.width
             b.height = autoHeight ? bounds.height : data.height
 
-            const { padding } = data
             if (padding) {
-                const [top, right, bottom, left] = MathHelper.fourNumber(padding)
+                const [top, right, bottom, left] = data.__padding
                 if (autoWidth) {
                     b.x -= left
                     b.width += (right + left)

package/src/UI.ts

@@ -1,7 +1,7 @@
 import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IAround, IFindMethod } from '@leafer/interface'
-import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, sortType, maskType, dataProcessor, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType } from '@leafer/core'
+import { Leaf, PathDrawer, surfaceType, dataType, positionType, boundsType, pathType, scaleType, rotationType, opacityType, sortType, maskType, dataProcessor, useModule, rewrite, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType, PathCreator } from '@leafer/core'
 
-import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IFindUIMethod, IEditSize, ILeafer } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowType, IFindUIMethod, IEditSize, ILeafer } from '@leafer-ui/interface'
 import { effectType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -19,7 +19,7 @@ export class UI extends Leaf implements IUI {
     @dataProcessor(UIData)
     declare public __: IUIData
 
-    declare public proxyData?: IUIInputData // need rewrite getter
+    declare public proxyData: IUIInputData // need rewrite getter
     declare public __proxyData?: IUIInputData
 
     public get app(): ILeafer { return this.leafer && this.leafer.app }
@@ -174,6 +174,13 @@ export class UI extends Leaf implements IUI {
     @strokeType(10)
     public miterLimit: INumber
 
+    // arrow
+
+    @strokeType('none')
+    public startArrow: IArrowType
+
+    @strokeType('none')
+    public endArrow: IArrowType
 
     // corner
 
@@ -251,14 +258,15 @@ export class UI extends Leaf implements IUI {
 
     // path
 
-    public getPath(curve?: boolean): IPathCommandData {
-        const { path } = this.__
-        if (!path) return []
+    public getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData {
+        this.__layout.update()
+        let path = pathForRender ? this.__.__pathForRender : this.__.path
+        if (!path) this.__drawPathByBox(new PathCreator(path = []))
         return curve ? PathConvert.toCanvasData(path, true) : path
     }
 
-    public getPathString(curve?: boolean): IPathString {
-        return PathConvert.stringify(this.getPath(curve))
+    public getPathString(curve?: boolean, pathForRender?: boolean): IPathString {
+        return PathConvert.stringify(this.getPath(curve, pathForRender))
     }
 
 

package/types/index.d.ts

@@ -1,10 +1,10 @@
 import { IString, INumber, IBoolean, IAround, IHitType, ICursorType, IPointData, IPathCommandData, IPathString, ILeaferCanvas, IPathDrawer, IExportFileType, IRenderOptions, ILeaferImage, ICanvasContext2D, IWindingRule } from '@leafer/interface';
 import { Leaf } from '@leafer/core';
-import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IEditSize, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IFindUIMethod, IExportOptions, IExportResult, IGroupData, IGroupInputData, IBox, IBoxData, IOverflow, IBoxInputData, IFrame, IFrameData, IFrameInputData, IRect, IRectData, IRectInputData, IEllipse, IEllipseData, IEllipseInputData, IPolygon, IPolygonData, IPolygonInputData, IStar, IStarData, IStarInputData, ILine, ILineData, ILineInputData, IImage, IImageData, IImageInputData, ICanvas, ICanvasData, ICanvasInputData, IText, ITextData, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IUnitData, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathString as IPathString$1, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
+import { IUI, IUIData, IUIInputData, ILeafer, IGroup, IBlendMode, IEditSize, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowType, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IFindUIMethod, IExportOptions, IExportResult, IGroupData, IGroupInputData, IBox, IBoxData, IOverflow, IBoxInputData, IFrame, IFrameData, IFrameInputData, IRect, IRectData, IRectInputData, IEllipse, IEllipseData, IEllipseInputData, IPolygon, IPolygonData, IPolygonInputData, IStar, IStarData, IStarInputData, ILine, ILineData, ILineInputData, IImage, IImageData, IImageInputData, ICanvas, ICanvasData, ICanvasInputData, IText, ITextData, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IUnitData, ITextAlign, IVerticalAlign, ITextWrap, ITextDrawData, ITextInputData, IPath, IPathData, IPathString as IPathString$1, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
 
 declare class UI extends Leaf implements IUI {
     __: IUIData;
-    proxyData?: IUIInputData;
+    proxyData: IUIInputData;
     __proxyData?: IUIInputData;
     get app(): ILeafer;
     leafer?: ILeafer;
@@ -51,6 +51,8 @@ declare class UI extends Leaf implements IUI {
     dashPattern: INumber[] | IDashPatternString;
     dashOffset: INumber;
     miterLimit: INumber;
+    startArrow: IArrowType;
+    endArrow: IArrowType;
     cornerRadius: number | number[] | ICornerRadiusString;
     cornerSmoothing: INumber;
     shadow: IShadowEffect | IShadowEffect[] | IShadowString;
@@ -67,8 +69,8 @@ declare class UI extends Leaf implements IUI {
     createProxyData(): IUIInputData;
     find(condition: number | string | IFindUIMethod, options?: any): IUI[];
     findOne(condition: number | string | IFindUIMethod, options?: any): IUI;
-    getPath(curve?: boolean): IPathCommandData;
-    getPathString(curve?: boolean): IPathString;
+    getPath(curve?: boolean, pathForRender?: boolean): IPathCommandData;
+    getPathString(curve?: boolean, pathForRender?: boolean): IPathString;
     __onUpdateSize(): void;
     __updateRenderPath(): void;
     __drawRenderPath(canvas: ILeaferCanvas): void;
@@ -193,7 +195,6 @@ declare class Image extends Rect implements IImage {
     get ready(): boolean;
     image: ILeaferImage;
     constructor(data?: IImageInputData);
-    __updateBoxBounds(): void;
     destroy(): void;
 }