@leafer/core 2.0.2 → 2.0.4

package/lib/core.cjs

@@ -206,6 +206,7 @@ class LeafData {
     }
     destroy() {
         this.__input = this.__middle = null;
+        if (this.__complexData) this.__complexData.destroy();
     }
 }
 
@@ -304,6 +305,8 @@ const {set: set$1, get: get$1, setTemp: setTemp, toTempAB: toTempAB} = FourNumbe
 
 const {round: round$3, pow: pow$1, max: max$1, floor: floor$2, PI: PI$1} = Math;
 
+const tempScaleData = {};
+
 const MathHelper = {
     within(value, min, max) {
         if (isObject(min)) max = min.max, min = min.min;
@@ -347,6 +350,24 @@ const MathHelper = {
         } 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.scaleX = scaleX;
+        tempScaleData.scaleY = scaleY;
+        return tempScaleData;
+    },
     assignScale(scaleData, scale) {
         if (isNumber(scale)) {
             scaleData.scaleX = scaleData.scaleY = scale;
@@ -843,8 +864,8 @@ const PointHelper = {
         if (isObject(originPoints[0])) points = [], originPoints.forEach(p => points.push(p.x, p.y));
         return points;
     },
-    isSame(t, point) {
-        return float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
+    isSame(t, point, quick) {
+        return quick ? t.x === point.x && t.y === point.y : float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
     },
     reset(t) {
         P$5.reset(t);
@@ -919,8 +940,8 @@ class Point {
     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);
@@ -1176,9 +1197,9 @@ const AroundHelper = {
         }
         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;
     }
 };
@@ -1445,6 +1466,9 @@ const BoundsHelper = {
             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);
@@ -1616,6 +1640,9 @@ class Bounds {
     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);
     }
@@ -4095,6 +4122,7 @@ const ImageManager = {
         return image;
     },
     recycle(image) {
+        if (image.parent) image = image.parent;
         image.use--;
         setTimeout(() => {
             if (!image.use) {
@@ -4263,8 +4291,10 @@ class LeaferImage {
         return undefined;
     }
     clearLevels(_checkUse) {}
+    destroyFilter() {}
     destroy() {
         this.clearLevels();
+        this.destroyFilter();
         const {view: view} = this;
         if (view && view.close) view.close();
         this.config = {
@@ -4461,7 +4491,6 @@ function dimType(defaultValue) {
             if (this.__setAttr(key, value)) {
                 const data = this.__;
                 DataHelper.stintSet(data, "__useDim", data.dim || data.bright || data.dimskip);
-                this.__layout.surfaceChange();
             }
         }
     }));
@@ -4511,7 +4540,6 @@ function sortType(defaultValue) {
     return decorateLeafAttr(defaultValue, key => attr({
         set(value) {
             if (this.__setAttr(key, value)) {
-                this.__layout.surfaceChange();
                 this.waitParent(() => {
                     this.parent.__layout.childrenSortChange();
                 });
@@ -4548,7 +4576,6 @@ function hitType(defaultValue) {
         set(value) {
             if (this.__setAttr(key, value)) {
                 this.__layout.hitCanvasChanged = true;
-                if (Debug.showBounds === "hit") this.__layout.surfaceChange();
                 if (this.leafer) this.leafer.updateCursor();
             }
         }
@@ -4754,6 +4781,10 @@ const LeafHelper = {
         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(leaf);
@@ -4778,6 +4809,9 @@ const LeafHelper = {
         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,
@@ -4889,6 +4923,9 @@ const LeafHelper = {
         divideParent(matrix, relative.scrollWorldTransform);
         return temp ? matrix : Object.assign({}, matrix);
     },
+    updateScaleFixedWorld(_t) {},
+    updateOuterBounds(_t) {},
+    cacheId(_t) {},
     drop(t, parent, index, resize) {
         t.setTransform(L.getRelativeWorld(t, parent, true), resize);
         parent.add(t, index);
@@ -4939,7 +4976,8 @@ const LeafBoundsHelper = {
         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;
@@ -4948,7 +4986,8 @@ const LeafBoundsHelper = {
         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;
@@ -5468,7 +5507,6 @@ class LeafLayout {
     }
     opacityChange() {
         this.opacityChanged = true;
-        this.surfaceChanged || this.surfaceChange();
     }
     childrenSortChange() {
         if (!this.childrenSortChanged) {
@@ -5575,7 +5613,7 @@ class BoundsEvent extends Event {
         }
     }
     static emitWorld(leaf) {
-        if (leaf.leaferIsReady) leaf.emit(WORLD, this);
+        if (leaf.leaferIsReady) leaf.emit(WORLD, leaf);
     }
 }
 
@@ -5961,6 +5999,7 @@ const LeafMatrix = {
         const {parent: parent, __layout: __layout, __world: __world, __scrollWorld: __scrollWorld, __: __} = this;
         multiplyParent$1(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) {
@@ -5994,6 +6033,7 @@ const LeafBounds = {
     __updateWorldBounds() {
         const {__layout: __layout, __world: __world} = this;
         toOuterOf$1(__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);
@@ -6043,6 +6083,7 @@ const LeafBounds = {
             layout.renderChanged = undefined;
             if (this.parent) this.parent.__layout.renderChange();
         }
+        if (layout.outerScale) LeafHelper.updateOuterBounds(this);
         layout.resized || (layout.resized = "local");
         layout.boundsChanged = undefined;
     },
@@ -6109,7 +6150,7 @@ const LeafRender = {
             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);
@@ -6163,7 +6204,7 @@ const BranchRender = {
                 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 {
@@ -6179,7 +6220,7 @@ const BranchRender = {
             const {children: children} = this;
             for (let i = 0, len = children.length; i < len; i++) {
                 child = children[i];
-                excludeRenderBounds(child, options) || (child.__.complex ? child.__renderComplex(canvas, options) : child.__render(canvas, options));
+                excludeRenderBounds(child, options) || (child.__hasComplex ? LeafHelper.renderComplex(child, canvas, options) : child.__render(canvas, options));
             }
         }
     },
@@ -6193,8 +6234,6 @@ const BranchRender = {
     }
 };
 
-const tempScaleData = {};
-
 const {LEAF: LEAF, create: create} = IncrementId;
 
 const {stintSet: stintSet} = DataHelper;
@@ -6205,6 +6244,8 @@ const {toOuterOf: toOuterOf} = BoundsHelper;
 
 const {copy: copy, move: move} = 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 {
@@ -6363,6 +6404,7 @@ exports.Leaf = class Leaf {
             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);
         }
@@ -6492,13 +6534,8 @@ exports.Leaf = class Leaf {
         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.scaleX = scaleX;
-        tempScaleData.scaleY = scaleY;
-        return tempScaleData;
+    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");
@@ -6537,14 +6574,16 @@ exports.Leaf = class Leaf {
             relative.innerToWorld(world, to, distance);
             world = to ? to : world;
         }
-        toInnerPoint(this.scrollWorldTransform, world, to, distance);
+        toInnerPoint(this.worldTransform, world, to, distance);
     }
     innerToWorld(inner, to, distance, relative) {
-        toOuterPoint(this.scrollWorldTransform, inner, to, distance);
+        toOuterPoint(this.worldTransform, inner, to, distance);
         if (relative) relative.worldToInner(to ? to : inner, null, distance);
     }
     getBoxPoint(world, relative, distance, change) {
-        return this.getBoxPointByInner(this.getInnerPoint(world, relative, distance, change), null, null, true);
+        const inner = this.getInnerPoint(world, relative, distance, change);
+        if (distance) return inner;
+        return this.getBoxPointByInner(inner, null, null, true);
     }
     getBoxPointByInner(inner, _relative, _distance, change) {
         const point = change ? inner : Object.assign({}, inner), {x: x, y: y} = this.boxBounds;
@@ -6660,7 +6699,6 @@ exports.Leaf = class Leaf {
     __drawHitPath(_canvas) {}
     __updateHitCanvas() {}
     __render(_canvas, _options) {}
-    __renderComplex(_canvas, _options) {}
     __drawFast(_canvas, _options) {}
     __draw(_canvas, _options, _originCanvas) {}
     __clip(_canvas, _options) {}
@@ -6671,7 +6709,7 @@ exports.Leaf = class Leaf {
     __drawPath(_canvas) {}
     __drawRenderPath(_canvas) {}
     __updatePath() {}
-    __updateRenderPath() {}
+    __updateRenderPath(_updateCache) {}
     getMotionPathData() {
         return Plugin.need("path");
     }
@@ -6745,9 +6783,11 @@ exports.Branch = class Branch extends exports.Leaf {
         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;
     }
@@ -7006,7 +7046,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.0.2";
+const version = "2.0.4";
 
 exports.AlignHelper = AlignHelper;