@leafer/core 1.0.0-rc.12 → 1.0.0-rc.17

package/lib/core.esm.js

@@ -403,6 +403,10 @@ const PointHelper = {
         t.x = point.x;
         t.y = point.y;
     },
+    copyFrom(t, x, y) {
+        t.x = x;
+        t.y = y;
+    },
     move(t, x, y) {
         t.x += x;
         t.y += y;
@@ -430,19 +434,19 @@ const PointHelper = {
     },
     tempToInnerOf(t, matrix) {
         const { tempPoint: temp } = P$5;
-        P$5.copy(temp, t);
+        copy$6(temp, t);
         toInnerPoint$2(matrix, temp, temp);
         return temp;
     },
     tempToOuterOf(t, matrix) {
         const { tempPoint: temp } = P$5;
-        P$5.copy(temp, t);
+        copy$6(temp, t);
         toOuterPoint$2(matrix, temp, temp);
         return temp;
     },
     tempToInnerRadiusPointOf(t, matrix) {
         const { tempRadiusPoint: temp } = P$5;
-        P$5.copy(temp, t);
+        copy$6(temp, t);
         P$5.toInnerRadiusPointOf(t, matrix, temp);
         return temp;
     },
@@ -468,7 +472,7 @@ const PointHelper = {
         return y1 + (y2 - y1) / 2;
     },
     getDistance(t, point) {
-        return P$5.getDistanceFrom(t.x, t.y, point.x, point.y);
+        return getDistanceFrom(t.x, t.y, point.x, point.y);
     },
     getDistanceFrom(x1, y1, x2, y2) {
         const x = abs$2(x2 - x1);
@@ -476,10 +480,10 @@ const PointHelper = {
         return sqrt$2(x * x + y * y);
     },
     getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
-        return min$1(P$5.getDistanceFrom(x1, y1, x2, y2), P$5.getDistanceFrom(x2, y2, x3, y3));
+        return min$1(getDistanceFrom(x1, y1, x2, y2), getDistanceFrom(x2, y2, x3, y3));
     },
     getAngle(t, to) {
-        return P$5.getAtan2(t, to) / OneRadian;
+        return getAtan2(t, to) / OneRadian;
     },
     getRotation(t, origin, to, toOrigin) {
         if (!toOrigin)
@@ -497,15 +501,19 @@ const PointHelper = {
     getAtan2(t, to) {
         return atan2$2(to.y - t.y, to.x - t.x);
     },
-    getDistancePoint(t, to, distance) {
-        const r = P$5.getAtan2(t, to);
-        return { x: t.x + cos$2(r) * distance, y: t.y + sin$2(r) * distance };
+    getDistancePoint(t, to, distance, changeTo) {
+        const r = getAtan2(t, to);
+        to = changeTo ? to : {};
+        to.x = t.x + cos$2(r) * distance;
+        to.y = t.y + sin$2(r) * distance;
+        return to;
     },
     reset(t) {
         P$5.reset(t);
     }
 };
 const P$5 = PointHelper;
+const { getDistanceFrom, copy: copy$6, getAtan2 } = P$5;
 
 class Point {
     constructor(x, y) {
@@ -559,8 +567,8 @@ class Point {
     getDistance(to) {
         return PointHelper.getDistance(this, to);
     }
-    getDistancePoint(to, distance) {
-        return new Point(PointHelper.getDistancePoint(this, to, distance));
+    getDistancePoint(to, distance, changeTo) {
+        return new Point(PointHelper.getDistancePoint(this, to, distance, changeTo));
     }
     getAngle(to) {
         return PointHelper.getAngle(this, to);
@@ -711,7 +719,7 @@ const TwoPointBoundsHelper = {
 };
 const { addPoint: addPoint$3 } = TwoPointBoundsHelper;
 
-const { tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPoint$2, toBounds: toBounds$1 } = TwoPointBoundsHelper;
+const { tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPoint$2, toBounds: toBounds$2 } = TwoPointBoundsHelper;
 const { toOuterPoint: toOuterPoint$1 } = MatrixHelper;
 const { float } = MathHelper;
 const { floor, ceil: ceil$1 } = Math;
@@ -822,7 +830,7 @@ const BoundsHelper = {
             point.x = t.x;
             toOuterPoint$1(matrix, point, toPoint$1);
             addPoint$2(tempPointBounds$1, toPoint$1.x, toPoint$1.y);
-            toBounds$1(tempPointBounds$1, to);
+            toBounds$2(tempPointBounds$1, to);
         }
     },
     toInnerOf(t, matrix, to) {
@@ -906,7 +914,7 @@ const BoundsHelper = {
     },
     setPoints(t, points) {
         points.forEach((point, index) => index === 0 ? setPoint$2(tempPointBounds$1, point.x, point.y) : addPoint$2(tempPointBounds$1, point.x, point.y));
-        toBounds$1(tempPointBounds$1, t);
+        toBounds$2(tempPointBounds$1, t);
     },
     getPoints(t) {
         const { x, y, width, height } = t;
@@ -1431,6 +1439,8 @@ class LeafData {
             if (value !== undefined)
                 return value;
         }
+        if (name === 'path' && !this.__pathInputed)
+            return;
         return this['_' + name];
     }
     __removeInput(name) {
@@ -1444,6 +1454,8 @@ class LeafData {
             if (key[0] !== '_') {
                 value = this['_' + key];
                 if (value !== undefined) {
+                    if (key === 'path' && !this.__pathInputed)
+                        continue;
                     inputValue = __input ? __input[key] : undefined;
                     data[key] = (inputValue === undefined) ? value : inputValue;
                 }
@@ -1473,6 +1485,9 @@ class LeafData {
             t.__single = true;
         }
     }
+    __removeNaturalSize() {
+        this.__naturalWidth = this.__naturalHeight = undefined;
+    }
     destroy() {
         this.__input = this.__middle = null;
     }
@@ -1960,7 +1975,7 @@ class LeaferCanvasBase extends Canvas {
             this.setStrokeOptions(options);
     }
     setStrokeOptions(options) {
-        this.strokeCap = options.strokeCap;
+        this.strokeCap = options.strokeCap === 'none' ? 'butt' : options.strokeCap;
         this.strokeJoin = options.strokeJoin;
         this.dashPattern = options.dashPattern;
         this.dashOffset = options.dashOffset;
@@ -2783,22 +2798,12 @@ const PathCommandDataHelper = {
         }
     },
     drawEllipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
-        if (rotation === undefined)
-            rotation = 0;
-        if (startAngle === undefined)
-            startAngle = 0;
-        if (endAngle === undefined)
-            endAngle = 360;
-        BezierHelper.ellipse(null, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise, null, null, startPoint);
+        BezierHelper.ellipse(null, x, y, radiusX, radiusY, rotation === undefined ? 0 : rotation, startAngle === undefined ? 0 : startAngle, endAngle === undefined ? 360 : endAngle, anticlockwise, null, null, startPoint);
         data.push(M$3, startPoint.x, startPoint.y);
         ellipse$2(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
     },
     drawArc(data, x, y, radius, startAngle, endAngle, anticlockwise) {
-        if (startAngle === undefined)
-            startAngle = 0;
-        if (endAngle === undefined)
-            endAngle = 360;
-        BezierHelper.arc(null, x, y, radius, startAngle, endAngle, anticlockwise, null, null, startPoint);
+        BezierHelper.arc(null, x, y, radius, startAngle === undefined ? 0 : startAngle, endAngle === undefined ? 360 : endAngle, anticlockwise, null, null, startPoint);
         data.push(M$3, startPoint.x, startPoint.y);
         arc$2(data, x, y, radius, startAngle, endAngle, anticlockwise);
     },
@@ -2810,68 +2815,70 @@ const { ellipse: ellipse$2, arc: arc$2 } = PathCommandDataHelper;
 
 const { moveTo, lineTo, quadraticCurveTo, bezierCurveTo, closePath, beginPath, rect, roundRect: roundRect$1, ellipse: ellipse$1, arc: arc$1, arcTo: arcTo$2, drawEllipse, drawArc, drawPoints } = PathCommandDataHelper;
 class PathCreator {
+    set path(value) { this.__path = value; }
+    get path() { return this.__path; }
     constructor(path) {
         if (path) {
-            this.path = typeof path === 'string' ? PathHelper.parse(path) : path;
+            this.__path = typeof path === 'string' ? PathHelper.parse(path) : path;
         }
         else {
-            this.path = [];
+            this.__path = [];
         }
     }
     beginPath() {
-        beginPath(this.path);
+        beginPath(this.__path);
         return this;
     }
     moveTo(x, y) {
-        moveTo(this.path, x, y);
+        moveTo(this.__path, x, y);
         return this;
     }
     lineTo(x, y) {
-        lineTo(this.path, x, y);
+        lineTo(this.__path, x, y);
         return this;
     }
     bezierCurveTo(x1, y1, x2, y2, x, y) {
-        bezierCurveTo(this.path, x1, y1, x2, y2, x, y);
+        bezierCurveTo(this.__path, x1, y1, x2, y2, x, y);
         return this;
     }
     quadraticCurveTo(x1, y1, x, y) {
-        quadraticCurveTo(this.path, x1, y1, x, y);
+        quadraticCurveTo(this.__path, x1, y1, x, y);
         return this;
     }
     closePath() {
-        closePath(this.path);
+        closePath(this.__path);
         return this;
     }
     rect(x, y, width, height) {
-        rect(this.path, x, y, width, height);
+        rect(this.__path, x, y, width, height);
         return this;
     }
     roundRect(x, y, width, height, cornerRadius) {
-        roundRect$1(this.path, x, y, width, height, cornerRadius);
+        roundRect$1(this.__path, x, y, width, height, cornerRadius);
         return this;
     }
     ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
-        ellipse$1(this.path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
+        ellipse$1(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
         return this;
     }
     arc(x, y, radius, startAngle, endAngle, anticlockwise) {
-        arc$1(this.path, x, y, radius, startAngle, endAngle, anticlockwise);
+        arc$1(this.__path, x, y, radius, startAngle, endAngle, anticlockwise);
         return this;
     }
     arcTo(x1, y1, x2, y2, radius) {
-        arcTo$2(this.path, x1, y1, x2, y2, radius);
+        arcTo$2(this.__path, x1, y1, x2, y2, radius);
         return this;
     }
     drawEllipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
-        drawEllipse(this.path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
+        drawEllipse(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
         return this;
     }
     drawArc(x, y, radius, startAngle, endAngle, anticlockwise) {
-        drawArc(this.path, x, y, radius, startAngle, endAngle, anticlockwise);
+        drawArc(this.__path, x, y, radius, startAngle, endAngle, anticlockwise);
         return this;
     }
     drawPoints(points, curve, close) {
-        drawPoints(this.path, points, curve, close);
+        drawPoints(this.__path, points, curve, close);
         return this;
     }
 }
@@ -2949,7 +2956,7 @@ const PathDrawer = {
 
 const { M: M$1, L: L$2, C: C$1, Q, Z: Z$1, N, D, X, G, F, O, P, U } = PathCommandMap;
 const { toTwoPointBounds, toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc, ellipse } = BezierHelper;
-const { addPointBounds, copy: copy$3, addPoint, setPoint, addBounds, toBounds } = TwoPointBoundsHelper;
+const { addPointBounds, copy: copy$3, addPoint, setPoint, addBounds, toBounds: toBounds$1 } = TwoPointBoundsHelper;
 const debug$2 = Debug.get('PathBounds');
 let radius, radiusX, radiusY;
 const tempPointBounds = {};
@@ -2958,7 +2965,7 @@ const setEndPoint = {};
 const PathBounds = {
     toBounds(data, setBounds) {
         PathBounds.toTwoPointBounds(data, setPointBounds);
-        toBounds(setPointBounds, setBounds);
+        toBounds$1(setPointBounds, setBounds);
     },
     toTwoPointBounds(data, setPointBounds) {
         if (!data || !data.length)
@@ -3620,9 +3627,35 @@ function boundsType(defaultValue) {
         defineLeafAttr(target, key, defaultValue, {
             set(value) {
                 this.__setAttr(key, value);
-                this.__layout.boxChanged || this.__layout.boxChange();
-                if (this.__hasAutoLayout)
-                    this.__layout.matrixChanged || this.__layout.matrixChange();
+                doBoundsType(this);
+            }
+        });
+    };
+}
+function naturalBoundsType(defaultValue) {
+    return (target, key) => {
+        defineLeafAttr(target, key, defaultValue, {
+            set(value) {
+                this.__setAttr(key, value);
+                doBoundsType(this);
+                this.__.__removeNaturalSize();
+            }
+        });
+    };
+}
+function doBoundsType(leaf) {
+    leaf.__layout.boxChanged || leaf.__layout.boxChange();
+    if (leaf.__hasAutoLayout)
+        leaf.__layout.matrixChanged || leaf.__layout.matrixChange();
+}
+function pathInputType(defaultValue) {
+    return (target, key) => {
+        defineLeafAttr(target, key, defaultValue, {
+            set(value) {
+                if (this.__.__pathInputed !== 2)
+                    this.__.__pathInputed = value ? 1 : 0;
+                this.__setAttr(key, value);
+                doBoundsType(this);
             }
         });
     };
@@ -3633,11 +3666,14 @@ function affectStrokeBoundsType(defaultValue) {
         defineLeafAttr(target, key, defaultValue, {
             set(value) {
                 this.__setAttr(key, value);
-                this.__layout.strokeChanged || this.__layout.strokeChange();
+                doStrokeType(this);
             }
         });
     };
 }
+function doStrokeType(leaf) {
+    leaf.__layout.strokeChanged || leaf.__layout.strokeChange();
+}
 const strokeType = affectStrokeBoundsType;
 function affectRenderBoundsType(defaultValue) {
     return (target, key) => {
@@ -4257,6 +4293,7 @@ class ChildEvent extends Event {
 }
 ChildEvent.ADD = 'child.add';
 ChildEvent.REMOVE = 'child.remove';
+ChildEvent.DESTROY = 'child.destroy';
 
 class PropertyEvent extends Event {
     constructor(type, target, attrName, oldValue, newValue) {
@@ -4704,6 +4741,7 @@ const WaitHelper = {
 const { updateMatrix, updateAllMatrix, hasParentAutoLayout } = LeafHelper;
 const { updateBounds } = BranchHelper;
 const { toOuterOf: toOuterOf$1, copyAndSpread } = BoundsHelper;
+const { toBounds } = PathBounds;
 const LeafBounds = {
     __updateWorldBounds() {
         toOuterOf$1(this.__layout.renderBounds, this.__world, this.__world);
@@ -4715,7 +4753,8 @@ const LeafBounds = {
     __updateLocalBounds() {
         const layout = this.__layout;
         if (layout.boxChanged) {
-            this.__updatePath();
+            if (!this.__.__pathInputed)
+                this.__updatePath();
             this.__updateRenderPath();
             this.__updateBoxBounds();
             layout.boxChanged = false;
@@ -4782,11 +4821,16 @@ const LeafBounds = {
     },
     __updateBoxBounds() {
         const b = this.__layout.boxBounds;
-        const { width, height } = this.__;
-        b.x = 0;
-        b.y = 0;
-        b.width = width;
-        b.height = height;
+        const data = this.__;
+        if (data.__pathInputed) {
+            toBounds(data.__pathForRender, b);
+        }
+        else {
+            b.x = 0;
+            b.y = 0;
+            b.width = data.width;
+            b.height = data.height;
+        }
     },
     __updateAutoLayout() {
         this.__layout.matrixChanged = true;
@@ -4915,6 +4959,9 @@ let Leaf = class Leaf {
     get innerName() { return this.__.name || this.tag + this.innerId; }
     get __DataProcessor() { return LeafData; }
     get __LayoutProcessor() { return LeafLayout; }
+    get isLeafer() { return false; }
+    get isBranch() { return false; }
+    get isBranchLeaf() { return false; }
     get __localMatrix() { return this.__local || this.__layout; }
     get __localBoxBounds() { return this.__local || this.__layout; }
     get worldTransform() { return this.__layout.getTransform('world'); }
@@ -4928,6 +4975,7 @@ let Leaf = class Leaf {
     get __worldFlipped() { return this.__world.scaleX < 0 || this.__world.scaleY < 0; }
     get __onlyHitMask() { return this.__hasMask && !this.__.hitChildren; }
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
+    get pathInputed() { return !!this.__.__pathInputed; }
     constructor(data) {
         this.innerId = create(LEAF);
         this.reset(data);
@@ -4979,7 +5027,7 @@ let Leaf = class Leaf {
         }
     }
     set(_data) { }
-    get() { return undefined; }
+    get(_name) { return undefined; }
     toJSON() {
         return this.__.__getInputData();
     }
@@ -5196,10 +5244,13 @@ let Leaf = class Leaf {
     }
     destroy() {
         if (!this.destroyed) {
-            if (this.parent)
+            const { parent } = this;
+            if (parent)
                 this.remove();
             if (this.children)
                 this.removeAll(true);
+            if (this.hasEvent(ChildEvent.DESTROY))
+                this.emitEvent(new ChildEvent(ChildEvent.DESTROY, this, parent));
             this.__.destroy();
             this.__layout.destroy();
             this.__captureMap = this.__bubbleMap = this.__parentWait = this.__leaferWait = null;
@@ -5219,11 +5270,6 @@ const { setListWithFn } = BoundsHelper;
 const { sort } = BranchHelper;
 const { localBoxBounds, localStrokeBounds, localRenderBounds, maskLocalBoxBounds, maskLocalStrokeBounds, maskLocalRenderBounds } = LeafBoundsHelper;
 let Branch = class Branch extends Leaf {
-    constructor() {
-        super();
-        this.isBranch = true;
-        this.children = [];
-    }
     __updateStrokeSpread() {
         const { children } = this;
         for (let i = 0, len = children.length; i < len; i++) {
@@ -5263,6 +5309,8 @@ let Branch = class Branch extends Leaf {
         }
     }
     add(child, index) {
+        if (child === this)
+            return;
         if (child.parent)
             child.parent.remove(child);
         child.parent = this;
@@ -5500,4 +5548,4 @@ class LeafLevelList {
     }
 }
 
-export { AnimateEvent, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, 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, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, defineDataProcessor, defineKey, defineLeafAttr, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, layoutProcessor, maskType, opacityType, pathType, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, useModule };
+export { AnimateEvent, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, 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, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, useModule };