@leafer-ui/display 2.1.0 → 2.1.1

package/package.json

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

package/src/Text.ts

@@ -1,5 +1,5 @@
 import { ILeaferCanvas, IBoolean, INumber, IString, IBoundsData, IUnitData, IRenderOptions, IFourNumber } from '@leafer/interface'
-import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, dataType, hitType, MathHelper, DataHelper } from '@leafer/core'
+import { BoundsHelper, boundsType, surfaceType, dataProcessor, registerUI, affectStrokeBoundsType, dataType, hitType, MathHelper, DataHelper, FourNumberHelper } from '@leafer/core'
 
 import { IFill, IText, IFontWeight, ITextCase, ITextDecoration, ITextData, ITextInputData, ITextAlign, IVerticalAlign, ITextDrawData, ITextOverflow, IStrokeAlign, IHitType, ITextWrap, IWritingMode, IBackgroundBoxStyle } from '@leafer-ui/interface'
 import { TextData } from '@leafer-ui/data'
@@ -9,7 +9,7 @@ import { TextConvert, UnitConvert } from '@leafer-ui/external'
 import { UI } from './UI'
 
 
-const { copyAndSpread, includes, spread, setList } = BoundsHelper, { stintSet } = DataHelper
+const { copyAndSpread, includes, setList } = BoundsHelper, { stintSet } = DataHelper
 
 @registerUI()
 export class Text<TConstructorData = ITextInputData> extends UI<TConstructorData> implements IText {
@@ -128,11 +128,12 @@ export class Text<TConstructorData = ITextInputData> extends UI<TConstructorData
         this.__updateTextDrawData() // layout text
 
         const { bounds: contentBounds } = data.__textDrawData
+        console.log(contentBounds)
         const b = layout.boxBounds
 
         layout.contentBounds = contentBounds
 
-        if (data.__lineHeight < fontSize) spread(contentBounds, fontSize / 2)
+        if (data.__lineHeight < fontSize) layout.renderChanged = true
 
         if (autoWidth || autoHeight) {
             b.x = autoWidth ? contentBounds.x : 0
@@ -159,6 +160,9 @@ export class Text<TConstructorData = ITextInputData> extends UI<TConstructorData
     override __updateRenderSpread(): IFourNumber {
         let spread = super.__updateRenderSpread()
         if (!spread) spread = this.isOverflow ? 1 : 0
+
+        const { __lineHeight, fontSize } = this.__
+        if (__lineHeight < fontSize) spread = FourNumberHelper.max(spread, (fontSize - __lineHeight) / 2)
         return spread
     }
 

package/src/UI.ts

@@ -211,7 +211,7 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     public dragBounds?: IBoundsData | 'parent'
 
     @dataType('auto')
-    dragBoundsType?: IDragBoundsType
+    public dragBoundsType?: IDragBoundsType
 
 
     @dataType(false)