@leafer-editor/worker 1.6.6 → 1.6.7

package/dist/worker.module.js

@@ -6233,7 +6233,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.6.6";
+const version = "1.6.7";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() { return true; }
@@ -8926,7 +8926,7 @@ let Text = class Text extends UI {
         const box = this.__box;
         if (box)
             box.__nowWorld = this.__nowWorld, box.__draw(canvas, options, originCanvas);
-        if (this.textEditing && !Export.running)
+        if (this.textEditing && !options.exporting)
             return;
         super.__draw(canvas, options, originCanvas);
     }
@@ -15266,7 +15266,7 @@ const ExportModule = {
             let { x, y, width, height } = new Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY);
             if (clip)
                 x += clip.x, y += clip.y, width = clip.width, height = clip.height;
-            const renderOptions = { matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) };
+            const renderOptions = { exporting: true, matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) };
             let canvas = Creator.canvas({ width: Math.floor(width), height: Math.floor(height), pixelRatio, smooth, contextSettings });
             let sliceLeaf;
             if (slice) {
@@ -15435,12 +15435,8 @@ function updateStyle(textDom, text, textScale) {
     style.justifyContent = verticalAlignMap[text.verticalAlign];
     style.lineHeight = (text.__.__lineHeight || 0) * textScale + 'px';
     style.letterSpacing = (text.__.__letterSpacing || 0) * textScale + 'px';
-    if (textWrap === 'none') {
-        style.whiteSpace = 'nowrap';
-    }
-    else if (textWrap === 'break') {
-        style.wordBreak = 'break-all';
-    }
+    style.whiteSpace = (textWrap === 'none' || text.__.__autoWidth) ? 'nowrap' : 'normal';
+    style.wordBreak = textWrap === 'break' ? 'break-all' : 'normal';
     style.textIndent = (text.paraIndent || 0) * textScale + 'px';
     style.padding = padding instanceof Array ? padding.map(item => item * textScale + 'px').join(' ') : (padding || 0) * textScale + 'px';
     style.textOverflow = textOverflow === 'show' ? '' : (textOverflow === 'hide' ? 'clip' : textOverflow);
@@ -15566,30 +15562,32 @@ let TextEditor = class TextEditor extends InnerEditor {
                 textScale *= 12 / text.fontSize;
         }
         this.textScale = textScale;
-        let { x, y } = this.inBody ? text.app.clientBounds : text.app.tree.clientBounds;
-        if (!this.inBody)
-            x -= window.scrollX, y -= window.scrollY;
         let { width, height } = text, offsetX = 0, offsetY = 0;
         width *= textScale, height *= textScale;
         const data = text.__;
-        if (data.__autoWidth && data.autoSizeAlign) {
+        if (data.__autoWidth) {
             width += 20;
-            switch (data.textAlign) {
-                case 'center':
-                    offsetX = -width / 2;
-                    break;
-                case 'right': offsetX = -width;
+            if (data.autoSizeAlign) {
+                switch (data.textAlign) {
+                    case 'center':
+                        offsetX = -width / 2;
+                        break;
+                    case 'right': offsetX = -width;
+                }
             }
         }
-        if (data.__autoHeight && data.autoSizeAlign) {
+        if (data.__autoHeight) {
             height += 20;
-            switch (data.verticalAlign) {
-                case 'middle':
-                    offsetY = -height / 2;
-                    break;
-                case 'bottom': offsetY = -height;
+            if (data.autoSizeAlign) {
+                switch (data.verticalAlign) {
+                    case 'middle':
+                        offsetY = -height / 2;
+                        break;
+                    case 'bottom': offsetY = -height;
+                }
             }
         }
+        const { x, y } = this.inBody ? text.app.clientBounds : text.app.tree.clientBounds;
         const { a, b, c, d, e, f } = new Matrix(text.worldTransform).scale(1 / textScale).translateInner(offsetX, offsetY);
         const { style } = this.editDom;
         style.transform = `matrix(${a},${b},${c},${d},${e},${f})`;