leafer-draw 1.4.2 → 1.5.1

package/dist/web.cjs

@@ -123,7 +123,7 @@ class LeaferCanvas extends core.LeaferCanvasBase {
         else {
             window.addEventListener('resize', this.windowListener = () => {
                 const pixelRatio = core.Platform.devicePixelRatio;
-                if (this.pixelRatio !== pixelRatio) {
+                if (!this.config.pixelRatio && this.pixelRatio !== pixelRatio) {
                     const { width, height } = this;
                     this.emitResize({ width, height, pixelRatio });
                 }
@@ -140,7 +140,7 @@ class LeaferCanvas extends core.LeaferCanvasBase {
     checkAutoBounds(parentSize) {
         const view = this.view;
         const { x, y, width, height } = this.autoBounds.getBoundsFrom(parentSize);
-        const size = { width, height, pixelRatio: core.Platform.devicePixelRatio };
+        const size = { width, height, pixelRatio: this.config.pixelRatio ? this.pixelRatio : core.Platform.devicePixelRatio };
         if (!this.isSameSize(size)) {
             const { style } = view;
             style.marginLeft = x + 'px';
@@ -2166,13 +2166,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) {
@@ -2184,7 +2185,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)) {
@@ -2253,7 +2254,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;