@leafer/worker 1.6.3 → 1.6.4

package/dist/worker.js

@@ -2272,16 +2272,19 @@ var LeaferUI = (function (exports) {
             if (blendMode)
                 this.blendMode = 'source-over';
         }
-        clearWorld(bounds, ceilPixel) {
-            this.setTempBounds(bounds, ceilPixel);
-            this.clearRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
-        }
         clipWorld(bounds, ceilPixel) {
             this.beginPath();
             this.setTempBounds(bounds, ceilPixel);
             this.rect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
             this.clip();
         }
+        clipUI(ruleData) {
+            ruleData.windingRule ? this.clip(ruleData.windingRule) : this.clip();
+        }
+        clearWorld(bounds, ceilPixel) {
+            this.setTempBounds(bounds, ceilPixel);
+            this.clearRect(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
+        }
         clear() {
             const { pixelRatio } = this;
             this.clearRect(0, 0, this.width * pixelRatio + 2, this.height * pixelRatio + 2);
@@ -5450,7 +5453,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();
+                canvas.clipUI(this);
             }
         },
         __updateWorldOpacity() {
@@ -6233,7 +6236,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.6.3";
+    const version = "1.6.4";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -7529,7 +7532,7 @@ var LeaferUI = (function (exports) {
         __drawAfterFill(canvas, options) {
             if (this.__.__clipAfterFill) {
                 canvas.save();
-                this.windingRule ? canvas.clip(this.windingRule) : canvas.clip();
+                canvas.clipUI();
                 this.__drawContent(canvas, options);
                 canvas.restore();
             }
@@ -9014,6 +9017,9 @@ var LeaferUI = (function (exports) {
     __decorate([
         boundsType('show')
     ], exports.Text.prototype, "textOverflow", void 0);
+    __decorate([
+        surfaceType(false)
+    ], exports.Text.prototype, "textEditing", void 0);
     exports.Text = __decorate([
         registerUI()
     ], exports.Text);
@@ -10478,11 +10484,14 @@ var LeaferUI = (function (exports) {
         out.blendMode = align === 'outside' ? 'destination-out' : 'destination-in';
         fillText(ui, out);
         out.blendMode = 'normal';
+        copyWorld(canvas, out, ui);
+        out.recycle(ui.__nowWorld);
+    }
+    function copyWorld(canvas, out, ui) {
         if (ui.__worldFlipped || Platform.fullImageShadow)
             canvas.copyWorldByReset(out, ui.__nowWorld);
         else
             canvas.copyWorldToInner(out, ui.__nowWorld, ui.__layout.renderBounds);
-        out.recycle(ui.__nowWorld);
     }
     function drawTextStroke(ui, canvas) {
         let row, data = ui.__.__textDrawData;
@@ -10551,9 +10560,8 @@ var LeaferUI = (function (exports) {
             Paint.strokeArrow(stroke, ui, canvas);
     }
     function drawInside(stroke, ui, canvas) {
-        const data = ui.__;
         canvas.save();
-        data.windingRule ? canvas.clip(data.windingRule) : canvas.clip();
+        canvas.clipUI(ui);
         drawCenter(stroke, 2, ui, canvas);
         canvas.restore();
     }
@@ -10567,12 +10575,9 @@ var LeaferUI = (function (exports) {
             const out = canvas.getSameCanvas(true, true);
             ui.__drawRenderPath(out);
             drawCenter(stroke, 2, ui, out);
-            data.windingRule ? out.clip(data.windingRule) : out.clip();
+            out.clipUI(data);
             out.clearWorld(renderBounds);
-            if (ui.__worldFlipped || Platform.fullImageShadow)
-                canvas.copyWorldByReset(out, ui.__nowWorld);
-            else
-                canvas.copyWorldToInner(out, ui.__nowWorld, renderBounds);
+            copyWorld(canvas, out, ui);
             out.recycle(ui.__nowWorld);
         }
     }
@@ -10628,9 +10633,7 @@ var LeaferUI = (function (exports) {
             paints = [paints];
         recycleMap = PaintImage.recycleImage(attrName, data);
         for (let i = 0, len = paints.length, item; i < len; i++) {
-            item = getLeafPaint(attrName, paints[i], ui);
-            if (item)
-                leafPaints.push(item);
+            (item = getLeafPaint(attrName, paints[i], ui)) && leafPaints.push(item);
         }
         data['_' + attrName] = leafPaints.length ? leafPaints : undefined;
         if (leafPaints.length) {
@@ -10668,8 +10671,8 @@ var LeaferUI = (function (exports) {
                 data = PaintGradient.conicGradient(paint, boxBounds);
                 break;
             case 'solid':
-                const { type, blendMode, color, opacity } = paint;
-                data = { type, blendMode, style: ColorConvert.string(color, opacity) };
+                const { type, color, opacity } = paint;
+                data = { type, style: ColorConvert.string(color, opacity) };
                 break;
             default:
                 if (paint.r !== undefined)
@@ -11046,7 +11049,7 @@ var LeaferUI = (function (exports) {
     }
     function drawImage(ui, canvas, paint, data) {
         canvas.save();
-        ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip();
+        canvas.clipUI(ui);
         if (paint.blendMode)
             canvas.blendMode = paint.blendMode;
         if (data.opacity)
@@ -11211,12 +11214,10 @@ var LeaferUI = (function (exports) {
                 }
                 worldCanvas ? other.copyWorld(worldCanvas, nowWorld, nowWorld, 'destination-out') : other.copyWorld(shape.canvas, shapeBounds, bounds, 'destination-out');
             }
-            if (ui.__worldFlipped) {
+            if (ui.__worldFlipped)
                 current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode);
-            }
-            else {
+            else
                 current.copyWorldToInner(other, copyBounds, __layout.renderBounds, item.blendMode);
-            }
             if (end && index < end)
                 other.clearWorld(copyBounds, true);
         });
@@ -11275,12 +11276,10 @@ var LeaferUI = (function (exports) {
                 copyBounds = bounds;
             }
             other.fillWorld(copyBounds, ColorConvert.string(item.color), 'source-in');
-            if (ui.__worldFlipped) {
+            if (ui.__worldFlipped)
                 current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode);
-            }
-            else {
+            else
                 current.copyWorldToInner(other, copyBounds, __layout.renderBounds, item.blendMode);
-            }
             if (end && index < end)
                 other.clearWorld(copyBounds, true);
         });
@@ -14433,7 +14432,6 @@ ${filterStyle$1}
     ], exports.TextEditor);
 
     Plugin.add('text-editor', 'editor');
-    exports.Text.addAttr('textEditing', false, surfaceType);
 
     function addViewport(leafer, mergeConfig, custom) {
         addViewportConfig(leafer.parentApp ? leafer.parentApp : leafer, mergeConfig);