@leafer-editor/worker 1.0.9 → 1.1.0

package/dist/worker.js

@@ -111,7 +111,7 @@ var LeaferUI = (function (exports) {
             return rotation - oldRotation;
         },
         float(num, maxLength) {
-            const a = maxLength ? pow$1(10, maxLength) : 1000000000000;
+            const a = maxLength !== undefined ? pow$1(10, maxLength) : 1000000000000;
             num = round(num * a) / a;
             return num === -0 ? 0 : num;
         },
@@ -1414,14 +1414,13 @@ var LeaferUI = (function (exports) {
         list: {},
         register(UI) {
             const { __tag: tag } = UI.prototype;
-            if (list$3[tag]) {
+            if (list$3[tag])
                 debug$f.repeat(tag);
-            }
-            else {
-                list$3[tag] = UI;
-            }
+            list$3[tag] = UI;
         },
         get(tag, data, x, y, width, height) {
+            if (!list$3[tag])
+                debug$f.error('not register ' + tag);
             const ui = new list$3[tag](data);
             if (x !== undefined) {
                 ui.x = x;
@@ -1445,7 +1444,7 @@ var LeaferUI = (function (exports) {
             Object.keys(Event).forEach(key => {
                 name = Event[key];
                 if (typeof name === 'string')
-                    nameList[name] ? debug$e.repeat(name) : nameList[name] = Event;
+                    nameList[name] && debug$e.repeat(name), nameList[name] = Event;
             });
         },
         changeName(oldName, newName) {
@@ -1647,7 +1646,7 @@ var LeaferUI = (function (exports) {
             const t = this;
             if (t.blendMode === 'pass-through') {
                 const leaf = this.__leaf;
-                if ((t.opacity < 1 && leaf.isBranch) || leaf.__hasEraser || t.eraser) {
+                if ((t.opacity < 1 && (leaf.isBranch || t.__hasMultiPaint)) || leaf.__hasEraser || t.eraser) {
                     t.__single = true;
                 }
                 else if (t.__single) {
@@ -2045,8 +2044,9 @@ var LeaferUI = (function (exports) {
                 takeCanvas = this.getSameCanvas();
                 takeCanvas.copyWorld(this);
             }
-            DataHelper.copyAttrs(this.size, size, canvasSizeAttrs);
-            this.size.pixelRatio || (this.size.pixelRatio = 1);
+            const s = this.size;
+            DataHelper.copyAttrs(s, size, canvasSizeAttrs);
+            canvasSizeAttrs.forEach(key => s[key] || (s[key] = 1));
             this.bounds = new Bounds(0, 0, this.width, this.height);
             if (this.context && !this.unreal) {
                 this.updateViewSize();
@@ -2160,6 +2160,17 @@ var LeaferUI = (function (exports) {
             if (!onlyResetTransform)
                 this.useWorldTransform();
         }
+        useGrayscaleAlpha(bounds) {
+            this.setTempBounds(bounds, true, true);
+            let alpha, pixel;
+            const { context } = this, imageData = context.getImageData(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height), { data } = imageData;
+            for (let i = 0, len = data.length; i < len; i += 4) {
+                pixel = data[i] * 0.299 + data[i + 1] * 0.587 + data[i + 2] * 0.114;
+                if (alpha = data[i + 3])
+                    data[i + 3] = alpha === 255 ? pixel : alpha * (pixel / 255);
+            }
+            context.putImageData(imageData, tempBounds$1.x, tempBounds$1.y);
+        }
         useMask(maskCanvas, fromBounds, toBounds) {
             this.copyWorld(maskCanvas, fromBounds, toBounds, 'destination-in');
         }
@@ -2170,7 +2181,7 @@ var LeaferUI = (function (exports) {
             if (blendMode)
                 this.blendMode = blendMode;
             this.fillStyle = color;
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
+            this.setTempBounds(bounds);
             this.fillRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
             if (blendMode)
                 this.blendMode = 'source-over';
@@ -2179,22 +2190,18 @@ var LeaferUI = (function (exports) {
             if (blendMode)
                 this.blendMode = blendMode;
             this.strokeStyle = color;
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
+            this.setTempBounds(bounds);
             this.strokeRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
             if (blendMode)
                 this.blendMode = 'source-over';
         }
         clearWorld(bounds, ceilPixel) {
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
-            if (ceilPixel)
-                tempBounds$1.ceil();
+            this.setTempBounds(bounds, ceilPixel);
             this.clearRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
         }
         clipWorld(bounds, ceilPixel) {
             this.beginPath();
-            tempBounds$1.set(bounds).scale(this.pixelRatio);
-            if (ceilPixel)
-                tempBounds$1.ceil();
+            this.setTempBounds(bounds, ceilPixel);
             this.rect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
             this.clip();
         }
@@ -2202,6 +2209,14 @@ var LeaferUI = (function (exports) {
             const { pixelRatio } = this;
             this.clearRect(0, 0, this.width * pixelRatio + 2, this.height * pixelRatio + 2);
         }
+        setTempBounds(bounds, ceil, intersect) {
+            tempBounds$1.set(bounds);
+            if (intersect)
+                tempBounds$1.intersect(this.bounds);
+            tempBounds$1.scale(this.pixelRatio);
+            if (ceil)
+                tempBounds$1.ceil();
+        }
         isSameSize(size) {
             return this.width === size.width && this.height === size.height && this.pixelRatio === size.pixelRatio;
         }
@@ -4153,20 +4168,17 @@ var LeaferUI = (function (exports) {
             }
             return true;
         },
-        moveWorld(t, x, y = 0, isInnerPoint) {
+        moveWorld(t, x, y = 0, isInnerPoint, transition) {
             const local = typeof x === 'object' ? Object.assign({}, x) : { x, y };
             isInnerPoint ? toOuterPoint$1(t.localTransform, local, local, true) : (t.parent && toInnerPoint$1(t.parent.worldTransform, local, local, true));
-            L$3.moveLocal(t, local.x, local.y);
+            L$3.moveLocal(t, local.x, local.y, transition);
         },
-        moveLocal(t, x, y = 0) {
-            if (typeof x === 'object') {
-                t.x += x.x;
-                t.y += x.y;
-            }
-            else {
-                t.x += x;
-                t.y += y;
-            }
+        moveLocal(t, x, y = 0, transition) {
+            if (typeof x === 'object')
+                y = x.y, x = x.x;
+            x += t.x;
+            y += t.y;
+            transition ? t.animate({ x, y }, transition) : (t.x = x, t.y = y);
         },
         zoomOfWorld(t, origin, scaleX, scaleY, resize) {
             L$3.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize);
@@ -5215,13 +5227,14 @@ var LeaferUI = (function (exports) {
             this.__.__checkSingle();
         },
         __render(canvas, options) {
+            this.__nowWorld = this.__getNowWorld(options);
             if (this.__worldOpacity) {
                 if (this.__.__single) {
                     if (this.__.eraser === 'path')
                         return this.__renderEraser(canvas, options);
                     const tempCanvas = canvas.getSameCanvas(false, true);
                     this.__renderBranch(tempCanvas, options);
-                    const nowWorld = this.__getNowWorld(options);
+                    const nowWorld = this.__nowWorld;
                     canvas.opacity = this.__.opacity;
                     canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, this.__.__blendMode, true);
                     tempCanvas.recycle(nowWorld);
@@ -5545,11 +5558,11 @@ var LeaferUI = (function (exports) {
         transform(matrix, resize) {
             transform(this, matrix, resize);
         }
-        move(x, y) {
-            moveLocal(this, x, y);
+        move(x, y, transition) {
+            moveLocal(this, x, y, transition);
         }
-        moveInner(x, y) {
-            moveWorld(this, x, y, true);
+        moveInner(x, y, transition) {
+            moveWorld(this, x, y, true, transition);
         }
         scaleOf(origin, scaleX, scaleY, resize) {
             zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize);
@@ -5563,8 +5576,8 @@ var LeaferUI = (function (exports) {
         transformWorld(worldTransform, resize) {
             transformWorld(this, worldTransform, resize);
         }
-        moveWorld(x, y) {
-            moveWorld(this, x, y);
+        moveWorld(x, y, transition) {
+            moveWorld(this, x, y, false, transition);
         }
         scaleOfWorld(worldOrigin, scaleX, scaleY, resize) {
             zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize);
@@ -5962,7 +5975,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.0.9";
+    const version = "1.1.0";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -6431,7 +6444,8 @@ var LeaferUI = (function (exports) {
             this.totalBounds = new Bounds();
             debug$6.log(target.innerName, '--->');
             try {
-                target.app.emit(RenderEvent.CHILD_START, target);
+                if (!target.isApp)
+                    target.app.emit(RenderEvent.CHILD_START, target);
                 this.emitRender(RenderEvent.START);
                 this.renderOnce(callback);
                 this.emitRender(RenderEvent.END, this.totalBounds);
@@ -6985,6 +6999,12 @@ var LeaferUI = (function (exports) {
                 return strokeWidth;
         }
         get __hasStroke() { return this.stroke && this.strokeWidth; }
+        get __hasMultiPaint() {
+            const t = this;
+            if ((t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect)
+                return true;
+            return t.fill && this.__hasStroke;
+        }
         get __clipAfterFill() { return (this.cornerRadius || this.__pathInputed); }
         get __autoWidth() { return !this._width; }
         get __autoHeight() { return !this._height; }
@@ -7354,9 +7374,8 @@ var LeaferUI = (function (exports) {
                             canvas.strokeRect(half, half, width, height);
                             canvas.restore();
                         }
-                        else {
+                        else
                             canvas.strokeRect(half, half, width, height);
-                        }
                         break;
                     case 'outside':
                         canvas.strokeRect(-half, -half, width + __strokeWidth, height + __strokeWidth);
@@ -7386,11 +7405,15 @@ var LeaferUI = (function (exports) {
             super(data);
         }
         reset(_data) { }
-        set(data, isTemp) {
-            if (isTemp) {
-                this.lockNormalStyle = true;
-                Object.assign(this, data);
-                this.lockNormalStyle = false;
+        set(data, transition) {
+            if (transition) {
+                if (transition === 'temp') {
+                    this.lockNormalStyle = true;
+                    Object.assign(this, data);
+                    this.lockNormalStyle = false;
+                }
+                else
+                    this.animate(data, transition);
             }
             else
                 Object.assign(this, data);
@@ -7581,6 +7604,15 @@ var LeaferUI = (function (exports) {
     __decorate([
         boundsType(0)
     ], exports.UI.prototype, "padding", void 0);
+    __decorate([
+        boundsType(false)
+    ], exports.UI.prototype, "lockRatio", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "widthRange", void 0);
+    __decorate([
+        boundsType()
+    ], exports.UI.prototype, "heightRange", void 0);
     __decorate([
         dataType(false)
     ], exports.UI.prototype, "draggable", void 0);
@@ -7691,17 +7723,17 @@ var LeaferUI = (function (exports) {
             if (!this.children)
                 this.children = [];
         }
-        set(data, isTemp) {
+        set(data, transition) {
             if (data.children) {
                 const { children } = data;
                 delete data.children;
                 this.children ? this.clear() : this.__setBranch();
-                super.set(data, isTemp);
+                super.set(data, transition);
                 children.forEach(child => this.add(child));
                 data.children = children;
             }
             else
-                super.set(data, isTemp);
+                super.set(data, transition);
         }
         toJSON(options) {
             const data = super.toJSON(options);
@@ -7814,8 +7846,8 @@ var LeaferUI = (function (exports) {
         }
         onInit() { }
         initType(_type) { }
-        set(data) {
-            this.waitInit(() => { super.set(data); });
+        set(data, transition) {
+            this.waitInit(() => { super.set(data, transition); });
         }
         start() {
             clearTimeout(this.__startTimer);
@@ -7872,8 +7904,6 @@ var LeaferUI = (function (exports) {
         __onResize(event) {
             this.emitEvent(event);
             DataHelper.copyAttrs(this.__, event, canvasSizeAttrs);
-            if (!event.width || !event.height)
-                debug$4.warn('w = 0 or h = 0');
             setTimeout(() => { if (this.canvasManager)
                 this.canvasManager.clearRecycled(); }, 0);
         }
@@ -8198,9 +8228,6 @@ var LeaferUI = (function (exports) {
     __decorate([
         dataType(false)
     ], exports.Box.prototype, "resizeChildren", void 0);
-    __decorate([
-        dataType(false)
-    ], exports.Box.prototype, "textBox", void 0);
     __decorate([
         affectRenderBoundsType('show')
     ], exports.Box.prototype, "overflow", void 0);
@@ -8955,19 +8982,13 @@ var LeaferUI = (function (exports) {
             Object.assign(this, params);
         }
         getBoxPoint(relative) {
-            if (!relative)
-                relative = this.current;
-            return relative.getBoxPoint(this);
+            return (relative || this.current).getBoxPoint(this);
         }
         getInnerPoint(relative) {
-            if (!relative)
-                relative = this.current;
-            return relative.getInnerPoint(this);
+            return (relative || this.current).getInnerPoint(this);
         }
         getLocalPoint(relative) {
-            if (!relative)
-                relative = this.current;
-            return relative.getLocalPoint(this);
+            return (relative || this.current).getLocalPoint(this);
         }
         getPagePoint() {
             return this.current.getPagePoint(this);
@@ -9015,10 +9036,8 @@ var LeaferUI = (function (exports) {
             this.data = data;
         }
         static getValidMove(leaf, start, total) {
-            const { draggable, dragBounds, x, y } = leaf;
-            const move = leaf.getLocalPoint(total, null, true);
-            move.x += start.x - x;
-            move.y += start.y - y;
+            const { draggable, dragBounds } = leaf, move = leaf.getLocalPoint(total, null, true);
+            PointHelper.move(move, start.x - leaf.x, start.y - leaf.y);
             if (dragBounds)
                 this.getMoveInDragBounds(leaf.__local, dragBounds === 'parent' ? leaf.parent.boxBounds : dragBounds, move, true);
             if (draggable === 'x')
@@ -9028,8 +9047,7 @@ var LeaferUI = (function (exports) {
             return move;
         }
         static getMoveInDragBounds(childBox, dragBounds, move, change) {
-            const x = childBox.x + move.x, y = childBox.y + move.y;
-            const right = x + childBox.width, bottom = y + childBox.height;
+            const x = childBox.x + move.x, y = childBox.y + move.y, right = x + childBox.width, bottom = y + childBox.height;
             const boundsRight = dragBounds.x + dragBounds.width, boundsBottom = dragBounds.y + dragBounds.height;
             if (!change)
                 move = Object.assign({}, move);
@@ -9081,9 +9099,7 @@ var LeaferUI = (function (exports) {
             return this.getLocalMove(relative, true);
         }
         getPageBounds() {
-            const total = this.getPageTotal();
-            const start = this.getPagePoint();
-            const bounds = {};
+            const total = this.getPageTotal(), start = this.getPagePoint(), bounds = {};
             BoundsHelper.set(bounds, start.x - total.x, start.y - total.y, total.x, total.y);
             BoundsHelper.unsign(bounds);
             return bounds;
@@ -9201,7 +9217,8 @@ var LeaferUI = (function (exports) {
     const LeaferTypeCreator = {
         list: {},
         register(name, fn) {
-            list$1[name] ? debug$3.repeat(name) : list$1[name] = fn;
+            list$1[name] && debug$3.repeat(name);
+            list$1[name] = fn;
         },
         run(name, leafer) {
             const fn = list$1[name];
@@ -10470,6 +10487,8 @@ var LeaferUI = (function (exports) {
                 case 'center':
                     canvas.setStroke(stroke, __strokeWidth, options);
                     canvas.stroke();
+                    if (options.__useArrow)
+                        strokeArrow(ui, canvas);
                     break;
                 case 'inside':
                     canvas.save();
@@ -10507,6 +10526,8 @@ var LeaferUI = (function (exports) {
                 case 'center':
                     canvas.setStroke(undefined, __strokeWidth, options);
                     drawStrokesStyle(strokes, false, ui, canvas);
+                    if (options.__useArrow)
+                        strokeArrow(ui, canvas);
                     break;
                 case 'inside':
                     canvas.save();
@@ -10532,6 +10553,14 @@ var LeaferUI = (function (exports) {
             }
         }
     }
+    function strokeArrow(ui, canvas) {
+        if (ui.__.dashPattern) {
+            canvas.beginPath();
+            ui.__drawPathByData(canvas, ui.__.__pathForArrow);
+            canvas.dashPattern = null;
+            canvas.stroke();
+        }
+    }
 
     const { getSpread, getOuterOf, getByMove, getIntersectData } = BoundsHelper;
     function shape(ui, current, options) {
@@ -11217,16 +11246,16 @@ var LeaferUI = (function (exports) {
 
     const { excludeRenderBounds } = LeafBoundsHelper;
     exports.Group.prototype.__renderMask = function (canvas, options) {
-        let child, maskCanvas, contentCanvas, maskOpacity, currentMask;
+        let child, maskCanvas, contentCanvas, maskOpacity, currentMask, mask;
         const { children } = this;
         for (let i = 0, len = children.length; i < len; i++) {
-            child = children[i];
-            if (child.__.mask) {
+            child = children[i], mask = child.__.mask;
+            if (mask) {
                 if (currentMask) {
                     maskEnd(this, currentMask, canvas, contentCanvas, maskCanvas, maskOpacity);
                     maskCanvas = contentCanvas = null;
                 }
-                if (child.__.mask === 'path') {
+                if (mask === 'path' || mask === 'clipping-path') {
                     if (child.opacity < 1) {
                         currentMask = 'opacity-path';
                         maskOpacity = child.opacity;
@@ -11240,14 +11269,14 @@ var LeaferUI = (function (exports) {
                     child.__clip(contentCanvas || canvas, options);
                 }
                 else {
-                    currentMask = 'alpha';
+                    currentMask = mask === 'grayscale' ? 'grayscale' : 'alpha';
                     if (!maskCanvas)
                         maskCanvas = getCanvas(canvas);
                     if (!contentCanvas)
                         contentCanvas = getCanvas(canvas);
                     child.__render(maskCanvas, options);
                 }
-                if (child.__.mask !== 'clipping')
+                if (!(mask === 'clipping' || mask === 'clipping-path'))
                     continue;
             }
             if (excludeRenderBounds(child, options))
@@ -11258,6 +11287,8 @@ var LeaferUI = (function (exports) {
     };
     function maskEnd(leaf, maskMode, canvas, contentCanvas, maskCanvas, maskOpacity) {
         switch (maskMode) {
+            case 'grayscale':
+                maskCanvas.useGrayscaleAlpha(leaf.__nowWorld);
             case 'alpha':
                 usePixelMask(leaf, canvas, contentCanvas, maskCanvas);
                 break;
@@ -11962,15 +11993,12 @@ var LeaferUI = (function (exports) {
     const debug$1 = Debug.get('@leafer-ui/export');
     canvas.export = function (filename, options) {
         const { quality, blob } = FileHelper.getExportOptions(options);
-        if (filename.includes('.')) {
+        if (filename.includes('.'))
             return this.saveAs(filename, quality);
-        }
-        else if (blob) {
+        else if (blob)
             return this.toBlob(filename, quality);
-        }
-        else {
+        else
             return this.toDataURL(filename, quality);
-        }
     };
     canvas.toBlob = function (type, quality) {
         return new Promise((resolve) => {
@@ -13012,7 +13040,7 @@ var LeaferUI = (function (exports) {
         }
         getPointStyle(userStyle) {
             const { stroke, strokeWidth, pointFill, pointSize, pointRadius } = this.editor.mergeConfig;
-            const defaultStyle = { fill: pointFill, stroke, strokeWidth, around: 'center', strokeAlign: 'center', width: pointSize, height: pointSize, cornerRadius: pointRadius };
+            const defaultStyle = { fill: pointFill, stroke, strokeWidth, around: 'center', strokeAlign: 'center', width: pointSize, height: pointSize, cornerRadius: pointRadius, offsetX: 0, offsetY: 0 };
             return userStyle ? Object.assign(defaultStyle, userStyle) : defaultStyle;
         }
         getPointsStyle() {
@@ -13094,9 +13122,10 @@ var LeaferUI = (function (exports) {
             const { editor } = this;
             if (editor.single) {
                 const { element } = editor;
-                if (element.isBranch) {
+                if (element.isBranch && !element.editInner) {
                     if (element.textBox) {
-                        const find = element.children.find(item => item.editable && item instanceof exports.Text);
+                        const { children } = element;
+                        const find = children.find(item => item.editable && item instanceof exports.Text) || children.find(item => item instanceof exports.Text);
                         if (find)
                             return editor.openInnerEditor(find);
                     }
@@ -13356,7 +13385,8 @@ ${filterStyle}
         list: {},
         register(EditTool) {
             const { tag } = EditTool.prototype;
-            list[tag] ? debug.repeat(tag) : (list[tag] = EditTool);
+            list[tag] && debug.repeat(tag);
+            list[tag] = EditTool;
         },
         get(tag, editor) {
             return new list[tag](editor);
@@ -14050,12 +14080,16 @@ ${filterStyle}
     ], exports.LineEditTool);
 
     Creator.editor = function (options) { return new Editor(options); };
+    dataType(false)(exports.Box.prototype, 'textBox');
     defineKey(exports.UI.prototype, 'editOuter', {
         get() { return this.__.__isLinePath ? 'LineEditTool' : 'EditTool'; }
     });
     defineKey(exports.UI.prototype, 'editInner', {
         get() { return 'PathEditor'; }
     });
+    defineKey(exports.Group.prototype, 'editInner', {
+        get() { return ''; }
+    });
     defineKey(exports.Text.prototype, 'editInner', {
         get() { return 'TextEditor'; }
     });
@@ -14352,13 +14386,13 @@ ${filterStyle}
     const angle = { connect: half, offset: { x: -0.71, bevelJoin: 0.36, roundJoin: 0.22 }, path: [1, -3, -3, 2, 0, 0, 2, -3, 3] };
     const angleSide = { connect: half, offset: { x: -1.207, bevelJoin: 0.854, roundJoin: 0.707 }, path: [1, -3, -3, 2, 0, 0, 2, -1, 0] };
     const triangleLinePath = [1, -3, 0, 2, -3, -2, 2, 0, 0, 2, -3, 2, 2, -3, 0];
-    const triangle = { connect: half, offset: { x: -0.9, bevelJoin: 0.624, roundJoin: 0.4 }, path: [...triangleLinePath, 1, -2.05, 1.1, 2, -2.05, -1.1] };
+    const triangle = { connect: half, offset: { x: -0.9, bevelJoin: 0.624, roundJoin: 0.4 }, path: [...triangleLinePath, 1, -2.05, 1.1, 2, -2.05, -1.1], dashPath: [1, -2, 0, 2, -0.5, 0] };
     const arrowLinePath = [1, -3, 0, 2, -3.5, -1.8, 2, 0, 0, 2, -3.5, 1.8, 2, -3, 0];
-    const arrow = { connect: half, offset: { x: -1.1, bevelJoin: 0.872, roundJoin: 0.6 }, path: [...arrowLinePath, 1, -2.25, 0.95, 2, -2.25, -0.95] };
-    const triangleFlip = { offset: half, path: [...triangle.path], };
+    const arrow = { connect: half, offset: { x: -1.1, bevelJoin: 0.872, roundJoin: 0.6 }, path: [...arrowLinePath, 1, -2.25, 0.95, 2, -2.25, -0.95], dashPath: [1, -3, 0, 2, -0.5, 0] };
+    const triangleFlip = { offset: half, path: [...triangle.path], dashPath: [1, -2.5, 0, 2, -1, 0] };
     rotate(triangleFlip.path, 180, { x: -1.5, y: 0 });
     const circleLine = { connect: { x: -1.3 }, path: [1, 1.8, -0.1, 2, 1.8, 0, 26, 0, 0, 1.8, 0, 359, 0], };
-    const circle = { connect: { x: 0.5 }, path: [...circleLine.path, 1, 0, 0, 26, 0, 0, 1, 0, 360, 0] };
+    const circle = { connect: { x: 0.5 }, path: [...circleLine.path, 1, 0, 0, 26, 0, 0, 1, 0, 360, 0], dashPath: [1, -0.5, 0, 2, 0.5, 0] };
     const squareLine = { connect: { x: -1.3 }, path: [1, -1.4, 0, 2, -1.4, -1.4, 2, 1.4, -1.4, 2, 1.4, 1.4, 2, -1.4, 1.4, 2, -1.4, 0] };
     const square = { path: [...squareLine.path, 2, -1.4, -0.49, 2, 1, -0.49, 1, -1.4, 0.49, 2, 1, 0.49] };
     const diamondLine = DataHelper.clone(squareLine);
@@ -14380,12 +14414,14 @@ ${filterStyle}
         'diamond-line': diamondLine,
         mark,
     };
-    function getArrowPath(ui, arrow, from, to, scale, connectOffset) {
+    function getArrowPath(ui, arrow, from, to, scale, connectOffset, hasDashPattern) {
         const { strokeCap, strokeJoin } = ui.__;
-        const { offset, connect, path } = (typeof arrow === 'object' ? arrow : arrows[arrow]);
+        const { offset, connect, path, dashPath } = (typeof arrow === 'object' ? arrow : arrows[arrow]);
         let connectX = connect ? connect.x : 0;
         let offsetX = offset ? offset.x : 0;
         const data = [...path];
+        if (hasDashPattern && dashPath)
+            data.push(...dashPath);
         if (strokeCap !== 'none')
             connectX -= 0.5;
         if (offset) {
@@ -14409,7 +14445,7 @@ ${filterStyle}
     const PathArrowModule = {
         list: arrows,
         addArrows(ui, changeRenderPath) {
-            const { startArrow, endArrow, strokeWidth, __pathForRender: data } = ui.__;
+            const { startArrow, endArrow, strokeWidth, dashPattern, __pathForRender: data } = ui.__;
             let command, i = 0, len = data.length, count = 0, useStartArrow = startArrow && startArrow !== 'none';
             while (i < len) {
                 command = data[i];
@@ -14468,17 +14504,20 @@ ${filterStyle}
                 if (count === 2 && useStartArrow)
                     copy(second, command === L ? now : last);
                 if (i === len) {
-                    const p = ui.__.__pathForRender = changeRenderPath ? [...data] : data;
+                    const path = ui.__.__pathForRender = changeRenderPath ? [...data] : data;
+                    const pathForArrow = ui.__.__pathForArrow = [];
                     if (useStartArrow) {
-                        p.push(...getArrowPath(ui, startArrow, second, first, strokeWidth, connectPoint));
+                        const startArrowPath = getArrowPath(ui, startArrow, second, first, strokeWidth, connectPoint, !!dashPattern);
+                        dashPattern ? pathForArrow.push(...startArrowPath) : path.push(...startArrowPath);
                         if (connectPoint.x) {
                             getDistancePoint(first, second, -connectPoint.x, true);
-                            p[1] = second.x;
-                            p[2] = second.y;
+                            path[1] = second.x;
+                            path[2] = second.y;
                         }
                     }
                     if (endArrow && endArrow !== 'none') {
-                        p.push(...getArrowPath(ui, endArrow, last, now, strokeWidth, connectPoint));
+                        const endArrowPath = getArrowPath(ui, endArrow, last, now, strokeWidth, connectPoint, !!dashPattern);
+                        dashPattern ? pathForArrow.push(...endArrowPath) : path.push(...endArrowPath);
                         if (connectPoint.x) {
                             getDistancePoint(now, last, -connectPoint.x, true);
                             let index;
@@ -14497,7 +14536,7 @@ ${filterStyle}
                                     break;
                             }
                             if (index)
-                                setPoint(p, last, index);
+                                setPoint(path, last, index);
                         }
                     }
                 }
@@ -14622,7 +14661,7 @@ ${filterStyle}
             style.position = 'fixed';
             style.transformOrigin = 'left top';
             style.boxSizing = 'border-box';
-            this.isHTMLText ? div.innerHTML = text.text : div.innerText = text.text;
+            this.isHTMLText ? div.innerHTML = String(text.text) : div.innerText = String(text.text);
             const { view } = editor.app;
             (this.inBody = view instanceof HTMLCanvasElement) ? document.body.appendChild(div) : view.appendChild(div);
             this.eventIds = [
@@ -14683,8 +14722,10 @@ ${filterStyle}
             this.textScale = textScale;
             const { a, b, c, d, e, f } = new Matrix(text.worldTransform).scale(1 / textScale);
             let { x, y } = this.inBody ? text.app.clientBounds : text.app.tree.clientBounds;
+            if (!this.inBody)
+                x -= window.scrollX, y -= window.scrollY;
             let { width, height } = text;
-            x -= window.scrollX, y -= window.scrollY, width *= textScale, height *= textScale;
+            width *= textScale, height *= textScale;
             const data = text.__;
             if (data.__autoWidth && data.autoSizeAlign) {
                 width += 20;