leafer-draw 2.0.0 → 2.0.1

package/dist/web.module.js

@@ -1727,7 +1727,7 @@ const Platform = {
         resize(view, width, height, xGap, yGap, clip, smooth, opacity, _filters, interlace) {
             const realWidth = max$2(floor(width + (xGap || 0)), 1), realHeight = max$2(floor(height + (yGap || 0)), 1);
             let interlaceX, interlaceY, interlaceOffset;
-            if (interlace && (interlaceOffset = UnitConvertHelper.number(interlace.offset, (interlaceX = interlace.type === "x") ? width : height))) interlaceX || (interlaceY = true);
+            if (interlace && (interlaceOffset = UnitConvertHelper.number(interlace.offset, interlace.type === "x" ? width : height))) interlace.type === "x" ? interlaceX = true : interlaceY = true;
             const canvas = Platform.origin.createCanvas(interlaceY ? realWidth * 2 : realWidth, interlaceX ? realHeight * 2 : realHeight);
             const ctx = canvas.getContext("2d");
             if (opacity) ctx.globalAlpha = opacity;
@@ -3317,10 +3317,10 @@ const PathCommandDataHelper = {
             data.push(O$2, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
         }
     },
-    arcTo(data, x1, y1, x2, y2, radius, lastX, lastY) {
+    arcTo(data, x1, y1, x2, y2, radius, lastX, lastY, fullRadius) {
         if (!isUndefined(lastX)) {
-            const d = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2);
-            radius = min(radius, min(d / 2, d / 2 * abs$2(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
+            const r = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2) / (fullRadius ? 1 : 2);
+            radius = min(radius, min(r, r * abs$2(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
         }
         data.push(U$2, x1, y1, x2, y2, radius);
     },
@@ -3664,7 +3664,7 @@ const PathCorner = {
         let command, lastCommand, commandLen;
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
         if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
-        const len = data.length;
+        const len = data.length, three = len === 9;
         const smooth = [];
         while (i < len) {
             command = data[i];
@@ -3676,7 +3676,7 @@ const PathCorner = {
                 if (data[i] === L$1) {
                     secondX = data[i + 1];
                     secondY = data[i + 2];
-                    smooth.push(M, getCenterX(startX, secondX), getCenterY(startY, secondY));
+                    three ? smooth.push(M, startX, startY) : smooth.push(M, getCenterX(startX, secondX), getCenterY(startY, secondY));
                 } else {
                     smooth.push(M, startX, startY);
                 }
@@ -3688,11 +3688,11 @@ const PathCorner = {
                 i += 3;
                 switch (data[i]) {
                   case L$1:
-                    arcTo(smooth, x, y, data[i + 1], data[i + 2], cornerRadius, lastX, lastY);
+                    arcTo(smooth, x, y, data[i + 1], data[i + 2], cornerRadius, lastX, lastY, three);
                     break;
 
                   case Z:
-                    arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY);
+                    arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY, three);
                     break;
 
                   default:
@@ -3704,7 +3704,7 @@ const PathCorner = {
 
               case Z:
                 if (lastCommand !== Z) {
-                    arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY);
+                    arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY, three);
                     smooth.push(Z);
                 }
                 i += 1;
@@ -6979,7 +6979,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.0.0";
+const version = "2.0.1";
 
 const debug$4 = Debug.get("LeaferCanvas");
 
@@ -7990,16 +7990,16 @@ class UIData extends LeafData {
         return t.fill || t.stroke;
     }
     get __autoWidth() {
-        return !this._width;
+        return this._width == null;
     }
     get __autoHeight() {
-        return !this._height;
+        return this._height == null;
     }
     get __autoSide() {
-        return !this._width || !this._height;
+        return this._width == null || this._height == null;
     }
     get __autoSize() {
-        return !this._width && !this._height;
+        return this._width == null && this._height == null;
     }
     setVisible(value) {
         this._visible = value;
@@ -11218,7 +11218,7 @@ function layoutText(drawData, style) {
     let {x: x, y: y, width: width, height: height} = bounds, realHeight = __lineHeight * countRows + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
     let starY = __baseLine;
     if (__clipText && realHeight > height) {
-        realHeight = Math.max(height, __lineHeight);
+        realHeight = Math.max(style.__autoHeight ? realHeight : height, __lineHeight);
         if (countRows > 1) drawData.overflow = countRows;
     } else if (height || autoSizeAlign) {
         switch (verticalAlign) {
@@ -11275,10 +11275,10 @@ function layoutText(drawData, style) {
 }
 
 function clipText(drawData, style, x, width) {
-    if (!width) return;
     const {rows: rows, overflow: overflow} = drawData;
     let {textOverflow: textOverflow} = style;
-    rows.splice(overflow);
+    if (overflow) rows.splice(overflow);
+    if (!width) return;
     if (textOverflow && textOverflow !== "show") {
         if (textOverflow === "hide") textOverflow = ""; else if (textOverflow === "ellipsis") textOverflow = "...";
         let char, charRight;