@leafer-ui/display 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

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

package/src/Ellipse.ts

@@ -1,5 +1,5 @@
 import { __Number } from '@leafer/interface'
-import { PathCommandDataHelper, dataProcessor, pathType, registerUI } from '@leafer/core'
+import { PathCommandDataHelper, PathConvert, Platform, dataProcessor, pathType, registerUI } from '@leafer/core'
 
 import { IEllipse, IEllipseInputData, IEllipseData } from '@leafer-ui/interface'
 import { EllipseData } from '@leafer-ui/data'
@@ -48,9 +48,12 @@ export class Ellipse extends UI implements IEllipse {
                     ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius)
                     moveTo(path, width, ry)
                 }
-                ellipse(path, rx, ry, rx, ry, 0, 0, 360, true)
+                ellipse(path, rx, ry, rx, ry, 0, 360, 0, true)
             }
 
+            // fix node
+            if (Platform.ellipseToCurve) this.__.path = PathConvert.toCanvasData(path, true)
+
         } else {
 
             if (startAngle || endAngle) {

package/src/Group.ts

@@ -47,7 +47,11 @@ export class Group extends UI implements IGroup {
             const { children } = data
             delete data.children
 
-            if (!this.children) this.__setBranch()
+            if (!this.children) {
+                this.__setBranch()
+            } else {
+                this.removeAll(true)
+            }
 
             super.set(data)
 

package/src/Text.ts

@@ -1,7 +1,7 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, __Boolean, __Number, __String } from '@leafer/interface'
-import { BoundsHelper, boundsType, dataProcessor, registerUI, affectStrokeBoundsType } from '@leafer/core'
+import { ILeaferCanvas, IPathDrawer, IPathCommandData, __Boolean, __Number, __String, IBoundsData } from '@leafer/interface'
+import { BoundsHelper, boundsType, dataProcessor, registerUI, affectStrokeBoundsType, hitType } from '@leafer/core'
 
-import { IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, IUnitData, IStrokeAlign } from '@leafer-ui/interface'
+import { IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, IUnitData, IStrokeAlign, IHitType, ITextWrap } from '@leafer-ui/interface'
 import { TextData, UnitConvert } from '@leafer-ui/data'
 
 import { TextConvert } from '@leafer-ui/external'
@@ -9,7 +9,7 @@ import { TextConvert } from '@leafer-ui/external'
 import { UI } from './UI'
 
 
-const { copyAndSpread, includes, spread } = BoundsHelper
+const { copyAndSpread, includes, spread, setByList } = BoundsHelper
 
 @registerUI()
 export class Text extends UI implements IText {
@@ -32,6 +32,9 @@ export class Text extends UI implements IText {
     @affectStrokeBoundsType('outside')
     declare public strokeAlign: IStrokeAlign
 
+    @hitType('all')
+    declare public hitFill: IHitType
+
     @boundsType('')
     public text: __String
 
@@ -71,6 +74,9 @@ export class Text extends UI implements IText {
     @boundsType('top')
     public verticalAlign: IVerticalAlign
 
+    @boundsType('normal')
+    public textWrap: ITextWrap
+
     @boundsType('show')
     public textOverflow: IOverflow | string
 
@@ -114,7 +120,10 @@ export class Text extends UI implements IText {
 
         const data = this.__
         const layout = this.__layout
-        const { lineHeight, letterSpacing, fontFamily, fontSize, fontWeight, italic, textCase } = data
+        const { lineHeight, letterSpacing, fontFamily, fontSize, fontWeight, italic, textCase, textOverflow } = data
+
+        const width = data.__getInput('width')
+        const height = data.__getInput('height')
 
         // compute
 
@@ -122,6 +131,7 @@ export class Text extends UI implements IText {
         data.__letterSpacing = UnitConvert.number(letterSpacing, fontSize)
         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' && (width || height)
 
         this.__updateTextDrawData()
 
@@ -130,9 +140,6 @@ export class Text extends UI implements IText {
 
         if (data.__lineHeight < fontSize) spread(bounds, fontSize / 2)
 
-        const width = data.__getInput('width')
-        const height = data.__getInput('height')
-
         if (width && height) {
             super.__updateBoxBounds()
         } else {
@@ -147,6 +154,9 @@ export class Text extends UI implements IText {
         if (contentBounds !== layout.contentBounds) {
             layout.contentBounds = contentBounds
             layout.renderChanged = true
+            setByList(data.__textBoxBounds = {} as IBoundsData, [b, bounds])
+        } else {
+            data.__textBoxBounds = contentBounds
         }
 
     }
@@ -158,7 +168,7 @@ export class Text extends UI implements IText {
     }
 
     public __updateRenderBounds(): void {
-        copyAndSpread(this.__layout.renderBounds, this.__layout.contentBounds, this.__layout.renderSpread)
+        copyAndSpread(this.__layout.renderBounds, this.__.__textBoxBounds, this.__layout.renderSpread)
     }
 
 }

package/src/UI.ts

@@ -1,7 +1,7 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, __Number, __Boolean, __String, IPathString, IExportFileType, IPointData, ICursorType, IAround } from '@leafer/interface'
+import { ILeaferCanvas, IPathDrawer, IPathCommandData, IHitType, __Number, __Boolean, __String, IPathString, IExportFileType, IPointData, ICursorType, IAround, ILeafDataOptions, 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 } from '@leafer/core'
 
-import { IUI, IShadowEffect, IBlurEffect, IPaint, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IPaintString, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IUIBaseInputData, IExportOptions, IExportResult } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IPaint, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IPaintString, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult } from '@leafer-ui/interface'
 import { effectType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -19,6 +19,8 @@ export class UI extends Leaf implements IUI {
     @dataProcessor(UIData)
     declare public __: IUIData
 
+    declare public proxyData?: IUIInputData
+
     declare public parent?: IGroup
 
     // ---
@@ -107,6 +109,9 @@ export class UI extends Leaf implements IUI {
     @strokeType('path')
     public hitStroke: IHitType
 
+    @hitType(false)
+    public hitBox: __Boolean
+
     @hitType(true)
     public hitChildren: __Boolean
 
@@ -195,19 +200,35 @@ export class UI extends Leaf implements IUI {
     }
 
 
-    constructor(data?: IUIBaseInputData) {
-        super(data)
-    }
+    // data
+
+    @rewrite(Leaf.prototype.reset)
+    public reset(_data?: IUIInputData): void { }
 
 
     public set(data: IUIInputData): void {
         Object.assign(this, data)
     }
 
-    public get(): IUIInputData {
-        return this.__.__getInputData()
+    public get(options?: ILeafDataOptions): IUIInputData {
+        return this.__.__getInputData(options)
     }
 
+    public getProxyData(): IUIInputData { return undefined }
+
+
+    // find
+
+    public find(condition: number | string | IFindMethod): IUI[] {
+        return this.leafer ? this.leafer.selector.getBy(condition, this) as IUI[] : []
+    }
+
+    public findOne(condition: number | string | IFindMethod): IUI {
+        return this.leafer ? this.leafer.selector.getBy(condition, this, true) as IUI : null
+    }
+
+
+    // path
 
     public getPath(curve?: boolean): IPathCommandData {
         const path = this.__.path
@@ -248,6 +269,9 @@ export class UI extends Leaf implements IUI {
     @rewrite(PathDrawer.drawPathByData)
     public __drawPathByData(_drawer: IPathDrawer, _data: IPathCommandData): void { }
 
+
+    // create
+
     public export(filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult> {
         return Export.export(this, filename, options)
     }
@@ -260,6 +284,7 @@ export class UI extends Leaf implements IUI {
         return UICreator.get(data.tag || this.prototype.__tag, data, x, y, width, height) as IUI
     }
 
+
     public destroy(): void {
         this.fill = this.stroke = null
         super.destroy()

package/types/index.d.ts

@@ -1,9 +1,10 @@
-import { __String, __Number, __Boolean, IAround, IHitType, ICursorType, IPointData, IPathCommandData, IPathString, ILeaferCanvas, IPathDrawer, IExportFileType, IRenderOptions, ILeaferImage, ICanvasContext2D, IWindingRule } from '@leafer/interface';
+import { __String, __Number, __Boolean, IAround, IHitType, ICursorType, IPointData, ILeafDataOptions, IFindMethod, IPathCommandData, IPathString, ILeaferCanvas, IPathDrawer, IExportFileType, IRenderOptions, ILeaferImage, ICanvasContext2D, IWindingRule } from '@leafer/interface';
 import { Leaf } from '@leafer/core';
-import { IUI, IUIData, IGroup, IBlendMode, IPaint, IPaintString, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IUIBaseInputData, IUIInputData, 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, IFontWeight, ITextCase, ITextDecoration, IUnitData, ITextAlign, IVerticalAlign, ITextDrawData, ITextInputData, IPath, IPathData, IPathString as IPathString$1, IPathInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPenInputData } from '@leafer-ui/interface';
+import { IUI, IUIData, IUIInputData, IGroup, IBlendMode, IPaint, IPaintString, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, 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;
     parent?: IGroup;
     id: __String;
     name: __String;
@@ -29,6 +30,7 @@ declare class UI extends Leaf implements IUI {
     hittable: __Boolean;
     hitFill: IHitType;
     hitStroke: IHitType;
+    hitBox: __Boolean;
     hitChildren: __Boolean;
     hitSelf: __Boolean;
     hitRadius: __Number;
@@ -51,9 +53,12 @@ declare class UI extends Leaf implements IUI {
     grayscale: __Number | IGrayscaleEffect;
     set scale(value: __Number | IPointData);
     get scale(): __Number | IPointData;
-    constructor(data?: IUIBaseInputData);
+    reset(_data?: IUIInputData): void;
     set(data: IUIInputData): void;
-    get(): IUIInputData;
+    get(options?: ILeafDataOptions): IUIInputData;
+    getProxyData(): IUIInputData;
+    find(condition: number | string | IFindMethod): IUI[];
+    findOne(condition: number | string | IFindMethod): IUI;
     getPath(curve?: boolean): IPathCommandData;
     getPathString(curve?: boolean): IPathString;
     __onUpdateSize(): void;
@@ -207,6 +212,7 @@ declare class Text extends UI implements IText {
     height: __Number;
     padding: number | number[];
     strokeAlign: IStrokeAlign;
+    hitFill: IHitType$1;
     text: __String;
     fontFamily: __String;
     fontSize: __Number;
@@ -220,6 +226,7 @@ declare class Text extends UI implements IText {
     paraSpacing: __Number;
     textAlign: ITextAlign;
     verticalAlign: IVerticalAlign;
+    textWrap: ITextWrap;
     textOverflow: IOverflow | string;
     get textDrawData(): ITextDrawData;
     constructor(data?: ITextInputData);