@leafer/worker 1.11.2 → 1.12.1

package/dist/worker.module.js

@@ -4056,16 +4056,27 @@ const ImageManager = {
     recycle(image) {
         image.use--;
         setTimeout(() => {
-            if (!image.use) I$1.recycledList.push(image);
+            if (!image.use) {
+                if (Platform.image.isLarge(image)) {
+                    if (image.url) Resource.remove(image.url);
+                } else {
+                    image.clearLevels();
+                    I$1.recycledList.push(image);
+                }
+            }
         });
     },
-    clearRecycled() {
+    recyclePaint(paint) {
+        I$1.recycle(paint.image);
+    },
+    clearRecycled(force) {
         const list = I$1.recycledList;
-        if (list.length > I$1.maxRecycled) {
-            list.forEach(image => !image.use && image.url && Resource.remove(image.url));
+        if (list.length > I$1.maxRecycled || force) {
+            list.forEach(image => (!image.use || force) && image.url && Resource.remove(image.url));
             list.length = 0;
         }
     },
+    clearLevels() {},
     hasAlphaPixel(config) {
         return FileHelper.alphaPixelTypes.some(item => I$1.isFormat(item, config));
     },
@@ -4080,7 +4091,7 @@ const ImageManager = {
         return false;
     },
     destroy() {
-        I$1.recycledList = [];
+        this.clearRecycled(true);
     }
 };
 
@@ -4183,11 +4194,15 @@ class LeaferImage {
         Platform.image.setPatternTransform(pattern, transform, paint);
         return pattern;
     }
+    clearLevels(_checkUse) {}
     destroy() {
+        this.clearLevels();
+        const {view: view} = this;
+        if (view && view.close) view.close();
         this.config = {
             url: ""
         };
-        this.cache = null;
+        this.cache = this.view = null;
         this.waitComplete.length = 0;
     }
 }
@@ -4936,10 +4951,53 @@ const BranchHelper = {
             if (exclude && exclude === branch) continue;
             updateBounds$4(branch);
         }
+    },
+    move(branch, x, y) {
+        let w;
+        const {children: children} = branch;
+        for (let i = 0, len = children.length; i < len; i++) {
+            branch = children[i];
+            w = branch.__world;
+            w.e += x;
+            w.f += y;
+            w.x += x;
+            w.y += y;
+            if (branch.isBranch) move$9(branch, x, y);
+        }
+    },
+    scale(branch, x, y, scaleX, scaleY, a, b) {
+        let w;
+        const {children: children} = branch;
+        const changeScaleX = scaleX - 1;
+        const changeScaleY = scaleY - 1;
+        for (let i = 0, len = children.length; i < len; i++) {
+            branch = children[i];
+            w = branch.__world;
+            w.a *= scaleX;
+            w.d *= scaleY;
+            if (w.b || w.c) {
+                w.b *= scaleX;
+                w.c *= scaleY;
+            }
+            if (w.e === w.x && w.f === w.y) {
+                w.x = w.e += (w.e - a) * changeScaleX + x;
+                w.y = w.f += (w.f - b) * changeScaleY + y;
+            } else {
+                w.e += (w.e - a) * changeScaleX + x;
+                w.f += (w.f - b) * changeScaleY + y;
+                w.x += (w.x - a) * changeScaleX + x;
+                w.y += (w.y - b) * changeScaleY + y;
+            }
+            w.width *= scaleX;
+            w.height *= scaleY;
+            w.scaleX *= scaleX;
+            w.scaleY *= scaleY;
+            if (branch.isBranch) scale$2(branch, x, y, scaleX, scaleY, a, b);
+        }
     }
 };
 
-const {pushAllChildBranch: pushAllChildBranch$1, pushAllBranchStack: pushAllBranchStack, updateBoundsByBranchStack: updateBoundsByBranchStack} = BranchHelper;
+const {pushAllChildBranch: pushAllChildBranch$1, pushAllBranchStack: pushAllBranchStack, updateBoundsByBranchStack: updateBoundsByBranchStack, move: move$9, scale: scale$2} = BranchHelper;
 
 const WaitHelper = {
     run(wait) {
@@ -5966,6 +6024,7 @@ const LeafBounds = {
 const LeafRender = {
     __render(canvas, options) {
         if (options.shape) return this.__renderShape(canvas, options);
+        if (options.cellList && !options.cellList.has(this)) return;
         if (this.__worldOpacity) {
             const data = this.__;
             if (data.bright && !options.topRendering) return options.topList.add(this);
@@ -6502,10 +6561,10 @@ let Leaf = class Leaf {
     hit(_world, _hitRadius) {
         return true;
     }
-    __hitWorld(_point) {
+    __hitWorld(_point, _forceHitFill) {
         return true;
     }
-    __hit(_local) {
+    __hit(_local, _forceHitFill) {
         return true;
     }
     __hitFill(_inner) {
@@ -6864,7 +6923,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.11.2";
+const version = "1.12.1";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -6981,7 +7040,7 @@ class Watcher {
         return this.hasAdd || this.hasRemove || this.hasVisible;
     }
     get updatedList() {
-        if (this.hasRemove) {
+        if (this.hasRemove && this.config.usePartLayout) {
             const updatedList = new LeafList;
             this.__updatedList.list.forEach(item => {
                 if (item.leafer) updatedList.add(item);
@@ -7016,16 +7075,18 @@ class Watcher {
         if (this.running) this.target.emit(RenderEvent.REQUEST);
     }
     __onAttrChange(event) {
-        this.__updatedList.add(event.target);
+        if (this.config.usePartLayout) this.__updatedList.add(event.target);
         this.update();
     }
     __onChildEvent(event) {
-        if (event.type === ChildEvent.ADD) {
-            this.hasAdd = true;
-            this.__pushChild(event.child);
-        } else {
-            this.hasRemove = true;
-            this.__updatedList.add(event.parent);
+        if (this.config.usePartLayout) {
+            if (event.type === ChildEvent.ADD) {
+                this.hasAdd = true;
+                this.__pushChild(event.child);
+            } else {
+                this.hasRemove = true;
+                this.__updatedList.add(event.parent);
+            }
         }
         this.update();
     }
@@ -7142,7 +7203,9 @@ const debug$7 = Debug.get("Layouter");
 class Layouter {
     constructor(target, userConfig) {
         this.totalTimes = 0;
-        this.config = {};
+        this.config = {
+            usePartLayout: true
+        };
         this.__levelList = new LeafLevelList;
         this.target = target;
         if (userConfig) this.config = DataHelper.default(userConfig, this.config);
@@ -7187,7 +7250,7 @@ class Layouter {
         this.totalTimes++;
         this.layouting = true;
         this.target.emit(WatchEvent.REQUEST);
-        if (this.totalTimes > 1) {
+        if (this.totalTimes > 1 && this.config.usePartLayout) {
             this.partLayout();
         } else {
             this.fullLayout();
@@ -7304,7 +7367,7 @@ class Renderer {
     }
     update(change = true) {
         if (!this.changed) this.changed = change;
-        this.__requestRender();
+        if (!this.requestTime) this.__requestRender();
     }
     requestLayout() {
         this.target.emit(LayoutEvent.REQUEST);
@@ -7411,7 +7474,7 @@ class Renderer {
         Run.end(t);
     }
     __render(bounds, realBounds) {
-        const {canvas: canvas} = this, includes = bounds.includes(this.target.__world), options = includes ? {
+        const {canvas: canvas, target: target} = this, includes = bounds.includes(target.__world), options = includes ? {
             includes: includes
         } : {
             bounds: bounds,
@@ -7419,12 +7482,16 @@ class Renderer {
         };
         if (this.needFill) canvas.fillWorld(bounds, this.config.fill);
         if (Debug.showRepaint) Debug.drawRepaint(canvas, bounds);
-        Platform.render(this.target, canvas, options);
+        if (this.config.useCellRender) options.cellList = this.getCellList();
+        Platform.render(target, canvas, options);
         this.renderBounds = realBounds = realBounds || bounds;
         this.renderOptions = options;
         this.totalBounds.isEmpty() ? this.totalBounds = realBounds : this.totalBounds.add(realBounds);
         canvas.updateRender(realBounds);
     }
+    getCellList() {
+        return undefined;
+    }
     addBlock(block) {
         if (!this.updateBlocks) this.updateBlocks = [];
         this.updateBlocks.push(block);
@@ -7639,7 +7706,7 @@ class Picker {
             hit = child.__.hitRadius ? true : hitRadiusPoint$1(child.__world, point);
             if (child.isBranch) {
                 if (hit || child.__ignoreHitWorld) {
-                    if (child.isBranchLeaf && child.__.__clipAfterFill && !child.__hitWorld(point)) continue;
+                    if (child.isBranchLeaf && child.__.__clipAfterFill && !child.__hitWorld(point, true)) continue;
                     if (child.topChildren) this.eachFind(child.topChildren, false);
                     this.eachFind(child.children, child.__onlyHitMask);
                     if (child.isBranchLeaf) this.hitChild(child, point);
@@ -8081,6 +8148,11 @@ class TextData extends UIData {
         }
         this._boxStyle = value;
     }
+    __getInputData(names, options) {
+        const data = super.__getInputData(names, options);
+        if (data.textEditing) delete data.textEditing;
+        return data;
+    }
 }
 
 class ImageData extends RectData {
@@ -10953,7 +11025,7 @@ leaf$1.hit = function(worldPoint, hitRadius = 0) {
     }) : this.__hitWorld(worldRadiusPoint);
 };
 
-leaf$1.__hitWorld = function(point) {
+leaf$1.__hitWorld = function(point, forceHitFill) {
     const data = this.__;
     if (!data.hitSelf) return false;
     const world = this.__world, layout = this.__layout;
@@ -10971,7 +11043,7 @@ leaf$1.__hitWorld = function(point) {
         this.__updateHitCanvas();
         if (!layout.boundsChanged) layout.hitCanvasChanged = false;
     }
-    return this.__hit(inner);
+    return this.__hit(inner, forceHitFill);
 };
 
 leaf$1.__hitFill = function(inner) {
@@ -11038,12 +11110,12 @@ ui$5.__updateHitCanvas = function() {
     h.setStrokeOptions(data);
 };
 
-ui$5.__hit = function(inner) {
+ui$5.__hit = function(inner, forceHitFill) {
     if (this.__box && this.__box.__hit(inner)) return true;
     const data = this.__;
     if (data.__isHitPixel && this.__hitPixel(inner)) return true;
     const {hitFill: hitFill} = data;
-    const needHitFillPath = (data.fill || data.__isCanvas) && (hitFill === "path" || hitFill === "pixel" && !(data.__isAlphaPixelFill || data.__isCanvas)) || hitFill === "all";
+    const needHitFillPath = (data.fill || data.__isCanvas) && (hitFill === "path" || hitFill === "pixel" && !(data.__isAlphaPixelFill || data.__isCanvas)) || hitFill === "all" || forceHitFill;
     if (needHitFillPath && this.__hitFill(inner)) return true;
     const {hitStroke: hitStroke, __maxStrokeWidth: strokeWidth} = data;
     const needHitStrokePath = data.stroke && (hitStroke === "path" || hitStroke === "pixel" && !data.__isAlphaPixelStroke) || hitStroke === "all";
@@ -11420,6 +11492,7 @@ function getLeafPaint(attrName, paint, ui) {
     const {boxBounds: boxBounds} = ui.__layout;
     switch (paint.type) {
       case "image":
+        if (!paint.url) return undefined;
         leafPaint = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url]);
         break;
 
@@ -11760,7 +11833,7 @@ function layout$3(transform, box, x, y, scaleX, scaleY, rotation, skew) {
     translate(transform, box.x + x, box.y + y);
 }
 
-const {get: get$1, scale: scale$2, copy: copy$4} = MatrixHelper;
+const {get: get$1, scale: scale$1, copy: copy$4} = MatrixHelper;
 
 const {getFloorScale: getFloorScale} = MathHelper, {abs: abs$6} = Math;
 
@@ -11792,7 +11865,7 @@ function createPattern(paint, ui, canvas, renderOptions) {
                 scaleY *= getFloorScale(height + (yGap || 0));
                 imageMatrix = get$1();
                 if (transform) copy$4(imageMatrix, transform);
-                scale$2(imageMatrix, 1 / scaleX, 1 / scaleY);
+                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 pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
@@ -11824,7 +11897,7 @@ function checkImage(paint, drawImage, ui, canvas, renderOptions) {
             if (data.repeat) {
                 drawImage = false;
             } else if (!(originPaint.changeful || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
-                drawImage = Platform.image.isLarge(image, scaleX, scaleY);
+                drawImage = Platform.image.isLarge(image, scaleX, scaleY) || image.width * scaleX > 8096 || image.height * scaleY > 8096;
             }
         }
         if (drawImage) {
@@ -11883,7 +11956,7 @@ function recycleImage(attrName, data) {
             if (url) {
                 if (!recycleMap) recycleMap = {};
                 recycleMap[url] = true;
-                ImageManager.recycle(image);
+                ImageManager.recyclePaint(paint);
                 if (image.loading) {
                     if (!input) {
                         input = data.__input && data.__input[attrName] || [];
@@ -12901,7 +12974,7 @@ function mergeConfigAttr() {
 
 const {abs: abs$4} = Math;
 
-const {copy: copy$2, scale: scale$1} = MatrixHelper;
+const {copy: copy$2} = MatrixHelper;
 
 const {setListWithFn: setListWithFn} = BoundsHelper;
 
@@ -12945,19 +13018,10 @@ class Stroker extends UI {
                     const aScaleX = abs$4(worldTransform.scaleX), aScaleY = abs$4(worldTransform.scaleY);
                     copy$2(matrix$1, worldTransform);
                     matrix$1.half = strokeWidth % 2;
-                    if (aScaleX !== aScaleY) {
-                        scale$1(matrix$1, 1 / aScaleX, 1 / aScaleY);
-                        canvas.setWorld(matrix$1, options.matrix);
-                        canvas.beginPath();
-                        data.strokeWidth = strokeWidth;
-                        const {x: x, y: y, width: width, height: height} = leaf.__layout.boxBounds;
-                        canvas.rect(x * aScaleX, y * aScaleY, width * aScaleX, height * aScaleY);
-                    } else {
-                        canvas.setWorld(matrix$1, options.matrix);
-                        canvas.beginPath();
-                        if (leaf.__.__useArrow) leaf.__drawPath(canvas); else leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas);
-                        data.strokeWidth = strokeWidth / abs$4(worldTransform.scaleX);
-                    }
+                    canvas.setWorld(matrix$1, options.matrix);
+                    canvas.beginPath();
+                    if (leaf.__.__useArrow) leaf.__drawPath(canvas); else leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas);
+                    data.strokeWidth = strokeWidth / Math.max(aScaleX, aScaleY);
                     if (stroke) isString(stroke) ? Paint.stroke(stroke, this, canvas, options) : Paint.strokes(stroke, this, canvas, options);
                     if (fill) isString(fill) ? Paint.fill(fill, this, canvas, options) : Paint.fills(fill, this, canvas, options);
                 }