@leafer-draw/miniapp 1.0.0 → 1.0.1

package/dist/miniapp.module.js

@@ -48,6 +48,8 @@ const I$1 = IncrementId;
 const { round, pow: pow$1, PI: PI$4 } = 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)
@@ -150,10 +152,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) {
@@ -312,7 +314,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;
@@ -344,10 +346,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) {
@@ -376,9 +378,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 };
     },
@@ -706,12 +710,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);
@@ -1999,7 +2003,7 @@ class LeaferCanvasBase extends Canvas$1 {
         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;
         }
@@ -2172,7 +2176,7 @@ class LeaferCanvasBase extends Canvas$1 {
             this.manager ? this.manager.recycle(this) : this.destroy();
         }
     }
-    updateRender() { }
+    updateRender(_bounds) { }
     unrealCanvas() { }
     destroy() {
         this.manager = this.view = this.parentView = null;
@@ -4066,8 +4070,13 @@ const LeafHelper = {
     zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize) {
         copy$6(matrix, t.__localMatrix);
         scaleOfOuter$2(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);
@@ -4075,8 +4084,13 @@ const LeafHelper = {
     rotateOfLocal(t, origin, angle) {
         copy$6(matrix, t.__localMatrix);
         rotateOfOuter$2(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);
@@ -4099,7 +4113,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;
@@ -4112,13 +4126,19 @@ const LeafHelper = {
             t.set(layout);
         }
     },
+    getFlipTransform(t, axis) {
+        const m = getMatrixData();
+        const sign = axis === 'x' ? 1 : -1;
+        scaleOfOuter$2(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$6(matrix, t.worldTransform);
@@ -4545,7 +4565,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 {
@@ -4576,7 +4599,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 => {
@@ -4878,7 +4901,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;
                 }
             }
@@ -4886,7 +4909,7 @@ const LeafMatrix = {
             local.f = data.y + data.offsetY;
             if (data.around || data.origin) {
                 toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$1);
-                translateInner(local, -tempPoint$1.x, -tempPoint$1.y, data.origin);
+                translateInner(local, -tempPoint$1.x, -tempPoint$1.y, !data.around);
             }
         }
         this.__layout.matrixChanged = false;
@@ -5115,7 +5138,7 @@ const { LEAF, create } = IncrementId;
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
 const { toOuterOf } = BoundsHelper;
 const { copy: copy$3 } = 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;
 let Leaf = class Leaf {
     get tag() { return this.__tag; }
     set tag(_value) { }
@@ -5141,6 +5164,8 @@ let 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);
@@ -5400,6 +5425,9 @@ let 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;
@@ -5757,13 +5785,14 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.0-rc.30";
+const version = "1.0.1";
 const inviteCode = {};
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() { return false; }
     init() {
-        let { view } = this.config;
+        const { config } = this;
+        let view = config.view || config.canvas;
         if (view) {
             if (typeof view === 'string') {
                 if (view[0] !== '#')
@@ -5793,16 +5822,18 @@ class LeaferCanvas extends LeaferCanvasBase {
         else {
             this.view = view.view || view;
         }
-        this.__createContext();
+        this.view.getContext ? this.__createContext() : this.unrealCanvas();
         const { width, height, pixelRatio } = this.config;
         const size = { width: width || view.width, height: height || view.height, pixelRatio };
         this.resize(size);
-        if (this.context.roundRect) {
-            this.roundRect = function (x, y, width, height, radius) {
-                this.context.roundRect(x, y, width, height, typeof radius === 'number' ? [radius] : radius);
-            };
+        if (this.context) {
+            if (this.context.roundRect) {
+                this.roundRect = function (x, y, width, height, radius) {
+                    this.context.roundRect(x, y, width, height, typeof radius === 'number' ? [radius] : radius);
+                };
+            }
+            canvasPatch(this.context.__proto__);
         }
-        canvasPatch(this.context.__proto__);
     }
     __createView() {
         this.view = Platform.origin.createCanvas(1, 1);
@@ -5820,10 +5851,12 @@ class LeaferCanvas extends LeaferCanvasBase {
                     callback();
             });
     }
-    startAutoLayout(_autoBounds, listener) {
+    startAutoLayout(autoBounds, listener) {
         this.resizeListener = listener;
-        this.checkSize = this.checkSize.bind(this);
-        Platform.miniapp.onWindowResize(this.checkSize);
+        if (autoBounds) {
+            this.checkSize = this.checkSize.bind(this);
+            Platform.miniapp.onWindowResize(this.checkSize);
+        }
     }
     checkSize() {
         if (this.viewSelect) {
@@ -5832,13 +5865,8 @@ class LeaferCanvas extends LeaferCanvasBase {
                     const { width, height } = this.clientBounds;
                     const { pixelRatio } = this;
                     const size = { width, height, pixelRatio };
-                    if (!this.isSameSize(size)) {
-                        const oldSize = {};
-                        DataHelper.copyAttrs(oldSize, this, canvasSizeAttrs);
-                        this.resize(size);
-                        if (this.width !== undefined)
-                            this.resizeListener(new ResizeEvent(size, oldSize));
-                    }
+                    if (!this.isSameSize(size))
+                        this.emitResize(size);
                 });
             }, 500);
         }
@@ -5848,6 +5876,16 @@ class LeaferCanvas extends LeaferCanvasBase {
         this.resizeListener = null;
         Platform.miniapp.offWindowResize(this.checkSize);
     }
+    unrealCanvas() {
+        this.unreal = true;
+    }
+    emitResize(size) {
+        const oldSize = {};
+        DataHelper.copyAttrs(oldSize, this, canvasSizeAttrs);
+        this.resize(size);
+        if (this.width !== undefined)
+            this.resizeListener(new ResizeEvent(size, oldSize));
+    }
 }
 
 const { mineType, fileType } = FileHelper;
@@ -5969,7 +6007,7 @@ function useCanvas(_canvasType, app) {
 }
 Platform.name = 'miniapp';
 Platform.requestRender = function (render) { Platform.canvas.view.requestAnimationFrame(render); };
-Platform.devicePixelRatio = wx.getSystemInfoSync().pixelRatio;
+defineKey(Platform, 'devicePixelRatio', { get() { return Math.max(1, wx.getSystemInfoSync().pixelRatio); } });
 
 class Watcher {
     get childrenChanged() { return this.hasAdd || this.hasRemove || this.hasVisible; }
@@ -6447,14 +6485,14 @@ class Renderer {
         if (Debug.showRepaint)
             this.canvas.strokeWorld(bounds, 'red');
         this.target.__render(this.canvas, options);
-        this.renderBounds = realBounds || bounds;
+        this.renderBounds = realBounds = realBounds || bounds;
         this.renderOptions = options;
-        this.totalBounds.isEmpty() ? this.totalBounds = this.renderBounds : this.totalBounds.add(this.renderBounds);
+        this.totalBounds.isEmpty() ? this.totalBounds = realBounds : this.totalBounds.add(realBounds);
         if (Debug.showHitView)
             this.renderHitView(options);
         if (Debug.showBoundsView)
             this.renderBoundsView(options);
-        this.canvas.updateRender();
+        this.canvas.updateRender(realBounds);
     }
     renderHitView(_options) { }
     renderBoundsView(_options) { }
@@ -7505,7 +7543,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.__controllers.push(this.renderer = Creator.renderer(this, canvas, config), this.watcher = Creator.watcher(this, config), this.layouter = Creator.layouter(this, config));
         if (this.isApp)
             this.__setApp();
-        this.__checkAutoLayout(config);
+        this.__checkAutoLayout(config, parentApp);
         this.view = canvas.view;
         if (parentApp) {
             this.__bindApp(parentApp);
@@ -7606,9 +7644,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         this.leafer = leafer;
         this.__level = 1;
     }
-    __checkAutoLayout(config) {
-        if (!config.width || !config.height) {
-            this.autoLayout = new AutoBounds(config);
+    __checkAutoLayout(config, parentApp) {
+        if (!parentApp) {
+            if (!config.width || !config.height)
+                this.autoLayout = new AutoBounds(config);
             this.canvas.startAutoLayout(this.autoLayout, this.__onResize.bind(this));
         }
     }
@@ -7743,7 +7782,9 @@ let Leafer = Leafer_1 = class Leafer extends Group {
             list.push(item);
         }
     }
-    zoom(_zoomType, _padding, _fixedScale) { return undefined; }
+    zoom(_zoomType, _padding, _fixedScale) {
+        return debug$1.error('need @leafer-in/view');
+    }
     getValidMove(moveX, moveY) { return { x: moveX, y: moveY }; }
     getValidScale(changeScale) { return changeScale; }
     getWorldPointByClient(clientPoint, updateClient) {
@@ -8270,8 +8311,7 @@ let Canvas = class Canvas extends Rect {
     destroy() {
         if (this.canvas) {
             this.canvas.destroy();
-            this.canvas = null;
-            this.context = null;
+            this.canvas = this.context = null;
         }
         super.destroy();
     }
@@ -9115,7 +9155,7 @@ function createPattern(ui, paint, pixelRatio) {
 const { abs } = Math;
 function checkImage(ui, canvas, paint, allowPaint) {
     const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
-    if (!paint.data || paint.patternId === scaleX + '-' + scaleY) {
+    if (!paint.data || (paint.patternId === scaleX + '-' + scaleY && !Export.running)) {
         return false;
     }
     else {
@@ -10093,7 +10133,10 @@ const ExportModule = {
                     const { x, y, width, height } = new Bounds(renderBounds).scale(scale);
                     let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio, smooth, contextSettings });
                     const renderOptions = { matrix: matrix.scale(1 / scale).invert().translate(-x, -y).withScale(1 / scaleX * scale, 1 / scaleY * scale) };
+                    let sliceLeaf;
                     if (slice) {
+                        sliceLeaf = leaf;
+                        sliceLeaf.__worldOpacity = 0;
                         leaf = leafer;
                         renderOptions.bounds = canvas.bounds;
                     }
@@ -10108,6 +10151,8 @@ const ExportModule = {
                         leaf.__render(canvas, renderOptions);
                     }
                     canvas.restore();
+                    if (sliceLeaf)
+                        sliceLeaf.__updateWorldOpacity();
                     if (trim) {
                         trimBounds = getTrimBounds(canvas);
                         const old = canvas, { width, height } = trimBounds;