@leafer/core 1.6.7 → 1.8.0

package/lib/core.esm.js

@@ -43,7 +43,7 @@ const IncrementId = {
 };
 const I$1 = IncrementId;
 
-const { round: round$3, pow: pow$1, PI: PI$2 } = Math;
+const { round: round$3, pow: pow$1, PI: PI$1 } = 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$2 / 180;
-const PI2 = PI$2 * 2;
-const PI_2 = PI$2 / 2;
+const OneRadian = PI$1 / 180;
+const PI2 = PI$1 * 2;
+const PI_2 = PI$1 / 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$2, cos: cos$2, abs: abs$2, sqrt: sqrt$2, atan2: atan2$2, min: min$1, round: round$2, PI: PI$1 } = Math;
+const { sin: sin$2, cos: cos$2, abs: abs$2, sqrt: sqrt$2, atan2: atan2$2, min: min$1, round: round$2 } = Math;
 const PointHelper = {
     defaultPoint: getPointData(),
     tempPoint: {},
@@ -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$1 ? 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);
@@ -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(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 = [];
@@ -2073,8 +2083,8 @@ class LeaferCanvasBase extends Canvas {
     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; }
@@ -2161,20 +2171,33 @@ class LeaferCanvasBase extends Canvas {
         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;
@@ -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]; };
     }
@@ -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));
@@ -5261,13 +5298,14 @@ const { setLayout, multiplyParent: multiplyParent$1, translateInner, defaultWorl
 const { toPoint, 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$1(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(children[i], options))
-                    continue;
-                children[i].__render(canvas, options);
+                excludeRenderBounds(children[i], options) || children[i].__render(canvas, options);
             }
         }
     },
@@ -5510,14 +5549,13 @@ const BranchRender = {
         if (this.__worldOpacity) {
             const { children } = this;
             for (let i = 0, len = children.length; i < len; i++) {
-                if (excludeRenderBounds(children[i], options))
-                    continue;
-                children[i].__clip(canvas, options);
+                excludeRenderBounds(children[i], options) || children[i].__clip(canvas, options);
             }
         }
     }
 };
 
+const tempScaleData = {};
 const { LEAF, create } = IncrementId;
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
 const { toOuterOf } = BoundsHelper;
@@ -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.scaleX = tempScaleData.scaleY = 1;
+        else if (abs)
+            tempScaleData.scaleX = scaleX < 0 ? -scaleX : scaleX, tempScaleData.scaleY = scaleY < 0 ? -scaleY : scaleY;
+        else
+            tempScaleData.scaleX = scaleX, tempScaleData.scaleY = scaleY;
+        return tempScaleData;
+    }
     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,6 +6288,6 @@ class LeafLevelList {
     }
 }
 
-const version = "1.6.7";
+const version = "1.8.0";
 
-export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isEmptyData, isNull, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, useModule, version, visibleType };
+export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isEmptyData, isNull, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, useModule, version, visibleType };