@leafer/core 1.0.0 → 1.0.2

package/lib/core.cjs

@@ -50,6 +50,8 @@ const I$1 = IncrementId;
 const { round, pow: pow$1, PI: PI$2 } = Math;
 const MathHelper = {
     within(value, min, max) {
+        if (typeof min === 'object')
+            max = min.max, min = min.min;
         if (min !== undefined && value < min)
             value = min;
         if (max !== undefined && value > max)
@@ -111,6 +113,19 @@ const MathHelper = {
         const a = maxLength ? pow$1(10, maxLength) : 1000000000000;
         num = round(num * a) / a;
         return num === -0 ? 0 : num;
+    },
+    getScaleData(scale, size, originSize, scaleData) {
+        if (!scaleData)
+            scaleData = {};
+        if (size) {
+            scaleData.scaleX = (typeof size === 'number' ? size : size.width) / originSize.width;
+            scaleData.scaleY = (typeof size === 'number' ? size : size.height) / originSize.height;
+        }
+        else if (scale) {
+            scaleData.scaleX = typeof scale === 'number' ? scale : scale.x;
+            scaleData.scaleY = typeof scale === 'number' ? scale : scale.y;
+        }
+        return scaleData;
     }
 };
 const OneRadian = PI$2 / 180;
@@ -152,10 +167,10 @@ const MatrixHelper = {
         t.e += x;
         t.f += y;
     },
-    translateInner(t, x, y, isMoveOrigin) {
+    translateInner(t, x, y, hasOrigin) {
         t.e += t.a * x + t.c * y;
         t.f += t.b * x + t.d * y;
-        if (isMoveOrigin)
+        if (hasOrigin)
             t.e -= x, t.f -= y;
     },
     scale(t, scaleX, scaleY = scaleX) {
@@ -314,7 +329,7 @@ const MatrixHelper = {
             to.y -= (f * a - e * b) * s;
         }
     },
-    setLayout(t, layout, origin, bcChanged) {
+    setLayout(t, layout, origin, around, bcChanged) {
         const { x, y, scaleX, scaleY } = layout;
         if (bcChanged === undefined)
             bcChanged = layout.rotation || layout.skewX || layout.skewY;
@@ -346,10 +361,10 @@ const MatrixHelper = {
         }
         t.e = x;
         t.f = y;
-        if (origin)
-            M$6.translateInner(t, -origin.x, -origin.y, true);
+        if (origin = origin || around)
+            M$6.translateInner(t, -origin.x, -origin.y, !around);
     },
-    getLayout(t, origin, firstSkewY) {
+    getLayout(t, origin, around, firstSkewY) {
         const { a, b, c, d, e, f } = t;
         let x = e, y = f, scaleX, scaleY, rotation, skewX, skewY;
         if (b || c) {
@@ -378,9 +393,11 @@ const MatrixHelper = {
             scaleY = d;
             rotation = skewX = skewY = 0;
         }
-        if (origin) {
+        if (origin = around || origin) {
             x += origin.x * a + origin.y * c;
             y += origin.x * b + origin.y * d;
+            if (!around)
+                x -= origin.x, y -= origin.y;
         }
         return { x, y, scaleX, scaleY, rotation, skewX, skewY };
     },
@@ -407,7 +424,7 @@ const MatrixHelper = {
 };
 const M$6 = MatrixHelper;
 
-const { toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$2 } = 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, PI: PI$1 } = Math;
 const PointHelper = {
     defaultPoint: getPointData(),
@@ -463,7 +480,7 @@ const PointHelper = {
     tempToOuterOf(t, matrix) {
         const { tempPoint: temp } = P$5;
         copy$7(temp, t);
-        toOuterPoint$2(matrix, temp, temp);
+        toOuterPoint$3(matrix, temp, temp);
         return temp;
     },
     tempToInnerRadiusPointOf(t, matrix) {
@@ -482,7 +499,7 @@ const PointHelper = {
         toInnerPoint$2(matrix, t, to);
     },
     toOuterOf(t, matrix, to) {
-        toOuterPoint$2(matrix, t, to);
+        toOuterPoint$3(matrix, t, to);
     },
     getCenter(t, to) {
         return { x: t.x + (to.x - t.x) / 2, y: t.y + (to.y - t.y) / 2 };
@@ -708,12 +725,12 @@ class Matrix {
     toInnerPoint(outer, to, distance) {
         MatrixHelper.toInnerPoint(this, outer, to, distance);
     }
-    setLayout(data, origin) {
-        MatrixHelper.setLayout(this, data, origin);
+    setLayout(data, origin, around) {
+        MatrixHelper.setLayout(this, data, origin, around);
         return this;
     }
-    getLayout(origin, firstSkewY) {
-        return MatrixHelper.getLayout(this, origin, firstSkewY);
+    getLayout(origin, around, firstSkewY) {
+        return MatrixHelper.getLayout(this, origin, around, firstSkewY);
     }
     withScale(scaleX, scaleY) {
         return MatrixHelper.withScale(this, scaleX, scaleY);
@@ -762,7 +779,7 @@ const TwoPointBoundsHelper = {
 const { addPoint: addPoint$3 } = TwoPointBoundsHelper;
 
 const { tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPoint$2, toBounds: toBounds$2 } = TwoPointBoundsHelper;
-const { toOuterPoint: toOuterPoint$1 } = MatrixHelper;
+const { toOuterPoint: toOuterPoint$2 } = MatrixHelper;
 const { float, fourNumber } = MathHelper;
 const { floor, ceil: ceil$1 } = Math;
 let right, bottom, boundsRight, boundsBottom;
@@ -782,17 +799,24 @@ const BoundsHelper = {
         t.width = bounds.width;
         t.height = bounds.height;
     },
-    copyAndSpread(t, bounds, spread, isShrink) {
+    copyAndSpread(t, bounds, spread, isShrink, side) {
+        const { x, y, width, height } = bounds;
         if (spread instanceof Array) {
             const four = fourNumber(spread);
             isShrink
-                ? B.set(t, bounds.x + four[3], bounds.y + four[0], bounds.width - four[1] - four[3], bounds.height - four[2] - four[0])
-                : B.set(t, bounds.x - four[3], bounds.y - four[0], bounds.width + four[1] + four[3], bounds.height + four[2] + four[0]);
+                ? B.set(t, x + four[3], y + four[0], width - four[1] - four[3], height - four[2] - four[0])
+                : B.set(t, x - four[3], y - four[0], width + four[1] + four[3], height + four[2] + four[0]);
         }
         else {
             if (isShrink)
                 spread = -spread;
-            B.set(t, bounds.x - spread, bounds.y - spread, bounds.width + spread * 2, bounds.height + spread * 2);
+            B.set(t, x - spread, y - spread, width + spread * 2, height + spread * 2);
+        }
+        if (side) {
+            if (side === 'width')
+                t.y = y, t.height = height;
+            else
+                t.x = x, t.width = width;
         }
     },
     minX(t) { return t.width > 0 ? t.x : t.x + t.width; },
@@ -869,16 +893,16 @@ const BoundsHelper = {
         else {
             point.x = t.x;
             point.y = t.y;
-            toOuterPoint$1(matrix, point, toPoint$2);
+            toOuterPoint$2(matrix, point, toPoint$2);
             setPoint$2(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
             point.x = t.x + t.width;
-            toOuterPoint$1(matrix, point, toPoint$2);
+            toOuterPoint$2(matrix, point, toPoint$2);
             addPoint$2(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
             point.y = t.y + t.height;
-            toOuterPoint$1(matrix, point, toPoint$2);
+            toOuterPoint$2(matrix, point, toPoint$2);
             addPoint$2(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
             point.x = t.x;
-            toOuterPoint$1(matrix, point, toPoint$2);
+            toOuterPoint$2(matrix, point, toPoint$2);
             addPoint$2(tempPointBounds$1, toPoint$2.x, toPoint$2.y);
             toBounds$2(tempPointBounds$1, to);
         }
@@ -892,16 +916,16 @@ const BoundsHelper = {
         const scale = Math.min(baseScale, Math.min(t.width / put.width, t.height / put.height));
         return new Matrix(scale, 0, 0, scale, -put.x * scale, -put.y * scale);
     },
-    getSpread(t, spread) {
+    getSpread(t, spread, side) {
         const n = {};
-        B.copyAndSpread(n, t, spread);
+        B.copyAndSpread(n, t, spread, false, side);
         return n;
     },
-    spread(t, spread) {
-        B.copyAndSpread(t, t, spread);
+    spread(t, spread, side) {
+        B.copyAndSpread(t, t, spread, false, side);
     },
-    shrink(t, shrink) {
-        B.copyAndSpread(t, t, shrink, true);
+    shrink(t, shrink, side) {
+        B.copyAndSpread(t, t, shrink, true, side);
     },
     ceil(t) {
         const { x, y } = t;
@@ -1084,12 +1108,12 @@ class Bounds {
     getFitMatrix(put, baseScale) {
         return BoundsHelper.getFitMatrix(this, put, baseScale);
     }
-    spread(fourNumber) {
-        BoundsHelper.spread(this, fourNumber);
+    spread(fourNumber, side) {
+        BoundsHelper.spread(this, fourNumber, side);
         return this;
     }
-    shrink(fourNumber) {
-        BoundsHelper.shrink(this, fourNumber);
+    shrink(fourNumber, side) {
+        BoundsHelper.shrink(this, fourNumber, side);
         return this;
     }
     ceil() {
@@ -2001,7 +2025,7 @@ class LeaferCanvasBase extends Canvas {
         DataHelper.copyAttrs(this.size, size, canvasSizeAttrs);
         this.size.pixelRatio || (this.size.pixelRatio = 1);
         this.bounds = new Bounds(0, 0, this.width, this.height);
-        if (!this.unreal) {
+        if (this.context && !this.unreal) {
             this.updateViewSize();
             this.smooth = this.config.smooth;
         }
@@ -2174,7 +2198,7 @@ class LeaferCanvasBase extends Canvas {
             this.manager ? this.manager.recycle(this) : this.destroy();
         }
     }
-    updateRender() { }
+    updateRender(_bounds) { }
     unrealCanvas() { }
     destroy() {
         this.manager = this.view = this.parentView = null;
@@ -2906,60 +2930,75 @@ class PathCreator {
     }
     beginPath() {
         beginPath(this.__path);
+        this.paint();
         return this;
     }
     moveTo(x, y) {
         moveTo(this.__path, x, y);
+        this.paint();
         return this;
     }
     lineTo(x, y) {
         lineTo(this.__path, x, y);
+        this.paint();
         return this;
     }
     bezierCurveTo(x1, y1, x2, y2, x, y) {
         bezierCurveTo(this.__path, x1, y1, x2, y2, x, y);
+        this.paint();
         return this;
     }
     quadraticCurveTo(x1, y1, x, y) {
         quadraticCurveTo(this.__path, x1, y1, x, y);
+        this.paint();
         return this;
     }
     closePath() {
         closePath(this.__path);
+        this.paint();
         return this;
     }
     rect(x, y, width, height) {
         rect(this.__path, x, y, width, height);
+        this.paint();
         return this;
     }
     roundRect(x, y, width, height, cornerRadius) {
         roundRect$1(this.__path, x, y, width, height, cornerRadius);
+        this.paint();
         return this;
     }
     ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
         ellipse$1(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     arc(x, y, radius, startAngle, endAngle, anticlockwise) {
         arc$1(this.__path, x, y, radius, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     arcTo(x1, y1, x2, y2, radius) {
         arcTo$2(this.__path, x1, y1, x2, y2, radius);
+        this.paint();
         return this;
     }
     drawEllipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
         drawEllipse(this.__path, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     drawArc(x, y, radius, startAngle, endAngle, anticlockwise) {
         drawArc(this.__path, x, y, radius, startAngle, endAngle, anticlockwise);
+        this.paint();
         return this;
     }
     drawPoints(points, curve, close) {
         drawPoints(this.__path, points, curve, close);
+        this.paint();
         return this;
     }
+    paint() { }
 }
 
 const { M: M$2, L: L$3, C: C$2, Q: Q$1, Z: Z$2, N: N$1, D: D$1, X: X$1, G: G$1, F: F$2, O: O$1, P: P$1, U: U$1 } = PathCommandMap;
@@ -3981,7 +4020,7 @@ function registerUIEvent() {
     };
 }
 
-const { copy: copy$3, toInnerPoint: toInnerPoint$1, scaleOfOuter, rotateOfOuter, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
+const { copy: copy$3, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter, rotateOfOuter, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
 const matrix = {};
 const LeafHelper = {
     updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
@@ -4046,10 +4085,9 @@ const LeafHelper = {
         }
         return true;
     },
-    moveWorld(t, x, y = 0) {
+    moveWorld(t, x, y = 0, isInnerPoint) {
         const local = typeof x === 'object' ? Object.assign({}, x) : { x, y };
-        if (t.parent)
-            toInnerPoint$1(t.parent.worldTransform, local, local, true);
+        isInnerPoint ? toOuterPoint$1(t.localTransform, local, local, true) : (t.parent && toInnerPoint$1(t.parent.worldTransform, local, local, true));
         L.moveLocal(t, local.x, local.y);
     },
     moveLocal(t, x, y = 0) {
@@ -4068,8 +4106,13 @@ const LeafHelper = {
     zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize) {
         copy$3(matrix, t.__localMatrix);
         scaleOfOuter(matrix, origin, scaleX, scaleY);
-        moveByMatrix(t, matrix);
-        t.scaleResize(scaleX, scaleY, resize !== true);
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix, resize);
+        }
+        else {
+            moveByMatrix(t, matrix);
+            t.scaleResize(scaleX, scaleY, resize !== true);
+        }
     },
     rotateOfWorld(t, origin, angle) {
         L.rotateOfLocal(t, getTempLocal(t, origin), angle);
@@ -4077,8 +4120,13 @@ const LeafHelper = {
     rotateOfLocal(t, origin, angle) {
         copy$3(matrix, t.__localMatrix);
         rotateOfOuter(matrix, origin, angle);
-        moveByMatrix(t, matrix);
-        t.rotation = MathHelper.formatRotation(t.rotation + angle);
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix);
+        }
+        else {
+            moveByMatrix(t, matrix);
+            t.rotation = MathHelper.formatRotation(t.rotation + angle);
+        }
     },
     skewOfWorld(t, origin, skewX, skewY, resize) {
         L.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize);
@@ -4101,7 +4149,7 @@ const LeafHelper = {
         L.setTransform(t, matrix, resize);
     },
     setTransform(t, transform, resize) {
-        const layout = getLayout(transform);
+        const layout = getLayout(transform, t.origin && L.getInnerOrigin(t, t.origin), t.around && L.getInnerOrigin(t, t.around));
         if (resize) {
             const scaleX = layout.scaleX / t.scaleX;
             const scaleY = layout.scaleY / t.scaleY;
@@ -4114,13 +4162,19 @@ const LeafHelper = {
             t.set(layout);
         }
     },
+    getFlipTransform(t, axis) {
+        const m = getMatrixData();
+        const sign = axis === 'x' ? 1 : -1;
+        scaleOfOuter(m, L.getLocalOrigin(t, 'center'), -1 * sign, 1 * sign);
+        return m;
+    },
     getLocalOrigin(t, origin) {
         return PointHelper.tempToOuterOf(L.getInnerOrigin(t, origin), t.localTransform);
     },
     getInnerOrigin(t, origin) {
-        if (typeof origin === 'string')
-            AroundHelper.toPoint(origin, t.boxBounds, origin = {});
-        return origin;
+        const innerOrigin = {};
+        AroundHelper.toPoint(origin, t.boxBounds, innerOrigin);
+        return innerOrigin;
     },
     getRelativeWorld(t, relative, temp) {
         copy$3(matrix, t.worldTransform);
@@ -4547,7 +4601,10 @@ const LeafEventer = {
     on(type, listener, options) {
         let capture, once;
         if (options) {
-            if (typeof options === 'boolean') {
+            if (options === 'once') {
+                once = true;
+            }
+            else if (typeof options === 'boolean') {
                 capture = options;
             }
             else {
@@ -4578,7 +4635,7 @@ const LeafEventer = {
             if (listener) {
                 let capture;
                 if (options)
-                    capture = typeof options === 'boolean' ? options : options.capture;
+                    capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
                 let events, index;
                 const map = __getListenerMap(this, capture);
                 typeList.forEach(type => {
@@ -4880,7 +4937,7 @@ const LeafMatrix = {
             const layout = this.__layout, local = this.__local, data = this.__;
             if (layout.affectScaleOrRotation) {
                 if (layout.scaleChanged || layout.rotationChanged) {
-                    setLayout(local, data, null, layout.affectRotation);
+                    setLayout(local, data, null, null, layout.affectRotation);
                     layout.scaleChanged = layout.rotationChanged = false;
                 }
             }
@@ -4888,7 +4945,7 @@ const LeafMatrix = {
             local.f = data.y + data.offsetY;
             if (data.around || data.origin) {
                 toPoint(data.around || data.origin, layout.boxBounds, tempPoint);
-                translateInner(local, -tempPoint.x, -tempPoint.y, data.origin);
+                translateInner(local, -tempPoint.x, -tempPoint.y, !data.around);
             }
         }
         this.__layout.matrixChanged = false;
@@ -4998,7 +5055,7 @@ const LeafBounds = {
                 updateAllMatrix(this);
                 updateBounds(this, this);
                 if (this.__.__autoSide)
-                    this.__updateBoxBounds();
+                    this.__updateBoxBounds(true);
             }
             else {
                 updateAllMatrix(this);
@@ -5117,7 +5174,7 @@ const { LEAF, create } = IncrementId;
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
 const { toOuterOf } = BoundsHelper;
 const { copy } = PointHelper;
-const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
+const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
 exports.Leaf = class Leaf {
     get tag() { return this.__tag; }
     set tag(_value) { }
@@ -5143,6 +5200,8 @@ exports.Leaf = class Leaf {
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
     get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
     get pathInputed() { return this.__.__pathInputed; }
+    set event(map) { let event; for (let key in map)
+        event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event); }
     constructor(data) {
         this.innerId = create(LEAF);
         this.reset(data);
@@ -5378,6 +5437,9 @@ exports.Leaf = class Leaf {
     move(x, y) {
         moveLocal(this, x, y);
     }
+    moveInner(x, y) {
+        moveWorld(this, x, y, true);
+    }
     scaleOf(origin, scaleX, scaleY, resize) {
         zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize);
     }
@@ -5402,6 +5464,9 @@ exports.Leaf = class Leaf {
     skewOfWorld(worldOrigin, skewX, skewY, resize) {
         skewOfWorld(this, worldOrigin, skewX, skewY, resize);
     }
+    flip(axis) {
+        transform(this, getFlipTransform(this, axis));
+    }
     scaleResize(scaleX, scaleY = scaleX, _noResize) {
         this.scaleX *= scaleX;
         this.scaleY *= scaleY;
@@ -5759,7 +5824,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.0-rc.30";
+const version = "1.0.1";
 const inviteCode = {};
 
 exports.AlignHelper = AlignHelper;