@leafer-editor/worker 1.0.0-rc.28 → 1.0.0

package/dist/worker.js

@@ -1558,7 +1558,7 @@ var LeaferUI = (function (exports) {
             if (this.__input && this.__input[name] !== undefined)
                 this.__input[name] = undefined;
         }
-        __getInputData(names) {
+        __getInputData(names, options) {
             const data = {};
             if (names) {
                 if (names instanceof Array) {
@@ -1585,6 +1585,12 @@ var LeaferUI = (function (exports) {
                     }
                 }
             }
+            if (options) {
+                if (options.matrix) {
+                    const { a, b, c, d, e, f } = this.__leaf.__localMatrix;
+                    data.matrix = { a, b, c, d, e, f };
+                }
+            }
             return data;
         }
         __setMiddle(name, value) {
@@ -5203,11 +5209,13 @@ var LeaferUI = (function (exports) {
         setAttr(name, value) { this[name] = value; }
         getAttr(name) { return this[name]; }
         getComputedAttr(name) { return this.__[name]; }
-        toJSON() {
-            return this.__.__getInputData();
+        toJSON(options) {
+            if (options)
+                this.__layout.update();
+            return this.__.__getInputData(null, options);
         }
-        toString() {
-            return JSON.stringify(this.toJSON());
+        toString(options) {
+            return JSON.stringify(this.toJSON(options));
         }
         toSVG() { return undefined; }
         __SVG(_data) { }
@@ -5280,14 +5288,6 @@ var LeaferUI = (function (exports) {
                 return this.__world;
             }
         }
-        getWorld(attrName) {
-            this.__layout.update();
-            if (attrName === 'x')
-                return this.__world.e;
-            if (attrName === 'y')
-                return this.__world.f;
-            return this.getLayoutBounds()[attrName];
-        }
         getTransform(relative) {
             return this.__layout.getTransform(relative || 'local');
         }
@@ -5408,14 +5408,8 @@ var LeaferUI = (function (exports) {
             this.scaleY *= scaleY;
         }
         __scaleResize(_scaleX, _scaleY) { }
-        resizeWidth(width) {
-            const scale = width / this.__localBoxBounds.width;
-            this.scaleResize(scale, this.__.lockRatio ? scale : 1);
-        }
-        resizeHeight(height) {
-            const scale = height / this.__localBoxBounds.height;
-            this.scaleResize(this.__.lockRatio ? scale : 1, scale);
-        }
+        resizeWidth(_width) { }
+        resizeHeight(_height) { }
         __hitWorld(_point) { return true; }
         __hit(_local) { return true; }
         __hitFill(_inner) { return true; }
@@ -5766,7 +5760,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.0.0-rc.27";
+    const version = "1.0.0-rc.30";
     const inviteCode = {};
 
     class LeaferCanvas extends LeaferCanvasBase {
@@ -7577,9 +7571,9 @@ var LeaferUI = (function (exports) {
                 super.set(data);
             }
         }
-        toJSON() {
-            const data = super.toJSON();
-            data.children = this.children.map(child => child.toJSON());
+        toJSON(options) {
+            const data = super.toJSON(options);
+            data.children = this.children.map(child => child.toJSON(options));
             return data;
         }
         pick(_hitPoint, _options) { return undefined; }
@@ -7746,6 +7740,8 @@ var LeaferUI = (function (exports) {
         __onResize(event) {
             this.emitEvent(event);
             DataHelper.copyAttrs(this.__, event, canvasSizeAttrs);
+            if (!event.width || !event.height)
+                debug$4.warn('w = 0 or h = 0');
             setTimeout(() => { if (this.canvasManager)
                 this.canvasManager.clearRecycled(); }, 0);
         }
@@ -7769,6 +7765,8 @@ var LeaferUI = (function (exports) {
         __setAttr(attrName, newValue) {
             if (this.canvas) {
                 if (canvasSizeAttrs.includes(attrName)) {
+                    if (!newValue)
+                        debug$4.warn(attrName + ' is 0');
                     this.__changeCanvasSize(attrName, newValue);
                 }
                 else if (attrName === 'fill') {
@@ -9541,7 +9539,7 @@ var LeaferUI = (function (exports) {
     }
     function emitEvent(leaf, type, data, capture, excludePath) {
         if (leaf.destroyed)
-            return true;
+            return false;
         if (leaf.__.hitSelf && !exclude(leaf, excludePath)) {
             if (State.updateEventStyle)
                 State.updateEventStyle(leaf, type);
@@ -9643,9 +9641,7 @@ var LeaferUI = (function (exports) {
                 this.tapWait();
                 this.longPressWait(data);
             }
-            else if (PointerButton.right(data)) {
-                this.waitMenuTap = true;
-            }
+            this.waitMenuTap = PointerButton.right(data);
             this.dragger.setDragData(data);
             if (!this.isHoldRightKey)
                 this.updateCursor(data);
@@ -10063,8 +10059,8 @@ var LeaferUI = (function (exports) {
 
     const { toInnerRadiusPointOf, copy: copy$5, setRadius } = PointHelper;
     const inner = {};
-    const leaf = exports.Leaf.prototype;
-    leaf.__hitWorld = function (point) {
+    const leaf$1 = exports.Leaf.prototype;
+    leaf$1.__hitWorld = function (point) {
         if (!this.__.hitSelf)
             return false;
         if (this.__.hitRadius) {
@@ -10087,10 +10083,10 @@ var LeaferUI = (function (exports) {
         }
         return this.__hit(inner);
     };
-    leaf.__hitFill = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitFill(inner, this.__.windingRule); };
-    leaf.__hitStroke = function (inner, strokeWidth) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitStroke(inner, strokeWidth); };
-    leaf.__hitPixel = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitPixel(inner, this.__layout.renderBounds, this.__hitCanvas.hitScale); };
-    leaf.__drawHitPath = function (canvas) { if (canvas)
+    leaf$1.__hitFill = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitFill(inner, this.__.windingRule); };
+    leaf$1.__hitStroke = function (inner, strokeWidth) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitStroke(inner, strokeWidth); };
+    leaf$1.__hitPixel = function (inner) { var _a; return (_a = this.__hitCanvas) === null || _a === void 0 ? void 0 : _a.hitPixel(inner, this.__layout.renderBounds, this.__hitCanvas.hitScale); };
+    leaf$1.__drawHitPath = function (canvas) { if (canvas)
         this.__drawRenderPath(canvas); };
 
     const matrix$2 = new Matrix();
@@ -11537,7 +11533,9 @@ var LeaferUI = (function (exports) {
         bounds.height = realHeight;
     }
 
-    function clipText(drawData, style) {
+    function clipText(drawData, style, x, width) {
+        if (!width)
+            return;
         const { rows, overflow } = drawData;
         let { textOverflow } = style;
         rows.splice(overflow);
@@ -11548,7 +11546,7 @@ var LeaferUI = (function (exports) {
                 textOverflow = '...';
             let char, charRight;
             const ellipsisWidth = textOverflow ? Platform.canvas.measureText(textOverflow).width : 0;
-            const right = style.x + style.width - ellipsisWidth;
+            const right = x + width - ellipsisWidth;
             const list = style.textWrap === 'none' ? rows : [rows[overflow - 1]];
             list.forEach(row => {
                 if (row.isOverflow && row.data) {
@@ -11624,7 +11622,7 @@ var LeaferUI = (function (exports) {
         layoutText(drawData, style);
         layoutChar(drawData, style, width);
         if (drawData.overflow)
-            clipText(drawData, style);
+            clipText(drawData, style, x, width);
         if (textDecoration !== 'none')
             decorationText(drawData, style);
         return drawData;
@@ -11695,6 +11693,8 @@ var LeaferUI = (function (exports) {
     const ExportModule = {
         export(leaf, filename, options) {
             this.running = true;
+            const fileType = FileHelper.fileType(filename);
+            options = FileHelper.getExportOptions(options);
             return addTask((success) => new Promise((resolve) => {
                 const over = (result) => {
                     success(result);
@@ -11703,12 +11703,11 @@ var LeaferUI = (function (exports) {
                 };
                 const { toURL } = Platform;
                 const { download } = Platform.origin;
-                const fileType = FileHelper.fileType(filename);
                 if (filename === 'json') {
-                    return over({ data: leaf.toJSON() });
+                    return over({ data: leaf.toJSON(options.json) });
                 }
                 else if (fileType === 'json') {
-                    download(toURL(JSON.stringify(leaf.toJSON()), 'text'), filename);
+                    download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
                     return over({ data: true });
                 }
                 if (filename === 'svg') {
@@ -11722,7 +11721,6 @@ var LeaferUI = (function (exports) {
                 if (leafer) {
                     checkLazy(leaf);
                     leafer.waitViewCompleted(() => __awaiter(this, void 0, void 0, function* () {
-                        options = FileHelper.getExportOptions(options);
                         let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
                         const { worldTransform, isLeafer, isFrame } = leaf;
                         const { slice, trim, onCanvas } = options;
@@ -11993,7 +11991,8 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    exports.Leaf.prototype.scaleResize = function (scaleX, scaleY = scaleX, noResize) {
+    const leaf = exports.Leaf.prototype;
+    leaf.scaleResize = function (scaleX, scaleY = scaleX, noResize) {
         const data = this;
         if (noResize || (data.editConfig && data.editConfig.editSize === 'scale')) {
             data.scaleX *= scaleX;
@@ -12007,9 +12006,17 @@ var LeaferUI = (function (exports) {
             this.__scaleResize(scaleX, scaleY);
         }
     };
-    exports.Leaf.prototype.__scaleResize = function (scaleX, scaleY) {
+    leaf.__scaleResize = function (scaleX, scaleY) {
         scaleResize(this, scaleX, scaleY);
     };
+    leaf.resizeWidth = function (width) {
+        const scale = width / this.getBounds('box', 'local').width;
+        this.scaleOf(this.__layout.boxBounds, scale, this.__.lockRatio ? scale : 1, true);
+    };
+    leaf.resizeHeight = function (height) {
+        const scale = height / this.getBounds('box', 'local').height;
+        this.scaleOf(this.__layout.boxBounds, this.__.lockRatio ? scale : 1, scale, true);
+    };
     exports.Text.prototype.__scaleResize = function (scaleX, scaleY) {
         if (this.__.__autoSize && (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size'))) {
             scaleResizeFontSize(this, scaleX, scaleY);
@@ -12788,8 +12795,11 @@ var LeaferUI = (function (exports) {
             return middlePoint instanceof Array ? middlePoint : (middlePoint ? [middlePoint] : this.getPointsStyle());
         }
         onSelect(e) {
-            if (e.oldList.length === 1)
-                e.oldList[0].syncEventer = this.app.interaction.bottomList = null;
+            if (e.oldList.length === 1) {
+                e.oldList[0].syncEventer = null;
+                if (this.app)
+                    this.app.interaction.bottomList = null;
+            }
         }
         onDragStart(e) {
             this.dragging = true;
@@ -12895,6 +12905,30 @@ var LeaferUI = (function (exports) {
         }
     }
 
+    class EditMask extends exports.UI {
+        constructor(editor) {
+            super();
+            this.editor = editor;
+            this.hittable = false;
+        }
+        __draw(canvas, options) {
+            const { editor } = this;
+            const { mask } = editor.mergeConfig;
+            if (mask && editor.list.length) {
+                const { rect } = editor.editBox;
+                const { width, height } = rect.__;
+                canvas.resetTransform();
+                canvas.fillWorld(canvas.bounds, mask);
+                canvas.setWorld(rect.__world, options.matrix);
+                canvas.clearRect(0, 0, width, height);
+            }
+        }
+        destroy() {
+            this.editor = null;
+            super.destroy();
+        }
+    }
+
     const filterStyle = `
 <feOffset dy="1"/>
 <feGaussianBlur stdDeviation="1.5"/>
@@ -13133,10 +13167,11 @@ ${filterStyle}
             this.editBox = new EditBox(this);
             this.editToolList = {};
             this.selector = new EditSelect(this);
+            this.editMask = new EditMask(this);
             this.targetEventIds = [];
             if (userConfig)
                 this.config = DataHelper.default(userConfig, this.config);
-            this.addMany(this.selector, this.editBox);
+            this.addMany(this.editMask, this.selector, this.editBox);
         }
         select(target) {
             this.target = target;