@leafer-draw/worker 1.0.0-rc.26 → 1.0.0-rc.28

package/dist/worker.module.js

@@ -11,8 +11,15 @@ const Platform = {
         hitCanvasSize: 100,
         maxCacheSize: 2560 * 1600,
         maxPatternSize: 4096 * 2160,
-        suffix: '',
-        crossOrigin: 'anonymous'
+        crossOrigin: 'anonymous',
+        getRealURL(url) {
+            const { prefix, suffix } = Platform.image;
+            if (suffix && !url.startsWith('data:') && !url.startsWith('blob:'))
+                url += (url.includes("?") ? "&" : "?") + suffix;
+            if (prefix && url[0] === '/')
+                url = prefix + url;
+            return url;
+        }
     }
 };
 
@@ -5126,6 +5133,7 @@ let Leaf = class Leaf {
     get __worldFlipped() { return this.__world.scaleX < 0 || this.__world.scaleY < 0; }
     get __onlyHitMask() { return this.__hasMask && !this.__.hitChildren; }
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
+    get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
     get pathInputed() { return this.__.__pathInputed; }
     constructor(data) {
         this.innerId = create(LEAF);
@@ -5189,6 +5197,9 @@ let Leaf = class Leaf {
     }
     set(_data) { }
     get(_name) { return undefined; }
+    setAttr(name, value) { this[name] = value; }
+    getAttr(name) { return this[name]; }
+    getComputedAttr(name) { return this.__[name]; }
     toJSON() {
         return this.__.__getInputData();
     }
@@ -5207,6 +5218,9 @@ let Leaf = class Leaf {
     findOne(_condition, _options) { return undefined; }
     findId(_id) { return undefined; }
     focus(_value) { }
+    updateLayout() {
+        this.__layout.update();
+    }
     forceUpdate(attrName) {
         if (attrName === undefined)
             attrName = 'width';
@@ -5216,8 +5230,8 @@ let Leaf = class Leaf {
         this.__[attrName] = value === undefined ? null : undefined;
         this[attrName] = value;
     }
-    updateLayout() {
-        this.__layout.update();
+    forceRender(_bounds) {
+        this.forceUpdate('surface');
     }
     __updateWorldMatrix() { }
     __updateLocalMatrix() { }
@@ -5749,7 +5763,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.0-rc.26";
+const version = "1.0.0-rc.27";
 const inviteCode = {};
 
 class LeaferCanvas extends LeaferCanvasBase {
@@ -5798,10 +5812,8 @@ function useCanvas(_canvasType, _power) {
         download(_url, _filename) { return undefined; },
         loadImage(src) {
             return new Promise((resolve, reject) => {
-                if (!src.startsWith('data:') && Platform.image.suffix)
-                    src += (src.includes("?") ? "&" : "?") + Platform.image.suffix;
                 let req = new XMLHttpRequest();
-                req.open('GET', src, true);
+                req.open('GET', Platform.image.getRealURL(src), true);
                 req.responseType = "blob";
                 req.onload = () => {
                     createImageBitmap(req.response).then(img => {
@@ -6819,6 +6831,8 @@ const UIRender = {
             this.__drawRenderPath(canvas);
             if (fill && !ignoreFill)
                 this.__.__pixelFill ? Paint.fills(fill, this, canvas) : Paint.fill('#000000', this, canvas);
+            if (this.__.__isCanvas)
+                this.__drawAfterFill(canvas, options);
             if (stroke && !ignoreStroke)
                 this.__.__pixelStroke ? Paint.strokes(stroke, this, canvas) : Paint.stroke('#000000', this, canvas);
         }
@@ -6932,7 +6946,7 @@ let UI = UI_1 = class UI extends Leaf {
     __onUpdateSize() {
         if (this.__.__input) {
             const data = this.__;
-            (data.lazy && this.leafer && this.leafer.created && !this.leafer.lazyBounds.hit(this.__world)) ? data.__needComputePaint = true : data.__computePaint();
+            (data.lazy && !this.__inLazyBounds && !Export.running) ? data.__needComputePaint = true : data.__computePaint();
         }
     }
     __updateRenderPath() {
@@ -7241,6 +7255,9 @@ __decorate([
 __decorate([
     dataType()
 ], UI.prototype, "disabledStyle", void 0);
+__decorate([
+    dataType({})
+], UI.prototype, "data", void 0);
 __decorate([
     rewrite(Leaf.prototype.reset)
 ], UI.prototype, "reset", null);
@@ -7487,6 +7504,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
                 if (!this.parent)
                     this.canvas.hittable = newValue;
             }
+            else if (attrName === 'zIndex') {
+                this.canvas.zIndex = newValue;
+                setTimeout(() => this.parent && this.parent.__updateSortChildren());
+            }
         }
         return super.__setAttr(attrName, newValue);
     }
@@ -8083,7 +8104,7 @@ let Canvas = class Canvas extends Rect {
         super(data);
         this.canvas = Creator.canvas(this.__);
         this.context = this.canvas.context;
-        this.__.__drawAfterFill = true;
+        this.__.__isCanvas = this.__.__drawAfterFill = true;
     }
     draw(ui, offset, scale, rotation) {
         ui.__layout.update();
@@ -8105,7 +8126,7 @@ let Canvas = class Canvas extends Rect {
     __drawAfterFill(canvas, _options) {
         const origin = this.canvas.view;
         const { width, height } = this;
-        if (this.__.cornerRadius) {
+        if (this.__.cornerRadius || this.pathInputed) {
             canvas.save();
             canvas.clip();
             canvas.drawImage(this.canvas.view, 0, 0, origin.width, origin.height, 0, 0, width, height);
@@ -8151,9 +8172,6 @@ __decorate([
 __decorate([
     resizeType()
 ], Canvas.prototype, "contextSettings", void 0);
-__decorate([
-    hitType('all')
-], Canvas.prototype, "hitFill", void 0);
 Canvas = __decorate([
     registerUI()
 ], Canvas);
@@ -8989,7 +9007,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
                     width *= data.scaleX;
                     height *= data.scaleY;
                 }
-                allowPaint = width * height > Platform.image.maxCacheSize;
+                allowPaint = (width * height > Platform.image.maxCacheSize) || Export.running;
             }
             else {
                 allowPaint = false;
@@ -9501,7 +9519,8 @@ function createRows(drawData, content, style) {
                     if (breakAll) {
                         if (wordWidth)
                             addWord();
-                        addRow();
+                        if (rowWidth)
+                            addRow();
                     }
                     else {
                         if (!afterBreak)
@@ -9509,10 +9528,12 @@ function createRows(drawData, content, style) {
                         if (langBreak || afterBreak || charType === Break || charType === Before || charType === Single || (wordWidth + charWidth > realWidth)) {
                             if (wordWidth)
                                 addWord();
-                            addRow();
+                            if (rowWidth)
+                                addRow();
                         }
                         else {
-                            addRow();
+                            if (rowWidth)
+                                addRow();
                         }
                     }
                 }
@@ -9898,6 +9919,7 @@ const ExportModule = {
             }
             const { leafer } = leaf;
             if (leafer) {
+                checkLazy(leaf);
                 leafer.waitViewCompleted(() => __awaiter(this, void 0, void 0, function* () {
                     options = FileHelper.getExportOptions(options);
                     let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
@@ -9905,6 +9927,8 @@ const ExportModule = {
                     const { slice, trim, onCanvas } = options;
                     let scale = options.scale || 1;
                     let pixelRatio = options.pixelRatio || 1;
+                    const smooth = options.smooth === undefined ? leafer.config.smooth : options.smooth;
+                    const contextSettings = options.contextSettings || leafer.config.contextSettings;
                     if (leaf.isApp) {
                         scale *= pixelRatio;
                         pixelRatio = leaf.app.pixelRatio;
@@ -9943,7 +9967,7 @@ const ExportModule = {
                         renderBounds = leaf.getBounds('render', relative);
                     }
                     const { x, y, width, height } = new Bounds(renderBounds).scale(scale);
-                    let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio });
+                    let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio, smooth, contextSettings });
                     const renderOptions = { matrix: matrix.scale(1 / scale).invert().translate(-x, -y).withScale(1 / scaleX * scale, 1 / scaleY * scale) };
                     if (slice) {
                         leaf = leafer;
@@ -9989,6 +10013,12 @@ function addTask(task) {
         tasker.add(() => __awaiter(this, void 0, void 0, function* () { return yield task(resolve); }), { parallel: false });
     });
 }
+function checkLazy(leaf) {
+    if (leaf.__.__needComputePaint)
+        leaf.__.__computePaint();
+    if (leaf.isBranch)
+        leaf.children.forEach(child => checkLazy(child));
+}
 
 const canvas = LeaferCanvasBase.prototype;
 const debug = Debug.get('@leafer-ui/export');