@leafer-ui/text 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/text",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "@leafer-ui/text",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -13,19 +13,19 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/leaferjs/ui.git"
+    "url": "https://github.com/leaferjs/leafer-ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/partner/text",
-  "bugs": "https://github.com/leaferjs/ui/issues",
+  "homepage": "https://github.com/leaferjs/leafer-ui/tree/main/packages/partner/text",
+  "bugs": "https://github.com/leaferjs/leafer-ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.4"
+    "@leafer/core": "1.0.6"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.4",
-    "@leafer-ui/interface": "1.0.4"
+    "@leafer/interface": "1.0.6",
+    "@leafer-ui/interface": "1.0.6"
   }
 }

package/src/TextConvert.ts

@@ -23,14 +23,11 @@ export function getDrawData(content: string, style: ITextData): ITextDrawData {
     const { textDecoration, __font, __padding: padding } = style
 
     if (padding) {
-        if (width) {
-            x = padding[left]
-            width -= (padding[right] + padding[left])
-        }
-        if (height) {
-            y = padding[top]
-            height -= (padding[top] + padding[bottom])
-        }
+        if (width) x = padding[left], width -= (padding[right] + padding[left])
+        else if (!style.autoSizeAlign) x = padding[left]
+
+        if (height) y = padding[top], height -= (padding[top] + padding[bottom])
+        else if (!style.autoSizeAlign) y = padding[top]
     }
 
     const drawData: ITextDrawData = {
@@ -58,23 +55,17 @@ export function getDrawData(content: string, style: ITextData): ITextDrawData {
 
 
 function padAutoText(padding: number[], drawData: ITextDrawData, style: ITextData, width: number, height: number): void {
-    if (!width) {
+    if (!width && style.autoSizeAlign) {
         switch (style.textAlign) {
-            case 'left':
-                offsetText(drawData, 'x', padding[left])
-                break
-            case 'right':
-                offsetText(drawData, 'x', -padding[right])
+            case 'left': offsetText(drawData, 'x', padding[left]); break
+            case 'right': offsetText(drawData, 'x', -padding[right])
         }
     }
 
-    if (!height) {
+    if (!height && style.autoSizeAlign) {
         switch (style.verticalAlign) {
-            case 'top':
-                offsetText(drawData, 'y', padding[top])
-                break
-            case 'bottom':
-                offsetText(drawData, 'y', -padding[bottom])
+            case 'top': offsetText(drawData, 'y', padding[top]); break
+            case 'bottom': offsetText(drawData, 'y', -padding[bottom])
         }
     }
 }

package/src/TextLayout.ts

@@ -4,7 +4,7 @@ import { ITextData, ITextDrawData, ITextRowData } from '@leafer-ui/interface'
 export function layoutText(drawData: ITextDrawData, style: ITextData): void {
 
     const { rows, bounds } = drawData
-    const { __lineHeight, __baseLine, __letterSpacing, __clipText, textAlign, verticalAlign, paraSpacing } = style
+    const { __lineHeight, __baseLine, __letterSpacing, __clipText, textAlign, verticalAlign, paraSpacing, autoSizeAlign } = style
 
     let { x, y, width, height } = bounds, realHeight = __lineHeight * rows.length + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0)
     let starY: number = __baseLine
@@ -14,20 +14,17 @@ export function layoutText(drawData: ITextDrawData, style: ITextData): void {
     if (__clipText && realHeight > height) {
         realHeight = Math.max(height, __lineHeight)
         drawData.overflow = rows.length
-    } else {
+    } else if (height || autoSizeAlign) {
         switch (verticalAlign) {
-            case 'middle':
-                y += (height - realHeight) / 2
-                break
-            case 'bottom':
-                y += (height - realHeight)
+            case 'middle': y += (height - realHeight) / 2; break
+            case 'bottom': y += (height - realHeight)
         }
     }
     starY += y
 
     // textAlign
 
-    let row: ITextRowData, rowX: number, rowWidth: number
+    let row: ITextRowData, rowX: number, rowWidth: number, layoutWidth = (width || autoSizeAlign) ? width : drawData.maxWidth
 
     for (let i = 0, len = rows.length; i < len; i++) {
         row = rows[i]
@@ -35,11 +32,8 @@ export function layoutText(drawData: ITextDrawData, style: ITextData): void {
 
         if (row.width < width || (row.width > width && !__clipText)) {
             switch (textAlign) {
-                case 'center':
-                    row.x += (width - row.width) / 2
-                    break
-                case 'right':
-                    row.x += width - row.width
+                case 'center': row.x += (layoutWidth - row.width) / 2; break
+                case 'right': row.x += layoutWidth - row.width
             }
         }
 

package/src/TextRows.ts

@@ -12,13 +12,14 @@ const { Letter, Single, Before, After, Symbol, Break } = CharType
 
 let word: ITextWordData, row: ITextRowData, wordWidth: number, rowWidth: number, realWidth: number
 let char: string, charWidth: number, startCharSize: number, charSize: number, charType: CharType, lastCharType: CharType, langBreak: boolean, afterBreak: boolean, paraStart: boolean
-let textDrawData: ITextDrawData, rows: ITextRowData[] = [], bounds: IBoundsData
+let textDrawData: ITextDrawData, rows: ITextRowData[] = [], bounds: IBoundsData, findMaxWidth: boolean
 
 export function createRows(drawData: ITextDrawData, content: string, style: ITextData): void {
 
     textDrawData = drawData
     rows = drawData.rows
     bounds = drawData.bounds
+    findMaxWidth = !bounds.width && !style.autoSizeAlign
 
     const { __letterSpacing, paraIndent, textCase } = style
     const { canvas } = Platform
@@ -126,7 +127,9 @@ export function createRows(drawData: ITextDrawData, content: string, style: ITex
 
         content.split('\n').forEach(content => {
             textDrawData.paraNumber++
-            rows.push({ x: paraIndent || 0, text: content, width: canvas.measureText(content).width, paraStart: true })
+            rowWidth = canvas.measureText(content).width
+            rows.push({ x: paraIndent || 0, text: content, width: rowWidth, paraStart: true })
+            if (findMaxWidth) setMaxWidth()
         })
 
     }
@@ -162,7 +165,12 @@ function addRow(): void {
 
     row.width = rowWidth
     if (bounds.width) trimRight(row)
+    else if (findMaxWidth) setMaxWidth()
     rows.push(row)
     row = { words: [] }
     rowWidth = 0
 }
+
+function setMaxWidth(): void {
+    if (rowWidth > (textDrawData.maxWidth || 0)) textDrawData.maxWidth = rowWidth
+}