@leafer-ui/text 1.0.0-rc.4 → 1.0.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/text",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.6",
   "description": "@leafer-ui/text",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/core": "1.0.0-rc.4"
+    "@leafer-ui/core": "1.0.0-rc.6"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.4",
-    "@leafer-ui/interface": "1.0.0-rc.4"
+    "@leafer/interface": "1.0.0-rc.6",
+    "@leafer-ui/interface": "1.0.0-rc.6"
   }
 }

package/src/CharLayout.ts

@@ -1,9 +1,9 @@
-import { ITextCharData, ITextData, ITextDrawData } from '@leafer-ui/interface'
+import { ITextCharData, ITextData, ITextDrawData, ITextRowData } from '@leafer-ui/interface'
 
 
 const CharMode = 0 // data: [{char:'a', x: 0}, {char:'b', x: 5}, {char:'d', x:20}]
 const WordMode = 1 // data: [{ char:'ab', x: 0}, { char:'d', x:20}]
-const RowMode = 2 // text: 'ab  c'
+const TextMode = 2 // text: 'ab  c'
 
 export function layoutChar(drawData: ITextDrawData, style: ITextData, width: number, _height: number): void {
 
@@ -16,18 +16,13 @@ export function layoutChar(drawData: ITextDrawData, style: ITextData, width: num
 
             indentWidth = paraIndent && row.paraStart ? paraIndent : 0
             addWordWidth = (width && textAlign === 'justify' && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0
-            mode = (letterSpacing || row.isOverflow) ? CharMode : (addWordWidth > 0.01 ? WordMode : RowMode)
+            mode = (letterSpacing || row.isOverflow) ? CharMode : (addWordWidth > 0.01 ? WordMode : TextMode)
+            if (row.isOverflow && !letterSpacing) row.textMode = true
 
-            if (mode === RowMode) {
+            if (mode === TextMode) {
 
-                row.text = ''
                 row.x += indentWidth
-
-                row.words.forEach(word => {
-                    word.data.forEach(char => {
-                        row.text += char.char
-                    })
-                })
+                toTextChar(row)
 
             } else {
 
@@ -63,6 +58,15 @@ export function layoutChar(drawData: ITextDrawData, style: ITextData, width: num
 
 }
 
+function toTextChar(row: ITextRowData): void {
+    row.text = ''
+    row.words.forEach(word => {
+        word.data.forEach(char => {
+            row.text += char.char
+        })
+    })
+}
+
 function toWordChar(data: ITextCharData[], charX: number, wordChar: ITextCharData): number {
     data.forEach(char => {
         wordChar.char += char.char

package/src/TextClip.ts

@@ -1,39 +1,59 @@
 import { Platform } from '@leafer/core'
 
-import { IOverflow, ITextCharData, ITextDrawData } from '@leafer-ui/interface'
+import { ITextCharData, ITextData, ITextDrawData, ITextRowData } from '@leafer-ui/interface'
 
 
-export function clipText(drawData: ITextDrawData, textOverflow: IOverflow | string): void {
+export function clipText(drawData: ITextDrawData, style: ITextData): void {
 
     const { rows, overflow } = drawData
+    let { textOverflow } = style
     rows.splice(overflow)
 
+
     if (textOverflow !== 'hide') {
         if (textOverflow === 'ellipsis') textOverflow = '...'
 
+        let char: ITextCharData, charRight: number
         const ellipsisWidth = Platform.canvas.measureText(textOverflow).width
-        const row = rows[overflow - 1]
-
-        let char: ITextCharData, end = row.data.length - 1, charRight: number
-
-        const { x, width } = drawData.bounds
-        const right = x + width - ellipsisWidth
-
-        for (let i = end; i > -1; i--) {
-            char = row.data[i]
-            charRight = char.x + char.width
-            if (i === end && charRight < right) {
-                break
-            } else if (charRight < right && char.char !== ' ') {
-                row.data.splice(i + 1)
-                row.width -= char.width
-                break
+        const right = style.x + style.width - ellipsisWidth
+        const list = style.textWrap === 'none' ? rows : [rows[overflow - 1]]
+
+        list.forEach(row => {
+
+            if (row.isOverflow && row.data) {
+
+                let end = row.data.length - 1
+
+                for (let i = end; i > -1; i--) {
+                    char = row.data[i]
+                    charRight = char.x + char.width
+                    if (i === end && charRight < right) {
+                        break
+                    } else if (charRight < right && char.char !== ' ') {
+                        row.data.splice(i + 1)
+                        row.width -= char.width
+                        break
+                    }
+                    row.width -= char.width
+                }
+
+                row.width += ellipsisWidth
+                row.data.push({ char: textOverflow, x: charRight })
+
+                if (row.textMode) toTextChar(row)
             }
-            row.width -= char.width
-        }
 
-        row.width += ellipsisWidth
-        row.data.push({ char: textOverflow, x: charRight })
+
+        })
+
     }
 
+}
+
+function toTextChar(row: ITextRowData): void {
+    row.text = ''
+    row.data.forEach(char => {
+        row.text += char.char
+    })
+    row.data = null
 }

package/src/TextConvert.ts

@@ -20,7 +20,7 @@ export const TextConvert: ITextConvertModule = {
         let width = style.__getInput('width') || 0
         let height = style.__getInput('height') || 0
 
-        const { textDecoration, textOverflow, __font, padding } = style
+        const { textDecoration, __font, padding } = style
 
         if (padding) {
             const [top, right, bottom, left] = MathHelper.fourNumber(padding)
@@ -47,7 +47,7 @@ export const TextConvert: ITextConvertModule = {
 
         layoutChar(drawData, style, width, height) // set char.x
 
-        if (drawData.overflow) clipText(drawData, textOverflow)
+        if (drawData.overflow) clipText(drawData, style)
 
         if (textDecoration !== 'none') decorationText(drawData, style)
 

package/src/TextLayout.ts

@@ -4,14 +4,14 @@ import { ITextData, ITextDrawData, ITextRowData } from '@leafer-ui/interface'
 export function layoutText(drawData: ITextDrawData, style: ITextData): void {
 
     const { rows, bounds } = drawData
-    const { __lineHeight, __baseLine, __letterSpacing, textAlign, verticalAlign, paraSpacing, textOverflow } = style
+    const { __lineHeight, __baseLine, __letterSpacing, __clipText, textAlign, verticalAlign, paraSpacing } = style
 
     let { x, y, width, height } = bounds, realHeight = __lineHeight * rows.length + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0)
     let starY: number = __baseLine
 
     // verticalAlign
 
-    if (textOverflow !== 'show' && realHeight > height) {
+    if (__clipText && realHeight > height) {
         realHeight = Math.max(height, __lineHeight)
         drawData.overflow = rows.length
     } else {
@@ -68,6 +68,11 @@ export function layoutText(drawData: ITextDrawData, style: ITextData): void {
         if (rowX < bounds.x) bounds.x = rowX
         if (rowWidth > bounds.width) bounds.width = rowWidth
 
+        // clip nowrap
+        if (__clipText && width && width < rowWidth) {
+            row.isOverflow = true
+            if (!drawData.overflow) drawData.overflow = rows.length
+        }
     }
 
     bounds.y = y

package/src/TextRows.ts

@@ -27,6 +27,9 @@ export function createRows(drawData: ITextDrawData, content: string, style: ITex
 
     if (charMode) {
 
+        const wrap = style.textWrap !== 'none'
+        const breakAll = style.textWrap === 'break'
+
         paraStart = true
         lastCharType = null
         startCharSize = charWidth = charSize = wordWidth = rowWidth = 0
@@ -61,18 +64,25 @@ export function createRows(drawData: ITextDrawData, content: string, style: ITex
 
                 realWidth = paraStart && paraIndent ? width - paraIndent : width
 
-                if (width && rowWidth + wordWidth + charWidth > realWidth) { // wrap
-
-                    if (!afterBreak) afterBreak = charType === Letter && lastCharType == After // split ，S  
+                if (wrap && (width && rowWidth + wordWidth + charWidth > realWidth)) { // wrap
 
-                    if (langBreak || afterBreak || charType === Break || charType === Before || charType === Single || (wordWidth + charWidth > realWidth)) {
+                    if (breakAll) {
 
                         if (wordWidth) addWord() // break
                         addRow()
 
                     } else {
+                        if (!afterBreak) afterBreak = charType === Letter && lastCharType == After // split ，S  
 
-                        addRow()
+                        if (langBreak || afterBreak || charType === Break || charType === Before || charType === Single || (wordWidth + charWidth > realWidth)) {
+
+                            if (wordWidth) addWord() // break
+                            addRow()
+
+                        } else {
+
+                            addRow()
+                        }
                     }
 
                 }