leafer-draw 1.0.6 → 1.0.8

package/dist/web.cjs

@@ -852,14 +852,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);
     }
@@ -925,12 +921,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) {
@@ -938,14 +932,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);
     }
@@ -998,12 +988,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;
         }
@@ -1038,12 +1026,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;
         }
@@ -1107,12 +1093,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)

package/dist/web.esm.js

@@ -853,14 +853,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);
     }
@@ -926,12 +922,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) {
@@ -939,14 +933,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);
     }
@@ -999,12 +989,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;
         }
@@ -1039,12 +1027,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;
         }
@@ -1108,12 +1094,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)

package/dist/web.js

@@ -2961,7 +2961,6 @@ var LeaferUI = (function (exports) {
         set path(value) { this.__path = value; }
         get path() { return this.__path; }
         constructor(path) {
-            this.clearPath = this.beginPath;
             this.set(path);
         }
         set(path) {
@@ -3043,6 +3042,9 @@ var LeaferUI = (function (exports) {
             this.paint();
             return this;
         }
+        clearPath() {
+            return this.beginPath();
+        }
         paint() { }
     }
 
@@ -3638,6 +3640,8 @@ var LeaferUI = (function (exports) {
             else {
                 if (url.includes('.' + format) || url.includes('.' + FileHelper.upperCaseTypeMap[format]))
                     return true;
+                else if (format === 'png' && !url.includes('.'))
+                    return true;
             }
             return false;
         },
@@ -4429,13 +4433,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;
@@ -5644,11 +5645,10 @@ var LeaferUI = (function (exports) {
         }
         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();
@@ -5962,7 +5962,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.0.6";
+    const version = "1.0.8";
 
     const debug$5 = Debug.get('LeaferCanvas');
     class LeaferCanvas extends LeaferCanvasBase {
@@ -6863,12 +6863,8 @@ var LeaferUI = (function (exports) {
     };
     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;
@@ -7314,8 +7310,8 @@ var LeaferUI = (function (exports) {
                 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();
@@ -7724,11 +7720,11 @@ var LeaferUI = (function (exports) {
         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() {
@@ -7834,12 +7830,10 @@ var LeaferUI = (function (exports) {
         }
         __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;
@@ -7906,13 +7900,10 @@ var LeaferUI = (function (exports) {
             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)
@@ -7926,9 +7917,8 @@ var LeaferUI = (function (exports) {
                     }
                 }
             }
-            else {
+            else
                 list.push(item);
-            }
         }
         zoom(_zoomType, _padding, _fixedScale) {
             return needPlugin('view');
@@ -7972,10 +7962,7 @@ var LeaferUI = (function (exports) {
                         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)
@@ -8508,23 +8495,23 @@ var LeaferUI = (function (exports) {
         }
         __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) {
@@ -8534,20 +8521,15 @@ var LeaferUI = (function (exports) {
                 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;
@@ -8556,9 +8538,8 @@ var LeaferUI = (function (exports) {
                 layout.renderChanged = true;
                 setList(data.__textBoxBounds = {}, [b, bounds]);
             }
-            else {
+            else
                 data.__textBoxBounds = contentBounds;
-            }
         }
         __updateRenderSpread() {
             let width = super.__updateRenderSpread();
@@ -8671,11 +8652,7 @@ var LeaferUI = (function (exports) {
             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; }
@@ -8702,7 +8679,7 @@ var LeaferUI = (function (exports) {
         penPathType()
     ], exports.Pen.prototype, "path", void 0);
     exports.Pen = __decorate([
-        useModule(PathCreator, ['set', 'beginPath', 'path', 'paint']),
+        useModule(PathCreator, ['set', 'path', 'paint']),
         registerUI()
     ], exports.Pen);
     function penPathType() {
@@ -8718,14 +8695,10 @@ var LeaferUI = (function (exports) {
         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);
         }
@@ -8791,12 +8764,10 @@ var LeaferUI = (function (exports) {
         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) {
@@ -8804,14 +8775,10 @@ var LeaferUI = (function (exports) {
         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);
         }
@@ -8864,12 +8831,10 @@ var LeaferUI = (function (exports) {
                     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;
             }
@@ -8904,12 +8869,10 @@ var LeaferUI = (function (exports) {
                     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;
             }
@@ -8973,12 +8936,7 @@ var LeaferUI = (function (exports) {
         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)