@leafer-draw/worker 1.6.7 → 1.8.0

package/dist/worker.module.js

@@ -43,7 +43,7 @@ const IncrementId = {
 };
 const I$1 = IncrementId;
 
-const { round: round$3, pow: pow$1, PI: PI$4 } = Math;
+const { round: round$3, pow: pow$1, PI: PI$3 } = Math;
 const MathHelper = {
     within(value, min, max) {
         if (typeof min === 'object')
@@ -139,9 +139,9 @@ const MathHelper = {
 function randInt(num) {
     return Math.round(Math.random() * num);
 }
-const OneRadian = PI$4 / 180;
-const PI2 = PI$4 * 2;
-const PI_2 = PI$4 / 2;
+const OneRadian = PI$3 / 180;
+const PI2 = PI$3 * 2;
+const PI_2 = PI$3 / 2;
 function getPointData() { return { x: 0, y: 0 }; }
 function getBoundsData() { return { x: 0, y: 0, width: 0, height: 0 }; }
 function getMatrixData() { return { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }; }
@@ -436,7 +436,7 @@ const MatrixHelper = {
 const M$6 = MatrixHelper;
 
 const { toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3 } = MatrixHelper;
-const { sin: sin$4, cos: cos$4, abs: abs$4, sqrt: sqrt$2, atan2: atan2$2, min: min$1, round: round$2, PI: PI$3 } = Math;
+const { sin: sin$4, cos: cos$4, abs: abs$3, sqrt: sqrt$2, atan2: atan2$2, min: min$1, round: round$2 } = Math;
 const PointHelper = {
     defaultPoint: getPointData(),
     tempPoint: {},
@@ -531,8 +531,8 @@ const PointHelper = {
         return getDistanceFrom(t.x, t.y, point.x, point.y);
     },
     getDistanceFrom(x1, y1, x2, y2) {
-        const x = abs$4(x2 - x1);
-        const y = abs$4(y2 - y1);
+        const x = abs$3(x2 - x1);
+        const y = abs$3(y2 - y1);
         return sqrt$2(x * x + y * y);
     },
     getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
@@ -549,10 +549,11 @@ const PointHelper = {
     getRadianFrom(fromX, fromY, originX, originY, toX, toY, toOriginX, toOriginY) {
         if (toOriginX === undefined)
             toOriginX = originX, toOriginY = originY;
-        let fromAngle = atan2$2(fromY - originY, fromX - originX);
-        let toAngle = atan2$2(toY - toOriginY, toX - toOriginX);
-        const radian = toAngle - fromAngle;
-        return radian < -PI$3 ? radian + PI2 : radian;
+        const a = fromX - originX;
+        const b = fromY - originY;
+        const c = toX - toOriginX;
+        const d = toY - toOriginY;
+        return Math.atan2(a * d - b * c, a * c + b * d);
     },
     getAtan2(t, to) {
         return atan2$2(to.y - t.y, to.x - t.x);
@@ -762,7 +763,7 @@ class Matrix {
         MatrixHelper.reset(this);
     }
 }
-const tempMatrix = new Matrix();
+const tempMatrix$1 = new Matrix();
 
 const TwoPointBoundsHelper = {
     tempPointBounds: {},
@@ -859,6 +860,12 @@ const AroundHelper = {
         }
         if (!onlyBoxSize)
             to.x += box.x, to.y += box.y;
+    },
+    getPoint(around, box, to) {
+        if (!to)
+            to = {};
+        AroundHelper.toPoint(around, box, to, true);
+        return to;
     }
 };
 function get$4(around) {
@@ -1787,10 +1794,13 @@ function contextAttr(realName) {
     return (target, key) => {
         if (!realName)
             realName = key;
-        Object.defineProperty(target, key, {
+        const property = {
             get() { return this.context[realName]; },
             set(value) { this.context[realName] = value; }
-        });
+        };
+        if (key === 'strokeCap')
+            property.set = function (value) { this.context[realName] = value === 'none' ? 'butt' : value; };
+        Object.defineProperty(target, key, property);
     };
 }
 const contextMethodNameList = [];
@@ -2066,15 +2076,15 @@ __decorate([
     contextMethod()
 ], Canvas$1.prototype, "strokeText", null);
 
-const { copy: copy$8, multiplyParent: multiplyParent$3 } = MatrixHelper, { round: round$1 } = Math;
+const { copy: copy$8, multiplyParent: multiplyParent$4 } = MatrixHelper, { round: round$1 } = Math;
 const minSize = { width: 1, height: 1, pixelRatio: 1 };
 const canvasSizeAttrs = ['width', 'height', 'pixelRatio'];
 class LeaferCanvasBase extends Canvas$1 {
     get width() { return this.size.width; }
     get height() { return this.size.height; }
     get pixelRatio() { return this.size.pixelRatio; }
-    get pixelWidth() { return this.width * this.pixelRatio; }
-    get pixelHeight() { return this.height * this.pixelRatio; }
+    get pixelWidth() { return this.width * this.pixelRatio || 0; }
+    get pixelHeight() { return this.height * this.pixelRatio || 0; }
     get pixelSnap() { return this.config.pixelSnap; }
     set pixelSnap(value) { this.config.pixelSnap = value; }
     get allowBackgroundColor() { return this.view && this.parentView; }
@@ -2139,7 +2149,7 @@ class LeaferCanvasBase extends Canvas$1 {
     setWorld(matrix, parentMatrix) {
         const { pixelRatio, pixelSnap } = this, w = this.worldTransform;
         if (parentMatrix)
-            multiplyParent$3(matrix, parentMatrix, w);
+            multiplyParent$4(matrix, parentMatrix, w);
         w.a = matrix.a * pixelRatio;
         w.b = matrix.b * pixelRatio;
         w.c = matrix.c * pixelRatio;
@@ -2161,20 +2171,33 @@ class LeaferCanvasBase extends Canvas$1 {
         if (w)
             this.setTransform(w.a, w.b, w.c, w.d, w.e, w.f);
     }
-    setStroke(color, strokeWidth, options) {
+    setStroke(color, strokeWidth, options, childOptions) {
         if (strokeWidth)
             this.strokeWidth = strokeWidth;
         if (color)
             this.strokeStyle = color;
         if (options)
-            this.setStrokeOptions(options);
-    }
-    setStrokeOptions(options) {
-        this.strokeCap = options.strokeCap === 'none' ? 'butt' : options.strokeCap;
-        this.strokeJoin = options.strokeJoin;
-        this.dashPattern = options.dashPattern;
-        this.dashOffset = options.dashOffset;
-        this.miterLimit = options.miterLimit;
+            this.setStrokeOptions(options, childOptions);
+    }
+    setStrokeOptions(options, childOptions) {
+        let { strokeCap, strokeJoin, dashPattern, dashOffset, miterLimit } = options;
+        if (childOptions) {
+            if (childOptions.strokeCap)
+                strokeCap = childOptions.strokeCap;
+            if (childOptions.strokeJoin)
+                strokeJoin = childOptions.strokeJoin;
+            if (childOptions.dashPattern !== undefined)
+                dashPattern = childOptions.dashPattern;
+            if (childOptions.dashOffset !== undefined)
+                dashOffset = childOptions.dashOffset;
+            if (childOptions.miterLimit)
+                miterLimit = childOptions.miterLimit;
+        }
+        this.strokeCap = strokeCap;
+        this.strokeJoin = strokeJoin;
+        this.dashPattern = dashPattern;
+        this.dashOffset = dashOffset;
+        this.miterLimit = miterLimit;
     }
     saveBlendMode(blendMode) {
         this.savedBlendMode = this.blendMode;
@@ -2408,7 +2431,7 @@ const RectHelper = {
     }
 };
 
-const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$3, PI: PI$2, sqrt: sqrt$1, pow } = Math;
+const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$2, PI: PI$2, sqrt: sqrt$1, pow } = Math;
 const { setPoint: setPoint$1, addPoint: addPoint$1 } = TwoPointBoundsHelper;
 const { set, toNumberPoints } = PointHelper;
 const { M: M$5, L: L$6, C: C$4, Q: Q$4, Z: Z$5 } = PathCommandMap;
@@ -2483,7 +2506,7 @@ const BezierHelper = {
         let totalRadian = endRadian - startRadian;
         if (totalRadian < 0)
             totalRadian += PI2;
-        if (totalRadian === PI$2 || (abs$3(BAx + BAy) < 1.e-12) || (abs$3(CBx + CBy) < 1.e-12)) {
+        if (totalRadian === PI$2 || (abs$2(BAx + BAy) < 1.e-12) || (abs$2(CBx + CBy) < 1.e-12)) {
             if (data)
                 data.push(L$6, x1, y1);
             if (setPointBounds) {
@@ -2525,7 +2548,7 @@ const BezierHelper = {
             totalRadian -= PI2;
         if (anticlockwise)
             totalRadian -= PI2;
-        const parts = ceil$1(abs$3(totalRadian / PI_2));
+        const parts = ceil$1(abs$2(totalRadian / PI_2));
         const partRadian = totalRadian / parts;
         const partRadian4Sin = sin$3(partRadian / 4);
         const control = 8 / 3 * partRadian4Sin * partRadian4Sin / sin$3(partRadian / 2);
@@ -2970,7 +2993,7 @@ const { current, pushData, copyData } = PathConvert;
 
 const { M: M$3, L: L$4, C: C$2, Q: Q$2, Z: Z$3, N: N$2, D: D$2, X: X$2, G: G$2, F: F$3, O: O$2, P: P$2, U: U$2 } = PathCommandMap;
 const { getMinDistanceFrom, getRadianFrom } = PointHelper;
-const { tan, min, abs: abs$2 } = Math;
+const { tan, min, abs: abs$1 } = Math;
 const startPoint = {};
 const PathCommandDataHelper = {
     beginPath(data) {
@@ -3033,7 +3056,7 @@ const PathCommandDataHelper = {
     arcTo(data, x1, y1, x2, y2, radius, lastX, lastY) {
         if (lastX !== undefined) {
             const d = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2);
-            radius = min(radius, min(d / 2, d / 2 * abs$2(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
+            radius = min(radius, min(d / 2, d / 2 * abs$1(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
         }
         data.push(U$2, x1, y1, x2, y2, radius);
     },
@@ -3339,7 +3362,7 @@ const { getCenterX, getCenterY } = PointHelper;
 const { arcTo } = PathCommandDataHelper;
 const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
-        let command, commandLen;
+        let command, lastCommand, commandLen;
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
         const len = data.length;
         const smooth = [];
@@ -3377,8 +3400,10 @@ const PathCorner = {
                     lastY = y;
                     break;
                 case Z:
-                    arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY);
-                    smooth.push(Z);
+                    if (lastCommand !== Z) {
+                        arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY);
+                        smooth.push(Z);
+                    }
                     i += 1;
                     break;
                 default:
@@ -3387,6 +3412,7 @@ const PathCorner = {
                         smooth.push(data[i + j]);
                     i += commandLen;
             }
+            lastCommand = command;
         }
         if (command !== Z) {
             smooth[1] = startX;
@@ -3883,12 +3909,12 @@ class LeaferImage {
         try {
             if (transform && pattern.setTransform) {
                 pattern.setTransform(transform);
-                transform = null;
+                transform = undefined;
             }
         }
         catch (_a) { }
         if (paint)
-            paint.transform = transform;
+            DataHelper.stintSet(paint, 'transform', transform);
         return pattern;
     }
     destroy() {
@@ -3906,6 +3932,13 @@ function defineKey(target, key, descriptor, noConfigurable) {
 function getDescriptor(object, name) {
     return Object.getOwnPropertyDescriptor(object, name);
 }
+function createDescriptor(key, defaultValue) {
+    const privateKey = '_' + key;
+    return {
+        get() { const v = this[privateKey]; return v === undefined ? defaultValue : v; },
+        set(value) { this[privateKey] = value; }
+    };
+}
 function getNames(object) {
     return Object.getOwnPropertyNames(object);
 }
@@ -3993,10 +4026,14 @@ function pathInputType(defaultValue) {
     }));
 }
 const pathType = boundsType;
-function affectStrokeBoundsType(defaultValue) {
+function affectStrokeBoundsType(defaultValue, useStroke) {
     return decorateLeafAttr(defaultValue, (key) => attr({
         set(value) {
-            this.__setAttr(key, value) && doStrokeType(this);
+            if (this.__setAttr(key, value)) {
+                doStrokeType(this);
+                if (useStroke)
+                    this.__.__useStroke = true;
+            }
         }
     }));
 }
@@ -4134,15 +4171,7 @@ function defineDataProcessor(target, key, defaultValue) {
     const data = target.__DataProcessor.prototype;
     const computedKey = '_' + key;
     const setMethodName = getSetMethodName(key);
-    const property = {
-        get() {
-            const v = this[computedKey];
-            return v === undefined ? defaultValue : v;
-        },
-        set(value) {
-            this[computedKey] = value;
-        }
-    };
+    const property = createDescriptor(key, defaultValue);
     if (defaultValue === undefined) {
         property.get = function () { return this[computedKey]; };
     }
@@ -4257,7 +4286,7 @@ function registerUIEvent() {
     };
 }
 
-const { copy: copy$6, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
+const { copy: copy$6, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter, multiplyParent: multiplyParent$3, divideParent, getLayout } = MatrixHelper;
 const matrix = {}, { round } = Math;
 const LeafHelper = {
     updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
@@ -4329,6 +4358,14 @@ const LeafHelper = {
         }
         return true;
     },
+    copyCanvasByWorld(leaf, currentCanvas, fromCanvas, fromWorld, blendMode, onlyResetTransform) {
+        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);
+    },
     moveWorld(t, x, y = 0, isInnerPoint, transition) {
         const local = typeof x === 'object' ? Object.assign({}, x) : { x, y };
         isInnerPoint ? toOuterPoint$1(t.localTransform, local, local, true) : (t.parent && toInnerPoint$1(t.parent.worldTransform, local, local, true));
@@ -4388,14 +4425,14 @@ const LeafHelper = {
     },
     transformWorld(t, transform, resize, transition) {
         copy$6(matrix, t.worldTransform);
-        multiplyParent$2(matrix, transform);
+        multiplyParent$3(matrix, transform);
         if (t.parent)
             divideParent(matrix, t.parent.worldTransform);
         L.setTransform(t, matrix, resize, transition);
     },
     transform(t, transform, resize, transition) {
         copy$6(matrix, t.localTransform);
-        multiplyParent$2(matrix, transform);
+        multiplyParent$3(matrix, transform);
         L.setTransform(t, matrix, resize, transition);
     },
     setTransform(t, transform, resize, transition) {
@@ -5257,17 +5294,18 @@ const LeafDataProxy = {
     }
 };
 
-const { setLayout, multiplyParent: multiplyParent$1, translateInner, defaultWorld } = MatrixHelper;
+const { setLayout, multiplyParent: multiplyParent$2, translateInner, defaultWorld } = MatrixHelper;
 const { toPoint: toPoint$3, tempPoint } = AroundHelper;
 const LeafMatrix = {
     __updateWorldMatrix() {
-        multiplyParent$1(this.__local || this.__layout, this.parent ? this.parent.__world : defaultWorld, this.__world, !!this.__layout.affectScaleOrRotation, this.__, this.parent && this.parent.__);
+        const { parent, __layout } = this;
+        multiplyParent$2(this.__local || __layout, parent ? parent.__world : defaultWorld, this.__world, !!__layout.affectScaleOrRotation, this.__, parent && (parent.scrollY || parent.scrollX) && parent.__);
     },
     __updateLocalMatrix() {
         if (this.__local) {
             const layout = this.__layout, local = this.__local, data = this.__;
             if (layout.affectScaleOrRotation) {
-                if ((layout.scaleChanged && (layout.resized = 'scale')) || layout.rotationChanged) {
+                if ((layout.scaleChanged && (layout.resized || (layout.resized = 'scale'))) || layout.rotationChanged) {
                     setLayout(local, data, null, null, layout.affectRotation);
                     layout.scaleChanged = layout.rotationChanged = undefined;
                 }
@@ -5422,6 +5460,8 @@ const LeafBounds = {
 
 const LeafRender = {
     __render(canvas, options) {
+        if (options.shape)
+            return this.__renderShape(canvas, options);
         if (this.__worldOpacity) {
             const data = this.__;
             canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
@@ -5431,12 +5471,7 @@ const LeafRender = {
                     return this.__renderEraser(canvas, options);
                 const tempCanvas = canvas.getSameCanvas(true, true);
                 this.__draw(tempCanvas, options, canvas);
-                if (this.__worldFlipped) {
-                    canvas.copyWorldByReset(tempCanvas, this.__nowWorld, null, data.__blendMode, true);
-                }
-                else {
-                    canvas.copyWorldToInner(tempCanvas, this.__nowWorld, this.__layout.renderBounds, data.__blendMode);
-                }
+                LeafHelper.copyCanvasByWorld(this, canvas, tempCanvas, this.__nowWorld, data.__blendMode, true);
                 tempCanvas.recycle(this.__nowWorld);
             }
             else {
@@ -5446,6 +5481,12 @@ const LeafRender = {
                 Debug.drawBounds(this, canvas, options);
         }
     },
+    __renderShape(canvas, options) {
+        if (this.__worldOpacity) {
+            canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
+            this.__drawShape(canvas, options);
+        }
+    },
     __clip(canvas, options) {
         if (this.__worldOpacity) {
             canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
@@ -5478,7 +5519,7 @@ const BranchRender = {
                 options.dimOpacity = data.dim === true ? 0.2 : data.dim;
             else if (data.dimskip)
                 options.dimOpacity && (options.dimOpacity = 0);
-            if (data.__single) {
+            if (data.__single && !this.isBranchLeaf) {
                 if (data.eraser === 'path')
                     return this.__renderEraser(canvas, options);
                 const tempCanvas = canvas.getSameCanvas(false, true);
@@ -5500,9 +5541,7 @@ const BranchRender = {
         else {
             const { children } = this;
             for (let i = 0, len = children.length; i < len; i++) {
-                if (excludeRenderBounds$1(children[i], options))
-                    continue;
-                children[i].__render(canvas, options);
+                excludeRenderBounds$1(children[i], options) || children[i].__render(canvas, options);
             }
         }
     },
@@ -5510,16 +5549,15 @@ const BranchRender = {
         if (this.__worldOpacity) {
             const { children } = this;
             for (let i = 0, len = children.length; i < len; i++) {
-                if (excludeRenderBounds$1(children[i], options))
-                    continue;
-                children[i].__clip(canvas, options);
+                excludeRenderBounds$1(children[i], options) || children[i].__clip(canvas, options);
             }
         }
     }
 };
 
+const tempScaleData$1 = {};
 const { LEAF, create } = IncrementId;
-const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
+const { toInnerPoint, toOuterPoint, multiplyParent: multiplyParent$1 } = MatrixHelper;
 const { toOuterOf } = BoundsHelper;
 const { copy: copy$3, move } = PointHelper;
 const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
@@ -5701,7 +5739,7 @@ let Leaf = class Leaf {
             if (!this.__cameraWorld)
                 this.__cameraWorld = {};
             const cameraWorld = this.__cameraWorld, world = this.__world;
-            multiplyParent(world, options.matrix, cameraWorld, undefined, world);
+            multiplyParent$1(world, options.matrix, cameraWorld, undefined, world);
             toOuterOf(this.__layout.renderBounds, cameraWorld, cameraWorld);
             cameraWorld.half !== world.half && (cameraWorld.half = world.half);
             return cameraWorld;
@@ -5710,6 +5748,22 @@ let Leaf = class Leaf {
             return this.__world;
         }
     }
+    getClampRenderScale() {
+        let { scaleX } = this.__nowWorld || this.__world;
+        if (scaleX < 0)
+            scaleX = -scaleX;
+        return scaleX > 1 ? scaleX : 1;
+    }
+    getRenderScaleData(abs, scaleFixed) {
+        const { scaleX, scaleY } = ImageManager.patternLocked ? this.__world : this.__nowWorld;
+        if (scaleFixed)
+            tempScaleData$1.scaleX = tempScaleData$1.scaleY = 1;
+        else if (abs)
+            tempScaleData$1.scaleX = scaleX < 0 ? -scaleX : scaleX, tempScaleData$1.scaleY = scaleY < 0 ? -scaleY : scaleY;
+        else
+            tempScaleData$1.scaleX = scaleX, tempScaleData$1.scaleY = scaleY;
+        return tempScaleData$1;
+    }
     getTransform(relative) {
         return this.__layout.getTransform(relative || 'local');
     }
@@ -5865,7 +5919,8 @@ let Leaf = class Leaf {
     __drawFast(_canvas, _options) { }
     __draw(_canvas, _options, _originCanvas) { }
     __clip(_canvas, _options) { }
-    __renderShape(_canvas, _options, _ignoreFill, _ignoreStroke) { }
+    __renderShape(_canvas, _options) { }
+    __drawShape(_canvas, _options) { }
     __updateWorldOpacity() { }
     __updateChange() { }
     __drawPath(_canvas) { }
@@ -6233,7 +6288,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.6.7";
+const version = "1.8.0";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() { return true; }
@@ -6924,6 +6979,11 @@ function zoomLayerType() {
         });
     };
 }
+function createAttr(defaultValue) {
+    return (target, key) => {
+        defineKey(target, key, createDescriptor(key, defaultValue));
+    };
+}
 
 function hasTransparent$3(color) {
     if (!color || color.length === 7 || color.length === 4)
@@ -6981,26 +7041,9 @@ const emptyPaint = {};
 const debug$1 = Debug.get('UIData');
 class UIData extends LeafData {
     get scale() { const { scaleX, scaleY } = this; return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX; }
-    get __strokeWidth() {
-        const { strokeWidth, strokeWidthFixed } = this;
-        if (strokeWidthFixed) {
-            const ui = this.__leaf;
-            let { scaleX } = ui.__nowWorld || ui.__world;
-            if (scaleX < 0)
-                scaleX = -scaleX;
-            return scaleX > 1 ? strokeWidth / scaleX : strokeWidth;
-        }
-        else
-            return strokeWidth;
-    }
-    get __hasStroke() { return this.stroke && this.strokeWidth; }
-    get __hasHalf() { const t = this; return (t.stroke && t.strokeAlign === 'center' && t.strokeWidth % 2) || undefined; }
-    get __hasMultiPaint() {
-        const t = this;
-        if ((t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect)
-            return true;
-        return t.fill && this.__hasStroke;
-    }
+    get __strokeWidth() { return this.__getRealStrokeWidth(); }
+    get __maxStrokeWidth() { const t = this; return t.__hasMultiStrokeStyle ? Math.max(t.__hasMultiStrokeStyle, t.strokeWidth) : t.strokeWidth; }
+    get __hasMultiPaint() { const t = this; return (t.fill && this.__useStroke) || (t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect; }
     get __clipAfterFill() { const t = this; return (t.cornerRadius || t.innerShadow || t.__pathInputed); }
     get __hasSurface() { const t = this; return (t.fill || t.stroke); }
     get __autoWidth() { return !this._width; }
@@ -7082,6 +7125,21 @@ class UIData extends LeafData {
             Paint.compute('stroke', this.__leaf);
         this.__needComputePaint = undefined;
     }
+    __getRealStrokeWidth(childStyle) {
+        let { strokeWidth, strokeWidthFixed } = this;
+        if (childStyle) {
+            if (childStyle.strokeWidth)
+                strokeWidth = childStyle.strokeWidth;
+            if (childStyle.strokeWidthFixed !== undefined)
+                strokeWidthFixed = childStyle.strokeWidthFixed;
+        }
+        if (strokeWidthFixed) {
+            const scale = this.__leaf.getClampRenderScale();
+            return scale > 1 ? strokeWidth / scale : strokeWidth;
+        }
+        else
+            return strokeWidth;
+    }
     __setPaint(attrName, value) {
         this.__setInput(attrName, value);
         const layout = this.__leaf.__layout;
@@ -7106,6 +7164,7 @@ class UIData extends LeafData {
         }
         else {
             stintSet$2(this, '__isAlphaPixelStroke', undefined);
+            stintSet$2(this, '__hasMultiStrokeStyle', undefined);
             this._stroke = this.__isStrokes = undefined;
         }
     }
@@ -7127,8 +7186,8 @@ class GroupData extends UIData {
 
 class BoxData extends GroupData {
     get __boxStroke() { return !this.__pathInputed; }
-    get __drawAfterFill() { const t = this; return (t.overflow === 'hide' && (t.__clipAfterFill || t.innerShadow) && t.__leaf.children.length); }
-    get __clipAfterFill() { return this.__leaf.isOverflow || super.__clipAfterFill; }
+    get __drawAfterFill() { const t = this; return t.__single || t.__clipAfterFill; }
+    get __clipAfterFill() { const t = this; return t.overflow === 'hide' && t.__leaf.children.length && (t.__leaf.isOverflow || super.__clipAfterFill); }
 }
 
 class LeaferData extends GroupData {
@@ -7248,7 +7307,7 @@ class CanvasData extends RectData {
 const UIBounds = {
     __updateStrokeSpread() {
         let width = 0, boxWidth = 0;
-        const data = this.__, { strokeAlign, strokeWidth } = data, box = this.__box;
+        const data = this.__, { strokeAlign, __maxStrokeWidth: strokeWidth } = data, box = this.__box;
         if ((data.stroke || data.hitStroke === 'all') && strokeWidth && strokeAlign !== 'inside') {
             boxWidth = width = strokeAlign === 'center' ? strokeWidth / 2 : strokeWidth;
             if (!data.__boxStroke) {
@@ -7268,13 +7327,15 @@ const UIBounds = {
     },
     __updateRenderSpread() {
         let width = 0;
-        const { shadow, innerShadow, blur, backgroundBlur, filter } = this.__;
+        const { shadow, innerShadow, blur, backgroundBlur, filter, renderSpread } = this.__;
         if (shadow)
             shadow.forEach(item => width = Math.max(width, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread > 0 ? item.spread : 0) + item.blur * 1.5));
         if (blur)
             width = Math.max(width, blur);
         if (filter)
             width += Filter.getSpread(filter);
+        if (renderSpread)
+            width += renderSpread;
         let shapeWidth = width = Math.ceil(width);
         if (innerShadow)
             innerShadow.forEach(item => shapeWidth = Math.max(shapeWidth, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread < 0 ? -item.spread : 0) + item.blur * 1.5));
@@ -7290,15 +7351,18 @@ const { stintSet: stintSet$1 } = DataHelper;
 const UIRender = {
     __updateChange() {
         const data = this.__;
+        if (data.__useStroke) {
+            const useStroke = data.__useStroke = !!(data.stroke && data.strokeWidth);
+            stintSet$1(this.__world, 'half', useStroke && data.strokeAlign === 'center' && data.strokeWidth % 2);
+            stintSet$1(data, '__fillAfterStroke', useStroke && data.strokeAlign === 'outside' && data.fill && !data.__isTransparentFill);
+        }
         if (data.__useEffect) {
             const { shadow, fill, stroke } = data, otherEffect = data.innerShadow || data.blur || data.backgroundBlur || data.filter;
-            stintSet$1(data, '__isFastShadow', shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !(shadow[0].box && data.__isTransparentFill) && fill && !(fill instanceof Array && fill.length > 1) && (this.useFastShadow || !stroke || (stroke && data.strokeAlign === 'inside')));
+            stintSet$1(data, '__isFastShadow', shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && fill && !data.__isTransparentFill && !(fill instanceof Array && fill.length > 1) && (this.useFastShadow || !stroke || (stroke && data.strokeAlign === 'inside')));
             data.__useEffect = !!(shadow || otherEffect);
         }
-        stintSet$1(this.__world, 'half', data.__hasHalf);
-        stintSet$1(data, '__fillAfterStroke', data.stroke && data.strokeAlign === 'outside' && data.fill && !data.__isTransparentFill);
         data.__checkSingle();
-        stintSet$1(data, '__complex', data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect);
+        stintSet$1(data, '__complex', (data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect));
     },
     __drawFast(canvas, options) {
         drawFast(this, canvas, options);
@@ -7356,18 +7420,15 @@ const UIRender = {
                 this.__drawFast(canvas, options);
         }
     },
-    __renderShape(canvas, options, ignoreFill, ignoreStroke) {
-        if (this.__worldOpacity) {
-            canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
-            const { fill, stroke } = this.__;
-            this.__drawRenderPath(canvas);
-            if (fill && !ignoreFill)
-                this.__.__isAlphaPixelFill ? Paint.fills(fill, this, canvas) : Paint.fill('#000000', this, canvas);
-            if (this.__.__isCanvas)
-                this.__drawAfterFill(canvas, options);
-            if (stroke && !ignoreStroke)
-                this.__.__isAlphaPixelStroke ? Paint.strokes(stroke, this, canvas) : Paint.stroke('#000000', this, canvas);
-        }
+    __drawShape(canvas, options) {
+        this.__drawRenderPath(canvas);
+        const data = this.__, { fill, stroke } = data;
+        if (fill && !options.ignoreFill)
+            data.__isAlphaPixelFill ? Paint.fills(fill, this, canvas) : Paint.fill('#000000', this, canvas);
+        if (data.__isCanvas)
+            this.__drawAfterFill(canvas, options);
+        if (stroke && !options.ignoreStroke)
+            data.__isAlphaPixelStroke ? Paint.strokes(stroke, this, canvas) : Paint.stroke('#000000', this, canvas);
     },
     __drawAfterFill(canvas, options) {
         if (this.__.__clipAfterFill) {
@@ -7404,17 +7465,17 @@ const RectRender = {
         if (__drawAfterFill)
             this.__drawAfterFill(canvas, options);
         if (stroke) {
-            const { strokeAlign, __strokeWidth } = this.__;
-            if (!__strokeWidth)
+            const { strokeAlign, __strokeWidth: strokeWidth } = this.__;
+            if (!strokeWidth)
                 return;
-            canvas.setStroke(stroke, __strokeWidth, this.__);
-            const half = __strokeWidth / 2;
+            canvas.setStroke(stroke, strokeWidth, this.__);
+            const half = strokeWidth / 2;
             switch (strokeAlign) {
                 case 'center':
                     canvas.strokeRect(0, 0, width, height);
                     break;
                 case 'inside':
-                    width -= __strokeWidth, height -= __strokeWidth;
+                    width -= strokeWidth, height -= strokeWidth;
                     if (width < 0 || height < 0) {
                         canvas.save();
                         this.__clip(canvas, options);
@@ -7425,7 +7486,7 @@ const RectRender = {
                         canvas.strokeRect(x + half, y + half, width, height);
                     break;
                 case 'outside':
-                    canvas.strokeRect(x - half, y - half, width + __strokeWidth, height + __strokeWidth);
+                    canvas.strokeRect(x - half, y - half, width + strokeWidth, height + strokeWidth);
                     break;
             }
         }
@@ -7438,6 +7499,8 @@ let UI = UI_1 = class UI extends Leaf {
     get isFrame() { return false; }
     set scale(value) { MathHelper.assignScale(this, value); }
     get scale() { return this.__.scale; }
+    get isAutoWidth() { const t = this.__; return t.__autoWidth || t.autoWidth; }
+    get isAutoHeight() { const t = this.__; return t.__autoHeight || t.autoHeight; }
     get pen() {
         const { path } = this.__;
         pen.set(this.path = path || []);
@@ -7492,12 +7555,14 @@ let UI = UI_1 = class UI extends Leaf {
         }
     }
     __updateRenderPath() {
-        if (this.__.path) {
-            const data = this.__;
+        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, !data.cornerRadius);
         }
+        else
+            data.__pathForRender && (data.__pathForRender = undefined);
     }
     __drawRenderPath(canvas) {
         canvas.beginPath();
@@ -7650,6 +7715,9 @@ __decorate([
 __decorate([
     naturalBoundsType(1)
 ], UI.prototype, "pixelRatio", void 0);
+__decorate([
+    affectRenderBoundsType(0)
+], UI.prototype, "renderSpread", void 0);
 __decorate([
     pathInputType()
 ], UI.prototype, "path", void 0);
@@ -7708,13 +7776,13 @@ __decorate([
     surfaceType()
 ], UI.prototype, "fill", void 0);
 __decorate([
-    strokeType()
+    strokeType(undefined, true)
 ], UI.prototype, "stroke", void 0);
 __decorate([
     strokeType('inside')
 ], UI.prototype, "strokeAlign", void 0);
 __decorate([
-    strokeType(1)
+    strokeType(1, true)
 ], UI.prototype, "strokeWidth", void 0);
 __decorate([
     strokeType(false)
@@ -7806,7 +7874,8 @@ let Group = class Group extends UI {
     }
     toJSON(options) {
         const data = super.toJSON(options);
-        data.children = this.children.map(child => child.toJSON(options));
+        if (!this.childlessJSON)
+            data.children = this.children.map(child => child.toJSON(options));
         return data;
     }
     pick(_hitPoint, _options) { return undefined; }
@@ -8141,7 +8210,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
             list.push(item);
         this.requestRender();
     }
-    zoom(_zoomType, _padding, _fixedScale, _transition) {
+    zoom(_zoomType, _optionsOrPadding, _scroll, _transition) {
         return Plugin.need('view');
     }
     getValidMove(moveX, moveY) { return { x: moveX, y: moveY }; }
@@ -8186,7 +8255,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
                 Leafer_1.list.remove(this);
                 try {
                     this.stop();
-                    this.emitEvent(new LeaferEvent(LeaferEvent.END, this));
+                    this.emitLeafer(LeaferEvent.END);
                     this.__removeListenEvents();
                     this.__controllers.forEach(item => !(this.parent && item === this.interaction) && item.destroy());
                     this.__controllers.length = 0;
@@ -8253,8 +8322,8 @@ let Box = class Box extends Group {
     __updateRenderSpread() { return this.__updateRectRenderSpread() || -1; }
     __updateRectBoxBounds() { }
     __updateBoxBounds(_secondLayout) {
-        const data = this.__;
         if (this.children.length && !this.pathInputed) {
+            const data = this.__;
             if (data.__autoSide) {
                 if (data.__hasSurface)
                     this.__extraUpdate();
@@ -8281,20 +8350,26 @@ let Box = class Box extends Group {
     __updateStrokeBounds() { }
     __updateRenderBounds() {
         let isOverflow;
-        const { renderBounds } = this.__layout;
         if (this.children.length) {
+            const data = this.__, { renderBounds, boxBounds } = this.__layout;
             super.__updateRenderBounds();
             copy$2(childrenRenderBounds, renderBounds);
             this.__updateRectRenderBounds();
-            isOverflow = !includes$1(renderBounds, childrenRenderBounds);
-            if (isOverflow && this.__.overflow !== 'hide')
+            if (data.scrollY || data.scrollX) {
+                childrenRenderBounds.x += data.scrollX;
+                childrenRenderBounds.y += data.scrollY;
+            }
+            isOverflow = !includes$1(boxBounds, childrenRenderBounds);
+            if (isOverflow && data.overflow !== 'hide')
                 add(renderBounds, childrenRenderBounds);
         }
         else
             this.__updateRectRenderBounds();
         DataHelper.stintSet(this, 'isOverflow', isOverflow);
+        this.__updateScrollBar();
     }
     __updateRectRenderBounds() { }
+    __updateScrollBar() { }
     __updateRectChange() { }
     __updateChange() {
         super.__updateChange();
@@ -8311,10 +8386,12 @@ let Box = class Box extends Group {
             if (this.children.length)
                 this.__renderGroup(canvas, options);
         }
+        if (this.scrollBar)
+            this.scrollBar.__render(canvas, options);
     }
     __drawContent(canvas, options) {
         this.__renderGroup(canvas, options);
-        if (this.__.__hasStroke) {
+        if (this.__.__useStroke || this.__.__useEffect) {
             canvas.setWorld(this.__nowWorld);
             this.__drawRenderPath(canvas);
         }
@@ -8534,8 +8611,8 @@ let Polygon = class Polygon extends UI {
             for (let i = 1; i < sides; i++) {
                 lineTo$1(path, rx + rx * sin$1((i * 2 * PI$1) / sides), ry - ry * cos$1((i * 2 * PI$1) / sides));
             }
+            closePath$1(path);
         }
-        closePath$1(path);
     }
     __updateRenderPath() { }
     __updateBoxBounds() { }
@@ -8773,6 +8850,11 @@ let Text = class Text extends UI {
             return;
         super.__draw(canvas, options, originCanvas);
     }
+    __drawShape(canvas, options) {
+        if (options.shape)
+            this.__box && this.__box.__drawShape(canvas, options);
+        super.__drawShape(canvas, options);
+    }
     destroy() {
         if (this.boxStyle)
             this.boxStyle = null;
@@ -8968,9 +9050,14 @@ function fills(fills, ui, canvas) {
             }
         }
         canvas.fillStyle = item.style;
-        if (item.transform) {
+        if (item.transform || item.scaleFixed) {
             canvas.save();
-            canvas.transform(item.transform);
+            if (item.transform)
+                canvas.transform(item.transform);
+            if (item.scaleFixed) {
+                const { scaleX, scaleY } = ui.getRenderScaleData(true);
+                canvas.scale(1 / scaleX, 1 / scaleY);
+            }
             if (item.blendMode)
                 canvas.blendMode = item.blendMode;
             fillPathOrText(ui, canvas);
@@ -9006,8 +9093,13 @@ function strokeText(stroke, ui, canvas) {
 }
 function drawCenter$1(stroke, strokeWidthScale, ui, canvas) {
     const data = ui.__;
-    canvas.setStroke(!data.__isStrokes && stroke, data.strokeWidth * strokeWidthScale, data);
-    data.__isStrokes ? drawStrokesStyle(stroke, true, ui, canvas) : drawTextStroke(ui, canvas);
+    if (typeof stroke === 'object') {
+        drawStrokesStyle(stroke, strokeWidthScale, true, ui, canvas);
+    }
+    else {
+        canvas.setStroke(stroke, data.__strokeWidth * strokeWidthScale, data);
+        drawTextStroke(ui, canvas);
+    }
 }
 function drawAlign(stroke, align, ui, canvas) {
     const out = canvas.getSameCanvas(true, true);
@@ -9016,15 +9108,9 @@ function drawAlign(stroke, align, ui, canvas) {
     out.blendMode = align === 'outside' ? 'destination-out' : 'destination-in';
     fillText(ui, out);
     out.blendMode = 'normal';
-    copyWorld(canvas, out, ui);
+    LeafHelper.copyCanvasByWorld(ui, canvas, out);
     out.recycle(ui.__nowWorld);
 }
-function copyWorld(canvas, out, ui) {
-    if (ui.__worldFlipped || Platform.fullImageShadow)
-        canvas.copyWorldByReset(out, ui.__nowWorld);
-    else
-        canvas.copyWorldToInner(out, ui.__nowWorld, ui.__layout.renderBounds);
-}
 function drawTextStroke(ui, canvas) {
     let row, data = ui.__.__textDrawData;
     const { rows, decorationY } = data;
@@ -9040,14 +9126,21 @@ function drawTextStroke(ui, canvas) {
         rows.forEach(row => decorationY.forEach(value => canvas.strokeRect(row.x, row.y + value, row.width, decorationHeight)));
     }
 }
-function drawStrokesStyle(strokes, isText, ui, canvas) {
+function drawStrokesStyle(strokes, strokeWidthScale, isText, ui, canvas) {
     let item;
+    const data = ui.__, { __hasMultiStrokeStyle } = data;
+    __hasMultiStrokeStyle || canvas.setStroke(undefined, data.__strokeWidth * strokeWidthScale, data);
     for (let i = 0, len = strokes.length; i < len; i++) {
         item = strokes[i];
         if (item.image && PaintImage.checkImage(ui, canvas, item, false))
             continue;
         if (item.style) {
-            canvas.strokeStyle = item.style;
+            if (__hasMultiStrokeStyle) {
+                const { strokeStyle } = item;
+                strokeStyle ? canvas.setStroke(item.style, data.__getRealStrokeWidth(strokeStyle) * strokeWidthScale, data, strokeStyle) : canvas.setStroke(item.style, data.__strokeWidth * strokeWidthScale, data);
+            }
+            else
+                canvas.strokeStyle = item.style;
             if (item.blendMode) {
                 canvas.saveBlendMode(item.blendMode);
                 isText ? drawTextStroke(ui, canvas) : canvas.stroke();
@@ -9086,8 +9179,13 @@ function strokes(strokes, ui, canvas) {
 }
 function drawCenter(stroke, strokeWidthScale, ui, canvas) {
     const data = ui.__;
-    canvas.setStroke(!data.__isStrokes && stroke, data.__strokeWidth * strokeWidthScale, data);
-    data.__isStrokes ? drawStrokesStyle(stroke, false, ui, canvas) : canvas.stroke();
+    if (typeof stroke === 'object') {
+        drawStrokesStyle(stroke, strokeWidthScale, false, ui, canvas);
+    }
+    else {
+        canvas.setStroke(stroke, data.__strokeWidth * strokeWidthScale, data);
+        canvas.stroke();
+    }
     if (data.__useArrow)
         Paint.strokeArrow(stroke, ui, canvas);
 }
@@ -9109,7 +9207,7 @@ function drawOutside(stroke, ui, canvas) {
         drawCenter(stroke, 2, ui, out);
         out.clipUI(data);
         out.clearWorld(renderBounds);
-        copyWorld(canvas, out, ui);
+        LeafHelper.copyCanvasByWorld(ui, canvas, out);
         out.recycle(ui.__nowWorld);
     }
 }
@@ -9164,8 +9262,16 @@ function compute(attrName, ui) {
     if (!(paints instanceof Array))
         paints = [paints];
     recycleMap = PaintImage.recycleImage(attrName, data);
+    let maxChildStrokeWidth;
     for (let i = 0, len = paints.length, item; i < len; i++) {
-        (item = getLeafPaint(attrName, paints[i], ui)) && leafPaints.push(item);
+        if (item = getLeafPaint(attrName, paints[i], ui)) {
+            leafPaints.push(item);
+            if (item.strokeStyle) {
+                maxChildStrokeWidth || (maxChildStrokeWidth = 1);
+                if (item.strokeStyle.strokeWidth)
+                    maxChildStrokeWidth = Math.max(maxChildStrokeWidth, item.strokeStyle.strokeWidth);
+            }
+        }
     }
     data['_' + attrName] = leafPaints.length ? leafPaints : undefined;
     if (leafPaints.length) {
@@ -9182,6 +9288,7 @@ function compute(attrName, ui) {
     else {
         stintSet(data, '__isAlphaPixelStroke', isAlphaPixel);
         stintSet(data, '__isTransparentStroke', isTransparent);
+        stintSet(data, '__hasMultiStrokeStyle', maxChildStrokeWidth);
     }
 }
 function getLeafPaint(attrName, paint, ui) {
@@ -9213,6 +9320,11 @@ function getLeafPaint(attrName, paint, ui) {
     if (data) {
         if (typeof data.style === 'string' && hasTransparent$1(data.style))
             data.isTransparent = true;
+        if (paint.style) {
+            if (paint.style.strokeWidth === 0)
+                return undefined;
+            data.strokeStyle = paint.style;
+        }
         if (paint.blendMode)
             data.blendMode = paint.blendMode;
     }
@@ -9232,8 +9344,8 @@ const PaintModule = {
     shape
 };
 
-let origin = {};
-const { get: get$3, rotateOfOuter: rotateOfOuter$1, translate: translate$1, scaleOfOuter: scaleOfOuter$1, scale: scaleHelper, rotate } = MatrixHelper;
+let origin = {}, tempMatrix = getMatrixData();
+const { get: get$3, rotateOfOuter: rotateOfOuter$1, translate: translate$1, scaleOfOuter: scaleOfOuter$1, multiplyParent, scale: scaleHelper, rotate, skew: skewHelper } = MatrixHelper;
 function fillOrFitMode(data, box, x, y, scaleX, scaleY, rotation) {
     const transform = get$3();
     translate$1(transform, box.x + x, box.y + y);
@@ -9242,13 +9354,19 @@ function fillOrFitMode(data, box, x, y, scaleX, scaleY, rotation) {
         rotateOfOuter$1(transform, { x: box.x + box.width / 2, y: box.y + box.height / 2 }, rotation);
     data.transform = transform;
 }
-function clipMode(data, box, x, y, scaleX, scaleY, rotation) {
+function clipMode(data, box, x, y, scaleX, scaleY, rotation, skew, clipSize) {
     const transform = get$3();
-    translate$1(transform, box.x + x, box.y + y);
-    if (scaleX)
-        scaleHelper(transform, scaleX, scaleY);
     if (rotation)
         rotate(transform, rotation);
+    if (skew)
+        skewHelper(transform, skew.x, skew.y);
+    if (scaleX)
+        scaleHelper(transform, scaleX, scaleY);
+    translate$1(transform, box.x + x, box.y + y);
+    if (clipSize) {
+        tempMatrix.a = box.width / clipSize.width, tempMatrix.d = box.height / clipSize.height;
+        multiplyParent(transform, tempMatrix);
+    }
     data.transform = transform;
 }
 function repeatMode(data, box, width, height, x, y, scaleX, scaleY, rotation, align) {
@@ -9285,11 +9403,15 @@ const tempBox = new Bounds();
 const tempScaleData = {};
 const tempImage = {};
 function createData(leafPaint, image, paint, box) {
-    const { changeful, sync } = paint;
+    const { changeful, sync, editing, scaleFixed } = paint;
     if (changeful)
         leafPaint.changeful = changeful;
     if (sync)
         leafPaint.sync = sync;
+    if (editing)
+        leafPaint.editing = editing;
+    if (scaleFixed)
+        leafPaint.scaleFixed = scaleFixed;
     leafPaint.data = getPatternData(paint, box, image);
 }
 function getPatternData(paint, box, image) {
@@ -9298,7 +9420,7 @@ function getPatternData(paint, box, image) {
     if (paint.mode === 'strench')
         paint.mode = 'stretch';
     let { width, height } = image;
-    const { opacity, mode, align, offset, scale, size, rotation, repeat, filters } = paint;
+    const { opacity, mode, align, offset, scale, size, rotation, skew, clipSize, repeat, filters } = paint;
     const sameBox = box.width === width && box.height === height;
     const data = { mode };
     const swapSize = align !== 'center' && (rotation || 0) % 180 === 90;
@@ -9332,8 +9454,8 @@ function getPatternData(paint, box, image) {
             break;
         case 'normal':
         case 'clip':
-            if (tempImage.x || tempImage.y || scaleX || rotation)
-                clipMode(data, box, tempImage.x, tempImage.y, scaleX, scaleY, rotation);
+            if (tempImage.x || tempImage.y || scaleX || clipSize || rotation || skew)
+                clipMode(data, box, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, paint.clipSize);
             break;
         case 'repeat':
             if (!sameBox || scaleX || rotation)
@@ -9410,11 +9532,11 @@ function image(ui, attrName, paint, boxBounds, firstUse) {
                 }
                 onLoadSuccess(ui, event);
             }
-            leafPaint.loadId = null;
+            leafPaint.loadId = undefined;
         }, (error) => {
             ignoreRender(ui, false);
             onLoadError(ui, event, error);
-            leafPaint.loadId = null;
+            leafPaint.loadId = undefined;
         });
         if (ui.placeholderColor) {
             if (!ui.placeholderDelay)
@@ -9470,16 +9592,16 @@ function ignoreRender(ui, value) {
 }
 
 const { get: get$1, scale, copy: copy$1 } = MatrixHelper;
-const { ceil, abs: abs$1 } = Math;
+const { ceil, abs } = Math;
 function createPattern(ui, paint, pixelRatio) {
-    let { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
+    let { scaleX, scaleY } = ui.getRenderScaleData(true, paint.scaleFixed);
     const id = scaleX + '-' + scaleY + '-' + pixelRatio;
     if (paint.patternId !== id && !ui.destroyed) {
-        scaleX = abs$1(scaleX);
-        scaleY = abs$1(scaleY);
         const { image, data } = paint;
         let imageScale, imageMatrix, { width, height, scaleX: sx, scaleY: sy, transform, repeat } = data;
         if (sx) {
+            sx = abs(sx);
+            sy = abs(sy);
             imageMatrix = get$1();
             copy$1(imageMatrix, transform);
             scale(imageMatrix, 1 / sx, 1 / sy);
@@ -9532,9 +9654,8 @@ function createPattern(ui, paint, pixelRatio) {
     }
 }
 
-const { abs } = Math;
 function checkImage(ui, canvas, paint, allowDraw) {
-    const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
+    const { scaleX, scaleY } = ui.getRenderScaleData(true, paint.scaleFixed);
     const { pixelRatio } = canvas, { data } = paint;
     if (!data || (paint.patternId === scaleX + '-' + scaleY + '-' + pixelRatio && !Export.running)) {
         return false;
@@ -9547,8 +9668,8 @@ function checkImage(ui, canvas, paint, allowDraw) {
             else {
                 if (!(paint.changeful || ResizeEvent.isResizing(ui) || Export.running)) {
                     let { width, height } = data;
-                    width *= abs(scaleX) * pixelRatio;
-                    height *= abs(scaleY) * pixelRatio;
+                    width *= scaleX * pixelRatio;
+                    height *= scaleY * pixelRatio;
                     if (data.scaleX) {
                         width *= data.scaleX;
                         height *= data.scaleY;
@@ -9558,6 +9679,10 @@ function checkImage(ui, canvas, paint, allowDraw) {
             }
         }
         if (allowDraw) {
+            if (ui.__.__isFastShadow) {
+                canvas.fillStyle = paint.style || '#000';
+                canvas.fill();
+            }
             drawImage(ui, canvas, paint, data);
             return true;
         }
@@ -9746,10 +9871,7 @@ function shadow(ui, current, shape) {
             }
             worldCanvas ? other.copyWorld(worldCanvas, nowWorld, nowWorld, 'destination-out') : other.copyWorld(shape.canvas, shapeBounds, bounds, 'destination-out');
         }
-        if (ui.__worldFlipped)
-            current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode);
-        else
-            current.copyWorldToInner(other, copyBounds, __layout.renderBounds, item.blendMode);
+        LeafHelper.copyCanvasByWorld(ui, current, other, copyBounds, item.blendMode);
         if (end && index < end)
             other.clearWorld(copyBounds, true);
     });
@@ -9808,10 +9930,7 @@ function innerShadow(ui, current, shape) {
             copyBounds = bounds;
         }
         other.fillWorld(copyBounds, ColorConvert.string(item.color), 'source-in');
-        if (ui.__worldFlipped)
-            current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode);
-        else
-            current.copyWorldToInner(other, copyBounds, __layout.renderBounds, item.blendMode);
+        LeafHelper.copyCanvasByWorld(ui, current, other, copyBounds, item.blendMode);
         if (end && index < end)
             other.clearWorld(copyBounds, true);
     });
@@ -9867,12 +9986,11 @@ Group.prototype.__renderMask = function (canvas, options) {
                     contentCanvas = getCanvas(canvas);
                 child.__render(maskCanvas, options);
             }
-            if (!(mask === 'clipping' || mask === 'clipping-path'))
-                continue;
-        }
-        if (excludeRenderBounds(child, options))
+            if (mask === 'clipping' || mask === 'clipping-path')
+                excludeRenderBounds(child, options) || child.__render(canvas, options);
             continue;
-        child.__render(contentCanvas || canvas, options);
+        }
+        excludeRenderBounds(child, options) || child.__render(contentCanvas || canvas, options);
     }
     maskEnd(this, currentMask, canvas, contentCanvas, maskCanvas, maskOpacity);
 };
@@ -10454,4 +10572,4 @@ Object.assign(Effect, EffectModule);
 
 useCanvas();
 
-export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, DataHelper, Debug, Direction4, Direction9, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Frame, FrameData, Group, GroupData, Image, ImageData, ImageEvent, ImageManager, IncrementId, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MyImage, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Plugin, Point, PointHelper, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Run, Star, StarData, State, StringNumberMap, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isEmptyData, isNull, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$2 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, DataHelper, Debug, Direction4, Direction9, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Frame, FrameData, Group, GroupData, Image, ImageData, ImageEvent, ImageManager, IncrementId, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MyImage, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Plugin, Point, PointHelper, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Run, Star, StarData, State, StringNumberMap, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isEmptyData, isNull, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix$1 as tempMatrix, tempPoint$2 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };