@leafer/worker 1.12.4 → 2.0.0

package/dist/worker.js

@@ -199,56 +199,6 @@ var LeaferUI = function(exports) {
             this.__input = this.__middle = null;
         }
     }
-    const {floor: floor$3, max: max$7} = 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$1.maxCacheSize);
-            },
-            isSuperLarge(size, scaleX, scaleY) {
-                return image$1.isLarge(size, scaleX, scaleY, image$1.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$7(floor$3(width + (xGap || 0)), 1), max$7(floor$3(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$1} = Platform;
     const IncrementId = {
         RUNTIME: "runtime",
         LEAF: "leaf",
@@ -268,7 +218,7 @@ var LeaferUI = function(exports) {
     };
     const I$2 = IncrementId;
     let tempA, tempB, tempTo;
-    const {max: max$6} = Math, tempFour = [ 0, 0, 0, 0 ];
+    const {max: max$7} = Math, tempFour = [ 0, 0, 0, 0 ];
     const FourNumberHelper = {
         zero: [ ...tempFour ],
         tempFour: tempFour,
@@ -319,9 +269,9 @@ var LeaferUI = function(exports) {
             return data;
         },
         max(t, other, change) {
-            if (isNumber(t) && isNumber(other)) return max$6(t, other);
+            if (isNumber(t) && isNumber(other)) return max$7(t, other);
             toTempAB(t, other, change);
-            return set$2(tempTo, max$6(tempA[0], tempB[0]), max$6(tempA[1], tempB[1]), max$6(tempA[2], tempB[2]), max$6(tempA[3], tempB[3]));
+            return set$2(tempTo, max$7(tempA[0], tempB[0]), max$7(tempA[1], tempB[1]), max$7(tempA[2], tempB[2]), max$7(tempA[3], tempB[3]));
         },
         add(t, other, change) {
             if (isNumber(t) && isNumber(other)) return t + other;
@@ -336,7 +286,7 @@ var LeaferUI = function(exports) {
         }
     };
     const {set: set$2, get: get$5, setTemp: setTemp, toTempAB: toTempAB} = FourNumberHelper;
-    const {round: round$6, pow: pow$2, max: max$5, floor: floor$2, PI: PI$4} = Math;
+    const {round: round$6, pow: pow$2, max: max$6, floor: floor$3, PI: PI$4} = Math;
     const MathHelper = {
         within(value, min, max) {
             if (isObject(min)) max = min.max, min = min.min;
@@ -389,7 +339,7 @@ var LeaferUI = function(exports) {
             }
         },
         getFloorScale(num, min = 1) {
-            return max$5(floor$2(num), min) / num;
+            return max$6(floor$3(num), min) / num;
         },
         randInt: randInt,
         randColor(opacity) {
@@ -1195,7 +1145,7 @@ var LeaferUI = function(exports) {
     const {tempPointBounds: tempPointBounds$1, setPoint: setPoint$5, addPoint: addPoint$3, toBounds: toBounds$3} = TwoPointBoundsHelper;
     const {toOuterPoint: toOuterPoint$2} = MatrixHelper;
     const {float: float$3, fourNumber: fourNumber$1} = MathHelper;
-    const {floor: floor$1, ceil: ceil$2} = Math;
+    const {floor: floor$2, ceil: ceil$2} = Math;
     let right$4, bottom$3, boundsRight, boundsBottom;
     const point$2 = {};
     const toPoint$5 = {};
@@ -1347,8 +1297,8 @@ var LeaferUI = function(exports) {
         },
         ceil(t) {
             const {x: x, y: y} = t;
-            t.x = floor$1(t.x);
-            t.y = floor$1(t.y);
+            t.x = floor$2(t.x);
+            t.y = floor$2(t.y);
             t.width = x > t.x ? ceil$2(t.width + x - t.x) : ceil$2(t.width);
             t.height = y > t.y ? ceil$2(t.height + y - t.y) : ceil$2(t.height);
         },
@@ -1480,6 +1430,9 @@ var LeaferUI = function(exports) {
         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);
         }
@@ -1650,6 +1603,11 @@ var LeaferUI = function(exports) {
             return new Bounds(left, top, width ? width : parent.width - left - right, height ? height : parent.height - top - bottom);
         }
     }
+    const UnitConvertHelper = {
+        number(value, percentRefer) {
+            return isObject(value) ? value.type === "percent" ? value.value * percentRefer : value.value : value;
+        }
+    };
     const StringNumberMap = {
         0: 1,
         1: 1,
@@ -1665,6 +1623,66 @@ var LeaferUI = function(exports) {
         e: 1,
         E: 1
     };
+    const {floor: floor$1, max: max$5} = 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$1.maxCacheSize);
+            },
+            isSuperLarge(size, scaleX, scaleY) {
+                return image$1.isLarge(size, scaleX, scaleY, image$1.maxPatternSize);
+            },
+            getRealURL(url) {
+                const {prefix: prefix, suffix: suffix} = image$1;
+                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$5(floor$1(width + (xGap || 0)), 1), realHeight = max$5(floor$1(height + (yGap || 0)), 1);
+                let interlaceX, interlaceY, interlaceOffset;
+                if (interlace && (interlaceOffset = UnitConvertHelper.number(interlace.offset, (interlaceX = interlace.type === "x") ? width : height))) interlaceX || (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$1.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$1} = Platform;
     const {randColor: randColor} = MathHelper;
     class Debug {
         constructor(name) {
@@ -3551,9 +3569,10 @@ var LeaferUI = function(exports) {
         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$c.error(error);
                 }
@@ -3668,7 +3687,7 @@ var LeaferUI = function(exports) {
         stop() {
             this.isComplete = true;
             this.list.forEach(task => {
-                if (!task.isComplete) task.cancel();
+                if (!task.isComplete) task.run();
             });
             this.pause();
             this.empty();
@@ -3951,7 +3970,7 @@ var LeaferUI = function(exports) {
         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) {
@@ -3964,7 +3983,7 @@ var LeaferUI = function(exports) {
                 }
                 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
@@ -5706,7 +5725,7 @@ var LeaferUI = function(exports) {
             if (this.__layout.opacityChanged) this.__layout.opacityChanged = false;
         }
     };
-    const {excludeRenderBounds: excludeRenderBounds$1} = LeafBoundsHelper;
+    const {excludeRenderBounds: excludeRenderBounds$1} = LeafBoundsHelper, {hasSize: hasSize} = BoundsHelper;
     const BranchRender = {
         __updateChange() {
             const {__layout: layout} = this;
@@ -5717,8 +5736,8 @@ var LeaferUI = function(exports) {
             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);
@@ -5727,7 +5746,6 @@ var LeaferUI = function(exports) {
                     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);
@@ -6549,7 +6567,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "1.12.4";
+    const version = "2.0.0";
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -6949,6 +6967,7 @@ var LeaferUI = function(exports) {
             this.times = 0;
             this.config = {
                 usePartRender: true,
+                ceilPartPixel: true,
                 maxFPS: 120
             };
             this.frames = [];
@@ -7057,8 +7076,9 @@ var LeaferUI = function(exports) {
             const {canvas: canvas} = this, bounds = block.getIntersect(canvas.bounds), realBounds = new Bounds(bounds);
             canvas.save();
             bounds.spread(Renderer.clipSpread).ceil();
-            canvas.clearWorld(bounds);
-            canvas.clipWorld(bounds);
+            const {ceilPartPixel: ceilPartPixel} = this.config;
+            canvas.clipWorld(bounds, ceilPartPixel);
+            canvas.clearWorld(bounds, ceilPartPixel);
             this.__render(bounds, realBounds);
             canvas.restore();
             Run.end(t);
@@ -7440,11 +7460,7 @@ var LeaferUI = function(exports) {
     const ColorConvert = {
         hasTransparent: hasTransparent$3
     };
-    const UnitConvert = {
-        number(value, percentRefer) {
-            return isObject(value) ? value.type === "percent" ? value.value * percentRefer : value.value : value;
-        }
-    };
+    const UnitConvert = UnitConvertHelper;
     const PathArrow = {};
     const Paint = {};
     const PaintImage = {};
@@ -8662,9 +8678,10 @@ var LeaferUI = function(exports) {
             const {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = this.__;
             const rx = width / 2, ry = height / 2;
             const path = this.__.path = [];
+            let open;
             if (innerRadius) {
                 if (startAngle || endAngle) {
-                    if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false);
+                    if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false); else open = true;
                     ellipse(path, rx, ry, rx, ry, 0, endAngle, startAngle, true);
                 } else {
                     if (innerRadius < 1) {
@@ -8681,7 +8698,7 @@ var LeaferUI = function(exports) {
                     ellipse(path, rx, ry, rx, ry);
                 }
             }
-            closePath$2(path);
+            if (!open) closePath$2(path);
             if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
         }
     };
@@ -10347,6 +10364,7 @@ var LeaferUI = function(exports) {
             ImageManager.patternLocked = true;
             this.__renderShape(h, {
                 matrix: matrix$2.setWith(this.__world).scaleWith(1 / scale).invertWith().translate(-x, -y),
+                snapshot: true,
                 ignoreFill: !isHitPixelFill,
                 ignoreStroke: !isHitPixelStroke
             });
@@ -10873,7 +10891,7 @@ var LeaferUI = function(exports) {
         if (paint.padding) box = tempBox.set(box).shrink(paint.padding);
         if (paint.mode === "strench") paint.mode = "stretch";
         const {width: width, height: height} = image;
-        const {opacity: opacity, mode: mode, align: align, offset: offset, scale: scale, size: size, rotation: rotation, skew: skew, clipSize: clipSize, repeat: repeat, gap: gap, filters: filters} = paint;
+        const {opacity: opacity, mode: mode, align: align, offset: offset, scale: scale, size: size, rotation: rotation, skew: skew, clipSize: clipSize, repeat: repeat, gap: gap, filters: filters, interlace: interlace} = paint;
         const sameBox = box.width === width && box.height === height;
         const data = {
             mode: mode
@@ -10939,6 +10957,10 @@ var LeaferUI = function(exports) {
         if (opacity && opacity < 1) data.opacity = opacity;
         if (filters) data.filters = filters;
         if (repeat) data.repeat = isString(repeat) ? repeat === "x" ? "repeat-x" : "repeat-y" : "repeat";
+        if (interlace) data.interlace = isNumber(interlace) || interlace.type === "percent" ? {
+            type: "x",
+            offset: interlace
+        } : interlace;
         return data;
     }
     function getGapData(gap, repeat, width, height, box) {
@@ -11059,7 +11081,7 @@ var LeaferUI = function(exports) {
                     if (transform) copy$4(imageMatrix, transform);
                     scale$1(imageMatrix, 1 / scaleX, 1 / scaleY);
                 }
-                const imageCanvas = image.getCanvas(width, height, data.opacity, data.filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth);
+                const imageCanvas = image.getCanvas(width, height, data.opacity, data.filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
                 const pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
                 paint.style = pattern;
                 paint.patternId = id;
@@ -11079,8 +11101,8 @@ var LeaferUI = function(exports) {
     }
     function checkImage(paint, drawImage, ui, canvas, renderOptions) {
         const {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions);
-        const {image: image, data: data, originPaint: originPaint} = paint, {exporting: exporting} = renderOptions;
-        if (!data || paint.patternId === scaleX + "-" + scaleY && !exporting) {
+        const {image: image, data: data, originPaint: originPaint} = paint, {exporting: exporting, snapshot: snapshot} = renderOptions;
+        if (!data || paint.patternId === scaleX + "-" + scaleY && !exporting || snapshot) {
             return false;
         } else {
             if (drawImage) {
@@ -11673,7 +11695,7 @@ var LeaferUI = function(exports) {
     const TextMode = 2;
     function layoutChar(drawData, style, width, _height) {
         const {rows: rows} = drawData;
-        const {textAlign: textAlign, paraIndent: paraIndent, letterSpacing: letterSpacing} = style;
+        const {textAlign: textAlign, paraIndent: paraIndent, __letterSpacing: __letterSpacing} = style;
         const justifyLast = width && textAlign.includes("both");
         const justify = justifyLast || width && textAlign.includes("justify");
         const justifyLetter = justify && textAlign.includes("letter");
@@ -11686,8 +11708,8 @@ var LeaferUI = function(exports) {
                     remainingWidth = width - row.width - indentWidth;
                     if (justifyLetter) addLetterWidth = remainingWidth / (row.words.reduce((total, item) => total + item.data.length, 0) - 1); else addWordWidth = wordsLength > 1 ? remainingWidth / (wordsLength - 1) : 0;
                 }
-                mode = letterSpacing || row.isOverflow || justifyLetter ? CharMode : addWordWidth ? WordMode : TextMode;
-                if (row.isOverflow && !letterSpacing) row.textMode = true;
+                mode = __letterSpacing || row.isOverflow || justifyLetter ? CharMode : addWordWidth ? WordMode : TextMode;
+                if (row.isOverflow && !__letterSpacing) row.textMode = true;
                 if (mode === TextMode) {
                     row.x += indentWidth;
                     toTextChar$1(row);
@@ -15108,13 +15130,14 @@ var LeaferUI = function(exports) {
         LeaferTypeCreator.run(type, this);
     };
     leafer.getValidMove = function(moveX, moveY, checkLimit = true) {
-        const {disabled: disabled} = this.app.config.move;
+        const {disabled: disabled, scrollSpread: scrollSpread} = this.app.config.move;
         move$4.set(moveX, moveY);
         const scrollType = getScrollType(this);
         if (scrollType) {
             if (scrollType.includes("x")) move$4.y = 0; else if (scrollType.includes("y")) move$4.x = 0; else Math.abs(move$4.x) > Math.abs(move$4.y) ? move$4.y = 0 : move$4.x = 0;
             if (checkLimit && scrollType.includes("limit")) {
                 bounds.set(this.__world).addPoint(this.zoomLayer);
+                if (scrollSpread) bounds.spread(scrollSpread);
                 DragBoundsHelper.getValidMove(bounds, this.canvas.bounds, "auto", move$4, true);
                 if (scrollType.includes("x")) move$4.y = 0; else if (scrollType.includes("y")) move$4.x = 0;
             }
@@ -18494,7 +18517,13 @@ var LeaferUI = function(exports) {
                     MathHelper.getScaleData(options.scale, options.size, renderBounds, scaleData);
                     let pixelRatio = options.pixelRatio || 1;
                     let {x: x, y: y, width: width, height: height} = new Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY);
-                    if (clip) x += clip.x, y += clip.y, width = clip.width, height = clip.height;
+                    if (clip) {
+                        x += clip.x, y += clip.y, width = clip.width, height = clip.height;
+                        if (clip.rotation) matrix.rotateOfInner({
+                            x: x,
+                            y: y
+                        }, -clip.rotation);
+                    }
                     const renderOptions = {
                         exporting: true,
                         matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY)
@@ -18817,6 +18846,7 @@ var LeaferUI = function(exports) {
     exports.UIEvent = UIEvent;
     exports.UIRender = UIRender;
     exports.UnitConvert = UnitConvert;
+    exports.UnitConvertHelper = UnitConvertHelper;
     exports.WaitHelper = WaitHelper;
     exports.WatchEvent = WatchEvent;
     exports.Watcher = Watcher;