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

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@leafer-ui/text",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-rc.2",
   "description": "@leafer-ui/text",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -19,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/core": "1.0.0-beta.8"
+    "@leafer-ui/core": "1.0.0-rc.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.8",
-    "@leafer-ui/interface": "1.0.0-beta.8"
+    "@leafer/interface": "1.0.0-rc.2",
+    "@leafer-ui/interface": "1.0.0-rc.2"
   }
 }

package/src/TextConvert.ts

@@ -1,6 +1,6 @@
 import { MathHelper, Platform } from '@leafer/core'
 
-import { ITextData, ITextDrawData } from '@leafer-ui/interface'
+import { ITextConvertModule, ITextData, ITextDrawData } from '@leafer-ui/interface'
 
 import { createRows } from './TextRows'
 import { layoutChar } from './CharLayout'
@@ -9,7 +9,7 @@ import { clipText } from './TextClip'
 import { decorationText } from './TextDecoration'
 
 
-export const TextConvert = {
+export const TextConvert: ITextConvertModule = {
 
     getDrawData(content: string, style: ITextData): ITextDrawData {
 

package/src/TextLayout.ts

@@ -11,21 +11,19 @@ export function layoutText(drawData: ITextDrawData, style: ITextData): void {
 
     // verticalAlign
 
-    if (height) {
-        if (textOverflow !== 'show' && realHeight > height) {
-            realHeight = Math.max(height, __lineHeight)
-            drawData.overflow = rows.length
-        } else {
-            switch (verticalAlign) {
-                case 'middle':
-                    y += (height - realHeight) / 2
-                    break
-                case 'bottom':
-                    y += (height - realHeight)
-            }
+    if (textOverflow !== 'show' && realHeight > height) {
+        realHeight = Math.max(height, __lineHeight)
+        drawData.overflow = rows.length
+    } else {
+        switch (verticalAlign) {
+            case 'middle':
+                y += (height - realHeight) / 2
+                break
+            case 'bottom':
+                y += (height - realHeight)
         }
-        starY += y
     }
+    starY += y
 
     // textAlign
 
@@ -54,7 +52,16 @@ export function layoutText(drawData: ITextDrawData, style: ITextData): void {
             drawData.overflow = i + 1
         }
 
-        if (row.width > bounds.width) bounds.width = row.width
+        if (row.width < 0) { // letterSpacing < 0
+            const charWidth = row.words[0].data[0].width
+            const rowX = row.x + row.width
+            if (rowX < bounds.x) bounds.x = rowX - charWidth
+            if (-row.width > bounds.width) bounds.width = -row.width + style.fontSize + charWidth
+        } else {
+            if (row.x < bounds.x) bounds.x = row.x
+            if (row.width > bounds.width) bounds.width = row.width
+        }
+
     }
 
     bounds.y = y

package/src/TextRows.ts

@@ -74,7 +74,11 @@ export function createRows(drawData: ITextDrawData, content: string, style: ITex
 
                 }
 
-                if (!(char === ' ' && (rowWidth + wordWidth) === 0)) {
+                if (char === ' ' && paraStart !== true && (rowWidth + wordWidth) === 0) {
+
+                    // trim space
+
+                } else {
 
                     if (charType === Break) {
 

package/types/index.d.ts

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