@leafer/core 2.1.5 → 2.1.7

package/lib/core.cjs

@@ -765,15 +765,15 @@ const PointHelper = {
         t.x += (t.x - origin.x) * (scaleX - 1);
         t.y += (t.y - origin.y) * (scaleY - 1);
     },
-    rotate(t, rotation, origin) {
+    rotate(t, rotation, origin, radiusX = 1, radiusY = 1) {
         if (!origin) origin = P$5.defaultPoint;
         rotation *= OneRadian;
         const cosR = cos$2(rotation);
         const sinR = sin$2(rotation);
-        const rx = t.x - origin.x;
-        const ry = t.y - origin.y;
-        t.x = origin.x + rx * cosR - ry * sinR;
-        t.y = origin.y + rx * sinR + ry * cosR;
+        const rx = (t.x - origin.x) / radiusX;
+        const ry = (t.y - origin.y) / radiusY;
+        t.x = origin.x + (rx * cosR - ry * sinR) * radiusX;
+        t.y = origin.y + (rx * sinR + ry * cosR) * radiusY;
     },
     tempToInnerOf(t, matrix) {
         const {tempPoint: temp} = P$5;
@@ -833,8 +833,8 @@ const PointHelper = {
     getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
         return min$1(getDistanceFrom(x1, y1, x2, y2), getDistanceFrom(x2, y2, x3, y3));
     },
-    getAngle(t, to) {
-        return getAtan2(t, to) / OneRadian;
+    getAngle(t, to, radiusX, radiusY) {
+        return getAtan2(t, to, radiusX, radiusY) / OneRadian;
     },
     getRotation(t, origin, to, toOrigin) {
         if (!toOrigin) toOrigin = origin;
@@ -848,8 +848,8 @@ const PointHelper = {
         const d = toY - toOriginY;
         return Math.atan2(a * d - b * c, a * c + b * d);
     },
-    getAtan2(t, to) {
-        return atan2$2(to.y - t.y, to.x - t.x);
+    getAtan2(t, to, radiusX = 1, radiusY = 1) {
+        return atan2$2((to.y - t.y) / radiusY, (to.x - t.x) / radiusX);
     },
     getDistancePoint(t, to, distance, changeTo, fromTo) {
         const r = getAtan2(t, to);
@@ -3715,7 +3715,7 @@ const {arcTo: arcTo} = PathCommandDataHelper;
 
 const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
-        let command, lastCommand, commandLen;
+        let command, lastCommand, commandLen, startXIndex, startYIndex, smoothLen;
         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, three = len === 9;
@@ -3724,6 +3724,11 @@ const PathCorner = {
             command = data[i];
             switch (command) {
               case M:
+                smoothLen = smooth.length;
+                if (smoothLen && lastCommand !== Z) {
+                    smooth[startXIndex] = startX;
+                    smooth[startYIndex] = startY;
+                }
                 startX = lastX = data[i + 1];
                 startY = lastY = data[i + 2];
                 i += 3;
@@ -3734,6 +3739,8 @@ const PathCorner = {
                 } else {
                     smooth.push(M, startX, startY);
                 }
+                startXIndex = smoothLen + 1;
+                startYIndex = smoothLen + 2;
                 break;
 
               case L$1:
@@ -3772,8 +3779,8 @@ const PathCorner = {
             lastCommand = command;
         }
         if (command !== Z) {
-            smooth[1] = startX;
-            smooth[2] = startY;
+            smooth[startXIndex] = startX;
+            smooth[startYIndex] = startY;
         }
         return smooth;
     }
@@ -6969,7 +6976,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.5";
+const version = "2.1.7";
 
 exports.AlignHelper = AlignHelper;
 

package/lib/core.esm.js

@@ -763,15 +763,15 @@ const PointHelper = {
         t.x += (t.x - origin.x) * (scaleX - 1);
         t.y += (t.y - origin.y) * (scaleY - 1);
     },
-    rotate(t, rotation, origin) {
+    rotate(t, rotation, origin, radiusX = 1, radiusY = 1) {
         if (!origin) origin = P$5.defaultPoint;
         rotation *= OneRadian;
         const cosR = cos$2(rotation);
         const sinR = sin$2(rotation);
-        const rx = t.x - origin.x;
-        const ry = t.y - origin.y;
-        t.x = origin.x + rx * cosR - ry * sinR;
-        t.y = origin.y + rx * sinR + ry * cosR;
+        const rx = (t.x - origin.x) / radiusX;
+        const ry = (t.y - origin.y) / radiusY;
+        t.x = origin.x + (rx * cosR - ry * sinR) * radiusX;
+        t.y = origin.y + (rx * sinR + ry * cosR) * radiusY;
     },
     tempToInnerOf(t, matrix) {
         const {tempPoint: temp} = P$5;
@@ -831,8 +831,8 @@ const PointHelper = {
     getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
         return min$1(getDistanceFrom(x1, y1, x2, y2), getDistanceFrom(x2, y2, x3, y3));
     },
-    getAngle(t, to) {
-        return getAtan2(t, to) / OneRadian;
+    getAngle(t, to, radiusX, radiusY) {
+        return getAtan2(t, to, radiusX, radiusY) / OneRadian;
     },
     getRotation(t, origin, to, toOrigin) {
         if (!toOrigin) toOrigin = origin;
@@ -846,8 +846,8 @@ const PointHelper = {
         const d = toY - toOriginY;
         return Math.atan2(a * d - b * c, a * c + b * d);
     },
-    getAtan2(t, to) {
-        return atan2$2(to.y - t.y, to.x - t.x);
+    getAtan2(t, to, radiusX = 1, radiusY = 1) {
+        return atan2$2((to.y - t.y) / radiusY, (to.x - t.x) / radiusX);
     },
     getDistancePoint(t, to, distance, changeTo, fromTo) {
         const r = getAtan2(t, to);
@@ -3713,7 +3713,7 @@ const {arcTo: arcTo} = PathCommandDataHelper;
 
 const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
-        let command, lastCommand, commandLen;
+        let command, lastCommand, commandLen, startXIndex, startYIndex, smoothLen;
         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, three = len === 9;
@@ -3722,6 +3722,11 @@ const PathCorner = {
             command = data[i];
             switch (command) {
               case M:
+                smoothLen = smooth.length;
+                if (smoothLen && lastCommand !== Z) {
+                    smooth[startXIndex] = startX;
+                    smooth[startYIndex] = startY;
+                }
                 startX = lastX = data[i + 1];
                 startY = lastY = data[i + 2];
                 i += 3;
@@ -3732,6 +3737,8 @@ const PathCorner = {
                 } else {
                     smooth.push(M, startX, startY);
                 }
+                startXIndex = smoothLen + 1;
+                startYIndex = smoothLen + 2;
                 break;
 
               case L$1:
@@ -3770,8 +3777,8 @@ const PathCorner = {
             lastCommand = command;
         }
         if (command !== Z) {
-            smooth[1] = startX;
-            smooth[2] = startY;
+            smooth[startXIndex] = startX;
+            smooth[startYIndex] = startY;
         }
         return smooth;
     }
@@ -6967,6 +6974,6 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.5";
+const version = "2.1.7";
 
 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, LeaferFilm, LeaferImage, LeaferVideo, 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 };