@leafer-ui/text 1.0.0-rc.8 → 1.0.0

package/package.json

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

package/src/CharLayout.ts

@@ -36,11 +36,11 @@ export function layoutChar(drawData: ITextDrawData, style: ITextData, width: num
 
                         wordChar = { char: '', x: charX }
                         charX = toWordChar(word.data, charX, wordChar)
-                        if (wordChar.char !== ' ') row.data.push(wordChar)
+                        if (row.isOverflow || wordChar.char !== ' ') row.data.push(wordChar)
 
                     } else {
 
-                        charX = toChar(word.data, charX, row.data)
+                        charX = toChar(word.data, charX, row.data, row.isOverflow)
 
                     }
 
@@ -75,9 +75,9 @@ function toWordChar(data: ITextCharData[], charX: number, wordChar: ITextCharDat
     return charX
 }
 
-function toChar(data: ITextCharData[], charX: number, rowData: ITextCharData[]): number {
+function toChar(data: ITextCharData[], charX: number, rowData: ITextCharData[], isOverflow?: boolean): number {
     data.forEach(char => {
-        if (char.char !== ' ') {
+        if (isOverflow || char.char !== ' ') {
             char.x = charX
             rowData.push(char)
         }

package/src/TextClip.ts

@@ -3,19 +3,20 @@ import { Platform } from '@leafer/core'
 import { ITextCharData, ITextData, ITextDrawData, ITextRowData } from '@leafer-ui/interface'
 
 
-export function clipText(drawData: ITextDrawData, style: ITextData): void {
+export function clipText(drawData: ITextDrawData, style: ITextData, x: number, width: number): void {
+    if (!width) return
 
     const { rows, overflow } = drawData
     let { textOverflow } = style
     rows.splice(overflow)
 
-
-    if (textOverflow !== 'hide') {
-        if (textOverflow === 'ellipsis') textOverflow = '...'
+    if (textOverflow && textOverflow !== 'show') {
+        if (textOverflow === 'hide') textOverflow = ''
+        else if (textOverflow === 'ellipsis') textOverflow = '...'
 
         let char: ITextCharData, charRight: number
-        const ellipsisWidth = Platform.canvas.measureText(textOverflow).width
-        const right = style.x + style.width - ellipsisWidth
+        const ellipsisWidth = textOverflow ? Platform.canvas.measureText(textOverflow).width : 0
+        const right = x + width - ellipsisWidth
         const list = style.textWrap === 'none' ? rows : [rows[overflow - 1]]
 
         list.forEach(row => {

package/src/TextConvert.ts

@@ -1,6 +1,6 @@
 import { Platform, Direction4 } from '@leafer/core'
 
-import { ITextConvertModule, ITextData, ITextDrawData } from '@leafer-ui/interface'
+import { ITextData, ITextDrawData } from '@leafer-ui/interface'
 
 import { createRows } from './TextRows'
 import { layoutChar } from './CharLayout'
@@ -11,52 +11,48 @@ import { decorationText } from './TextDecoration'
 
 const { top, right, bottom, left } = Direction4
 
-export const TextConvert: ITextConvertModule = {
+export function getDrawData(content: string, style: ITextData): ITextDrawData {
 
-    getDrawData(content: string, style: ITextData): ITextDrawData {
+    if (typeof content !== 'string') content = String(content)
 
-        if (typeof content !== 'string') content = String(content)
+    let x = 0, y = 0
 
-        let x = 0, y = 0
+    let width = style.__getInput('width') || 0
+    let height = style.__getInput('height') || 0
 
-        let width = style.__getInput('width') || 0
-        let height = style.__getInput('height') || 0
+    const { textDecoration, __font, __padding: padding } = style
 
-        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 (padding) {
+        if (width) {
+            x = padding[left]
+            width -= (padding[right] + padding[left])
         }
-
-        const drawData: ITextDrawData = {
-            bounds: { x, y, width, height },
-            rows: [],
-            paraNumber: 0,
-            font: Platform.canvas.font = __font
+        if (height) {
+            y = padding[top]
+            height -= (padding[top] + padding[bottom])
         }
+    }
 
-        createRows(drawData, content, style) // set rows, paraNumber
+    const drawData: ITextDrawData = {
+        bounds: { x, y, width, height },
+        rows: [],
+        paraNumber: 0,
+        font: Platform.canvas.font = __font
+    }
 
-        if (padding) padAutoText(padding, drawData, style, width, height)
+    createRows(drawData, content, style) // set rows, paraNumber
 
-        layoutText(drawData, style) // set bounds
+    if (padding) padAutoText(padding, drawData, style, width, height)
 
-        layoutChar(drawData, style, width, height) // set char.x
+    layoutText(drawData, style) // set bounds
 
-        if (drawData.overflow) clipText(drawData, style)
+    layoutChar(drawData, style, width, height) // set char.x
 
-        if (textDecoration !== 'none') decorationText(drawData, style)
+    if (drawData.overflow) clipText(drawData, style, x, width)
 
-        return drawData
+    if (textDecoration !== 'none') decorationText(drawData, style)
 
-    }
+    return drawData
 
 }
 

package/src/TextLayout.ts

@@ -33,12 +33,14 @@ export function layoutText(drawData: ITextDrawData, style: ITextData): void {
         row = rows[i]
         row.x = x
 
-        switch (textAlign) {
-            case 'center':
-                row.x += (width - row.width) / 2
-                break
-            case 'right':
-                row.x += width - row.width
+        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
+            }
         }
 
         if (row.paraStart && paraSpacing && i > 0) starY += paraSpacing

package/src/TextRows.ts

@@ -69,7 +69,7 @@ export function createRows(drawData: ITextDrawData, content: string, style: ITex
                     if (breakAll) {
 
                         if (wordWidth) addWord() // break
-                        addRow()
+                        if (rowWidth) addRow()
 
                     } else {
                         if (!afterBreak) afterBreak = charType === Letter && lastCharType == After // split ，S  
@@ -77,11 +77,11 @@ export function createRows(drawData: ITextDrawData, content: string, style: ITex
                         if (langBreak || afterBreak || charType === Break || charType === Before || charType === Single || (wordWidth + charWidth > realWidth)) {
 
                             if (wordWidth) addWord() // break
-                            addRow()
+                            if (rowWidth) addRow()
 
                         } else {
 
-                            addRow()
+                            if (rowWidth) addRow()
                         }
                     }
 

package/src/index.ts

@@ -1 +1,7 @@
-export { TextConvert } from './TextConvert'
+import { ITextConvertModule } from '@leafer-ui/interface'
+
+import { getDrawData } from './TextConvert'
+
+export const TextConvertModule: ITextConvertModule = {
+    getDrawData
+}

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import { ITextConvertModule } from '@leafer-ui/interface';
 
-declare const TextConvert: ITextConvertModule;
+declare const TextConvertModule: ITextConvertModule;
 
-export { TextConvert };
+export { TextConvertModule };