@leafer/core 1.12.4 → 2.0.1

package/lib/core.cjs

@@ -209,59 +209,6 @@ class LeafData {
     }
 }
 
-const {floor: floor$2, max: max$2} = Math;
-
-const Platform = {
-    toURL(text, fileType) {
-        let url = encodeURIComponent(text);
-        if (fileType === "text") url = "data:text/plain;charset=utf-8," + url; else if (fileType === "svg") url = "data:image/svg+xml," + url;
-        return url;
-    },
-    image: {
-        hitCanvasSize: 100,
-        maxCacheSize: 2560 * 1600,
-        maxPatternSize: 4096 * 2160,
-        crossOrigin: "anonymous",
-        isLarge(size, scaleX, scaleY, largeSize) {
-            return size.width * size.height * (scaleX ? scaleX * scaleY : 1) > (largeSize || image.maxCacheSize);
-        },
-        isSuperLarge(size, scaleX, scaleY) {
-            return image.isLarge(size, scaleX, scaleY, image.maxPatternSize);
-        },
-        getRealURL(url) {
-            const {prefix: prefix, suffix: suffix} = Platform.image;
-            if (suffix && !url.startsWith("data:") && !url.startsWith("blob:")) url += (url.includes("?") ? "&" : "?") + suffix;
-            if (prefix && url[0] === "/") url = prefix + url;
-            return url;
-        },
-        resize(image, width, height, xGap, yGap, clip, smooth, opacity, _filters) {
-            const canvas = Platform.origin.createCanvas(max$2(floor$2(width + (xGap || 0)), 1), max$2(floor$2(height + (yGap || 0)), 1));
-            const ctx = canvas.getContext("2d");
-            if (opacity) ctx.globalAlpha = opacity;
-            ctx.imageSmoothingEnabled = smooth === false ? false : true;
-            if (image) {
-                if (clip) {
-                    const scaleX = width / clip.width, scaleY = height / clip.height;
-                    ctx.setTransform(scaleX, 0, 0, scaleY, -clip.x * scaleX, -clip.y * scaleY);
-                    ctx.drawImage(image, 0, 0, image.width, image.height);
-                } else ctx.drawImage(image, 0, 0, width, height);
-            }
-            return canvas;
-        },
-        setPatternTransform(pattern, transform, paint) {
-            try {
-                if (transform && pattern.setTransform) {
-                    pattern.setTransform(transform);
-                    transform = undefined;
-                }
-            } catch (_a) {}
-            if (paint) DataHelper.stintSet(paint, "transform", transform);
-        }
-    }
-};
-
-const {image: image} = Platform;
-
 const IncrementId = {
     RUNTIME: "runtime",
     LEAF: "leaf",
@@ -284,7 +231,7 @@ const I$1 = IncrementId;
 
 let tempA, tempB, tempTo;
 
-const {max: max$1} = Math, tempFour = [ 0, 0, 0, 0 ];
+const {max: max$2} = Math, tempFour = [ 0, 0, 0, 0 ];
 
 const FourNumberHelper = {
     zero: [ ...tempFour ],
@@ -336,9 +283,9 @@ const FourNumberHelper = {
         return data;
     },
     max(t, other, change) {
-        if (isNumber(t) && isNumber(other)) return max$1(t, other);
+        if (isNumber(t) && isNumber(other)) return max$2(t, other);
         toTempAB(t, other, change);
-        return set$1(tempTo, max$1(tempA[0], tempB[0]), max$1(tempA[1], tempB[1]), max$1(tempA[2], tempB[2]), max$1(tempA[3], tempB[3]));
+        return set$1(tempTo, max$2(tempA[0], tempB[0]), max$2(tempA[1], tempB[1]), max$2(tempA[2], tempB[2]), max$2(tempA[3], tempB[3]));
     },
     add(t, other, change) {
         if (isNumber(t) && isNumber(other)) return t + other;
@@ -355,7 +302,7 @@ const FourNumberHelper = {
 
 const {set: set$1, get: get$1, setTemp: setTemp, toTempAB: toTempAB} = FourNumberHelper;
 
-const {round: round$3, pow: pow$1, max: max, floor: floor$1, PI: PI$1} = Math;
+const {round: round$3, pow: pow$1, max: max$1, floor: floor$2, PI: PI$1} = Math;
 
 const MathHelper = {
     within(value, min, max) {
@@ -409,7 +356,7 @@ const MathHelper = {
         }
     },
     getFloorScale(num, min = 1) {
-        return max(floor$1(num), min) / num;
+        return max$1(floor$2(num), min) / num;
     },
     randInt: randInt,
     randColor(opacity) {
@@ -1254,7 +1201,7 @@ const {toOuterPoint: toOuterPoint$2} = MatrixHelper;
 
 const {float: float, fourNumber: fourNumber} = MathHelper;
 
-const {floor: floor, ceil: ceil$1} = Math;
+const {floor: floor$1, ceil: ceil$1} = Math;
 
 let right, bottom, boundsRight, boundsBottom;
 
@@ -1411,8 +1358,8 @@ const BoundsHelper = {
     },
     ceil(t) {
         const {x: x, y: y} = t;
-        t.x = floor(t.x);
-        t.y = floor(t.y);
+        t.x = floor$1(t.x);
+        t.y = floor$1(t.y);
         t.width = x > t.x ? ceil$1(t.width + x - t.x) : ceil$1(t.width);
         t.height = y > t.y ? ceil$1(t.height + y - t.y) : ceil$1(t.height);
     },
@@ -1544,6 +1491,9 @@ const BoundsHelper = {
     isEmpty(t) {
         return t.x === 0 && t.y === 0 && t.width === 0 && t.height === 0;
     },
+    hasSize(t) {
+        return t.width && t.height;
+    },
     reset(t) {
         B.set(t);
     }
@@ -1720,6 +1670,12 @@ class AutoBounds {
     }
 }
 
+const UnitConvertHelper = {
+    number(value, percentRefer) {
+        return isObject(value) ? value.type === "percent" ? value.value * percentRefer : value.value : value;
+    }
+};
+
 const StringNumberMap = {
     0: 1,
     1: 1,
@@ -1736,6 +1692,69 @@ const StringNumberMap = {
     E: 1
 };
 
+const {floor: floor, max: max} = Math;
+
+const Platform = {
+    toURL(text, fileType) {
+        let url = encodeURIComponent(text);
+        if (fileType === "text") url = "data:text/plain;charset=utf-8," + url; else if (fileType === "svg") url = "data:image/svg+xml," + url;
+        return url;
+    },
+    image: {
+        hitCanvasSize: 100,
+        maxCacheSize: 2560 * 1600,
+        maxPatternSize: 4096 * 2160,
+        crossOrigin: "anonymous",
+        isLarge(size, scaleX, scaleY, largeSize) {
+            return size.width * size.height * (scaleX ? scaleX * scaleY : 1) > (largeSize || image.maxCacheSize);
+        },
+        isSuperLarge(size, scaleX, scaleY) {
+            return image.isLarge(size, scaleX, scaleY, image.maxPatternSize);
+        },
+        getRealURL(url) {
+            const {prefix: prefix, suffix: suffix} = image;
+            if (suffix && !url.startsWith("data:") && !url.startsWith("blob:")) url += (url.includes("?") ? "&" : "?") + suffix;
+            if (prefix && url[0] === "/") url = prefix + url;
+            return url;
+        },
+        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, 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;
+            ctx.imageSmoothingEnabled = smooth === false ? false : true;
+            if (image.canUse(view)) {
+                if (clip) {
+                    const scaleX = width / clip.width, scaleY = height / clip.height;
+                    ctx.setTransform(scaleX, 0, 0, scaleY, -clip.x * scaleX, -clip.y * scaleY);
+                    ctx.drawImage(view, 0, 0, view.width, view.height);
+                } else ctx.drawImage(view, 0, 0, width, height);
+                if (interlaceOffset) {
+                    ctx.drawImage(canvas, 0, 0, realWidth, realHeight, interlaceX ? interlaceOffset - realWidth : realWidth, interlaceX ? realHeight : interlaceOffset - realHeight, realWidth, realHeight);
+                    ctx.drawImage(canvas, 0, 0, realWidth, realHeight, interlaceX ? interlaceOffset : realWidth, interlaceX ? realHeight : interlaceOffset, realWidth, realHeight);
+                }
+            }
+            return canvas;
+        },
+        canUse(view) {
+            return view && view.width && !view.__closed;
+        },
+        setPatternTransform(pattern, transform, paint) {
+            try {
+                if (transform && pattern.setTransform) {
+                    pattern.setTransform(transform);
+                    transform = undefined;
+                }
+            } catch (_a) {}
+            if (paint) DataHelper.stintSet(paint, "transform", transform);
+        }
+    }
+};
+
+const {image: image} = Platform;
+
 const {randColor: randColor} = MathHelper;
 
 class Debug {
@@ -3291,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);
     },
@@ -3638,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];
@@ -3650,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);
                 }
@@ -3662,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:
@@ -3678,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;
@@ -3778,9 +3797,10 @@ class TaskItem {
     run() {
         return __awaiter(this, void 0, void 0, function*() {
             try {
-                if (this.isComplete) return;
+                if (this.isComplete || this.runing) return;
+                this.runing = true;
                 if (this.canUse && !this.canUse()) return this.cancel();
-                if (this.task && this.parent.running) yield this.task();
+                if (this.task) yield this.task();
             } catch (error) {
                 debug$4.error(error);
             }
@@ -3896,7 +3916,7 @@ class TaskProcessor {
     stop() {
         this.isComplete = true;
         this.list.forEach(task => {
-            if (!task.isComplete) task.cancel();
+            if (!task.isComplete) task.run();
         });
         this.pause();
         this.empty();
@@ -4186,7 +4206,7 @@ class LeaferImage {
     getFull(_filters) {
         return this.view;
     }
-    getCanvas(width, height, opacity, filters, xGap, yGap, smooth) {
+    getCanvas(width, height, opacity, filters, xGap, yGap, smooth, interlace) {
         width || (width = this.width);
         height || (height = this.height);
         if (this.cache) {
@@ -4199,7 +4219,7 @@ class LeaferImage {
             }
             if (data) return data;
         }
-        const canvas = Platform.image.resize(this.view, width, height, xGap, yGap, undefined, smooth, opacity, filters);
+        const canvas = Platform.image.resize(this.view, width, height, xGap, yGap, undefined, smooth, opacity, filters, interlace);
         this.cache = this.use > 1 ? {
             data: canvas,
             params: arguments
@@ -6091,7 +6111,7 @@ const LeafRender = {
     }
 };
 
-const {excludeRenderBounds: excludeRenderBounds} = LeafBoundsHelper;
+const {excludeRenderBounds: excludeRenderBounds} = LeafBoundsHelper, {hasSize: hasSize} = BoundsHelper;
 
 const BranchRender = {
     __updateChange() {
@@ -6103,8 +6123,8 @@ const BranchRender = {
         this.__.__checkSingle();
     },
     __render(canvas, options) {
-        this.__nowWorld = this.__getNowWorld(options);
-        if (this.__worldOpacity) {
+        const nowWorld = this.__nowWorld = this.__getNowWorld(options);
+        if (this.__worldOpacity && hasSize(nowWorld)) {
             const data = this.__;
             if (data.__useDim) {
                 if (data.dim) options.dimOpacity = data.dim === true ? .2 : data.dim; else if (data.bright && !options.topRendering) return options.topList.add(this); else if (data.dimskip) options.dimOpacity && (options.dimOpacity = 0);
@@ -6113,7 +6133,6 @@ const BranchRender = {
                 if (data.eraser === "path") return this.__renderEraser(canvas, options);
                 const tempCanvas = canvas.getSameCanvas(false, true);
                 this.__renderBranch(tempCanvas, options);
-                const nowWorld = this.__nowWorld;
                 canvas.opacity = options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
                 canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, data.__blendMode, true);
                 tempCanvas.recycle(nowWorld);
@@ -6953,7 +6972,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.12.4";
+const version = "2.0.1";
 
 exports.AlignHelper = AlignHelper;
 
@@ -7097,6 +7116,8 @@ exports.TwoPointBoundsHelper = TwoPointBoundsHelper;
 
 exports.UICreator = UICreator;
 
+exports.UnitConvertHelper = UnitConvertHelper;
+
 exports.WaitHelper = WaitHelper;
 
 exports.WatchEvent = WatchEvent;