leafer-draw 1.0.7 → 1.0.8

package/dist/web.module.js

@@ -2958,7 +2958,6 @@ class PathCreator {
     set path(value) { this.__path = value; }
     get path() { return this.__path; }
     constructor(path) {
-        this.clearPath = this.beginPath;
         this.set(path);
     }
     set(path) {
@@ -3040,6 +3039,9 @@ class PathCreator {
         this.paint();
         return this;
     }
+    clearPath() {
+        return this.beginPath();
+    }
     paint() { }
 }
 
@@ -3635,6 +3637,8 @@ const ImageManager = {
         else {
             if (url.includes('.' + format) || url.includes('.' + FileHelper.upperCaseTypeMap[format]))
                 return true;
+            else if (format === 'png' && !url.includes('.'))
+                return true;
         }
         return false;
     },
@@ -5638,11 +5642,10 @@ let Leaf = class Leaf {
     }
     destroy() {
         if (!this.destroyed) {
-            const { parent } = this;
-            if (parent)
+            if (this.parent)
                 this.remove();
             if (this.children)
-                this.removeAll(true);
+                this.clear();
             this.__emitLifeEvent(ChildEvent.DESTROY);
             this.__.destroy();
             this.__layout.destroy();
@@ -5956,7 +5959,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.7";
+const version = "1.0.8";
 
 const debug$5 = Debug.get('LeaferCanvas');
 class LeaferCanvas extends LeaferCanvasBase {
@@ -6857,12 +6860,8 @@ const State = {
 };
 const Transition = {
     list: {},
-    register(attrName, fn) {
-        Transition.list[attrName] = fn;
-    },
-    get(attrName) {
-        return Transition.list[attrName];
-    }
+    register(attrName, fn) { Transition.list[attrName] = fn; },
+    get(attrName) { return Transition.list[attrName]; }
 };
 
 const { parse, objectToCanvasData } = PathConvert;
@@ -7308,8 +7307,8 @@ let UI = UI_1 = class UI extends Leaf {
             pen.set(path = []), this.__drawPathByBox(pen);
         return curve ? PathConvert.toCanvasData(path, true) : path;
     }
-    getPathString(curve, pathForRender) {
-        return PathConvert.stringify(this.getPath(curve, pathForRender));
+    getPathString(curve, pathForRender, floatLength) {
+        return PathConvert.stringify(this.getPath(curve, pathForRender), floatLength);
     }
     load() {
         this.__.__computePaint();
@@ -7718,11 +7717,11 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     start() {
         clearTimeout(this.__startTimer);
         if (!this.running && this.canvas) {
+            this.running = true;
             this.ready ? this.emitLeafer(LeaferEvent.RESTART) : this.emitLeafer(LeaferEvent.START);
             this.__controllers.forEach(item => item.start());
             if (!this.isApp)
                 this.renderer.render();
-            this.running = true;
         }
     }
     stop() {
@@ -7828,12 +7827,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     }
     __changeFill(newValue) {
         this.config.fill = newValue;
-        if (this.canvas.allowBackgroundColor) {
+        if (this.canvas.allowBackgroundColor)
             this.canvas.backgroundColor = newValue;
-        }
-        else {
+        else
             this.forceRender();
-        }
     }
     __onCreated() {
         this.created = true;
@@ -7900,13 +7897,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
         if (bind)
             item = item.bind(bind);
         this.__viewCompletedWait.push(item);
-        if (this.viewCompleted) {
+        if (this.viewCompleted)
             this.__checkViewCompleted(false);
-        }
-        else {
-            if (!this.running)
-                this.start();
-        }
+        else if (!this.running)
+            this.start();
     }
     nextRender(item, bind, off) {
         if (bind)
@@ -7920,9 +7914,8 @@ let Leafer = Leafer_1 = class Leafer extends Group {
                 }
             }
         }
-        else {
+        else
             list.push(item);
-        }
     }
     zoom(_zoomType, _padding, _fixedScale) {
         return needPlugin('view');
@@ -7966,10 +7959,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
                     this.stop();
                     this.emitEvent(new LeaferEvent(LeaferEvent.END, this));
                     this.__removeListenEvents();
-                    this.__controllers.forEach(item => {
-                        if (!(this.parent && item === this.interaction))
-                            item.destroy();
-                    });
+                    this.__controllers.forEach(item => !(this.parent && item === this.interaction) && item.destroy());
                     this.__controllers.length = 0;
                     if (!this.parent) {
                         if (this.selector)
@@ -8502,23 +8492,23 @@ let Text = class Text extends UI {
     }
     __updateTextDrawData() {
         const data = this.__;
-        data.__textDrawData = TextConvert.getDrawData(data.text, this.__);
-    }
-    __updateBoxBounds() {
-        const data = this.__;
-        const layout = this.__layout;
         const { lineHeight, letterSpacing, fontFamily, fontSize, fontWeight, italic, textCase, textOverflow, padding } = data;
-        const autoWidth = data.__autoWidth;
-        const autoHeight = data.__autoHeight;
         data.__lineHeight = UnitConvert.number(lineHeight, fontSize);
         data.__letterSpacing = UnitConvert.number(letterSpacing, fontSize);
         data.__padding = padding ? MathHelper.fourNumber(padding) : undefined;
         data.__baseLine = data.__lineHeight - (data.__lineHeight - fontSize * 0.7) / 2;
         data.__font = `${italic ? 'italic ' : ''}${textCase === 'small-caps' ? 'small-caps ' : ''}${fontWeight !== 'normal' ? fontWeight + ' ' : ''}${fontSize}px ${fontFamily}`;
         data.__clipText = textOverflow !== 'show' && !data.__autoSize;
+        data.__textDrawData = TextConvert.getDrawData(data.text, this.__);
+    }
+    __updateBoxBounds() {
+        const data = this.__;
+        const layout = this.__layout;
+        const { fontSize, italic, padding, __autoWidth: autoWidth, __autoHeight: autoHeight } = data;
         this.__updateTextDrawData();
         const { bounds } = data.__textDrawData;
         const b = layout.boxBounds;
+        console.log(bounds, autoWidth, autoHeight);
         if (data.__lineHeight < fontSize)
             spread(bounds, fontSize / 2);
         if (autoWidth || autoHeight) {
@@ -8528,20 +8518,15 @@ let Text = class Text extends UI {
             b.height = autoHeight ? bounds.height : data.height;
             if (padding) {
                 const [top, right, bottom, left] = data.__padding;
-                if (autoWidth) {
-                    b.x -= left;
-                    b.width += (right + left);
-                }
-                if (autoHeight) {
-                    b.y -= top;
-                    b.height += (bottom + top);
-                }
+                if (autoWidth)
+                    b.x -= left, b.width += (right + left);
+                if (autoHeight)
+                    b.y -= top, b.height += (bottom + top);
             }
             this.__updateNaturalSize();
         }
-        else {
+        else
             super.__updateBoxBounds();
-        }
         if (italic)
             b.width += fontSize * 0.16;
         const contentBounds = includes(b, bounds) ? b : bounds;
@@ -8664,11 +8649,7 @@ let Pen = class Pen extends Group {
         this.add(path);
         return this;
     }
-    beginPath() {
-        this.__path.length = 0;
-        this.paint();
-        return this;
-    }
+    beginPath() { return this; }
     moveTo(_x, _y) { return this; }
     lineTo(_x, _y) { return this; }
     bezierCurveTo(_x1, _y1, _x2, _y2, _x, _y) { return this; }
@@ -8695,7 +8676,7 @@ __decorate([
     penPathType()
 ], Pen.prototype, "path", void 0);
 Pen = __decorate([
-    useModule(PathCreator, ['set', 'beginPath', 'path', 'paint']),
+    useModule(PathCreator, ['set', 'path', 'paint']),
     registerUI()
 ], Pen);
 function penPathType() {
@@ -8711,14 +8692,10 @@ function fillText(ui, canvas) {
     const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
     for (let i = 0, len = rows.length; i < len; i++) {
         row = rows[i];
-        if (row.text) {
+        if (row.text)
             canvas.fillText(row.text, row.x, row.y);
-        }
-        else if (row.data) {
-            row.data.forEach(charData => {
-                canvas.fillText(charData.char, charData.x, row.y);
-            });
-        }
+        else if (row.data)
+            row.data.forEach(charData => { canvas.fillText(charData.char, charData.x, row.y); });
         if (decorationY)
             canvas.fillRect(row.x, row.y + decorationY, row.width, decorationHeight);
     }
@@ -8784,12 +8761,10 @@ function drawAlignStroke(align, stroke, isStrokes, ui, canvas) {
     out.blendMode = align === 'outside' ? 'destination-out' : 'destination-in';
     fillText(ui, out);
     out.blendMode = 'normal';
-    if (ui.__worldFlipped) {
+    if (ui.__worldFlipped)
         canvas.copyWorldByReset(out, ui.__nowWorld);
-    }
-    else {
+    else
         canvas.copyWorldToInner(out, ui.__nowWorld, ui.__layout.renderBounds);
-    }
     out.recycle(ui.__nowWorld);
 }
 function drawTextStroke(ui, canvas) {
@@ -8797,14 +8772,10 @@ function drawTextStroke(ui, canvas) {
     const { rows, decorationY, decorationHeight } = ui.__.__textDrawData;
     for (let i = 0, len = rows.length; i < len; i++) {
         row = rows[i];
-        if (row.text) {
+        if (row.text)
             canvas.strokeText(row.text, row.x, row.y);
-        }
-        else if (row.data) {
-            row.data.forEach(charData => {
-                canvas.strokeText(charData.char, charData.x, row.y);
-            });
-        }
+        else if (row.data)
+            row.data.forEach(charData => { canvas.strokeText(charData.char, charData.x, row.y); });
         if (decorationY)
             canvas.strokeRect(row.x, row.y + decorationY, row.width, decorationHeight);
     }
@@ -8857,12 +8828,10 @@ function stroke(stroke, ui, canvas) {
                 out.stroke();
                 options.windingRule ? out.clip(options.windingRule) : out.clip();
                 out.clearWorld(ui.__layout.renderBounds);
-                if (ui.__worldFlipped) {
+                if (ui.__worldFlipped)
                     canvas.copyWorldByReset(out, ui.__nowWorld);
-                }
-                else {
+                else
                     canvas.copyWorldToInner(out, ui.__nowWorld, ui.__layout.renderBounds);
-                }
                 out.recycle(ui.__nowWorld);
                 break;
         }
@@ -8897,12 +8866,10 @@ function strokes(strokes, ui, canvas) {
                 drawStrokesStyle(strokes, false, ui, out);
                 options.windingRule ? out.clip(options.windingRule) : out.clip();
                 out.clearWorld(renderBounds);
-                if (ui.__worldFlipped) {
+                if (ui.__worldFlipped)
                     canvas.copyWorldByReset(out, ui.__nowWorld);
-                }
-                else {
+                else
                     canvas.copyWorldToInner(out, ui.__nowWorld, renderBounds);
-                }
                 out.recycle(ui.__nowWorld);
                 break;
         }
@@ -8966,12 +8933,7 @@ function compute(attrName, ui) {
     data['_' + attrName] = leafPaints.length ? leafPaints : undefined;
     if (leafPaints.length && leafPaints[0].image)
         hasOpacityPixel = leafPaints[0].image.hasOpacityPixel;
-    if (attrName === 'fill') {
-        data.__pixelFill = hasOpacityPixel;
-    }
-    else {
-        data.__pixelStroke = hasOpacityPixel;
-    }
+    attrName === 'fill' ? data.__pixelFill = hasOpacityPixel : data.__pixelStroke = hasOpacityPixel;
 }
 function getLeafPaint(attrName, paint, ui) {
     if (typeof paint !== 'object' || paint.visible === false || paint.opacity === 0)