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

package/src/Polygon.ts

@@ -1,16 +1,18 @@
-import { __Number } from '@leafer/interface'
-import { PathBounds, PathCommandDataHelper, dataProcessor, pathType, registerUI } from '@leafer/core'
+import { INumber } from '@leafer/interface'
+import { PathCommandDataHelper, dataProcessor, pathType, registerUI, rewrite, rewriteAble } from '@leafer/core'
 
 import { IPolygon, IPolygonData, IPolygonInputData } from '@leafer-ui/interface'
 import { PolygonData } from '@leafer-ui/data'
 
 import { UI } from './UI'
+import { Line } from './Line'
 
 
 const { sin, cos, PI } = Math
 const { moveTo, lineTo, closePath, drawPoints } = PathCommandDataHelper
-const { toBounds } = PathBounds
+const line = Line.prototype
 
+@rewriteAble()
 @registerUI()
 export class Polygon extends UI implements IPolygon {
 
@@ -20,15 +22,13 @@ export class Polygon extends UI implements IPolygon {
     declare public __: IPolygonData
 
     @pathType(3)
-    sides: number
+    public sides?: INumber
 
     @pathType()
-    points: number[]
+    public points?: number[]
 
     @pathType(0)
-    curve: boolean | number
-
-    public get resizeable(): boolean { return !this.points }
+    public curve?: boolean | number
 
     constructor(data?: IPolygonInputData) {
         super(data)
@@ -58,22 +58,10 @@ export class Polygon extends UI implements IPolygon {
         closePath(path)
     }
 
+    @rewrite(line.__updateRenderPath)
+    public __updateRenderPath(): void { }
 
-    public __updateRenderPath(): void {
-        if (this.__.points && this.__.curve) {
-            drawPoints(this.__.__pathForRender = [], this.__.points, this.__.curve, true)
-        } else {
-            super.__updateRenderPath()
-        }
-    }
-
-    public __updateBoxBounds(): void {
-        if (this.__.points) {
-            toBounds(this.__.__pathForRender, this.__layout.boxBounds)
-            this.__updateNaturalSize()
-        } else {
-            super.__updateBoxBounds()
-        }
-    }
+    @rewrite(line.__updateBoxBounds)
+    public __updateBoxBounds(): void { }
 
 }

package/src/Rect.ts

@@ -1,5 +1,4 @@
-import { IPathDrawer, IPathCommandData, __Number } from '@leafer/interface'
-import { dataProcessor, registerUI, useModule } from '@leafer/core'
+import { dataProcessor, registerUI, rewriteAble, useModule } from '@leafer/core'
 
 import { IRect, IRectInputData, IRectData } from '@leafer-ui/interface'
 import { RectData } from '@leafer-ui/data'
@@ -9,8 +8,9 @@ import { UI } from './UI'
 
 
 @useModule(RectRender)
+@rewriteAble()
 @registerUI()
-export class Rect extends UI implements IRect {
+export class Rect extends UI implements IRect { // tip: rewrited Box
 
     public get __tag() { return 'Rect' }
 
@@ -21,12 +21,4 @@ export class Rect extends UI implements IRect {
         super(data)
     }
 
-    public __drawPathByData(drawer: IPathDrawer, _data: IPathCommandData): void {
-        const { width, height, cornerRadius } = this.__
-        if (cornerRadius) {
-            drawer.roundRect(0, 0, width, height, cornerRadius)
-        } else {
-            drawer.rect(0, 0, width, height)
-        }
-    }
 }

package/src/Star.ts

@@ -1,4 +1,4 @@
-import { __Number } from '@leafer/interface'
+import { INumber } from '@leafer/interface'
 import { PathCommandDataHelper, dataProcessor, pathType, registerUI } from '@leafer/core'
 
 import { IStar, IStarData, IStarInputData } from '@leafer-ui/interface'
@@ -20,10 +20,10 @@ export class Star extends UI implements IStar {
     declare public __: IStarData
 
     @pathType(5)
-    public corners: __Number
+    public corners?: INumber
 
     @pathType(0.382)
-    public innerRadius: __Number
+    public innerRadius?: INumber
 
     constructor(data?: IStarInputData) {
         super(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, IBoolean, INumber, IString, IBoundsData, IUnitData } from '@leafer/interface'
+import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, dataType, hitType, MathHelper } from '@leafer/core'
 
-import { IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, IUnitData, IStrokeAlign } from '@leafer-ui/interface'
+import { IFill, IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, 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, isSame, spread, setList } = BoundsHelper
 
 @registerUI()
 export class Text extends UI implements IText {
@@ -21,64 +21,76 @@ export class Text extends UI implements IText {
 
     // size
     @boundsType(0)
-    declare public width: __Number
+    declare public width?: INumber
 
     @boundsType(0)
-    declare public height: __Number
+    declare public height?: INumber
 
-    @boundsType(0)
-    public padding: number | number[]
+    @dataType(false)
+    public resizeFontSize?: IBoolean
+
+    @surfaceType('#000000')
+    declare public fill?: IFill
 
     @affectStrokeBoundsType('outside')
-    declare public strokeAlign: IStrokeAlign
+    declare public strokeAlign?: IStrokeAlign
+
+    @hitType('all')
+    declare public hitFill?: IHitType
 
     @boundsType('')
-    public text: __String
+    public text?: IString
 
     @boundsType('L')
-    public fontFamily: __String
+    public fontFamily?: IString
 
     @boundsType(12)
-    public fontSize: __Number
+    public fontSize?: INumber
 
     @boundsType('normal')
-    public fontWeight: IFontWeight
+    public fontWeight?: IFontWeight
 
     @boundsType(false)
-    public italic: __Boolean
+    public italic?: IBoolean
 
     @boundsType('none')
-    public textCase: ITextCase
+    public textCase?: ITextCase
 
     @boundsType('none')
-    public textDecoration: ITextDecoration
+    public textDecoration?: ITextDecoration
 
     @boundsType(0)
-    public letterSpacing: __Number | IUnitData
+    public letterSpacing?: INumber | IUnitData
 
-    @boundsType({ type: 'percent', value: 150 } as IUnitData)
-    public lineHeight: __Number | IUnitData
+    @boundsType({ type: 'percent', value: 1.5 } as IUnitData)
+    public lineHeight?: INumber | IUnitData
 
     @boundsType(0)
-    public paraIndent: __Number
+    public paraIndent?: INumber
 
     @boundsType(0)
-    public paraSpacing: __Number
+    public paraSpacing?: INumber
 
     @boundsType('left')
-    public textAlign: ITextAlign
+    public textAlign?: ITextAlign
 
     @boundsType('top')
-    public verticalAlign: IVerticalAlign
+    public verticalAlign?: IVerticalAlign
+
+    @boundsType('normal')
+    public textWrap?: ITextWrap
 
     @boundsType('show')
-    public textOverflow: IOverflow | string
+    public textOverflow?: IOverflow | string
+
+    public get editInner(): string { return 'TextEditor' }
 
     public get textDrawData(): ITextDrawData {
-        this.__layout.checkUpdate()
+        this.__layout.update()
         return this.__.__textDrawData
     }
 
+
     constructor(data?: ITextInputData) {
         super(data)
     }
@@ -114,14 +126,19 @@ 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, padding } = data
+
+        const autoWidth = data.__autoWidth
+        const autoHeight = data.__autoHeight
 
         // compute
 
         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.__autoSize
 
         this.__updateTextDrawData()
 
@@ -130,23 +147,37 @@ 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 {
-            b.x = width ? 0 : bounds.x
-            b.y = height ? 0 : bounds.y
-            b.width = width ? width : bounds.width
-            b.height = height ? height : bounds.height
+        if (autoWidth || autoHeight) {
+            b.x = autoWidth ? bounds.x : 0
+            b.y = autoHeight ? bounds.y : 0
+            b.width = autoWidth ? bounds.width : data.width
+            b.height = autoHeight ? bounds.height : data.height
+
+            if (padding) {
+                const [top, right, bottom, left] = data.__padding
+                if (autoWidth) {
+                    b.x -= left
+                    b.width += (right + left)
+                }
+                if (autoHeight) {
+                    b.y -= top
+                    b.height += (bottom + top)
+                }
+            }
             this.__updateNaturalSize()
+        } else {
+            super.__updateBoxBounds()
         }
 
+        if (italic) b.width += fontSize * 0.16
+
         const contentBounds = includes(b, bounds) ? b : bounds
-        if (contentBounds !== layout.contentBounds) {
+        if (!isSame(contentBounds, layout.contentBounds)) {
             layout.contentBounds = contentBounds
             layout.renderChanged = true
+            setList(data.__textBoxBounds = {} as IBoundsData, [b, bounds])
+        } else {
+            data.__textBoxBounds = contentBounds
         }
 
     }
@@ -158,7 +189,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)
     }
 
 }