leafer-ui 1.0.0-rc.28 → 1.0.0-rc.30

package/dist/web.module.js

@@ -1555,7 +1555,7 @@ class LeafData {
         if (this.__input && this.__input[name] !== undefined)
             this.__input[name] = undefined;
     }
-    __getInputData(names) {
+    __getInputData(names, options) {
         const data = {};
         if (names) {
             if (names instanceof Array) {
@@ -1582,6 +1582,12 @@ class LeafData {
                 }
             }
         }
+        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) {
@@ -5200,11 +5206,13 @@ let Leaf = class Leaf {
     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) { }
@@ -5277,14 +5285,6 @@ let Leaf = class Leaf {
             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');
     }
@@ -5405,14 +5405,8 @@ let Leaf = class Leaf {
         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; }
@@ -5763,7 +5757,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.0-rc.27";
+const version = "1.0.0-rc.30";
 const inviteCode = {};
 
 const debug$7 = Debug.get('LeaferCanvas');
@@ -5871,6 +5865,10 @@ class LeaferCanvas extends LeaferCanvasBase {
                 this.resizeObserver.observe(parent);
                 this.checkAutoBounds(parent.getBoundingClientRect());
             }
+            else {
+                this.checkAutoBounds(this.view);
+                debug$7.warn('no parent');
+            }
         }
         catch (_a) {
             this.imitateResizeObserver();
@@ -7729,9 +7727,9 @@ let Group = class Group extends UI {
             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; }
@@ -7898,6 +7896,8 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     __onResize(event) {
         this.emitEvent(event);
         DataHelper.copyAttrs(this.__, event, canvasSizeAttrs);
+        if (!event.width || !event.height)
+            debug$3.warn('w = 0 or h = 0');
         setTimeout(() => { if (this.canvasManager)
             this.canvasManager.clearRecycled(); }, 0);
     }
@@ -7921,6 +7921,8 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     __setAttr(attrName, newValue) {
         if (this.canvas) {
             if (canvasSizeAttrs.includes(attrName)) {
+                if (!newValue)
+                    debug$3.warn(attrName + ' is 0');
                 this.__changeCanvasSize(attrName, newValue);
             }
             else if (attrName === 'fill') {
@@ -9693,7 +9695,7 @@ function emitAppChildren(leaf, type, data, capture, excludePath) {
 }
 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);
@@ -9795,9 +9797,7 @@ class InteractionBase {
             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);
@@ -10643,6 +10643,8 @@ class Interaction extends InteractionBase {
     onWheel(e) {
         this.preventDefaultWheel(e);
         const { wheel } = this.config;
+        if (wheel.disabled)
+            return;
         const scale = wheel.getScale ? wheel.getScale(e, wheel) : WheelEventHelper.getScale(e, wheel);
         const local = this.getLocal(e);
         const eventBase = InteractionHelper.getBase(e);
@@ -12036,7 +12038,9 @@ function layoutText(drawData, style) {
     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);
@@ -12047,7 +12051,7 @@ function clipText(drawData, style) {
             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) {
@@ -12123,7 +12127,7 @@ function getDrawData(content, style) {
     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;
@@ -12194,6 +12198,8 @@ function getTrimBounds(canvas) {
 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);
@@ -12202,12 +12208,11 @@ const ExportModule = {
             };
             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') {
@@ -12221,7 +12226,6 @@ const ExportModule = {
             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;