@leafer/worker 1.9.10 → 1.9.12

package/dist/worker.js

@@ -3611,7 +3611,12 @@ var LeaferUI = function(exports) {
         runTask() {
             const task = this.list[this.index];
             if (!task) {
-                this.nextTask();
+                this.timer = setTimeout(() => this.nextTask());
+                return;
+            }
+            if (task.isCancel) {
+                this.index++;
+                this.runTask();
                 return;
             }
             task.run().then(() => {
@@ -3642,16 +3647,15 @@ var LeaferUI = function(exports) {
         }
         setParallelList() {
             let task;
+            const {config: config, list: list, index: index} = this;
             this.parallelList = [];
             this.parallelSuccessNumber = 0;
-            let end = this.index + this.config.parallel;
-            if (end > this.list.length) end = this.list.length;
-            for (let i = this.index; i < end; i++) {
-                task = this.list[i];
-                if (task.parallel) {
-                    this.parallelList.push(task);
-                } else {
-                    break;
+            let end = index + config.parallel;
+            if (end > list.length) end = list.length;
+            if (config.parallel > 1) {
+                for (let i = index; i < end; i++) {
+                    task = list[i];
+                    if (task.parallel) this.parallelList.push(task); else break;
                 }
             }
         }
@@ -6409,7 +6413,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "1.9.10";
+    const version = "1.9.12";
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -9082,7 +9086,7 @@ var LeaferUI = function(exports) {
             EventCreator.changeName(oldName, newName);
         }
     }
-    const {float: float$1, sign: sign$2} = MathHelper, {min: min, max: max$3, abs: abs$7} = Math;
+    const {min: min, max: max$3, abs: abs$7} = Math, {float: float$1, sign: sign$2} = MathHelper, {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = BoundsHelper;
     const tempContent = new Bounds, tempDragBounds = new Bounds;
     const DragBoundsHelper = {
         limitMove(leaf, move) {
@@ -9130,26 +9134,27 @@ var LeaferUI = function(exports) {
             tempContent.set(content).scaleOf(origin, scale.x, scale.y);
             const originLeftScale = (origin.x - content.x) / content.width, originRightScale = 1 - originLeftScale;
             const originTopScale = (origin.y - content.y) / content.height, originBottomScale = 1 - originTopScale;
-            let correctScaleX, correctScaleY, aScale, bScale, aSize, bSize;
+            let correctScaleX = 1, correctScaleY = 1, aScale, bScale, aSize, bSize;
             if (D$2.isInnerMode(content, dragBounds, dragBoundsType, "width")) {
-                correctScaleX = scale.x < 0 ? 1 / scale.x : 1;
-                if (scale.x < 0) tempContent.scaleOf(origin, correctScaleX, 1);
+                if (scale.x < 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
                 aSize = float$1(tempContent.minX - tempDragBounds.minX);
                 bSize = float$1(tempDragBounds.maxX - tempContent.maxX);
                 aScale = originLeftScale && aSize > 0 ? 1 + aSize / (originLeftScale * tempContent.width) : 1;
                 bScale = originRightScale && bSize > 0 ? 1 + bSize / (originRightScale * tempContent.width) : 1;
                 correctScaleX *= max$3(aScale, bScale);
             } else {
-                if (scale.x < 0) tempContent.unsign();
+                if (scale.x < 0) {
+                    if (float$1(minX(content) - minX(dragBounds)) <= 0 || float$1(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
+                    tempContent.unsign();
+                }
                 aSize = float$1(tempDragBounds.minX - tempContent.minX);
                 bSize = float$1(tempContent.maxX - tempDragBounds.maxX);
                 aScale = originLeftScale && aSize > 0 ? 1 - aSize / (originLeftScale * tempContent.width) : 1;
                 bScale = originRightScale && bSize > 0 ? 1 - bSize / (originRightScale * tempContent.width) : 1;
-                correctScaleX = min(aScale, bScale);
+                correctScaleX *= min(aScale, bScale);
             }
             if (D$2.isInnerMode(content, dragBounds, dragBoundsType, "height")) {
-                correctScaleY = scale.y < 0 ? 1 / scale.y : 1;
-                if (scale.y < 0) tempContent.scaleOf(origin, 1, correctScaleY);
+                if (scale.y < 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
                 aSize = float$1(tempContent.minY - tempDragBounds.minY);
                 bSize = float$1(tempDragBounds.maxY - tempContent.maxY);
                 aScale = originTopScale && aSize > 0 ? 1 + aSize / (originTopScale * tempContent.height) : 1;
@@ -9161,12 +9166,15 @@ var LeaferUI = function(exports) {
                     correctScaleY = sign$2(correctScaleY) * aScale;
                 }
             } else {
-                if (scale.y < 0) tempContent.unsign();
+                if (scale.y < 0) {
+                    if (float$1(minY(content) - minY(dragBounds)) <= 0 || float$1(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
+                    tempContent.unsign();
+                }
                 aSize = float$1(tempDragBounds.minY - tempContent.minY);
                 bSize = float$1(tempContent.maxY - tempDragBounds.maxY);
                 aScale = originTopScale && aSize > 0 ? 1 - aSize / (originTopScale * tempContent.height) : 1;
                 bScale = originBottomScale && bSize > 0 ? 1 - bSize / (originBottomScale * tempContent.height) : 1;
-                correctScaleY = min(aScale, bScale);
+                correctScaleY *= min(aScale, bScale);
             }
             scale.x *= isFinite(correctScaleX) ? correctScaleX : 1;
             scale.y *= isFinite(correctScaleY) ? correctScaleY : 1;
@@ -10145,9 +10153,9 @@ var LeaferUI = function(exports) {
     const ui$5 = exports.UI.prototype;
     ui$5.__updateHitCanvas = function() {
         if (this.__box) this.__box.__updateHitCanvas();
-        const leafer = this.leafer || this.parent && this.parent.leafer;
-        if (!leafer) return;
-        const data = this.__, {hitCanvasManager: hitCanvasManager} = leafer;
+        const {hitCanvasManager: hitCanvasManager} = this.leafer || this.parent && this.parent.leafer || {};
+        if (!hitCanvasManager) return;
+        const data = this.__;
         const isHitPixelFill = (data.__isAlphaPixelFill || data.__isCanvas) && data.hitFill === "pixel";
         const isHitPixelStroke = data.__isAlphaPixelStroke && data.hitStroke === "pixel";
         const isHitPixel = isHitPixelFill || isHitPixelStroke;
@@ -11144,11 +11152,11 @@ var LeaferUI = function(exports) {
     }
     function getShadowTransform(ui, canvas, _shape, shadow, outBounds, otherScale, isInnerShaodw) {
         if (shadow.spread) {
-            const spreadScale = 1 + shadow.spread * 2 / ui.__layout.strokeBounds.width * otherScale * (isInnerShaodw ? -1 : 1);
+            const spread = shadow.spread * 2 * otherScale * (isInnerShaodw ? -1 : 1), {width: width, height: height} = ui.__layout.strokeBounds;
             tempMatrix.set().scaleOfOuter({
                 x: (outBounds.x + outBounds.width / 2) * canvas.pixelRatio,
                 y: (outBounds.y + outBounds.height / 2) * canvas.pixelRatio
-            }, spreadScale);
+            }, 1 + spread / width, 1 + spread / height);
             return tempMatrix;
         }
         return undefined;
@@ -12577,7 +12585,7 @@ var LeaferUI = function(exports) {
             return this.scaleX * this.scaleY < 0;
         }
         get canUse() {
-            return this.app && this.visible && this.view.visible;
+            return this.app && this.editor.editing;
         }
         get canGesture() {
             if (!this.canUse) return false;
@@ -12851,29 +12859,25 @@ var LeaferUI = function(exports) {
             this.dragPoint = null;
         }
         onTransformStart(e) {
-            if (this.canUse) {
-                if (this.moving) this.editor.opacity = this.mergedConfig.hideOnMove ? 0 : 1;
-                if (this.resizing) ResizeEvent.resizingKeys = this.editor.leafList.keys;
-                const {dragStartData: dragStartData, target: target} = this;
-                dragStartData.x = e.x;
-                dragStartData.y = e.y;
-                dragStartData.totalOffset = getPointData();
-                dragStartData.point = {
-                    x: target.x,
-                    y: target.y
-                };
-                dragStartData.bounds = Object.assign({}, target.getLayoutBounds("box", "local"));
-                dragStartData.rotation = target.rotation;
-            }
+            if (this.moving) this.editor.opacity = this.mergedConfig.hideOnMove ? 0 : 1;
+            if (this.resizing) ResizeEvent.resizingKeys = this.editor.leafList.keys;
+            const {dragStartData: dragStartData, target: target} = this;
+            dragStartData.x = e.x;
+            dragStartData.y = e.y;
+            dragStartData.totalOffset = getPointData();
+            dragStartData.point = {
+                x: target.x,
+                y: target.y
+            };
+            dragStartData.bounds = Object.assign({}, target.getLayoutBounds("box", "local"));
+            dragStartData.rotation = target.rotation;
         }
         onTransformEnd(e) {
-            if (this.canUse) {
-                if (this.canDragLimitAnimate && (e instanceof exports.DragEvent || e instanceof exports.MoveEvent)) this.transformTool.onMove(e);
-                if (this.resizing) ResizeEvent.resizingKeys = null;
-                this.dragging = this.gesturing = this.moving = this.resizing = this.rotating = this.skewing = false;
-                this.editor.opacity = 1;
-                this.update();
-            }
+            if (this.canDragLimitAnimate && (e instanceof exports.DragEvent || e instanceof exports.MoveEvent)) this.transformTool.onMove(e);
+            if (this.resizing) ResizeEvent.resizingKeys = null;
+            this.dragging = this.gesturing = this.moving = this.resizing = this.rotating = this.skewing = false;
+            this.editor.opacity = 1;
+            this.editor.update();
         }
         onMove(e) {
             if (this.canGesture && e.moveType !== "drag") {
@@ -12902,6 +12906,12 @@ var LeaferUI = function(exports) {
                 }
             }
         }
+        onGestureStart(e) {
+            if (this.canGesture && e.moveType !== "drag") this.onTransformStart(e);
+        }
+        onGestureEnd(e) {
+            if (this.canGesture && e.moveType !== "drag") this.onTransformEnd(e);
+        }
         isHoldRotateKey(e) {
             const {rotateKey: rotateKey} = this.mergedConfig;
             if (rotateKey) return e.isHoldKeys(rotateKey);
@@ -12971,7 +12981,7 @@ var LeaferUI = function(exports) {
             const {rect: rect, editor: editor, __eventIds: events} = this;
             events.push(rect.on_([ [ exports.PointerEvent.DOUBLE_TAP, this.onDoubleTap, this ], [ exports.PointerEvent.LONG_PRESS, this.onLongPress, this ] ]));
             this.waitLeafer(() => {
-                events.push(editor.app.on_([ [ [ exports.KeyEvent.HOLD, exports.KeyEvent.UP ], this.onKey, this ], [ exports.KeyEvent.DOWN, this.onArrow, this ], [ [ exports.MoveEvent.START, exports.MoveEvent.BEFORE_MOVE ], this.onMove, this, true ], [ [ exports.ZoomEvent.START, exports.ZoomEvent.BEFORE_ZOOM ], this.onScale, this, true ], [ [ exports.RotateEvent.START, exports.RotateEvent.BEFORE_ROTATE ], this.onRotate, this, true ], [ [ exports.MoveEvent.END, exports.ZoomEvent.END, exports.RotateEvent.END ], this.onTransformEnd, this ] ]));
+                events.push(editor.app.on_([ [ [ exports.KeyEvent.HOLD, exports.KeyEvent.UP ], this.onKey, this ], [ exports.KeyEvent.DOWN, this.onArrow, this ], [ exports.MoveEvent.BEFORE_MOVE, this.onMove, this, true ], [ exports.ZoomEvent.BEFORE_ZOOM, this.onScale, this, true ], [ exports.RotateEvent.BEFORE_ROTATE, this.onRotate, this, true ], [ [ exports.MoveEvent.START, exports.ZoomEvent.START, exports.RotateEvent.START ], this.onGestureStart, this ], [ [ exports.MoveEvent.END, exports.ZoomEvent.END, exports.RotateEvent.END ], this.onGestureEnd, this ] ]));
             });
         }
         __removeListenEvents() {
@@ -13777,7 +13787,7 @@ var LeaferUI = function(exports) {
             const event = new EditorGroupEvent(type, {
                 editTarget: group
             });
-            if (!group || !group.syncEventer) this.emitEvent(event);
+            this.emitEvent(event);
             if (group) group.emitEvent(event);
         }
         openInnerEditor(target, nameOrSelect, select) {
@@ -13822,7 +13832,7 @@ var LeaferUI = function(exports) {
                 editTarget: editTarget,
                 innerEditor: innerEditor
             });
-            if (!editTarget.syncEventer) this.emitEvent(event);
+            this.emitEvent(event);
             editTarget.emitEvent(event);
         }
         lock() {