label-printer 0.7.7 → 0.7.8

package/dist/index.mjs

@@ -2537,6 +2537,24 @@ var Text = class extends LabelField {
     this.y = y;
     this.formatted = formatted;
   }
+  endsWithBreak(node) {
+    if (node.nodeType == NodeType.TEXT_NODE) {
+      return node.innerText.trim() == "";
+    }
+    const elementNode = node;
+    if (elementNode.rawTagName == BREAK_TAG) return true;
+    const children = elementNode.childNodes;
+    for (let i = children.length - 1; i >= 0; i--) {
+      const child = children[i];
+      if (child.nodeType == NodeType.TEXT_NODE) {
+        if (child.innerText.trim() == "") continue;
+        return false;
+      }
+      if (this.endsWithBreak(child)) return true;
+      return false;
+    }
+    return false;
+  }
   /**
    * Sets the field to single line
    * @param width Max width of the text. Leave it undefined to allow the field to grow 
@@ -2631,8 +2649,7 @@ var Text = class extends LabelField {
         baseFont.style = "italic";
       }
       if (tag == PARAGRAPH_TAG) {
-        const isAtFieldOrigin = initialX == this.x && initialY == this.y;
-        if (!isAtFieldOrigin) {
+        if (initialX != this.x) {
           currentX = this.x;
           currentY = initialY + baseFont.size + this.lineSpacing;
         }
@@ -2644,20 +2661,7 @@ var Text = class extends LabelField {
         commands.push(command);
       });
       if (tag == PARAGRAPH_TAG) {
-        let paragraphEndsWithBreak = false;
-        for (let i = elementNode.childNodes.length - 1; i >= 0; i--) {
-          const node = elementNode.childNodes[i];
-          if (node.nodeType == NodeType.TEXT_NODE) {
-            if (node.innerText.trim() == "") continue;
-            break;
-          }
-          const childElement = node;
-          if (childElement.rawTagName == BREAK_TAG) {
-            paragraphEndsWithBreak = true;
-          }
-          break;
-        }
-        if (!paragraphEndsWithBreak) {
+        if (!this.endsWithBreak(elementNode)) {
           currentX = this.x;
           currentY += baseFont.size + this.lineSpacing;
         }