@leafer/core 2.0.0 → 2.0.1

package/lib/core.cjs

@@ -1720,7 +1720,7 @@ const Platform = {
         resize(view, width, height, xGap, yGap, clip, smooth, opacity, _filters, interlace) {
             const realWidth = max(floor(width + (xGap || 0)), 1), realHeight = max(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;
@@ -3310,10 +3310,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(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(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
         }
         data.push(U$2, x1, y1, x2, y2, radius);
     },
@@ -3657,7 +3657,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];
@@ -3669,7 +3669,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);
                 }
@@ -3681,11 +3681,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:
@@ -3697,7 +3697,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;
@@ -6972,7 +6972,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.0.0";
+const version = "2.0.1";
 
 exports.AlignHelper = AlignHelper;
 

package/lib/core.esm.js

@@ -1718,7 +1718,7 @@ const Platform = {
         resize(view, width, height, xGap, yGap, clip, smooth, opacity, _filters, interlace) {
             const realWidth = max(floor(width + (xGap || 0)), 1), realHeight = max(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;
@@ -3308,10 +3308,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(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(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
         }
         data.push(U$2, x1, y1, x2, y2, radius);
     },
@@ -3655,7 +3655,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];
@@ -3667,7 +3667,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);
                 }
@@ -3679,11 +3679,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:
@@ -3695,7 +3695,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;
@@ -6970,6 +6970,6 @@ class LeafLevelList {
     }
 }
 
-const version = "2.0.0";
+const version = "2.0.1";
 
 export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, FourNumberHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, UnitConvertHelper, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, tryToNumber, useModule, version, visibleType };