leafer-ui 1.6.3 → 1.6.5

package/dist/web.module.js

@@ -2269,16 +2269,19 @@ class LeaferCanvasBase extends Canvas$1 {
         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);
@@ -5447,7 +5450,7 @@ const LeafRender = {
         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() {
@@ -6230,7 +6233,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.6.3";
+const version = "1.6.5";
 
 const debug$5 = Debug.get('LeaferCanvas');
 class LeaferCanvas extends LeaferCanvasBase {
@@ -7707,7 +7710,7 @@ const UIRender = {
     __drawAfterFill(canvas, options) {
         if (this.__.__clipAfterFill) {
             canvas.save();
-            this.windingRule ? canvas.clip(this.windingRule) : canvas.clip();
+            canvas.clipUI();
             this.__drawContent(canvas, options);
             canvas.restore();
         }
@@ -9192,6 +9195,9 @@ __decorate([
 __decorate([
     boundsType('show')
 ], Text.prototype, "textOverflow", void 0);
+__decorate([
+    surfaceType(false)
+], Text.prototype, "textEditing", void 0);
 Text = __decorate([
     registerUI()
 ], Text);
@@ -10965,11 +10971,14 @@ function drawAlign(stroke, align, ui, canvas) {
     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;
@@ -11038,9 +11047,8 @@ function drawCenter(stroke, strokeWidthScale, ui, canvas) {
         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();
 }
@@ -11054,12 +11062,9 @@ function drawOutside(stroke, ui, canvas) {
         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);
     }
 }
@@ -11115,9 +11120,7 @@ function compute(attrName, ui) {
         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) {
@@ -11155,8 +11158,8 @@ function getLeafPaint(attrName, paint, ui) {
             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)
@@ -11533,7 +11536,7 @@ function checkImage(ui, canvas, paint, allowDraw) {
 }
 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)
@@ -11698,12 +11701,10 @@ function shadow(ui, current, shape) {
             }
             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);
     });
@@ -11762,12 +11763,10 @@ function innerShadow(ui, current, shape) {
             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);
     });