@leafer-ui/miniapp 1.4.1 → 1.5.0

package/dist/miniapp.cjs

@@ -2387,13 +2387,14 @@ function toChar(data, charX, rowData, isOverflow) {
 }
 
 function layoutText(drawData, style) {
-    const { rows, bounds } = drawData;
+    const { rows, bounds } = drawData, countRows = rows.length;
     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 { x, y, width, height } = bounds, realHeight = __lineHeight * countRows + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
     let starY = __baseLine;
     if (__clipText && realHeight > height) {
         realHeight = Math.max(height, __lineHeight);
-        drawData.overflow = rows.length;
+        if (countRows > 1)
+            drawData.overflow = countRows;
     }
     else if (height || autoSizeAlign) {
         switch (verticalAlign) {
@@ -2405,7 +2406,7 @@ function layoutText(drawData, style) {
     }
     starY += y;
     let row, rowX, rowWidth, layoutWidth = (width || autoSizeAlign) ? width : drawData.maxWidth;
-    for (let i = 0, len = rows.length; i < len; i++) {
+    for (let i = 0, len = countRows; i < len; i++) {
         row = rows[i];
         row.x = x;
         if (row.width < width || (row.width > width && !__clipText)) {
@@ -2474,7 +2475,7 @@ function clipText(drawData, style, x, width) {
                     if (i === end && charRight < right) {
                         break;
                     }
-                    else if (charRight < right && char.char !== ' ') {
+                    else if ((charRight < right && char.char !== ' ') || !i) {
                         row.data.splice(i + 1);
                         row.width -= char.width;
                         break;
@@ -2613,30 +2614,6 @@ try {
 }
 catch (_a) { }
 
-const systemInfo = wx.getSystemInfoSync();
-const platform = systemInfo.platform;
-if (platform === 'ios') {
-    core.LeaferImage.prototype.getPattern = function (canvas, repeat, transform, paint) {
-        const pattern = core.Platform.canvas.createPattern(this.view, repeat);
-        const { width, height } = canvas;
-        if (this.width !== width || this.height !== height) {
-            if (!transform)
-                transform = core.MatrixHelper.get();
-            core.MatrixHelper.scale(transform, width / this.width, height / this.height);
-        }
-        try {
-            if (transform && pattern.setTransform) {
-                pattern.setTransform(transform);
-                transform = null;
-            }
-        }
-        catch (_a) { }
-        if (paint)
-            paint.transform = transform;
-        return pattern;
-    };
-}
-
 Object.defineProperty(exports, "LeaferImage", {
     enumerable: true,
     get: function () { return core.LeaferImage; }