leafer-game 2.0.2 → 2.0.3

package/dist/web.js

@@ -233,6 +233,7 @@ var LeaferUI = function(exports) {
         }
         destroy() {
             this.__input = this.__middle = null;
+            if (this.__complexData) this.__complexData.destroy();
         }
     }
     const IncrementId = {
@@ -323,6 +324,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$4, floor: floor$3, PI: PI$4} = Math;
+    const tempScaleData$1 = {};
     const MathHelper = {
         within(value, min, max) {
             if (isObject(min)) max = min.max, min = min.min;
@@ -366,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;
@@ -845,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$4(t.x) === float$4(point.x) && float$4(t.y) === float$4(point.y);
+        isSame(t, point, quick) {
+            return quick ? t.x === point.x && t.y === point.y : float$4(t.x) === float$4(point.x) && float$4(t.y) === float$4(point.y);
         },
         reset(t) {
             P$5.reset(t);
@@ -918,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);
@@ -1163,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;
         }
     };
@@ -1420,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);
@@ -1588,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);
         }
@@ -3861,6 +3887,7 @@ var LeaferUI = function(exports) {
             return image;
         },
         recycle(image) {
+            if (image.parent) image = image.parent;
             image.use--;
             setTimeout(() => {
                 if (!image.use) {
@@ -4026,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 = {
@@ -4198,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();
                 }
             }
         }));
@@ -4243,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();
                     });
@@ -4277,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();
                 }
             }
@@ -4465,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$1.updateComplex(leaf);
+                layout.surfaceChanged = false;
+            }
         },
         updateAllChange(leaf) {
             updateChange$1(leaf);
@@ -4489,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,
@@ -4600,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$1.getRelativeWorld(t, parent, true), resize);
             parent.add(t, index);
@@ -4646,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;
@@ -4655,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;
@@ -5164,7 +5202,6 @@ var LeaferUI = function(exports) {
         }
         opacityChange() {
             this.opacityChanged = true;
-            this.surfaceChanged || this.surfaceChange();
         }
         childrenSortChange() {
             if (!this.childrenSortChanged) {
@@ -5579,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) {
@@ -5607,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);
@@ -5656,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;
         },
@@ -5721,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);
@@ -5773,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 {
@@ -5789,7 +5829,7 @@ var LeaferUI = function(exports) {
                 const {children: children} = this;
                 for (let i = 0, len = children.length; i < len; i++) {
                     child = children[i];
-                    excludeRenderBounds$1(child, options) || (child.__.complex ? child.__renderComplex(canvas, options) : child.__render(canvas, options));
+                    excludeRenderBounds$1(child, options) || (child.__hasComplex ? LeafHelper.renderComplex(child, canvas, options) : child.__render(canvas, options));
                 }
             }
         },
@@ -5802,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() {
@@ -5965,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);
             }
@@ -6094,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");
@@ -6262,7 +6298,6 @@ var LeaferUI = function(exports) {
         __drawHitPath(_canvas) {}
         __updateHitCanvas() {}
         __render(_canvas, _options) {}
-        __renderComplex(_canvas, _options) {}
         __drawFast(_canvas, _options) {}
         __draw(_canvas, _options, _originCanvas) {}
         __clip(_canvas, _options) {}
@@ -6273,7 +6308,7 @@ var LeaferUI = function(exports) {
         __drawPath(_canvas) {}
         __drawRenderPath(_canvas) {}
         __updatePath() {}
-        __updateRenderPath() {}
+        __updateRenderPath(_updateCache) {}
         getMotionPathData() {
             return Plugin.need("path");
         }
@@ -6341,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;
         }
@@ -6598,7 +6635,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.0.2";
+    const version = "2.0.3";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -7600,7 +7637,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;
@@ -7638,7 +7675,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();
             }
         }));
     }
@@ -7831,15 +7870,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 (strokeWidthFixed) {
-                const scale = this.__leaf.getClampRenderScale();
-                return scale > 1 ? strokeWidth / scale : strokeWidth;
-            } else return strokeWidth;
+            if (strokeScaleFixed) {
+                const {scaleX: scaleX} = this.__leaf.getRenderScaleData(true, strokeScaleFixed, false);
+                if (scaleX !== 1) return strokeWidth * scaleX;
+            }
+            return strokeWidth;
         }
         __setPaint(attrName, value) {
             this.__setInput(attrName, value);
@@ -8007,7 +8047,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);
@@ -8158,6 +8198,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);
         }
@@ -8213,6 +8259,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();
         }
@@ -8222,16 +8271,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();
@@ -8280,6 +8331,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();
@@ -8340,7 +8392,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);
@@ -8914,9 +8966,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) {
@@ -8938,7 +8990,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);
@@ -9394,7 +9446,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));
@@ -11034,8 +11086,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);
@@ -11432,6 +11484,7 @@ var LeaferUI = function(exports) {
             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) {
@@ -11635,7 +11688,7 @@ var LeaferUI = function(exports) {
         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, {opacity: opacity, filters: filters} = paint.originPaint, {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;
@@ -11651,7 +11704,7 @@ var LeaferUI = function(exports) {
                     if (transform) copy$1(imageMatrix, transform);
                     scale(imageMatrix, 1 / scaleX, 1 / scaleY);
                 }
-                const imageCanvas = image.getCanvas(width, height, opacity, 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;
@@ -11737,6 +11790,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] || [];
@@ -14344,9 +14398,7 @@ var LeaferUI = function(exports) {
     const {Yes: Yes, NoAndSkip: NoAndSkip, YesAndSkip: YesAndSkip} = exports.Answer;
     const idCondition = {}, classNameCondition = {}, tagCondition = {};
     class Finder {
-        constructor(target) {
-            this.innerIdMap = {};
-            this.idMap = {};
+        constructor(target, _config) {
             this.methods = {
                 id: (leaf, name) => leaf.id === name ? (this.target && (this.idMap[name] = leaf), 
                 1) : 0,
@@ -14356,6 +14408,13 @@ var LeaferUI = function(exports) {
                 tag: (leaf, name) => leaf.__tag === name ? 1 : 0,
                 tags: (leaf, nameMap) => nameMap[leaf.__tag] ? 1 : 0
             };
+            this.idMap = {};
+            this.innerIdMap = {};
+            const app = target && target.app;
+            if (app) {
+                app.idMap ? this.idMap = app.idMap : app.idMap = this.idMap;
+                app.innerIdMap ? this.innerIdMap = app.innerIdMap : app.innerIdMap = this.innerIdMap;
+            }
             if (this.target = target) this.__listenEvents();
         }
         getBy(condition, branch, one, options) {
@@ -14476,8 +14535,13 @@ var LeaferUI = function(exports) {
         return getSelector(this).getBy(condition, this, true, options);
     };
     Plugin.add("find");
-    Creator.finder = function(target) {
-        return new Finder(target);
+    Creator.finder = function(target, config) {
+        return new Finder(target, config);
+    };
+    LeafHelper.cacheId = function(t) {
+        const {leafer: leafer, id: id} = t;
+        if (id) leafer.app.idMap[id] = t;
+        if (leafer.cacheInnerId) leafer.app.innerIdMap[t.innerId] = t;
     };
     exports.AlignHelper = AlignHelper;
     exports.AnimateEasing = AnimateEasing;