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

package/src/Rect.ts

@@ -1,5 +1,4 @@
-import { IPathDrawer, IPathCommandData } from '@leafer/interface'
-import { dataProcessor, registerUI, rewrite, rewriteAble, 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'
@@ -11,7 +10,7 @@ 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' }
 
@@ -22,7 +21,4 @@ export class Rect extends UI implements IRect {
         super(data)
     }
 
-    @rewrite(UI.prototype.__drawPathByBox)
-    public __drawPathByData(_drawer: IPathDrawer, _data: IPathCommandData): void { }
-
 }

package/src/Star.ts

@@ -20,10 +20,10 @@ export class Star extends UI implements IStar {
     declare public __: IStarData
 
     @pathType(5)
-    public corners: INumber
+    public corners?: INumber
 
     @pathType(0.382)
-    public innerRadius: INumber
+    public innerRadius?: INumber
 
     constructor(data?: IStarInputData) {
         super(data)

package/src/Text.ts

@@ -1,7 +1,7 @@
-import { ILeaferCanvas, IPathDrawer, IPathCommandData, IBoolean, INumber, IString, IBoundsData } from '@leafer/interface'
-import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, hitType, MathHelper } 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 { IFill, IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, IOverflow, IUnitData, IStrokeAlign, IHitType, ITextWrap } 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, setList } = BoundsHelper
+const { copyAndSpread, includes, isSame, spread, setList } = BoundsHelper
 
 @registerUI()
 export class Text extends UI implements IText {
@@ -21,73 +21,76 @@ export class Text extends UI implements IText {
 
     // size
     @boundsType(0)
-    declare public width: INumber
+    declare public width?: INumber
 
     @boundsType(0)
-    declare public height: INumber
+    declare public height?: INumber
 
-    @boundsType(0)
-    public padding: number | number[]
+    @dataType(false)
+    public resizeFontSize?: IBoolean
 
     @surfaceType('#000000')
-    declare public fill: IFill
+    declare public fill?: IFill
 
     @affectStrokeBoundsType('outside')
-    declare public strokeAlign: IStrokeAlign
+    declare public strokeAlign?: IStrokeAlign
 
     @hitType('all')
-    declare public hitFill: IHitType
+    declare public hitFill?: IHitType
 
     @boundsType('')
-    public text: IString
+    public text?: IString
 
     @boundsType('L')
-    public fontFamily: IString
+    public fontFamily?: IString
 
     @boundsType(12)
-    public fontSize: INumber
+    public fontSize?: INumber
 
     @boundsType('normal')
-    public fontWeight: IFontWeight
+    public fontWeight?: IFontWeight
 
     @boundsType(false)
-    public italic: IBoolean
+    public italic?: IBoolean
 
     @boundsType('none')
-    public textCase: ITextCase
+    public textCase?: ITextCase
 
     @boundsType('none')
-    public textDecoration: ITextDecoration
+    public textDecoration?: ITextDecoration
 
     @boundsType(0)
-    public letterSpacing: INumber | IUnitData
+    public letterSpacing?: INumber | IUnitData
 
-    @boundsType({ type: 'percent', value: 150 } as IUnitData)
-    public lineHeight: INumber | IUnitData
+    @boundsType({ type: 'percent', value: 1.5 } as IUnitData)
+    public lineHeight?: INumber | IUnitData
 
     @boundsType(0)
-    public paraIndent: INumber
+    public paraIndent?: INumber
 
     @boundsType(0)
-    public paraSpacing: INumber
+    public paraSpacing?: INumber
 
     @boundsType('left')
-    public textAlign: ITextAlign
+    public textAlign?: ITextAlign
 
     @boundsType('top')
-    public verticalAlign: IVerticalAlign
+    public verticalAlign?: IVerticalAlign
 
     @boundsType('normal')
-    public textWrap: ITextWrap
+    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.update()
         return this.__.__textDrawData
     }
 
+
     constructor(data?: ITextInputData) {
         super(data)
     }
@@ -135,7 +138,7 @@ export class Text extends UI implements IText {
         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
+        data.__clipText = textOverflow !== 'show' && !data.__autoSize
 
         this.__updateTextDrawData()
 
@@ -166,8 +169,10 @@ export class Text extends UI implements IText {
             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])