leafer-draw 2.0.9 → 2.1.1

package/dist/web.module.js

@@ -3082,7 +3082,7 @@ const PathConvert = {
               case M$4:
                 x = old[i + 1];
                 y = old[i + 2];
-                data.push(M$4, x, y);
+                data.push(lastCommand === command ? L$5 : M$4, x, y);
                 i += 3;
                 break;
 
@@ -6075,12 +6075,13 @@ const LeafBounds = {
         if (this.__hasWorldEvent) BoundsEvent.emitWorld(this);
     },
     __updateLocalBounds() {
-        const layout = this.__layout;
+        const layout = this.__layout, data = this.__;
         if (layout.boxChanged) {
-            if (!this.__.__pathInputed) this.__updatePath();
+            if (!data.__pathInputed) this.__updatePath();
             this.__updateRenderPath();
             this.__updateBoxBounds();
             layout.resized = "inner";
+            if (data.__strokeGeometry) data.__strokeGeometry = undefined;
         }
         if (layout.localBoxChanged) {
             if (this.__local) this.__updateLocalBoxBounds();
@@ -6103,6 +6104,7 @@ const LeafBounds = {
             if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
             if (this.parent) this.parent.__layout.strokeChange();
             layout.resized = "inner";
+            if (data.__strokeGeometry) data.__strokeGeometry = undefined;
         }
         if (layout.renderChanged) {
             layout.renderSpread = this.__updateRenderSpread();
@@ -7079,7 +7081,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.0.9";
+const version = "2.1.1";
 
 const debug$4 = Debug.get("LeaferCanvas");
 
@@ -8079,8 +8081,8 @@ class UIData extends LeafData {
         return this.__getRealStrokeWidth();
     }
     get __maxStrokeWidth() {
-        const t = this;
-        return t.__hasMultiStrokeStyle ? Math.max(t.__hasMultiStrokeStyle, t.strokeWidth) : t.strokeWidth;
+        const t = this, strokeWidth = t.__hasStrokeSides || t.strokeWidth;
+        return t.__hasMultiStrokeStyle ? Math.max(t.__hasMultiStrokeStyle, strokeWidth) : strokeWidth;
     }
     get __hasMultiPaint() {
         const t = this;
@@ -8148,7 +8150,7 @@ class UIData extends LeafData {
         const isStr = isString(value);
         if (isStr || value && isObject(value[0])) {
             this.__setInput("path", value);
-            this._path = isStr ? parse(value) : objectToCanvasData(value);
+            this._path = isStr ? parse(value, this.__useArrow) : objectToCanvasData(value);
         } else {
             if (this.__input) this.__removeInput("path");
             this._path = value;
@@ -8181,6 +8183,10 @@ class UIData extends LeafData {
         }
         return strokeWidth;
     }
+    __checkComplex() {
+        const t = this;
+        stintSet$3(t, "__complex", t.__isFills || t.__isStrokes || t.cornerRadius || t.__useEffect);
+    }
     __setPaint(attrName, value) {
         this.__setInput(attrName, value);
         const layout = this.__leaf.__layout;
@@ -8259,7 +8265,11 @@ class EllipseData extends UIData {
     }
 }
 
-class PolygonData extends LineData {}
+class PolygonData extends UIData {
+    get __usePathBox() {
+        return this.points || this.__pathInputed;
+    }
+}
 
 class StarData extends UIData {
     get __boxStroke() {
@@ -8370,7 +8380,7 @@ const UIBounds = {
         if ((data.stroke || data.hitStroke === "all") && strokeWidth && strokeAlign !== "inside") {
             boxSpread = spread = strokeAlign === "center" ? strokeWidth / 2 : strokeWidth;
             if (!data.__boxStroke || data.__useArrow) {
-                const miterLimitAddWidth = data.__isLinePath ? 0 : 10 * spread;
+                const miterLimitAddWidth = data.__isLinePath ? 0 : (data.strokeJoin === "miter" ? 10 : 1) * spread;
                 const storkeCapAddWidth = data.strokeCap === "none" ? 0 : strokeWidth;
                 spread += Math.max(miterLimitAddWidth, storkeCapAddWidth);
             }
@@ -8415,7 +8425,7 @@ const UIRender = {
             data.__useEffect = !!(shadow || otherEffect);
         }
         data.__checkSingle();
-        stintSet$2(data, "__complex", data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect);
+        data.__checkComplex();
     },
     __drawFast(canvas, options) {
         drawFast(this, canvas, options);
@@ -9674,7 +9684,7 @@ __decorate([ resizeType() ], Canvas.prototype, "contextSettings", void 0);
 
 Canvas = __decorate([ registerUI() ], Canvas);
 
-const {copyAndSpread: copyAndSpread$1, includes: includes, spread: spread, setList: setList} = BoundsHelper, {stintSet: stintSet$1} = DataHelper;
+const {copyAndSpread: copyAndSpread$1, includes: includes, setList: setList} = BoundsHelper, {stintSet: stintSet$1} = DataHelper;
 
 let Text = class Text extends UI {
     get __tag() {
@@ -9702,9 +9712,10 @@ let Text = class Text extends UI {
         const {fontSize: fontSize, italic: italic, padding: padding, __autoWidth: autoWidth, __autoHeight: autoHeight} = data;
         this.__updateTextDrawData();
         const {bounds: contentBounds} = data.__textDrawData;
+        console.log(contentBounds);
         const b = layout.boxBounds;
         layout.contentBounds = contentBounds;
-        if (data.__lineHeight < fontSize) spread(contentBounds, fontSize / 2);
+        if (data.__lineHeight < fontSize) layout.renderChanged = true;
         if (autoWidth || autoHeight) {
             b.x = autoWidth ? contentBounds.x : 0;
             b.y = autoHeight ? contentBounds.y : 0;
@@ -9724,6 +9735,8 @@ let Text = class Text extends UI {
     __updateRenderSpread() {
         let spread = super.__updateRenderSpread();
         if (!spread) spread = this.isOverflow ? 1 : 0;
+        const {__lineHeight: __lineHeight, fontSize: fontSize} = this.__;
+        if (__lineHeight < fontSize) spread = FourNumberHelper.max(spread, (fontSize - __lineHeight) / 2);
         return spread;
     }
     __updateRenderBounds() {
@@ -10181,8 +10194,8 @@ function compute(attrName, ui) {
             }
         }
     }
-    data["_" + attrName] = leafPaints.length ? leafPaints : undefined;
     if (leafPaints.length) {
+        data["_" + attrName] = leafPaints;
         if (leafPaints.every(item => item.isTransparent)) {
             if (leafPaints.some(item => item.image)) isAlphaPixel = true;
             isTransparent = true;
@@ -10197,6 +10210,7 @@ function compute(attrName, ui) {
         }
     } else {
         data.__removePaint(attrName, false);
+        data["_" + attrName] = "";
     }
 }
 
@@ -10346,11 +10360,12 @@ function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds
             needUpdate = false;
         }
     }
+    if (paint.mode === "brush") PaintImage.brush(leafPaint);
     if (!leafPaint.data) {
         PaintImage.createData(leafPaint, image, paint, boxBounds);
-        const {transform: transform} = leafPaint.data, {opacity: opacity, blendMode: blendMode} = paint;
-        const clip = transform && !transform.onlyScale || data.path || data.cornerRadius;
-        if (clip || opacity && opacity < 1 || blendMode) leafPaint.complex = clip ? 2 : true;
+        const {transform: transform} = leafPaint.data, {opacity: opacity} = paint;
+        const clip = (transform && !transform.onlyScale || data.path || data.cornerRadius) && !leafPaint.brush;
+        if (clip || opacity && opacity < 1 || paint.blendMode) leafPaint.complex = clip ? 2 : true;
     }
     if (paint.filter) PaintImage.applyFilter(leafPaint, image, paint.filter, ui);
     return needUpdate;
@@ -10440,6 +10455,7 @@ function getPatternData(paint, box, image) {
         break;
 
       case "repeat":
+      case "brush":
         if (!sameBox || scaleX || rotation || skew) PaintImage.repeatMode(data, box, width, height, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, align, paint.freeTransform);
         if (!repeat) data.repeat = "repeat";
         const count = isObject(repeat);
@@ -10580,7 +10596,7 @@ function createPattern(paint, ui, canvas, renderOptions) {
     let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
     if (paint.patternId !== id && !ui.destroyed) {
         if (!(Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)) {
-            const {image: image, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
+            const {image: image, brush: brush, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
             let imageMatrix, xGap, yGap, {width: width, height: height} = image;
             if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
             width *= scaleX;
@@ -10588,6 +10604,10 @@ function createPattern(paint, ui, canvas, renderOptions) {
             if (gap) {
                 xGap = gap.x * scaleX / abs$1(data.scaleX || 1);
                 yGap = gap.y * scaleY / abs$1(data.scaleY || 1);
+                if (brush) {
+                    const brushScale = PaintImage.getBrushScale(paint, ui);
+                    xGap /= brushScale, yGap /= brushScale;
+                }
             }
             if (transform || scaleX !== 1 || scaleY !== 1) {
                 scaleX *= getFloorScale(width + (xGap || 0));
@@ -10597,7 +10617,7 @@ function createPattern(paint, ui, canvas, renderOptions) {
                 scale(imageMatrix, 1 / scaleX, 1 / scaleY);
             }
             const imageCanvas = image.getCanvas(width, height, opacity, undefined, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
-            const pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
+            const pattern = brush ? imageCanvas : image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
             paint.style = pattern;
             paint.patternId = id;
         }
@@ -10618,9 +10638,9 @@ function getPatternFixScale(paint, imageScaleX, imageScaleY) {
 
 function checkImage(paint, drawImage, ui, canvas, renderOptions) {
     const {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
-    const {image: image, data: data, originPaint: originPaint} = paint, {exporting: exporting, snapshot: snapshot} = renderOptions;
+    const {image: image, brush: brush, data: data, originPaint: originPaint} = paint, {exporting: exporting, snapshot: snapshot} = renderOptions;
     if (!data || paint.patternId === id && !exporting || snapshot) {
-        return false;
+        if (!(brush && paint.style)) return false;
     } else {
         if (drawImage) {
             if (data.repeat) {
@@ -10634,18 +10654,18 @@ function checkImage(paint, drawImage, ui, canvas, renderOptions) {
                 canvas.fillStyle = paint.style || "#000";
                 canvas.fill();
             }
-            PaintImage.drawImage(paint, scaleX, scaleY, ui, canvas, renderOptions);
-            return true;
         } else {
             if (!paint.style || originPaint.sync || exporting) PaintImage.createPattern(paint, ui, canvas, renderOptions); else PaintImage.createPatternTask(paint, ui, canvas, renderOptions);
-            return false;
+            if (!(brush && paint.style)) return false;
         }
     }
+    PaintImage.drawImage(paint, scaleX, scaleY, ui, canvas, renderOptions);
+    return true;
 }
 
 function drawImage(paint, imageScaleX, imageScaleY, ui, canvas, _renderOptions) {
-    const {data: data, image: image, complex: complex} = paint;
-    let {width: width, height: height} = image;
+    const {data: data, image: image, brush: brush, complex: complex} = paint;
+    let {width: width, height: height} = image, view = brush || image;
     if (complex) {
         const {blendMode: blendMode, opacity: opacity} = paint.originPaint, {transform: transform} = data;
         canvas.save();
@@ -10653,16 +10673,17 @@ function drawImage(paint, imageScaleX, imageScaleY, ui, canvas, _renderOptions)
         blendMode && (canvas.blendMode = blendMode);
         opacity && (canvas.opacity *= opacity);
         transform && canvas.transform(transform);
-        image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
+        view.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
         canvas.restore();
     } else {
         if (data.scaleX) width *= data.scaleX, height *= data.scaleY;
-        image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
+        view.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
     }
 }
 
 function getImageRenderScaleData(paint, ui, canvas, _renderOptions) {
     const scaleData = ui.getRenderScaleData(true, paint.originPaint.scaleFixed), {data: data} = paint;
+    if (paint.brush) PaintImage.addBrushScale(scaleData, paint, ui);
     if (canvas) {
         const {pixelRatio: pixelRatio} = canvas;
         scaleData.scaleX *= pixelRatio;
@@ -10679,6 +10700,7 @@ function recycleImage(attrName, data) {
     const paints = data["_" + attrName];
     if (isArray(paints)) {
         let paint, image, recycleMap, input, url;
+        const ui = data.__leaf;
         for (let i = 0, len = paints.length; i < len; i++) {
             paint = paints[i];
             image = paint.image;
@@ -10687,7 +10709,8 @@ function recycleImage(attrName, data) {
                 if (!recycleMap) recycleMap = {};
                 recycleMap[url] = true;
                 ImageManager.recyclePaint(paint);
-                if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, data.__leaf);
+                if (paint.brush) PaintImage.recycleBrush(paint, ui);
+                if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, ui);
                 if (image.loading) {
                     if (!input) {
                         input = data.__input && data.__input[attrName] || [];