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

package/package.json

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

package/src/TextConvert.ts

@@ -1,4 +1,4 @@
-import { MathHelper, Platform } from '@leafer/core'
+import { Platform, Direction4 } from '@leafer/core'
 
 import { ITextConvertModule, ITextData, ITextDrawData } from '@leafer-ui/interface'
 
@@ -9,6 +9,8 @@ import { clipText } from './TextClip'
 import { decorationText } from './TextDecoration'
 
 
+const { top, right, bottom, left } = Direction4
+
 export const TextConvert: ITextConvertModule = {
 
     getDrawData(content: string, style: ITextData): ITextDrawData {
@@ -20,17 +22,16 @@ export const TextConvert: ITextConvertModule = {
         let width = style.__getInput('width') || 0
         let height = style.__getInput('height') || 0
 
-        const { textDecoration, __font, padding } = style
+        const { textDecoration, __font, __padding: padding } = style
 
         if (padding) {
-            const [top, right, bottom, left] = MathHelper.fourNumber(padding)
             if (width) {
-                x = left
-                width -= (right + left)
+                x = padding[left]
+                width -= (padding[right] + padding[left])
             }
             if (height) {
-                y = top
-                height -= (top + bottom)
+                y = padding[top]
+                height -= (padding[top] + padding[bottom])
             }
         }
 
@@ -43,6 +44,8 @@ export const TextConvert: ITextConvertModule = {
 
         createRows(drawData, content, style) // set rows, paraNumber
 
+        if (padding) padAutoText(padding, drawData, style, width, height)
+
         layoutText(drawData, style) // set bounds
 
         layoutChar(drawData, style, width, height) // set char.x
@@ -55,4 +58,34 @@ export const TextConvert: ITextConvertModule = {
 
     }
 
+}
+
+
+function padAutoText(padding: number[], drawData: ITextDrawData, style: ITextData, width: number, height: number): void {
+    if (!width) {
+        switch (style.textAlign) {
+            case 'left':
+                offsetText(drawData, 'x', padding[left])
+                break
+            case 'right':
+                offsetText(drawData, 'x', -padding[right])
+        }
+    }
+
+    if (!height) {
+        switch (style.verticalAlign) {
+            case 'top':
+                offsetText(drawData, 'y', padding[top])
+                break
+            case 'bottom':
+                offsetText(drawData, 'y', -padding[bottom])
+        }
+    }
+}
+
+
+function offsetText(drawData: ITextDrawData, attrName: 'x' | 'y', value: number): void {
+    const { bounds, rows } = drawData
+    bounds[attrName] += value
+    for (let i = 0; i < rows.length; i++) rows[i][attrName] += value
 }