leafer-draw 2.1.2 → 2.1.3

package/dist/web.module.js

@@ -3048,7 +3048,7 @@ const PathConvert = {
                 current.length = PathCommandLengthMap[char];
                 current.index = 0;
                 pushData(data, current.name);
-                if (!needConvert && convertCommand[char]) needConvert = true;
+                if (char === "m") current.name = PathCommandMap["l"]; else if (char === "M") current.name = PathCommandMap["L"]; else if (!needConvert && convertCommand[char]) needConvert = true;
             } else {
                 if (char === "-" || char === "+") {
                     if (lastChar === "e" || lastChar === "E") {
@@ -3080,10 +3080,9 @@ const PathConvert = {
                 old[i + 2] += y;
 
               case M$4:
-                x = old[i + 1];
-                y = old[i + 2];
-                if (lastCommand === command) data.push(L$5, x, y); else data.push(M$4, x, y), startX = x, 
-                startY = y;
+                x = startX = old[i + 1];
+                y = startY = old[i + 2];
+                data.push(M$4, x, y);
                 i += 3;
                 break;
 
@@ -6084,39 +6083,45 @@ const LeafBounds = {
             this.__updateRenderPath();
             this.__updateBoxBounds();
             layout.resized = "inner";
-            if (data.__strokeGeometry) data.__strokeGeometry = undefined;
         }
         if (layout.localBoxChanged) {
             if (this.__local) this.__updateLocalBoxBounds();
             layout.localBoxChanged = undefined;
-            if (layout.strokeSpread) layout.strokeChanged = true;
-            if (layout.renderSpread) layout.renderChanged = true;
+            if (layout.strokeSpread && !layout.strokeChanged) layout.strokeChanged = layout.boxChanged ? true : 2;
+            if (layout.renderSpread && !layout.renderChanged) layout.renderChanged = layout.boxChanged ? true : 2;
             if (this.parent) this.parent.__layout.boxChange();
         }
         layout.boxChanged = undefined;
         if (layout.strokeChanged) {
-            layout.strokeSpread = this.__updateStrokeSpread();
-            if (layout.strokeSpread) {
-                if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
-                this.__updateStrokeBounds();
+            if (layout.strokeChanged === 2) {
                 this.__updateLocalStrokeBounds();
             } else {
-                layout.spreadStrokeCancel();
+                layout.strokeSpread = this.__updateStrokeSpread();
+                if (layout.strokeSpread) {
+                    if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
+                    this.__updateStrokeBounds();
+                    this.__updateLocalStrokeBounds();
+                } else {
+                    layout.spreadStrokeCancel();
+                }
+                layout.resized = "inner";
+                if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
             }
             layout.strokeChanged = undefined;
-            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();
-            if (layout.renderSpread) {
-                if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
-                this.__updateRenderBounds();
+            if (layout.renderChanged === 2) {
                 this.__updateLocalRenderBounds();
             } else {
-                layout.spreadRenderCancel();
+                layout.renderSpread = this.__updateRenderSpread();
+                if (layout.renderSpread) {
+                    if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
+                    this.__updateRenderBounds();
+                    this.__updateLocalRenderBounds();
+                } else {
+                    layout.spreadRenderCancel();
+                }
             }
             layout.renderChanged = undefined;
             if (this.parent) this.parent.__layout.renderChange();
@@ -7084,7 +7089,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.2";
+const version = "2.1.3";
 
 const debug$4 = Debug.get("LeaferCanvas");
 
@@ -10362,7 +10367,7 @@ function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds
             needUpdate = false;
         }
     }
-    if (paint.mode === "brush") PaintImage.brush(leafPaint);
+    if (paint.mode === "brush") PaintImage.brush(leafPaint, ui);
     if (!leafPaint.data) {
         PaintImage.createData(leafPaint, image, paint, boxBounds);
         const {transform: transform} = leafPaint.data, {opacity: opacity} = paint;
@@ -10619,8 +10624,12 @@ 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 = brush ? imageCanvas : image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
-            paint.style = pattern;
+            if (brush) {
+                paint.style = imageCanvas;
+                PaintImage.cacheBrush(paint, ui, canvas, renderOptions);
+            } else {
+                paint.style = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
+            }
             paint.patternId = id;
         }
     }