leafer-ui 1.0.0 → 1.0.1

package/dist/web.module.js

@@ -48,6 +48,8 @@ const I$2 = 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$7(matrix$1, t.__localMatrix);
         scaleOfOuter$2(matrix$1, origin, scaleX, scaleY);
-        moveByMatrix(t, matrix$1);
-        t.scaleResize(scaleX, scaleY, resize !== true);
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix$1, resize);
+        }
+        else {
+            moveByMatrix(t, matrix$1);
+            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$7(matrix$1, t.__localMatrix);
         rotateOfOuter$2(matrix$1, origin, angle);
-        moveByMatrix(t, matrix$1);
-        t.rotation = MathHelper.formatRotation(t.rotation + angle);
+        if (t.origin || t.around) {
+            L.setTransform(t, matrix$1);
+        }
+        else {
+            moveByMatrix(t, matrix$1);
+            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$1, 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$7(matrix$1, 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$4 } = 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,7 +5785,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.0-rc.30";
+const version = "1.0.1";
 const inviteCode = {};
 
 const debug$7 = Debug.get('LeaferCanvas');
@@ -5781,7 +5809,8 @@ class LeaferCanvas extends LeaferCanvasBase {
         }
     }
     init() {
-        const { view } = this.config;
+        const { config } = this;
+        const view = config.view || config.canvas;
         view ? this.__createViewFrom(view) : this.__createView();
         const { style } = this.view;
         style.display || (style.display = 'block');
@@ -5796,7 +5825,7 @@ class LeaferCanvas extends LeaferCanvasBase {
         }
         this.__createContext();
         if (!this.autoLayout)
-            this.resize(this.config);
+            this.resize(config);
     }
     set backgroundColor(color) { this.view.style.backgroundColor = color; }
     get backgroundColor() { return this.view.style.backgroundColor; }
@@ -5852,26 +5881,37 @@ class LeaferCanvas extends LeaferCanvasBase {
         this.clientBounds = this.view.getBoundingClientRect();
     }
     startAutoLayout(autoBounds, listener) {
-        this.autoBounds = autoBounds;
         this.resizeListener = listener;
-        try {
-            this.resizeObserver = new ResizeObserver((entries) => {
-                this.updateClientBounds();
-                for (const entry of entries)
-                    this.checkAutoBounds(entry.contentRect);
-            });
-            const parent = this.parentView;
-            if (parent) {
-                this.resizeObserver.observe(parent);
-                this.checkAutoBounds(parent.getBoundingClientRect());
+        if (autoBounds) {
+            this.autoBounds = autoBounds;
+            try {
+                this.resizeObserver = new ResizeObserver((entries) => {
+                    this.updateClientBounds();
+                    for (const entry of entries)
+                        this.checkAutoBounds(entry.contentRect);
+                });
+                const parent = this.parentView;
+                if (parent) {
+                    this.resizeObserver.observe(parent);
+                    this.checkAutoBounds(parent.getBoundingClientRect());
+                }
+                else {
+                    this.checkAutoBounds(this.view);
+                    debug$7.warn('no parent');
+                }
             }
-            else {
-                this.checkAutoBounds(this.view);
-                debug$7.warn('no parent');
+            catch (_a) {
+                this.imitateResizeObserver();
             }
         }
-        catch (_a) {
-            this.imitateResizeObserver();
+        else {
+            window.addEventListener('resize', () => {
+                const pixelRatio = Platform.devicePixelRatio;
+                if (this.pixelRatio !== pixelRatio) {
+                    const { width, height } = this;
+                    this.emitResize({ width, height, pixelRatio });
+                }
+            });
         }
     }
     imitateResizeObserver() {
@@ -5884,17 +5924,12 @@ class LeaferCanvas extends LeaferCanvasBase {
     checkAutoBounds(parentSize) {
         const view = this.view;
         const { x, y, width, height } = this.autoBounds.getBoundsFrom(parentSize);
-        if (width !== this.width || height !== this.height) {
+        const size = { width, height, pixelRatio: Platform.devicePixelRatio };
+        if (!this.isSameSize(size)) {
             const { style } = view;
-            const { pixelRatio } = this;
             style.marginLeft = x + 'px';
             style.marginTop = y + 'px';
-            const size = { width, height, pixelRatio };
-            const oldSize = {};
-            DataHelper.copyAttrs(oldSize, this, canvasSizeAttrs);
-            this.resize(size);
-            if (this.width !== undefined)
-                this.resizeListener(new ResizeEvent(size, oldSize));
+            this.emitResize(size);
         }
     }
     stopAutoLayout() {
@@ -5905,6 +5940,13 @@ class LeaferCanvas extends LeaferCanvasBase {
             this.resizeObserver = null;
         }
     }
+    emitResize(size) {
+        const oldSize = {};
+        DataHelper.copyAttrs(oldSize, this, canvasSizeAttrs);
+        this.resize(size);
+        if (this.width !== undefined)
+            this.resizeListener(new ResizeEvent(size, oldSize));
+    }
     unrealCanvas() {
         if (!this.unreal && this.parentView) {
             const view = this.view;
@@ -5985,7 +6027,7 @@ function useCanvas(_canvasType, _power) {
 Platform.name = 'web';
 Platform.isMobile = 'ontouchstart' in window;
 Platform.requestRender = function (render) { window.requestAnimationFrame(render); };
-Platform.devicePixelRatio = Math.max(1, devicePixelRatio);
+defineKey(Platform, 'devicePixelRatio', { get() { return Math.max(1, devicePixelRatio); } });
 const { userAgent } = navigator;
 if (userAgent.indexOf("Firefox") > -1) {
     Platform.conicGradientRotate90 = true;
@@ -6482,14 +6524,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) { }
@@ -7811,7 +7853,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);
@@ -7912,9 +7954,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));
         }
     }
@@ -8049,7 +8092,9 @@ let Leafer = Leafer_1 = class Leafer extends Group {
             list.push(item);
         }
     }
-    zoom(_zoomType, _padding, _fixedScale) { return undefined; }
+    zoom(_zoomType, _padding, _fixedScale) {
+        return debug$3.error('need @leafer-in/view');
+    }
     getValidMove(moveX, moveY) { return { x: moveX, y: moveY }; }
     getValidScale(changeScale) { return changeScale; }
     getWorldPointByClient(clientPoint, updateClient) {
@@ -8576,8 +8621,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();
     }
@@ -8930,11 +8974,13 @@ let App = class App extends Leafer {
             this.renderer.update();
     }
     __render(canvas, options) {
-        if (options.matrix) {
-            const { a, b, c, d, e, f } = options.matrix;
-            canvas.setTransform(a, b, c, d, e, f);
+        if (canvas.context) {
+            if (options.matrix) {
+                const { a, b, c, d, e, f } = options.matrix;
+                canvas.setTransform(a, b, c, d, e, f);
+            }
+            this.children.forEach(leafer => canvas.copyWorld(leafer.canvas));
         }
-        this.children.forEach(leafer => canvas.copyWorld(leafer.canvas));
     }
     __onResize(event) {
         this.children.forEach(leafer => leafer.resize(event));
@@ -9301,11 +9347,14 @@ leafer.getValidScale = function (changeScale) {
 };
 
 class Transformer {
+    get transforming() { return !!(this.moveData || this.zoomData || this.rotateData); }
     constructor(interaction) {
         this.interaction = interaction;
     }
     move(data) {
         const { interaction } = this;
+        if (!data.moveType)
+            data.moveType = 'move';
         if (!this.moveData) {
             const { path } = interaction.selector.getByPoint(data, interaction.hitRadius);
             data.path = path;
@@ -9470,8 +9519,10 @@ class Dragger {
             return;
         }
         if (!this.moving && canDrag) {
-            if (this.moving = interaction.canMove(this.downData) || interaction.isHoldRightKey || interaction.isMobileDragEmpty)
+            if (this.moving = interaction.canMove(this.downData) || interaction.isHoldRightKey || interaction.isMobileDragEmpty) {
+                this.dragData.moveType = 'drag';
                 interaction.emit(MoveEvent.START, this.dragData);
+            }
         }
         if (!this.moving) {
             this.dragStart(data, canDrag);
@@ -9510,6 +9561,7 @@ class Dragger {
             this.dragData.throughPath = throughPath;
         this.dragData.path = path;
         if (this.moving) {
+            this.dragData.moveType = 'drag';
             interaction.emit(MoveEvent.BEFORE_MOVE, this.dragData);
             interaction.emit(MoveEvent.MOVE, this.dragData);
         }
@@ -9576,6 +9628,7 @@ class Dragger {
         endDragData.path = path;
         if (this.moving) {
             this.moving = false;
+            endDragData.moveType = 'drag';
             interaction.emit(MoveEvent.END, endDragData);
         }
         if (this.dragging) {
@@ -9634,7 +9687,7 @@ class Dragger {
             totalY += moveY;
             PointHelper.move(downData, moveX, moveY);
             PointHelper.move(this.dragData, moveX, moveY);
-            interaction.move(Object.assign(Object.assign({}, data), { moveX, moveY, totalX, totalY }));
+            interaction.move(Object.assign(Object.assign({}, data), { moveX, moveY, totalX, totalY, moveType: 'drag' }));
             interaction.pointerMoveReal(data);
         }, 10);
     }
@@ -9754,9 +9807,11 @@ const config = {
 const { pathHasEventType, getMoveEventData: getMoveEventData$1, getZoomEventData: getZoomEventData$1, getRotateEventData: getRotateEventData$1 } = InteractionHelper;
 class InteractionBase {
     get dragging() { return this.dragger.dragging; }
+    get transforming() { return this.transformer.transforming; }
     get moveMode() { return this.config.move.drag || this.isHoldSpaceKey || this.isHoldMiddleKey || (this.isHoldRightKey && this.dragger.moving) || this.isDragEmpty; }
+    get canHover() { return this.config.pointer.hover && !this.config.mobile; }
     get isDragEmpty() { return this.config.move.dragEmpty && this.isRootPath(this.hoverData) && (!this.downData || this.isRootPath(this.downData)); }
-    get isMobileDragEmpty() { return this.config.move.dragEmpty && !this.config.pointer.hover && this.downData && this.isTreePath(this.downData); }
+    get isMobileDragEmpty() { return this.config.move.dragEmpty && !this.canHover && this.downData && this.isTreePath(this.downData); }
     get isHoldMiddleKey() { return this.config.move.holdMiddleKey && this.downData && PointerButton.middle(this.downData); }
     get isHoldRightKey() { return this.config.move.holdRightKey && this.downData && PointerButton.right(this.downData); }
     get isHoldSpaceKey() { return this.config.move.holdSpaceKey && Keyboard.isHoldSpaceKey(); }
@@ -9849,6 +9904,7 @@ class InteractionBase {
         if (!downData)
             return;
         PointerButton.defaultLeft(data);
+        data.multiTouch = downData.multiTouch;
         this.findPath(data);
         const upData = Object.assign(Object.assign({}, data), { path: data.path.clone() });
         data.path.addList(downData.path.list);
@@ -9921,7 +9977,7 @@ class InteractionBase {
             this.updateCursor();
     }
     pointerHover(data) {
-        if (this.config.pointer.hover) {
+        if (this.canHover) {
             this.pointerOverOrOut(data);
             this.pointerEnterOrLeave(data);
         }
@@ -10058,7 +10114,7 @@ class InteractionBase {
         this.hoverData = data;
     }
     updateCursor(data) {
-        if (!this.config.cursor || !this.config.pointer.hover)
+        if (!this.config.cursor || !this.canHover)
             return;
         if (!data) {
             this.updateHoverData();
@@ -10380,7 +10436,7 @@ const PointerEventHelper = {
     convertTouch(e, local) {
         const touch = PointerEventHelper.getTouch(e);
         const base = InteractionHelper.getBase(e);
-        return Object.assign(Object.assign({}, base), { x: local.x, y: local.y, width: 1, height: 1, pointerType: 'touch', pressure: touch.force });
+        return Object.assign(Object.assign({}, base), { x: local.x, y: local.y, width: 1, height: 1, pointerType: 'touch', multiTouch: e.touches.length > 1, pressure: touch.force });
     },
     getTouch(e) {
         return e.targetTouches[0] || e.changedTouches[0];
@@ -10521,21 +10577,21 @@ class Interaction extends InteractionBase {
     }
     onPointerDown(e) {
         this.preventDefaultPointer(e);
-        this.usePointer || (this.usePointer = true);
-        if (this.useMultiTouch)
+        if (this.config.pointer.touch || this.useMultiTouch)
             return;
+        this.usePointer || (this.usePointer = true);
         this.pointerDown(PointerEventHelper.convert(e, this.getLocal(e)));
     }
     onPointerMove(e) {
-        this.usePointer || (this.usePointer = true);
-        if (this.useMultiTouch || this.preventWindowPointer(e))
+        if (this.config.pointer.touch || this.useMultiTouch || this.preventWindowPointer(e))
             return;
+        this.usePointer || (this.usePointer = true);
         this.pointerMove(PointerEventHelper.convert(e, this.getLocal(e, true)));
     }
     onPointerUp(e) {
         if (this.downData)
             this.preventDefaultPointer(e);
-        if (this.useMultiTouch || this.preventWindowPointer(e))
+        if (this.config.pointer.touch || this.useMultiTouch || this.preventWindowPointer(e))
             return;
         this.pointerUp(PointerEventHelper.convert(e, this.getLocal(e)));
     }
@@ -10605,7 +10661,7 @@ class Interaction extends InteractionBase {
         this.pointerCancel();
     }
     multiTouchStart(e) {
-        this.useMultiTouch = (e.touches.length >= 2);
+        this.useMultiTouch = (e.touches.length > 1);
         this.touches = this.useMultiTouch ? this.getTouches(e.touches) : undefined;
         if (this.useMultiTouch)
             this.pointerCancel();
@@ -11295,7 +11351,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 {
@@ -12273,7 +12329,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;
                     }
@@ -12288,6 +12347,8 @@ const ExportModule = {
                         leaf.__render(canvas, renderOptions);
                     }
                     canvas.restore();
+                    if (sliceLeaf)
+                        sliceLeaf.__updateWorldOpacity();
                     if (trim) {
                         trimBounds = getTrimBounds(canvas);
                         const old = canvas, { width, height } = trimBounds;