@leafer-ui/worker 2.0.1 → 2.0.3

package/dist/worker.js

@@ -7,6 +7,42 @@ var LeaferUI = function(exports) {
         PathNodeHandleType[PathNodeHandleType["mirrorAngle"] = 3] = "mirrorAngle";
         PathNodeHandleType[PathNodeHandleType["mirror"] = 4] = "mirror";
     })(exports.PathNodeHandleType || (exports.PathNodeHandleType = {}));
+    function __decorate(decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    }
+    function __awaiter(thisArg, _arguments, P, generator) {
+        function adopt(value) {
+            return value instanceof P ? value : new P(function(resolve) {
+                resolve(value);
+            });
+        }
+        return new (P || (P = Promise))(function(resolve, reject) {
+            function fulfilled(value) {
+                try {
+                    step(generator.next(value));
+                } catch (e) {
+                    reject(e);
+                }
+            }
+            function rejected(value) {
+                try {
+                    step(generator["throw"](value));
+                } catch (e) {
+                    reject(e);
+                }
+            }
+            function step(result) {
+                result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+            }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    }
+    typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
     exports.Answer = void 0;
     (function(Answer) {
         Answer[Answer["No"] = 0] = "No";
@@ -197,6 +233,7 @@ var LeaferUI = function(exports) {
         }
         destroy() {
             this.__input = this.__middle = null;
+            if (this.__complexData) this.__complexData.destroy();
         }
     }
     const IncrementId = {
@@ -287,6 +324,7 @@ var LeaferUI = function(exports) {
     };
     const {set: set$2, get: get$5, setTemp: setTemp, toTempAB: toTempAB} = FourNumberHelper;
     const {round: round$3, pow: pow$1, max: max$4, floor: floor$2, PI: PI$3} = Math;
+    const tempScaleData$1 = {};
     const MathHelper = {
         within(value, min, max) {
             if (isObject(min)) max = min.max, min = min.min;
@@ -330,6 +368,24 @@ var LeaferUI = function(exports) {
             } else if (scale) MathHelper.assignScale(scaleData, scale);
             return scaleData;
         },
+        getScaleFixedData(worldScaleData, scaleFixed, unscale, abs, _localScaleData) {
+            let {scaleX: scaleX, scaleY: scaleY} = worldScaleData;
+            if (abs || scaleFixed) scaleX < 0 && (scaleX = -scaleX), scaleY < 0 && (scaleY = -scaleY);
+            if (scaleFixed) {
+                if (scaleFixed === true) {
+                    scaleX = scaleY = unscale ? 1 : 1 / scaleX;
+                } else {
+                    let minScale;
+                    if (isNumber(scaleFixed)) minScale = scaleFixed; else if (scaleFixed === "zoom-in") minScale = 1;
+                    if (minScale) {
+                        if (scaleX > minScale || scaleY > minScale) scaleX = scaleY = unscale ? 1 : 1 / scaleX; else scaleX = scaleY = unscale ? 1 : 1 / minScale;
+                    }
+                }
+            }
+            tempScaleData$1.scaleX = scaleX;
+            tempScaleData$1.scaleY = scaleY;
+            return tempScaleData$1;
+        },
         assignScale(scaleData, scale) {
             if (isNumber(scale)) {
                 scaleData.scaleX = scaleData.scaleY = scale;
@@ -809,8 +865,8 @@ var LeaferUI = function(exports) {
             if (isObject(originPoints[0])) points = [], originPoints.forEach(p => points.push(p.x, p.y));
             return points;
         },
-        isSame(t, point) {
-            return float$2(t.x) === float$2(point.x) && float$2(t.y) === float$2(point.y);
+        isSame(t, point, quick) {
+            return quick ? t.x === point.x && t.y === point.y : float$2(t.x) === float$2(point.x) && float$2(t.y) === float$2(point.y);
         },
         reset(t) {
             P$5.reset(t);
@@ -882,8 +938,8 @@ var LeaferUI = function(exports) {
         getAtan2(to) {
             return PointHelper.getAtan2(this, to);
         }
-        isSame(point) {
-            return PointHelper.isSame(this, point);
+        isSame(point, quick) {
+            return PointHelper.isSame(this, point, quick);
         }
         reset() {
             PointHelper.reset(this);
@@ -1127,9 +1183,9 @@ var LeaferUI = function(exports) {
             }
             if (!onlyBoxSize) to.x += box.x, to.y += box.y;
         },
-        getPoint(around, box, to) {
+        getPoint(around, box, to, onlyBoxSize = true) {
             if (!to) to = {};
-            AroundHelper.toPoint(around, box, to, true);
+            AroundHelper.toPoint(around, box, to, onlyBoxSize);
             return to;
         }
     };
@@ -1384,6 +1440,9 @@ var LeaferUI = function(exports) {
                 y: y + height
             } ];
         },
+        getPoint(t, around, onlyBoxSize = false, to) {
+            return AroundHelper.getPoint(around, t, to, onlyBoxSize);
+        },
         hitRadiusPoint(t, point, pointMatrix) {
             if (pointMatrix) point = PointHelper.tempToInnerRadiusPointOf(point, pointMatrix);
             return point.x >= t.x - point.radiusX && point.x <= t.x + t.width + point.radiusX && (point.y >= t.y - point.radiusY && point.y <= t.y + t.height + point.radiusY);
@@ -1552,6 +1611,9 @@ var LeaferUI = function(exports) {
         getPoints() {
             return BoundsHelper.getPoints(this);
         }
+        getPoint(around, onlyBoxSize, to) {
+            return BoundsHelper.getPoint(this, around, onlyBoxSize, to);
+        }
         hitPoint(point, pointMatrix) {
             return BoundsHelper.hitPoint(this, point, pointMatrix);
         }
@@ -1803,7 +1865,10 @@ var LeaferUI = function(exports) {
             list$1[tag] = UI;
         },
         get(tag, data, x, y, width, height) {
-            if (!list$1[tag]) debug$e.error("not register " + tag);
+            if (!list$1[tag]) {
+                debug$e.warn("not register " + tag);
+                return undefined;
+            }
             const ui = new list$1[tag](data);
             if (!isUndefined(x)) {
                 ui.x = x;
@@ -1888,42 +1953,6 @@ var LeaferUI = function(exports) {
             this.clear();
         }
     }
-    function __decorate(decorators, target, key, desc) {
-        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-        return c > 3 && r && Object.defineProperty(target, key, r), r;
-    }
-    function __awaiter(thisArg, _arguments, P, generator) {
-        function adopt(value) {
-            return value instanceof P ? value : new P(function(resolve) {
-                resolve(value);
-            });
-        }
-        return new (P || (P = Promise))(function(resolve, reject) {
-            function fulfilled(value) {
-                try {
-                    step(generator.next(value));
-                } catch (e) {
-                    reject(e);
-                }
-            }
-            function rejected(value) {
-                try {
-                    step(generator["throw"](value));
-                } catch (e) {
-                    reject(e);
-                }
-            }
-            function step(result) {
-                result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-            }
-            step((generator = generator.apply(thisArg, _arguments || [])).next());
-        });
-    }
-    typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
-        var e = new Error(message);
-        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-    };
     function contextAttr(realName) {
         return (target, key) => {
             if (!realName) realName = key;
@@ -3523,10 +3552,10 @@ var LeaferUI = function(exports) {
     const FileHelper = {
         alphaPixelTypes: [ "png", "webp", "svg" ],
         upperCaseTypeMap: {},
-        mineType(type) {
-            if (!type || type.startsWith("image")) return type;
+        mimeType(type, base = "image") {
+            if (!type || type.startsWith(base)) return type;
             if (type === "jpg") type = "jpeg";
-            return "image/" + type;
+            return base + "/" + type;
         },
         fileType(filename) {
             const l = filename.split(".");
@@ -3557,6 +3586,7 @@ var LeaferUI = function(exports) {
         }
     };
     const F = FileHelper;
+    F.mineType = F.mimeType;
     F.alphaPixelTypes.forEach(type => F.upperCaseTypeMap[type] = type.toUpperCase());
     const debug$9 = Debug.get("TaskProcessor");
     class TaskItem {
@@ -3796,6 +3826,9 @@ var LeaferUI = function(exports) {
     const debug$8 = Debug.get("Resource");
     const Resource = {
         tasker: new TaskProcessor,
+        queue: new TaskProcessor({
+            parallel: 1
+        }),
         map: {},
         get isComplete() {
             return R.tasker.isComplete;
@@ -3832,6 +3865,12 @@ var LeaferUI = function(exports) {
             R.set(key, value);
             return value;
         },
+        loadFilm(_key, _format) {
+            return undefined;
+        },
+        loadVideo(_key, _format) {
+            return undefined;
+        },
         destroy() {
             R.map = {};
         }
@@ -3840,16 +3879,15 @@ var LeaferUI = function(exports) {
     const ImageManager = {
         maxRecycled: 10,
         recycledList: [],
-        patternTasker: new TaskProcessor({
-            parallel: 1
-        }),
-        get(config) {
+        patternTasker: Resource.queue,
+        get(config, type) {
             let image = Resource.get(config.url);
-            if (!image) Resource.set(config.url, image = Creator.image(config));
+            if (!image) Resource.set(config.url, image = type === "film" ? Creator.film(config) : Creator.image(config));
             image.use++;
             return image;
         },
         recycle(image) {
+            if (image.parent) image = image.parent;
             image.use--;
             setTimeout(() => {
                 if (!image.use) {
@@ -3880,7 +3918,7 @@ var LeaferUI = function(exports) {
             if (config.format) return config.format === format;
             const {url: url} = config;
             if (url.startsWith("data:")) {
-                if (url.startsWith("data:" + FileHelper.mineType(format))) return true;
+                if (url.startsWith("data:" + FileHelper.mimeType(format))) return true;
             } else {
                 if (url.includes("." + format) || url.includes("." + FileHelper.upperCaseTypeMap[format])) return true; else if (format === "png" && !url.includes(".")) return true;
             }
@@ -3893,6 +3931,9 @@ var LeaferUI = function(exports) {
     const I$1 = ImageManager;
     const {IMAGE: IMAGE, create: create$1} = IncrementId;
     class LeaferImage {
+        get tag() {
+            return "Image";
+        }
         get url() {
             return this.config.url;
         }
@@ -3921,7 +3962,7 @@ var LeaferUI = function(exports) {
             if (!this.loading) {
                 this.loading = true;
                 Resource.tasker.add(() => __awaiter(this, void 0, void 0, function*() {
-                    return yield Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
+                    return yield Platform.origin["load" + this.tag](this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
                         if (thumbSize) this.setThumbView(img);
                         this.setView(img);
                     }).catch(e => {
@@ -3995,6 +4036,9 @@ var LeaferUI = function(exports) {
             Platform.image.setPatternTransform(pattern, transform, paint);
             return pattern;
         }
+        render(canvas, x, y, width, height, _leaf, _paint, _imageScaleX, _imageScaleY) {
+            canvas.drawImage(this.view, x, y, width, height);
+        }
         getLoadUrl(_thumbSize) {
             return this.url;
         }
@@ -4009,8 +4053,10 @@ var LeaferUI = function(exports) {
             return undefined;
         }
         clearLevels(_checkUse) {}
+        destroyFilter() {}
         destroy() {
             this.clearLevels();
+            this.destroyFilter();
             const {view: view} = this;
             if (view && view.close) view.close();
             this.config = {
@@ -4020,6 +4066,16 @@ var LeaferUI = function(exports) {
             this.waitComplete.length = 0;
         }
     }
+    class LeaferFilm extends LeaferImage {
+        get tag() {
+            return "Film";
+        }
+    }
+    class LeaferVideo extends LeaferImage {
+        get tag() {
+            return "Video";
+        }
+    }
     function defineKey(target, key, descriptor, noConfigurable) {
         if (!noConfigurable) descriptor.configurable = descriptor.enumerable = true;
         Object.defineProperty(target, key, descriptor);
@@ -4171,7 +4227,6 @@ var LeaferUI = function(exports) {
                 if (this.__setAttr(key, value)) {
                     const data = this.__;
                     DataHelper.stintSet(data, "__useDim", data.dim || data.bright || data.dimskip);
-                    this.__layout.surfaceChange();
                 }
             }
         }));
@@ -4216,7 +4271,6 @@ var LeaferUI = function(exports) {
         return decorateLeafAttr(defaultValue, key => attr({
             set(value) {
                 if (this.__setAttr(key, value)) {
-                    this.__layout.surfaceChange();
                     this.waitParent(() => {
                         this.parent.__layout.childrenSortChange();
                     });
@@ -4250,7 +4304,6 @@ var LeaferUI = function(exports) {
             set(value) {
                 if (this.__setAttr(key, value)) {
                     this.__layout.hitCanvasChanged = true;
-                    if (Debug.showBounds === "hit") this.__layout.surfaceChange();
                     if (this.leafer) this.leafer.updateCursor();
                 }
             }
@@ -4438,6 +4491,10 @@ var LeaferUI = function(exports) {
             if (layout.stateStyleChanged) leaf.updateState();
             if (layout.opacityChanged) updateAllWorldOpacity(leaf);
             leaf.__updateChange();
+            if (layout.surfaceChanged) {
+                if (leaf.__hasComplex) L.updateComplex(leaf);
+                layout.surfaceChanged = false;
+            }
         },
         updateAllChange(leaf) {
             updateChange$1(leaf);
@@ -4462,6 +4519,9 @@ var LeaferUI = function(exports) {
             if (!fromWorld) fromWorld = leaf.__nowWorld;
             if (leaf.__worldFlipped || Platform.fullImageShadow) currentCanvas.copyWorldByReset(fromCanvas, fromWorld, leaf.__nowWorld, blendMode, onlyResetTransform); else currentCanvas.copyWorldToInner(fromCanvas, fromWorld, leaf.__layout.renderBounds, blendMode);
         },
+        renderComplex(_leaf, _canvas, _options) {},
+        updateComplex(_leaf) {},
+        checkComplex(_leaf) {},
         moveWorld(t, x, y = 0, isInnerPoint, transition) {
             const local = isObject(x) ? Object.assign({}, x) : {
                 x: x,
@@ -4573,6 +4633,9 @@ var LeaferUI = function(exports) {
             divideParent(matrix$1, relative.scrollWorldTransform);
             return temp ? matrix$1 : Object.assign({}, matrix$1);
         },
+        updateScaleFixedWorld(_t) {},
+        updateOuterBounds(_t) {},
+        cacheId(_t) {},
         drop(t, parent, index, resize) {
             t.setTransform(L.getRelativeWorld(t, parent, true), resize);
             parent.add(t, index);
@@ -4619,7 +4682,8 @@ var LeaferUI = function(exports) {
             return target.__.eraser || target.__.visible === 0 ? null : target.__layout.localStrokeBounds;
         },
         localRenderBounds(target) {
-            return target.__.eraser || target.__.visible === 0 ? null : target.__layout.localRenderBounds;
+            const {__: __, __layout: __layout} = target;
+            return __.eraser || __.visible === 0 ? null : __layout.localOuterBounds || __layout.localRenderBounds;
         },
         maskLocalBoxBounds(target, index) {
             return checkMask(target, index) && target.__localBoxBounds;
@@ -4628,7 +4692,8 @@ var LeaferUI = function(exports) {
             return checkMask(target, index) && target.__layout.localStrokeBounds;
         },
         maskLocalRenderBounds(target, index) {
-            return checkMask(target, index) && target.__layout.localRenderBounds;
+            const {__layout: __layout} = target;
+            return checkMask(target, index) && (__layout.localOuterBounds || __layout.localRenderBounds);
         },
         excludeRenderBounds(child, options) {
             if (options.bounds && !options.bounds.hit(child.__world, options.matrix)) return true;
@@ -5137,7 +5202,6 @@ var LeaferUI = function(exports) {
         }
         opacityChange() {
             this.opacityChanged = true;
-            this.surfaceChanged || this.surfaceChange();
         }
         childrenSortChange() {
             if (!this.childrenSortChanged) {
@@ -5552,6 +5616,7 @@ var LeaferUI = function(exports) {
             const {parent: parent, __layout: __layout, __world: __world, __scrollWorld: __scrollWorld, __: __} = this;
             multiplyParent$2(this.__local || __layout, parent ? parent.__scrollWorld || parent.__world : defaultWorld, __world, !!__layout.affectScaleOrRotation, __);
             if (__scrollWorld) translateInner(Object.assign(__scrollWorld, __world), __.scrollX, __.scrollY);
+            if (__layout.scaleFixed) LeafHelper.updateScaleFixedWorld(this);
         },
         __updateLocalMatrix() {
             if (this.__local) {
@@ -5580,6 +5645,7 @@ var LeaferUI = function(exports) {
         __updateWorldBounds() {
             const {__layout: __layout, __world: __world} = this;
             toOuterOf$2(__layout.renderBounds, __world, __world);
+            if (this.__hasComplex) LeafHelper.checkComplex(this);
             if (__layout.resized) {
                 if (__layout.resized === "inner") this.__onUpdateSize();
                 if (this.__hasLocalEvent) BoundsEvent.emitLocal(this);
@@ -5629,6 +5695,7 @@ var LeaferUI = function(exports) {
                 layout.renderChanged = undefined;
                 if (this.parent) this.parent.__layout.renderChange();
             }
+            if (layout.outerScale) LeafHelper.updateOuterBounds(this);
             layout.resized || (layout.resized = "local");
             layout.boundsChanged = undefined;
         },
@@ -5694,7 +5761,7 @@ var LeaferUI = function(exports) {
                 const data = this.__;
                 if (data.bright && !options.topRendering) return options.topList.add(this);
                 canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
-                canvas.opacity = options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity;
+                canvas.opacity = options.ignoreOpacity ? 1 : options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity;
                 if (this.__.__single) {
                     if (data.eraser === "path") return this.__renderEraser(canvas, options);
                     const tempCanvas = canvas.getSameCanvas(true, true);
@@ -5746,7 +5813,7 @@ var LeaferUI = function(exports) {
                     if (data.eraser === "path") return this.__renderEraser(canvas, options);
                     const tempCanvas = canvas.getSameCanvas(false, true);
                     this.__renderBranch(tempCanvas, options);
-                    canvas.opacity = options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
+                    canvas.opacity = options.ignoreOpacity ? 1 : options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
                     canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, data.__blendMode, true);
                     tempCanvas.recycle(nowWorld);
                 } else {
@@ -5758,9 +5825,11 @@ var LeaferUI = function(exports) {
             if (this.__hasMask) {
                 this.__renderMask(canvas, options);
             } else {
+                let child;
                 const {children: children} = this;
                 for (let i = 0, len = children.length; i < len; i++) {
-                    excludeRenderBounds$1(children[i], options) || children[i].__render(canvas, options);
+                    child = children[i];
+                    excludeRenderBounds$1(child, options) || (child.__hasComplex ? LeafHelper.renderComplex(child, canvas, options) : child.__render(canvas, options));
                 }
             }
         },
@@ -5773,12 +5842,12 @@ var LeaferUI = function(exports) {
             }
         }
     };
-    const tempScaleData$1 = {};
     const {LEAF: LEAF, create: create} = IncrementId;
     const {stintSet: stintSet$4} = DataHelper;
     const {toInnerPoint: toInnerPoint, toOuterPoint: toOuterPoint, multiplyParent: multiplyParent$1} = MatrixHelper;
     const {toOuterOf: toOuterOf$1} = BoundsHelper;
     const {copy: copy$2, move: move$2} = PointHelper;
+    const {getScaleFixedData: getScaleFixedData} = MathHelper;
     const {moveLocal: moveLocal, zoomOfLocal: zoomOfLocal, rotateOfLocal: rotateOfLocal, skewOfLocal: skewOfLocal, moveWorld: moveWorld, zoomOfWorld: zoomOfWorld, rotateOfWorld: rotateOfWorld, skewOfWorld: skewOfWorld, transform: transform, transformWorld: transformWorld, setTransform: setTransform, getFlipTransform: getFlipTransform, getLocalOrigin: getLocalOrigin, getRelativeWorld: getRelativeWorld, drop: drop} = LeafHelper;
     exports.Leaf = class Leaf {
         get tag() {
@@ -5936,6 +6005,7 @@ var LeaferUI = function(exports) {
                 this.__level = this.parent ? this.parent.__level + 1 : 1;
                 if (this.animation) this.__runAnimation("in");
                 if (this.__bubbleMap) this.__emitLifeEvent(ChildEvent.MOUNTED);
+                if (leafer.cacheId) LeafHelper.cacheId(this);
             } else {
                 this.__emitLifeEvent(ChildEvent.UNMOUNTED);
             }
@@ -6065,13 +6135,8 @@ var LeaferUI = function(exports) {
             if (scaleX < 0) scaleX = -scaleX;
             return scaleX > 1 ? scaleX : 1;
         }
-        getRenderScaleData(abs, scaleFixed) {
-            let {scaleX: scaleX, scaleY: scaleY} = ImageManager.patternLocked ? this.__world : this.__nowWorld;
-            if (abs) scaleX < 0 && (scaleX = -scaleX), scaleY < 0 && (scaleY = -scaleY);
-            if (scaleFixed === true || scaleFixed === "zoom-in" && scaleX > 1 && scaleY > 1) scaleX = scaleY = 1;
-            tempScaleData$1.scaleX = scaleX;
-            tempScaleData$1.scaleY = scaleY;
-            return tempScaleData$1;
+        getRenderScaleData(abs, scaleFixed, unscale = true) {
+            return getScaleFixedData(ImageManager.patternLocked ? this.__world : this.__nowWorld || this.__world, scaleFixed, unscale, abs);
         }
         getTransform(relative) {
             return this.__layout.getTransform(relative || "local");
@@ -6243,7 +6308,7 @@ var LeaferUI = function(exports) {
         __drawPath(_canvas) {}
         __drawRenderPath(_canvas) {}
         __updatePath() {}
-        __updateRenderPath() {}
+        __updateRenderPath(_updateCache) {}
         getMotionPathData() {
             return Plugin.need("path");
         }
@@ -6311,9 +6376,11 @@ var LeaferUI = function(exports) {
             return 0;
         }
         __updateRenderSpread() {
+            let layout;
             const {children: children} = this;
             for (let i = 0, len = children.length; i < len; i++) {
-                if (children[i].__layout.renderSpread) return 1;
+                layout = children[i].__layout;
+                if (layout.renderSpread || layout.localOuterBounds) return 1;
             }
             return 0;
         }
@@ -6346,6 +6413,7 @@ var LeaferUI = function(exports) {
                     this.add(item, index);
                     noIndex || index++;
                 }); else child = UICreator.get(child.tag, child);
+                if (!child) return;
             }
             if (child.parent) child.parent.remove(child);
             child.parent = this;
@@ -6567,7 +6635,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.0.1";
+    const version = "2.0.3";
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -6589,7 +6657,6 @@ var LeaferUI = function(exports) {
     }
     canvasPatch(OffscreenCanvasRenderingContext2D.prototype);
     canvasPatch(Path2D.prototype);
-    const {mineType: mineType} = FileHelper;
     Object.assign(Creator, {
         canvas: (options, manager) => new LeaferCanvas(options, manager),
         image: options => new LeaferImage(options)
@@ -6599,7 +6666,7 @@ var LeaferUI = function(exports) {
             createCanvas: (width, height) => new OffscreenCanvas(width, height),
             canvasToDataURL: (canvas, type, quality) => new Promise((resolve, reject) => {
                 canvas.convertToBlob({
-                    type: mineType(type),
+                    type: FileHelper.mimeType(type),
                     quality: quality
                 }).then(blob => {
                     var reader = new FileReader;
@@ -6611,14 +6678,14 @@ var LeaferUI = function(exports) {
                 });
             }),
             canvasToBolb: (canvas, type, quality) => canvas.convertToBlob({
-                type: mineType(type),
+                type: FileHelper.mimeType(type),
                 quality: quality
             }),
             canvasSaveAs: (_canvas, _filename, _quality) => new Promise(resolve => resolve()),
             download(_url, _filename) {
                 return undefined;
             },
-            loadImage(src) {
+            loadImage(src, _crossOrigin, _leaferImage) {
                 return new Promise((resolve, reject) => {
                     let req = new XMLHttpRequest;
                     req.open("GET", Platform.image.getRealURL(src), true);
@@ -6633,6 +6700,13 @@ var LeaferUI = function(exports) {
                     req.onerror = e => reject(e);
                     req.send();
                 });
+            },
+            loadContent(url_1) {
+                return __awaiter(this, arguments, void 0, function*(url, responseType = "text") {
+                    const response = yield fetch(url);
+                    if (!response.ok) throw new Error(`${response.status}`);
+                    return yield response[responseType]();
+                });
             }
         };
         Platform.canvas = Creator.canvas();
@@ -7111,7 +7185,7 @@ var LeaferUI = function(exports) {
         getCellList() {
             return undefined;
         }
-        addBlock(block) {
+        addBlock(block, _leafList) {
             if (!this.updateBlocks) this.updateBlocks = [];
             this.updateBlocks.push(block);
         }
@@ -7159,7 +7233,8 @@ var LeaferUI = function(exports) {
         __onLayoutEnd(event) {
             if (event.data) event.data.map(item => {
                 let empty;
-                if (item.updatedList) item.updatedList.list.some(leaf => {
+                const {updatedList: updatedList} = item;
+                if (updatedList) updatedList.list.some(leaf => {
                     empty = !leaf.__world.width || !leaf.__world.height;
                     if (empty) {
                         if (!leaf.isLeafer) debug$3.tip(leaf.innerName, ": empty");
@@ -7167,7 +7242,7 @@ var LeaferUI = function(exports) {
                     }
                     return empty;
                 });
-                this.addBlock(empty ? this.canvas.bounds : item.updatedBounds);
+                this.addBlock(empty ? this.canvas.bounds : item.updatedBounds, updatedList);
             });
         }
         emitRender(type, bounds, options) {
@@ -7367,7 +7442,7 @@ var LeaferUI = function(exports) {
             this.config = {};
             if (userConfig) this.config = DataHelper.default(userConfig, this.config);
             this.picker = new Picker(this.target = target, this);
-            this.finder = Creator.finder && Creator.finder();
+            this.finder = Creator.finder && Creator.finder(target, this.config);
         }
         getByPoint(hitPoint, hitRadius, options) {
             const {target: target, picker: picker} = this;
@@ -7405,7 +7480,9 @@ var LeaferUI = function(exports) {
             set(value) {
                 this.__setAttr(key, value);
                 if (value) this.__.__useEffect = true;
-                this.__layout.renderChanged || this.__layout.renderChange();
+                const layout = this.__layout;
+                layout.renderChanged || layout.renderChange();
+                layout.surfaceChange();
             }
         }));
     }
@@ -7598,15 +7675,16 @@ var LeaferUI = function(exports) {
             this.__needComputePaint = undefined;
         }
         __getRealStrokeWidth(childStyle) {
-            let {strokeWidth: strokeWidth, strokeWidthFixed: strokeWidthFixed} = this;
+            let {strokeWidth: strokeWidth, strokeScaleFixed: strokeScaleFixed} = this;
             if (childStyle) {
                 if (childStyle.strokeWidth) strokeWidth = childStyle.strokeWidth;
-                if (!isUndefined(childStyle.strokeWidthFixed)) strokeWidthFixed = childStyle.strokeWidthFixed;
+                if (!isUndefined(childStyle.strokeScaleFixed)) strokeScaleFixed = childStyle.strokeScaleFixed;
+            }
+            if (strokeScaleFixed) {
+                const {scaleX: scaleX} = this.__leaf.getRenderScaleData(true, strokeScaleFixed, false);
+                if (scaleX !== 1) return strokeWidth * scaleX;
             }
-            if (strokeWidthFixed) {
-                const scale = this.__leaf.getClampRenderScale();
-                return scale > 1 ? strokeWidth / scale : strokeWidth;
-            } else return strokeWidth;
+            return strokeWidth;
         }
         __setPaint(attrName, value) {
             this.__setInput(attrName, value);
@@ -7729,13 +7807,16 @@ var LeaferUI = function(exports) {
         }
     }
     class ImageData extends RectData {
+        get __urlType() {
+            return "image";
+        }
         setUrl(value) {
             this.__setImageFill(value);
             this._url = value;
         }
         __setImageFill(value) {
             this.fill = value ? {
-                type: "image",
+                type: this.__urlType,
                 mode: "stretch",
                 url: value
             } : undefined;
@@ -7771,7 +7852,7 @@ var LeaferUI = function(exports) {
             const data = this.__, {strokeAlign: strokeAlign, __maxStrokeWidth: strokeWidth} = data, box = this.__box;
             if ((data.stroke || data.hitStroke === "all") && strokeWidth && strokeAlign !== "inside") {
                 boxSpread = spread = strokeAlign === "center" ? strokeWidth / 2 : strokeWidth;
-                if (!data.__boxStroke) {
+                if (!data.__boxStroke || data.__useArrow) {
                     const miterLimitAddWidth = data.__isLinePath ? 0 : 10 * spread;
                     const storkeCapAddWidth = data.strokeCap === "none" ? 0 : strokeWidth;
                     spread += Math.max(miterLimitAddWidth, storkeCapAddWidth);
@@ -7922,6 +8003,12 @@ var LeaferUI = function(exports) {
         get isFrame() {
             return false;
         }
+        set strokeWidthFixed(value) {
+            this.strokeScaleFixed = value;
+        }
+        get strokeWidthFixed() {
+            return this.strokeScaleFixed;
+        }
         set scale(value) {
             MathHelper.assignScale(this, value);
         }
@@ -7977,6 +8064,9 @@ var LeaferUI = function(exports) {
         getPathString(curve, pathForRender, floatLength) {
             return PathConvert.stringify(this.getPath(curve, pathForRender), floatLength);
         }
+        asPath(curve, pathForRender) {
+            this.path = this.getPath(curve, pathForRender);
+        }
         load() {
             this.__.__computePaint();
         }
@@ -7986,16 +8076,18 @@ var LeaferUI = function(exports) {
                 data.lazy && !this.__inLazyBounds && !Export.running ? data.__needComputePaint = true : data.__computePaint();
             }
         }
-        __updateRenderPath() {
+        __updateRenderPath(updateCache) {
             const data = this.__;
             if (data.path) {
                 data.__pathForRender = data.cornerRadius ? PathCorner.smooth(data.path, data.cornerRadius, data.cornerSmoothing) : data.path;
-                if (data.__useArrow) PathArrow.addArrows(this);
+                if (data.__useArrow) PathArrow.addArrows(this, updateCache);
             } else data.__pathForRender && (data.__pathForRender = undefined);
         }
         __drawRenderPath(canvas) {
+            const data = this.__;
             canvas.beginPath();
-            this.__drawPathByData(canvas, this.__.__pathForRender);
+            if (data.__useArrow) PathArrow.updateArrow(this);
+            this.__drawPathByData(canvas, data.__pathForRender);
         }
         __drawPath(canvas) {
             canvas.beginPath();
@@ -8044,6 +8136,7 @@ var LeaferUI = function(exports) {
         static setEditOuter(_toolName) {}
         static setEditInner(_editorName) {}
         destroy() {
+            this.__.__willDestroy = true;
             this.fill = this.stroke = null;
             if (this.__animate) this.killAnimate();
             super.destroy();
@@ -8104,7 +8197,7 @@ var LeaferUI = function(exports) {
     __decorate([ strokeType(undefined, true) ], exports.UI.prototype, "stroke", void 0);
     __decorate([ strokeType("inside") ], exports.UI.prototype, "strokeAlign", void 0);
     __decorate([ strokeType(1, true) ], exports.UI.prototype, "strokeWidth", void 0);
-    __decorate([ strokeType(false) ], exports.UI.prototype, "strokeWidthFixed", void 0);
+    __decorate([ strokeType(false) ], exports.UI.prototype, "strokeScaleFixed", void 0);
     __decorate([ strokeType("none") ], exports.UI.prototype, "strokeCap", void 0);
     __decorate([ strokeType("miter") ], exports.UI.prototype, "strokeJoin", void 0);
     __decorate([ strokeType() ], exports.UI.prototype, "dashPattern", void 0);
@@ -8151,7 +8244,10 @@ var LeaferUI = function(exports) {
         }
         toJSON(options) {
             const data = super.toJSON(options);
-            if (!this.childlessJSON) data.children = this.children.map(child => child.toJSON(options));
+            if (!this.childlessJSON) {
+                const children = data.children = [];
+                this.children.forEach(child => child.skipJSON || children.push(child.toJSON(options)));
+            }
             return data;
         }
         pick(_hitPoint, _options) {
@@ -8293,12 +8389,12 @@ var LeaferUI = function(exports) {
                 this.emitLeafer(LeaferEvent.STOP);
             }
         }
-        unlockLayout() {
+        unlockLayout(updateLayout = true) {
             this.layouter.start();
-            this.updateLayout();
+            if (updateLayout) this.updateLayout();
         }
-        lockLayout() {
-            this.updateLayout();
+        lockLayout(updateLayout = true) {
+            if (updateLayout) this.updateLayout();
             this.layouter.stop();
         }
         resize(size) {
@@ -8675,9 +8771,9 @@ var LeaferUI = function(exports) {
             return "Ellipse";
         }
         __updatePath() {
-            const {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = this.__;
+            const data = this.__, {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = data;
             const rx = width / 2, ry = height / 2;
-            const path = this.__.path = [];
+            const path = data.path = [];
             let open;
             if (innerRadius) {
                 if (startAngle || endAngle) {
@@ -8699,7 +8795,7 @@ var LeaferUI = function(exports) {
                 }
             }
             if (!open) closePath$2(path);
-            if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
+            if (Platform.ellipseToCurve || data.__useArrow) data.path = this.getPath(true);
         }
     };
     __decorate([ dataProcessor(EllipseData) ], exports.Ellipse.prototype, "__", void 0);
@@ -9155,7 +9251,7 @@ var LeaferUI = function(exports) {
             if (this.viewReady) this.renderer.update();
         }
         __render(canvas, options) {
-            if (canvas.context) this.forEach(leafer => options.matrix ? leafer.__render(canvas, options) : canvas.copyWorld(leafer.canvas, options.bounds));
+            if (canvas.context) this.forEach(leafer => options.matrix ? leafer.__render(canvas, options) : canvas.copyWorld(leafer.canvas, options.bounds, undefined, undefined, true));
         }
         __onResize(event) {
             this.forEach(leafer => leafer.resize(event));
@@ -9877,6 +9973,7 @@ var LeaferUI = function(exports) {
             this.checkPath(data, useDefaultPath);
             this.downTime = Date.now();
             this.emit(exports.PointerEvent.BEFORE_DOWN, data);
+            if (data.path.needUpdate) this.updateDownData(data);
             this.emit(exports.PointerEvent.DOWN, data);
             if (PointerButton.left(data)) {
                 this.tapWait();
@@ -10470,8 +10567,8 @@ var LeaferUI = function(exports) {
                 canvas.save();
                 if (item.transform) canvas.transform(item.transform);
                 if (originPaint.scaleFixed) {
-                    const {scaleX: scaleX, scaleY: scaleY} = ui.getRenderScaleData(true);
-                    if (originPaint.scaleFixed === true || originPaint.scaleFixed === "zoom-in" && scaleX > 1 && scaleY > 1) canvas.scale(1 / scaleX, 1 / scaleY);
+                    const {scaleX: scaleX, scaleY: scaleY} = ui.getRenderScaleData(true, originPaint.scaleFixed, false);
+                    if (scaleX !== 1) canvas.scale(scaleX, scaleY);
                 }
                 if (originPaint.blendMode) canvas.blendMode = originPaint.blendMode;
                 fillPathOrText(ui, canvas, renderOptions);
@@ -10726,11 +10823,14 @@ var LeaferUI = function(exports) {
     function getLeafPaint(attrName, paint, ui) {
         if (!isObject(paint) || paint.visible === false || paint.opacity === 0) return undefined;
         let leafPaint;
-        const {boxBounds: boxBounds} = ui.__layout;
-        switch (paint.type) {
+        const {boxBounds: boxBounds} = ui.__layout, {type: type} = paint;
+        switch (type) {
           case "image":
+          case "film":
+          case "video":
             if (!paint.url) return undefined;
             leafPaint = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url]);
+            if (type !== "image") PaintImage[type](leafPaint);
             break;
 
           case "linear":
@@ -10746,7 +10846,7 @@ var LeaferUI = function(exports) {
             break;
 
           case "solid":
-            const {type: type, color: color, opacity: opacity} = paint;
+            const {color: color, opacity: opacity} = paint;
             leafPaint = {
                 type: type,
                 style: ColorConvert.string(color, opacity)
@@ -10786,7 +10886,7 @@ var LeaferUI = function(exports) {
     const {isSame: isSame} = BoundsHelper;
     function image(ui, attrName, paint, boxBounds, firstUse) {
         let leafPaint, event;
-        const image = ImageManager.get(paint);
+        const image = ImageManager.get(paint, paint.type);
         if (cache && paint === cache.paint && isSame(boxBounds, cache.boxBounds)) {
             leafPaint = cache.leafPaint;
         } else {
@@ -10846,8 +10946,8 @@ var LeaferUI = function(exports) {
         return leafPaint;
     }
     function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds) {
-        if (attrName === "fill" && !ui.__.__naturalWidth) {
-            const data = ui.__;
+        const data = ui.__;
+        if (attrName === "fill" && !data.__naturalWidth) {
             data.__naturalWidth = image.width / data.pixelRatio;
             data.__naturalHeight = image.height / data.pixelRatio;
             if (data.__autoSide) {
@@ -10859,7 +10959,13 @@ var LeaferUI = function(exports) {
                 return false;
             }
         }
-        if (!leafPaint.data) PaintImage.createData(leafPaint, image, paint, boxBounds);
+        if (!leafPaint.data) {
+            PaintImage.createData(leafPaint, image, paint, boxBounds);
+            const {transform: transform} = leafPaint.data, {opacity: opacity, blendMode: blendMode} = paint;
+            const clip = transform && !transform.onlyScale || data.path || data.cornerRadius;
+            if (clip || opacity && opacity < 1 || blendMode) leafPaint.complex = clip ? 2 : true;
+        }
+        if (paint.filter) PaintImage.applyFilter(leafPaint, image, paint.filter, ui);
         return true;
     }
     function onLoad(ui, event) {
@@ -10891,7 +10997,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, interlace: interlace} = paint;
+        const {mode: mode, align: align, offset: offset, scale: scale, size: size, rotation: rotation, skew: skew, clipSize: clipSize, repeat: repeat, gap: gap, interlace: interlace} = paint;
         const sameBox = box.width === width && box.height === height;
         const data = {
             mode: mode
@@ -10954,8 +11060,6 @@ var LeaferUI = function(exports) {
             data.scaleX = scaleX;
             data.scaleY = scaleY;
         }
-        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",
@@ -10981,7 +11085,7 @@ var LeaferUI = function(exports) {
     const {get: get$2, set: set, rotateOfOuter: rotateOfOuter$1, translate: translate, scaleOfOuter: scaleOfOuter$1, multiplyParent: multiplyParent, scale: scaleHelper, rotate: rotate, skew: skewHelper} = MatrixHelper;
     function stretchMode(data, box, scaleX, scaleY) {
         const transform = get$2(), {x: x, y: y} = box;
-        if (x || y) translate(transform, x, y); else transform.onlyScale = true;
+        if (x || y) translate(transform, x, y); else if (scaleX > 0 && scaleY > 0) transform.onlyScale = true;
         scaleHelper(transform, scaleX, scaleY);
         data.transform = transform;
     }
@@ -11062,10 +11166,10 @@ var LeaferUI = function(exports) {
         }
     }
     function createPattern(paint, ui, canvas, renderOptions) {
-        let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = scaleX + "-" + scaleY;
+        let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
         if (paint.patternId !== id && !ui.destroyed) {
             if (!(Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)) {
-                const {image: image, data: data} = paint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
+                const {image: image, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
                 let imageMatrix, xGap, yGap, {width: width, height: height} = image;
                 if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
                 width *= scaleX;
@@ -11081,7 +11185,7 @@ var LeaferUI = function(exports) {
                     if (transform) copy$1(imageMatrix, transform);
                     scale(imageMatrix, 1 / scaleX, 1 / scaleY);
                 }
-                const imageCanvas = image.getCanvas(width, height, data.opacity, data.filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
+                const imageCanvas = image.getCanvas(width, height, opacity, undefined, 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;
@@ -11100,15 +11204,15 @@ var LeaferUI = function(exports) {
         return fixScale;
     }
     function checkImage(paint, drawImage, ui, canvas, renderOptions) {
-        const {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions);
+        const {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
         const {image: image, data: data, originPaint: originPaint} = paint, {exporting: exporting, snapshot: snapshot} = renderOptions;
-        if (!data || paint.patternId === scaleX + "-" + scaleY && !exporting || snapshot) {
+        if (!data || paint.patternId === id && !exporting || snapshot) {
             return false;
         } else {
             if (drawImage) {
                 if (data.repeat) {
                     drawImage = false;
-                } else if (!(originPaint.changeful || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
+                } else if (!(originPaint.changeful || paint.film || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
                     drawImage = Platform.image.isLarge(image, scaleX, scaleY) || image.width * scaleX > 8096 || image.height * scaleY > 8096;
                 }
             }
@@ -11125,20 +11229,21 @@ var LeaferUI = function(exports) {
             }
         }
     }
-    function drawImage(paint, _imageScaleX, _imageScaleY, ui, canvas, _renderOptions) {
-        const {data: data, image: image} = paint, {blendMode: blendMode} = paint.originPaint, {opacity: opacity, transform: transform} = data, view = image.getFull(data.filters), u = ui.__;
-        let {width: width, height: height} = image, clipUI;
-        if ((clipUI = transform && !transform.onlyScale || u.path || u.cornerRadius) || opacity || blendMode) {
+    function drawImage(paint, imageScaleX, imageScaleY, ui, canvas, _renderOptions) {
+        const {data: data, image: image, complex: complex} = paint;
+        let {width: width, height: height} = image;
+        if (complex) {
+            const {blendMode: blendMode, opacity: opacity} = paint.originPaint, {transform: transform} = data;
             canvas.save();
-            clipUI && canvas.clipUI(ui);
+            complex === 2 && canvas.clipUI(ui);
             blendMode && (canvas.blendMode = blendMode);
             opacity && (canvas.opacity *= opacity);
             transform && canvas.transform(transform);
-            canvas.drawImage(view, 0, 0, width, height);
+            image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
             canvas.restore();
         } else {
             if (data.scaleX) width *= data.scaleX, height *= data.scaleY;
-            canvas.drawImage(view, 0, 0, width, height);
+            image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
         }
     }
     function getImageRenderScaleData(paint, ui, canvas, _renderOptions) {
@@ -11166,6 +11271,7 @@ var LeaferUI = function(exports) {
                     if (!recycleMap) recycleMap = {};
                     recycleMap[url] = true;
                     ImageManager.recyclePaint(paint);
+                    if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, data.__leaf);
                     if (image.loading) {
                         if (!input) {
                             input = data.__input && data.__input[attrName] || [];
@@ -12037,7 +12143,9 @@ var LeaferUI = function(exports) {
     exports.LeaferCanvasBase = LeaferCanvasBase;
     exports.LeaferData = LeaferData;
     exports.LeaferEvent = LeaferEvent;
+    exports.LeaferFilm = LeaferFilm;
     exports.LeaferImage = LeaferImage;
+    exports.LeaferVideo = LeaferVideo;
     exports.LineData = LineData;
     exports.MathHelper = MathHelper;
     exports.Matrix = Matrix;