@leafer/core 1.12.1 → 1.12.2

package/lib/core.cjs

@@ -454,7 +454,7 @@ function getMatrixData() {
 
 const {sin: sin$3, cos: cos$3, acos: acos, sqrt: sqrt$3} = Math;
 
-const {float: float$1} = MathHelper;
+const {float: float$2} = MathHelper;
 
 const tempPoint$3 = {};
 
@@ -705,12 +705,12 @@ const MatrixHelper = {
                 const cosR = c / scaleY;
                 rotation = PI_2 - (d > 0 ? acos(-cosR) : -acos(cosR));
             }
-            const cosR = float$1(cos$3(rotation));
+            const cosR = float$2(cos$3(rotation));
             const sinR = sin$3(rotation);
-            scaleX = float$1(scaleX), scaleY = float$1(scaleY);
-            skewX = cosR ? float$1((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
-            skewY = cosR ? float$1((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
-            rotation = float$1(rotation / OneRadian);
+            scaleX = float$2(scaleX), scaleY = float$2(scaleY);
+            skewX = cosR ? float$2((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
+            skewY = cosR ? float$2((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
+            rotation = float$2(rotation / OneRadian);
         } else {
             scaleX = a;
             scaleY = d;
@@ -754,6 +754,8 @@ const MatrixHelper = {
 
 const M$6 = MatrixHelper;
 
+const {float: float$1} = MathHelper;
+
 const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
 
 const {sin: sin$2, cos: cos$2, abs: abs$2, sqrt: sqrt$2, atan2: atan2$2, min: min$1, round: round$2} = Math;
@@ -821,6 +823,11 @@ const PointHelper = {
         P$5.toInnerRadiusPointOf(t, matrix, temp);
         return temp;
     },
+    copyRadiusPoint(t, point, x, y) {
+        copy$7(t, point);
+        setRadius(t, x, y);
+        return t;
+    },
     toInnerRadiusPointOf(t, matrix, to) {
         to || (to = t);
         toInnerPoint$2(matrix, t, to);
@@ -888,7 +895,7 @@ const PointHelper = {
         return points;
     },
     isSame(t, point) {
-        return t.x === point.x && t.y === point.y;
+        return float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
     },
     reset(t) {
         P$5.reset(t);
@@ -897,7 +904,7 @@ const PointHelper = {
 
 const P$5 = PointHelper;
 
-const {getDistanceFrom: getDistanceFrom, copy: copy$7, getAtan2: getAtan2} = P$5;
+const {getDistanceFrom: getDistanceFrom, copy: copy$7, setRadius: setRadius, getAtan2: getAtan2} = P$5;
 
 class Point {
     constructor(x, y) {
@@ -2400,7 +2407,7 @@ class LeaferCanvasBase extends Canvas {
         const {pixelRatio: pixelRatio} = this;
         this.filter = `blur(${blur * pixelRatio}px)`;
     }
-    copyWorld(canvas, from, to, blendMode, ceilPixel = true) {
+    copyWorld(canvas, from, to, blendMode, ceilPixel) {
         if (blendMode) this.blendMode = blendMode;
         if (from) {
             this.setTempPixelBounds(from, ceilPixel);
@@ -2411,7 +2418,7 @@ class LeaferCanvasBase extends Canvas {
         }
         if (blendMode) this.blendMode = "source-over";
     }
-    copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel = true) {
+    copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel) {
         if (fromWorld.b || fromWorld.c) {
             this.save();
             this.resetTransform();
@@ -2424,7 +2431,7 @@ class LeaferCanvasBase extends Canvas {
             if (blendMode) this.blendMode = "source-over";
         }
     }
-    copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel = true) {
+    copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel) {
         this.resetTransform();
         this.copyWorld(canvas, from, to, blendMode, ceilPixel);
         if (!onlyResetTransform) this.useWorldTransform();
@@ -2651,7 +2658,7 @@ const BezierHelper = {
         data.push(M$5, points[0], points[1]);
         if (curve && points.length > 5) {
             let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
-            let ba, cb, d, len = points.length;
+            let baX, baY, ba, cb, d, len = points.length;
             const t = curve === true ? .5 : curve;
             if (close) {
                 points = [ points[len - 2], points[len - 1], ...points, points[0], points[1], points[2], points[3] ];
@@ -2664,7 +2671,9 @@ const BezierHelper = {
                 bY = points[i + 1];
                 cX = points[i + 2];
                 cY = points[i + 3];
-                ba = sqrt$1(pow(bX - aX, 2) + pow(bY - aY, 2));
+                baX = bX - aX;
+                baY = bY - aY;
+                ba = sqrt$1(pow(baX, 2) + pow(baY, 2));
                 cb = sqrt$1(pow(cX - bX, 2) + pow(cY - bY, 2));
                 if (!ba && !cb) continue;
                 d = ba + cb;
@@ -2677,7 +2686,7 @@ const BezierHelper = {
                 if (i === 2) {
                     if (!close) data.push(Q$4, c1X, c1Y, bX, bY);
                 } else {
-                    data.push(C$4, c2X, c2Y, c1X, c1Y, bX, bY);
+                    if (baX || baY) data.push(C$4, c2X, c2Y, c1X, c1Y, bX, bY);
                 }
                 c2X = bX + cb * cX;
                 c2Y = bY + cb * cY;
@@ -3262,6 +3271,7 @@ const PathCommandDataHelper = {
         }
     },
     ellipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
+        if (radiusX === radiusY) return arc$2(data, x, y, radiusX, startAngle, endAngle, anticlockwise);
         if (isNull(rotation)) {
             data.push(F$3, x, y, radiusX, radiusY);
         } else {
@@ -3274,6 +3284,7 @@ const PathCommandDataHelper = {
         if (isNull(startAngle)) {
             data.push(P$2, x, y, radius);
         } else {
+            if (isNull(startAngle)) startAngle = 0;
             if (isNull(endAngle)) endAngle = 360;
             data.push(O$2, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
         }
@@ -3624,6 +3635,7 @@ const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
         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 smooth = [];
         while (i < len) {
@@ -4039,7 +4051,9 @@ const R = Resource;
 const ImageManager = {
     maxRecycled: 10,
     recycledList: [],
-    patternTasker: new TaskProcessor,
+    patternTasker: new TaskProcessor({
+        parallel: 1
+    }),
     get(config) {
         let image = Resource.get(config.url);
         if (!image) Resource.set(config.url, image = Creator.image(config));
@@ -6916,7 +6930,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.12.1";
+const version = "1.12.2";
 
 exports.AlignHelper = AlignHelper;
 

package/lib/core.esm.js

@@ -452,7 +452,7 @@ function getMatrixData() {
 
 const {sin: sin$3, cos: cos$3, acos: acos, sqrt: sqrt$3} = Math;
 
-const {float: float$1} = MathHelper;
+const {float: float$2} = MathHelper;
 
 const tempPoint$3 = {};
 
@@ -703,12 +703,12 @@ const MatrixHelper = {
                 const cosR = c / scaleY;
                 rotation = PI_2 - (d > 0 ? acos(-cosR) : -acos(cosR));
             }
-            const cosR = float$1(cos$3(rotation));
+            const cosR = float$2(cos$3(rotation));
             const sinR = sin$3(rotation);
-            scaleX = float$1(scaleX), scaleY = float$1(scaleY);
-            skewX = cosR ? float$1((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
-            skewY = cosR ? float$1((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
-            rotation = float$1(rotation / OneRadian);
+            scaleX = float$2(scaleX), scaleY = float$2(scaleY);
+            skewX = cosR ? float$2((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
+            skewY = cosR ? float$2((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
+            rotation = float$2(rotation / OneRadian);
         } else {
             scaleX = a;
             scaleY = d;
@@ -752,6 +752,8 @@ const MatrixHelper = {
 
 const M$6 = MatrixHelper;
 
+const {float: float$1} = MathHelper;
+
 const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
 
 const {sin: sin$2, cos: cos$2, abs: abs$2, sqrt: sqrt$2, atan2: atan2$2, min: min$1, round: round$2} = Math;
@@ -819,6 +821,11 @@ const PointHelper = {
         P$5.toInnerRadiusPointOf(t, matrix, temp);
         return temp;
     },
+    copyRadiusPoint(t, point, x, y) {
+        copy$7(t, point);
+        setRadius(t, x, y);
+        return t;
+    },
     toInnerRadiusPointOf(t, matrix, to) {
         to || (to = t);
         toInnerPoint$2(matrix, t, to);
@@ -886,7 +893,7 @@ const PointHelper = {
         return points;
     },
     isSame(t, point) {
-        return t.x === point.x && t.y === point.y;
+        return float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
     },
     reset(t) {
         P$5.reset(t);
@@ -895,7 +902,7 @@ const PointHelper = {
 
 const P$5 = PointHelper;
 
-const {getDistanceFrom: getDistanceFrom, copy: copy$7, getAtan2: getAtan2} = P$5;
+const {getDistanceFrom: getDistanceFrom, copy: copy$7, setRadius: setRadius, getAtan2: getAtan2} = P$5;
 
 class Point {
     constructor(x, y) {
@@ -2398,7 +2405,7 @@ class LeaferCanvasBase extends Canvas {
         const {pixelRatio: pixelRatio} = this;
         this.filter = `blur(${blur * pixelRatio}px)`;
     }
-    copyWorld(canvas, from, to, blendMode, ceilPixel = true) {
+    copyWorld(canvas, from, to, blendMode, ceilPixel) {
         if (blendMode) this.blendMode = blendMode;
         if (from) {
             this.setTempPixelBounds(from, ceilPixel);
@@ -2409,7 +2416,7 @@ class LeaferCanvasBase extends Canvas {
         }
         if (blendMode) this.blendMode = "source-over";
     }
-    copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel = true) {
+    copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel) {
         if (fromWorld.b || fromWorld.c) {
             this.save();
             this.resetTransform();
@@ -2422,7 +2429,7 @@ class LeaferCanvasBase extends Canvas {
             if (blendMode) this.blendMode = "source-over";
         }
     }
-    copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel = true) {
+    copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel) {
         this.resetTransform();
         this.copyWorld(canvas, from, to, blendMode, ceilPixel);
         if (!onlyResetTransform) this.useWorldTransform();
@@ -2649,7 +2656,7 @@ const BezierHelper = {
         data.push(M$5, points[0], points[1]);
         if (curve && points.length > 5) {
             let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
-            let ba, cb, d, len = points.length;
+            let baX, baY, ba, cb, d, len = points.length;
             const t = curve === true ? .5 : curve;
             if (close) {
                 points = [ points[len - 2], points[len - 1], ...points, points[0], points[1], points[2], points[3] ];
@@ -2662,7 +2669,9 @@ const BezierHelper = {
                 bY = points[i + 1];
                 cX = points[i + 2];
                 cY = points[i + 3];
-                ba = sqrt$1(pow(bX - aX, 2) + pow(bY - aY, 2));
+                baX = bX - aX;
+                baY = bY - aY;
+                ba = sqrt$1(pow(baX, 2) + pow(baY, 2));
                 cb = sqrt$1(pow(cX - bX, 2) + pow(cY - bY, 2));
                 if (!ba && !cb) continue;
                 d = ba + cb;
@@ -2675,7 +2684,7 @@ const BezierHelper = {
                 if (i === 2) {
                     if (!close) data.push(Q$4, c1X, c1Y, bX, bY);
                 } else {
-                    data.push(C$4, c2X, c2Y, c1X, c1Y, bX, bY);
+                    if (baX || baY) data.push(C$4, c2X, c2Y, c1X, c1Y, bX, bY);
                 }
                 c2X = bX + cb * cX;
                 c2Y = bY + cb * cY;
@@ -3260,6 +3269,7 @@ const PathCommandDataHelper = {
         }
     },
     ellipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
+        if (radiusX === radiusY) return arc$2(data, x, y, radiusX, startAngle, endAngle, anticlockwise);
         if (isNull(rotation)) {
             data.push(F$3, x, y, radiusX, radiusY);
         } else {
@@ -3272,6 +3282,7 @@ const PathCommandDataHelper = {
         if (isNull(startAngle)) {
             data.push(P$2, x, y, radius);
         } else {
+            if (isNull(startAngle)) startAngle = 0;
             if (isNull(endAngle)) endAngle = 360;
             data.push(O$2, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
         }
@@ -3622,6 +3633,7 @@ const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
         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 smooth = [];
         while (i < len) {
@@ -4037,7 +4049,9 @@ const R = Resource;
 const ImageManager = {
     maxRecycled: 10,
     recycledList: [],
-    patternTasker: new TaskProcessor,
+    patternTasker: new TaskProcessor({
+        parallel: 1
+    }),
     get(config) {
         let image = Resource.get(config.url);
         if (!image) Resource.set(config.url, image = Creator.image(config));
@@ -6914,6 +6928,6 @@ class LeafLevelList {
     }
 }
 
-const version = "1.12.1";
+const version = "1.12.2";
 
 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, 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 };