@leafer-draw/worker 1.0.5 → 1.0.7

package/dist/worker.js

@@ -555,6 +555,12 @@ var LeaferUI = (function (exports) {
             to.y = t.y + sin$4(r) * distance;
             return to;
         },
+        toNumberPoints(originPoints) {
+            let points = originPoints;
+            if (typeof originPoints[0] === 'object')
+                points = [], originPoints.forEach(p => points.push(p.x, p.y));
+            return points;
+        },
         reset(t) {
             P$5.reset(t);
         }
@@ -1545,7 +1551,10 @@ var LeaferUI = (function (exports) {
 
     class LeafData {
         get __useNaturalRatio() { return true; }
-        get __isLinePath() { return this.path && this.path.length === 6; }
+        get __isLinePath() {
+            const { path } = this;
+            return path && path.length === 6 && path[0] === 1;
+        }
         get __blendMode() {
             if (this.eraser && this.eraser !== 'path')
                 return 'destination-out';
@@ -2308,11 +2317,12 @@ var LeaferUI = (function (exports) {
 
     const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$3, PI: PI$2, sqrt: sqrt$1, pow } = Math;
     const { setPoint: setPoint$2, addPoint: addPoint$2 } = TwoPointBoundsHelper;
-    const { set } = PointHelper;
+    const { set, toNumberPoints } = PointHelper;
     const { M: M$5, L: L$6, C: C$5, Q: Q$4, Z: Z$5 } = PathCommandMap;
     const tempPoint$2 = {};
     const BezierHelper = {
-        points(data, points, curve, close) {
+        points(data, originPoints, curve, close) {
+            let points = toNumberPoints(originPoints);
             data.push(M$5, points[0], points[1]);
             if (curve && points.length > 5) {
                 let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
@@ -2821,6 +2831,27 @@ var LeaferUI = (function (exports) {
             }
             return data;
         },
+        objectToCanvasData(list) {
+            const data = [];
+            list.forEach(item => {
+                switch (item.name) {
+                    case 'M':
+                        data.push(M$4, item.x, item.y);
+                        break;
+                    case 'L':
+                        data.push(L$5, item.x, item.y);
+                        break;
+                    case 'C':
+                        data.push(C$4, item.x1, item.y1, item.x2, item.y2, item.x, item.y);
+                        break;
+                    case 'Q':
+                        data.push(Q$3, item.x1, item.y1, item.x, item.y);
+                        break;
+                    case 'Z': data.push(Z$4);
+                }
+            });
+            return data;
+        },
         copyData(data, old, index, count) {
             for (let i = index, end = index + count; i < end; i++) {
                 data.push(old[i]);
@@ -4398,13 +4429,10 @@ var LeaferUI = (function (exports) {
         update() {
             const { leafer } = this.leaf;
             if (leafer) {
-                if (leafer.ready) {
-                    if (leafer.watcher.changed)
-                        leafer.layouter.layout();
-                }
-                else {
+                if (leafer.ready)
+                    leafer.watcher.changed && leafer.layouter.layout();
+                else
                     leafer.start();
-                }
             }
             else {
                 let root = this.leaf;
@@ -5162,7 +5190,7 @@ var LeaferUI = (function (exports) {
             if (this.__worldOpacity) {
                 canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
                 this.__drawRenderPath(canvas);
-                this.__.windingRule ? canvas.clip(this.__.windingRule) : canvas.clip();
+                this.windingRule ? canvas.clip(this.windingRule) : canvas.clip();
             }
         },
         __updateWorldOpacity() {
@@ -5679,11 +5707,17 @@ var LeaferUI = (function (exports) {
         add(child, index) {
             if (child === this)
                 return;
-            child.__ || (child = UICreator.get(child.tag, child));
+            const noIndex = index === undefined;
+            if (!child.__) {
+                if (child instanceof Array)
+                    return child.forEach(item => { this.add(item, index); noIndex || index++; });
+                else
+                    child = UICreator.get(child.tag, child);
+            }
             if (child.parent)
                 child.parent.remove(child);
             child.parent = this;
-            index === undefined ? this.children.push(child) : this.children.splice(index, 0, child);
+            noIndex ? this.children.push(child) : this.children.splice(index, 0, child);
             if (child.isBranch)
                 this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1;
             child.__layout.boxChanged || child.__layout.boxChange();
@@ -5697,9 +5731,7 @@ var LeaferUI = (function (exports) {
             }
             this.__layout.affectChildrenSort && this.__layout.childrenSortChange();
         }
-        addMany(...children) {
-            children.forEach(child => this.add(child));
-        }
+        addMany(...children) { this.add(children); }
         remove(child, destroy) {
             if (child) {
                 if (child.__) {
@@ -5927,7 +5959,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.0.5";
+    const version = "1.0.7";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -6636,6 +6668,13 @@ var LeaferUI = (function (exports) {
 
     const TextConvert = {};
     const ColorConvert = {};
+    const UnitConvert = {
+        number(value, percentRefer) {
+            if (typeof value === 'object')
+                return value.type === 'percent' ? value.value * percentRefer : value.value;
+            return value;
+        }
+    };
     const PathArrow = {};
     const Paint = {};
     const PaintImage = {};
@@ -6656,7 +6695,7 @@ var LeaferUI = (function (exports) {
         }
     };
 
-    const { parse } = PathConvert;
+    const { parse, objectToCanvasData } = PathConvert;
     const emptyPaint = {};
     const debug$2 = Debug.get('UIData');
     class UIData extends LeafData {
@@ -6670,10 +6709,11 @@ var LeaferUI = (function (exports) {
                     scaleX = -scaleX;
                 return scaleX > 1 ? strokeWidth / scaleX : strokeWidth;
             }
-            else {
+            else
                 return strokeWidth;
-            }
         }
+        get __hasStroke() { return this.stroke && this.strokeWidth; }
+        get __clipAfterFill() { return (this.cornerRadius || this.__pathInputed); }
         get __autoWidth() { return !this._width; }
         get __autoHeight() { return !this._height; }
         get __autoSide() { return !this._width || !this._height; }
@@ -6690,9 +6730,8 @@ var LeaferUI = (function (exports) {
                 this.__leaf.scaleX *= -1;
                 debug$2.warn('width < 0, instead -scaleX ', this);
             }
-            else {
+            else
                 this._width = value;
-            }
         }
         setHeight(value) {
             if (value < 0) {
@@ -6700,9 +6739,8 @@ var LeaferUI = (function (exports) {
                 this.__leaf.scaleY *= -1;
                 debug$2.warn('height < 0, instead -scaleY', this);
             }
-            else {
+            else
                 this._height = value;
-            }
         }
         setFill(value) {
             if (this.__naturalWidth)
@@ -6743,9 +6781,10 @@ var LeaferUI = (function (exports) {
             }
         }
         setPath(value) {
-            if (typeof value === 'string') {
+            const isString = typeof value === 'string';
+            if (isString || (value && typeof value[0] === 'object')) {
                 this.__setInput('path', value);
-                this._path = parse(value);
+                this._path = isString ? parse(value) : objectToCanvasData(value);
             }
             else {
                 if (this.__input)
@@ -6760,12 +6799,8 @@ var LeaferUI = (function (exports) {
                     value = value.filter((item) => item.visible !== false);
                 this._shadow = value.length ? value : null;
             }
-            else if (value) {
-                this._shadow = value.visible === false ? null : [value];
-            }
-            else {
-                this._shadow = null;
-            }
+            else
+                this._shadow = value && value.visible !== false ? [value] : null;
         }
         setInnerShadow(value) {
             this.__setInput('innerShadow', value);
@@ -6774,12 +6809,8 @@ var LeaferUI = (function (exports) {
                     value = value.filter((item) => item.visible !== false);
                 this._innerShadow = value.length ? value : null;
             }
-            else if (value) {
-                this._innerShadow = value.visible === false ? null : [value];
-            }
-            else {
-                this._innerShadow = null;
-            }
+            else
+                this._innerShadow = value && value.visible !== false ? [value] : null;
         }
         __computePaint() {
             const { fill, stroke } = this.__input;
@@ -6790,24 +6821,19 @@ var LeaferUI = (function (exports) {
             this.__needComputePaint = false;
         }
     }
-    const UnitConvert = {
-        number(value, percentRefer) {
-            if (typeof value === 'object')
-                return value.type === 'percent' ? value.value * percentRefer : value.value;
-            return value;
-        }
-    };
 
     class GroupData extends UIData {
     }
 
     class BoxData extends GroupData {
         get __boxStroke() { return !this.__pathInputed; }
+        get __drawAfterFill() { return this.overflow === 'hide' && this.__clipAfterFill && this.__leaf.children.length; }
+        get __clipAfterFill() { return this.__leaf.isOverflow || super.__clipAfterFill; }
     }
 
     class LeaferData extends GroupData {
-        __getInputData() {
-            const data = super.__getInputData();
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
             canvasSizeAttrs.forEach(key => delete data[key]);
             return data;
         }
@@ -6834,6 +6860,7 @@ var LeaferUI = (function (exports) {
     }
 
     class PathData extends UIData {
+        get __pathInputed() { return 2; }
     }
 
     class PenData extends GroupData {
@@ -6880,16 +6907,18 @@ var LeaferUI = (function (exports) {
             delete data.fill;
             return data;
         }
-        __getInputData() {
-            const data = super.__getInputData();
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
             delete data.fill;
             return data;
         }
     }
 
     class CanvasData extends RectData {
-        __getInputData() {
-            const data = super.__getInputData();
+        get __isCanvas() { return true; }
+        get __drawAfterFill() { return true; }
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
             data.url = this.__leaf.canvas.toDataURL('image/png');
             return data;
         }
@@ -6916,16 +6945,12 @@ var LeaferUI = (function (exports) {
             let width = 0;
             const { shadow, innerShadow, blur, backgroundBlur } = this.__;
             if (shadow)
-                shadow.forEach(item => {
-                    width = Math.max(width, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread > 0 ? item.spread : 0) + item.blur * 1.5);
-                });
+                shadow.forEach(item => width = Math.max(width, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread > 0 ? item.spread : 0) + item.blur * 1.5));
             if (blur)
                 width = Math.max(width, blur);
             let shapeWidth = width = Math.ceil(width);
             if (innerShadow)
-                innerShadow.forEach(item => {
-                    shapeWidth = Math.max(shapeWidth, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread < 0 ? -item.spread : 0) + item.blur * 1.5);
-                });
+                innerShadow.forEach(item => shapeWidth = Math.max(shapeWidth, Math.max(Math.abs(item.y), Math.abs(item.x)) + (item.spread < 0 ? -item.spread : 0) + item.blur * 1.5));
             if (backgroundBlur)
                 shapeWidth = Math.max(shapeWidth, backgroundBlur);
             this.__layout.renderShapeSpread = shapeWidth;
@@ -7007,6 +7032,16 @@ var LeaferUI = (function (exports) {
                 if (stroke && !ignoreStroke)
                     this.__.__pixelStroke ? Paint.strokes(stroke, this, canvas) : Paint.stroke('#000000', this, canvas);
             }
+        },
+        __drawAfterFill(canvas, options) {
+            if (this.__.__clipAfterFill) {
+                canvas.save();
+                this.windingRule ? canvas.clip(this.windingRule) : canvas.clip();
+                this.__drawContent(canvas, options);
+                canvas.restore();
+            }
+            else
+                this.__drawContent(canvas, options);
         }
     };
     function drawFast(ui, canvas, options) {
@@ -7073,8 +7108,8 @@ var LeaferUI = (function (exports) {
             return pen;
         }
         get editConfig() { return undefined; }
-        get editOuter() { return this.__.__isLinePath ? 'LineEditTool' : 'EditTool'; }
-        get editInner() { return 'PathEditor'; }
+        get editOuter() { return ''; }
+        get editInner() { return ''; }
         constructor(data) {
             super(data);
         }
@@ -7085,9 +7120,8 @@ var LeaferUI = (function (exports) {
                 Object.assign(this, data);
                 this.lockNormalStyle = false;
             }
-            else {
+            else
                 Object.assign(this, data);
-            }
         }
         get(name) {
             return typeof name === 'string' ? this.__.__getInput(name) : this.__.__getInputData(name);
@@ -7389,23 +7423,13 @@ var LeaferUI = (function (exports) {
             if (data.children) {
                 const { children } = data;
                 delete data.children;
-                if (!this.children) {
-                    this.__setBranch();
-                }
-                else {
-                    this.clear();
-                }
+                this.children ? this.clear() : this.__setBranch();
                 super.set(data, isTemp);
-                let child;
-                children.forEach(childData => {
-                    child = childData.__ ? childData : UICreator.get(childData.tag, childData);
-                    this.add(child);
-                });
+                children.forEach(child => this.add(child));
                 data.children = children;
             }
-            else {
+            else
                 super.set(data, isTemp);
-            }
         }
         toJSON(options) {
             const data = super.toJSON(options);
@@ -7837,9 +7861,7 @@ var LeaferUI = (function (exports) {
         }
         __updateStrokeSpread() { return 0; }
         __updateRectRenderSpread() { return 0; }
-        __updateRenderSpread() {
-            return this.__updateRectRenderSpread() || -1;
-        }
+        __updateRenderSpread() { return this.__updateRectRenderSpread() || -1; }
         __updateRectBoxBounds() { }
         __updateBoxBounds(_secondLayout) {
             const data = this.__;
@@ -7859,13 +7881,11 @@ var LeaferUI = (function (exports) {
                     }
                     this.__updateNaturalSize();
                 }
-                else {
+                else
                     this.__updateRectBoxBounds();
-                }
             }
-            else {
+            else
                 this.__updateRectBoxBounds();
-            }
         }
         __updateStrokeBounds() { }
         __updateRenderBounds() {
@@ -7875,14 +7895,13 @@ var LeaferUI = (function (exports) {
                 super.__updateRenderBounds();
                 copy$2(childrenRenderBounds, renderBounds);
                 this.__updateRectRenderBounds();
-                isOverflow = !includes$1(renderBounds, childrenRenderBounds) || !this.pathInputed || !this.__.cornerRadius;
+                isOverflow = !includes$1(renderBounds, childrenRenderBounds);
+                if (isOverflow && this.__.overflow !== 'hide')
+                    add(renderBounds, childrenRenderBounds);
             }
-            else {
+            else
                 this.__updateRectRenderBounds();
-            }
-            this.isOverflow !== isOverflow && (this.isOverflow = isOverflow);
-            if (!(this.__.__drawAfterFill = this.__.overflow === 'hide') && isOverflow)
-                add(renderBounds, childrenRenderBounds);
+            !this.isOverflow !== !isOverflow && (this.isOverflow = isOverflow);
         }
         __updateRectRenderBounds() { }
         __updateRectChange() { }
@@ -7902,20 +7921,9 @@ var LeaferUI = (function (exports) {
                     this.__renderGroup(canvas, options);
             }
         }
-        __drawAfterFill(canvas, options) {
-            const { length } = this.children;
-            if (this.isOverflow) {
-                canvas.save();
-                canvas.clip();
-                if (length)
-                    this.__renderGroup(canvas, options);
-                canvas.restore();
-            }
-            else {
-                if (length)
-                    this.__renderGroup(canvas, options);
-            }
-            if (this.__.stroke && length) {
+        __drawContent(canvas, options) {
+            this.__renderGroup(canvas, options);
+            if (this.__.__hasStroke) {
                 canvas.setWorld(this.__nowWorld);
                 this.__drawRenderPath(canvas);
             }
@@ -8079,17 +8087,15 @@ var LeaferUI = (function (exports) {
                 if (data.__useArrow)
                     PathArrow.addArrows(this, false);
             }
-            else {
+            else
                 super.__updateRenderPath();
-            }
         }
         __updateBoxBounds() {
             if (this.points) {
                 toBounds$1(this.__.__pathForRender, this.__layout.boxBounds);
             }
-            else {
+            else
                 super.__updateBoxBounds();
-            }
         }
     };
     __decorate([
@@ -8227,7 +8233,6 @@ var LeaferUI = (function (exports) {
             super(data);
             this.canvas = Creator.canvas(this.__);
             this.context = this.canvas.context;
-            this.__.__isCanvas = this.__.__drawAfterFill = true;
             if (data && data.url)
                 this.drawImage(data.url);
         }
@@ -8240,8 +8245,7 @@ var LeaferUI = (function (exports) {
             });
         }
         draw(ui, offset, scale, rotation) {
-            ui.__layout.update();
-            const matrix = new Matrix(ui.__world).invert();
+            const matrix = new Matrix(ui.worldTransform).invert();
             const m = new Matrix();
             if (offset)
                 m.translate(offset.x, offset.y);
@@ -8256,17 +8260,9 @@ var LeaferUI = (function (exports) {
         paint() {
             this.forceRender();
         }
-        __drawAfterFill(canvas, _options) {
-            const { width, height, cornerRadius } = this.__, { view } = this.canvas;
-            if (cornerRadius || this.pathInputed) {
-                canvas.save();
-                canvas.clip();
-                canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
-                canvas.restore();
-            }
-            else {
-                canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
-            }
+        __drawContent(canvas, _options) {
+            const { width, height } = this.__, { view } = this.canvas;
+            canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
         }
         __updateSize() {
             const { canvas } = this;
@@ -8310,7 +8306,6 @@ var LeaferUI = (function (exports) {
     const { copyAndSpread, includes, isSame: isSame$1, spread, setList } = BoundsHelper;
     exports.Text = class Text extends exports.UI {
         get __tag() { return 'Text'; }
-        get editInner() { return 'TextEditor'; }
         get textDrawData() {
             this.__layout.update();
             return this.__.__textDrawData;
@@ -8385,9 +8380,8 @@ var LeaferUI = (function (exports) {
                 layout.renderChanged = true;
                 setList(data.__textBoxBounds = {}, [b, bounds]);
             }
-            else {
+            else
                 data.__textBoxBounds = contentBounds;
-            }
         }
         __updateRenderSpread() {
             let width = super.__updateRenderSpread();
@@ -8476,7 +8470,6 @@ var LeaferUI = (function (exports) {
         get __tag() { return 'Path'; }
         constructor(data) {
             super(data);
-            this.__.__pathInputed = 2;
         }
     };
     __decorate([
@@ -9154,7 +9147,7 @@ var LeaferUI = (function (exports) {
             }
             if (allowPaint) {
                 canvas.save();
-                canvas.clip();
+                ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip();
                 if (paint.blendMode)
                     canvas.blendMode = paint.blendMode;
                 if (data.opacity)