abstract-document 6.10.4 → 6.11.0

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Center alignment that linebreaks.pdf

@@ -51,7 +51,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<1e8f742f019fed6c07d991fdedd94e00> <1e8f742f019fed6c07d991fdedd94e00>]
+/ID [<5aa8c31db49da96a882ad12308004bce> <5aa8c31db49da96a882ad12308004bce>]
 >>
 startxref
 1427

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Center alignment.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<8c3220ee8968c0d9769bd110e2a320f3> <8c3220ee8968c0d9769bd110e2a320f3>]
+/ID [<e9d4f28e7d854cb346d3e6ba388f946c> <e9d4f28e7d854cb346d3e6ba388f946c>]
 >>
 startxref
 854

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with End alignment that linebreaks.pdf

@@ -51,7 +51,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<3f5f622a2c97d6ba5d93d7e396dde755> <3f5f622a2c97d6ba5d93d7e396dde755>]
+/ID [<93d9a8db60abda27b0487774741b48a5> <93d9a8db60abda27b0487774741b48a5>]
 >>
 startxref
 1427

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with End alignment.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<8648768a38a6d173d82f80ac8fcecab9> <8648768a38a6d173d82f80ac8fcecab9>]
+/ID [<d97f18a85e933a40e5e66524c283a493> <d97f18a85e933a40e5e66524c283a493>]
 >>
 startxref
 853

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Justify alignment.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<377927c194d231b2e736820c362dc124> <377927c194d231b2e736820c362dc124>]
+/ID [<0e6de0384d1fc397480213f663476d17> <0e6de0384d1fc397480213f663476d17>]
 >>
 startxref
 848

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Start alignment that linebreaks.pdf

@@ -51,7 +51,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<eb088bfc6ef16e967dcb9bc85e2fd5c5> <eb088bfc6ef16e967dcb9bc85e2fd5c5>]
+/ID [<d727fcc1be4b0b5c5335cba92fe3e6b2> <d727fcc1be4b0b5c5335cba92fe3e6b2>]
 >>
 startxref
 1418

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Start alignment.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<67e2d0ec43d2ce24d49e0f271a51e41f> <67e2d0ec43d2ce24d49e0f271a51e41f>]
+/ID [<b4e937497ce7da3cf087843f1dd36485> <b4e937497ce7da3cf087843f1dd36485>]
 >>
 startxref
 848

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with super and subscripts.pdf

@@ -63,7 +63,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -126,7 +126,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<a0f26c0a6aebb1b0dcb160868ea332be> <a0f26c0a6aebb1b0dcb160868ea332be>]
+/ID [<c947cc1fbc46d25a2ca6e0998ca880fb> <c947cc1fbc46d25a2ca6e0998ca880fb>]
 >>
 startxref
 1076

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<c9b6be6bccaf465d4a348af322e457a4> <c9b6be6bccaf465d4a348af322e457a4>]
+/ID [<ff6e69619150df3b6db0d42e3e69ecb0> <ff6e69619150df3b6db0d42e3e69ecb0>]
 >>
 startxref
 824

package/src/abstract-document-exporters/__tests__/pdf/tmp/Table of content separator.pdf

@@ -71,7 +71,7 @@ endobj
 (PDFKit)
 endobj
 14 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 11 0 obj
 <<
@@ -136,7 +136,7 @@ trailer
 /Size 15
 /Root 3 0 R
 /Info 11 0 R
-/ID [<e5a41a4afd04adc92da7a2227a7abdf4> <e5a41a4afd04adc92da7a2227a7abdf4>]
+/ID [<3e87d7be7742d4546833e51d430b2636> <3e87d7be7742d4546833e51d430b2636>]
 >>
 startxref
 1232

package/src/abstract-document-exporters/__tests__/pdf/tmp/hello with roman font.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131541Z)
+(D:20230608065810Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<82b0555981391f5535bad2d51a0b9262> <82b0555981391f5535bad2d51a0b9262>]
+/ID [<934112d90e67c46dbc73bdd5306c4e9d> <934112d90e67c46dbc73bdd5306c4e9d>]
 >>
 startxref
 894

package/src/abstract-document-exporters/__tests__/pdf/tmp/hello.pdf

@@ -79,7 +79,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20230525131542Z)
+(D:20230608065811Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<00c51155fa8490c248759740d85ae566> <00c51155fa8490c248759740d85ae566>]
+/ID [<f9cc22232a65c37d0c256468909cf644> <f9cc22232a65c37d0c256468909cf644>]
 >>
 startxref
 1212

package/src/abstract-document-exporters/__tests__/pdf/tmp/pagebreak.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131541Z)
+(D:20230608065810Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<72b0a8f7056a98574b479c589a1496d4> <72b0a8f7056a98574b479c589a1496d4>]
+/ID [<04e05e7e8ee47a45ab26c110b7d0e49b> <04e05e7e8ee47a45ab26c110b7d0e49b>]
 >>
 startxref
 824

package/src/abstract-document-exporters/__tests__/pdf/tmp/world.pdf

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230525131543Z)
+(D:20230608065812Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<037b19ea4b5ac9ce5f8c10f3fb337b11> <037b19ea4b5ac9ce5f8c10f3fb337b11>]
+/ID [<2d39a98aa94d3e77acb70ef84bf204f7> <2d39a98aa94d3e77acb70ef84bf204f7>]
 >>
 startxref
 837

package/src/abstract-document-exporters/pdf/measure.ts

@@ -102,51 +102,67 @@ function measureParagraph(
   const contentAvailableHeight = availableSize.height - (style.margins.top + style.margins.bottom);
   const contentAvailableSize = AD.Size.create(contentAvailableWidth, contentAvailableHeight);
 
-  const initialHeight = style.margins.top + style.margins.bottom;
-  let desiredHeight = initialHeight;
-  let currentRowWidth = 0;
-  let currentRowHeight = 0;
+  let paragraphHeight = style.margins.top + style.margins.bottom;
   let desiredSizes = new Map<any, AD.Size.Size>();
-  let concatenatedText = "";
-  let hasAtomImage = false;
-  let textOptions;
-  for (let atom of paragraph.children) {
-    if (atom.type === "Image") {
-      hasAtomImage = true;
-    }
-    const atomSize = measureAtom(
-      pdf,
-      resources,
-      style.textStyle,
-      contentAvailableSize,
-      contentAvailableSize.width - currentRowWidth,
-      atom
-    );
-    if (atom.type === "TextRun" || atom.type === "TextField" || atom.type === "HyperLink") {
-      concatenatedText += atom.text;
-      textOptions = getBiggestStyle(atom, style, resources, textOptions);
-    }
-    desiredSizes.set(atom, atomSize);
-    currentRowWidth += atomSize.width;
-    currentRowHeight = Math.max(atomSize.height, currentRowHeight);
-    if (currentRowWidth > contentAvailableSize.width) {
-      desiredHeight += currentRowHeight;
-      currentRowWidth = 0;
-      currentRowHeight = 0;
+
+  const rows: Array<Array<AD.Atom.Atom>> = [];
+  let currentRow: Array<AD.Atom.Atom> = [];
+  for (const atom of paragraph.children) {
+    currentRow.push(atom);
+    if (atom.type === "LineBreak") {
+      rows.push(currentRow);
+      currentRow = [];
     }
   }
-  if (hasAtomImage) {
-    desiredHeight += currentRowHeight;
-  } else {
-    desiredHeight =
-      initialHeight +
-      pdf.heightOfString(concatenatedText, {
+  if (currentRow.length > 0) {
+    rows.push(currentRow);
+  }
+
+  for (const row of rows) {
+    let desiredHeight = 0;
+    let currentRowWidth = 0;
+    let currentRowHeight = 0;
+    let concatenatedText = "";
+    let hasAtomImage = false;
+    let textOptions;
+    for (const atom of row) {
+      if (atom.type === "Image") {
+        hasAtomImage = true;
+      }
+      const atomSize = measureAtom(
+        pdf,
+        resources,
+        style.textStyle,
+        contentAvailableSize,
+        contentAvailableSize.width - currentRowWidth,
+        atom
+      );
+      if (atom.type === "TextRun" || atom.type === "TextField" || atom.type === "HyperLink") {
+        concatenatedText += atom.text;
+        textOptions = getBiggestStyle(atom, style, resources, textOptions);
+      }
+      desiredSizes.set(atom, atomSize);
+      currentRowWidth += atomSize.width;
+      currentRowHeight = Math.max(atomSize.height, currentRowHeight);
+      if (currentRowWidth > contentAvailableSize.width) {
+        desiredHeight += currentRowHeight;
+        currentRowWidth = 0;
+        currentRowHeight = 0;
+      }
+    }
+    if (row.length === 1 && row[0].type === "LineBreak") {
+      paragraphHeight += currentRowHeight;
+    } else if (hasAtomImage) {
+      paragraphHeight += desiredHeight + currentRowHeight;
+    } else {
+      paragraphHeight += pdf.heightOfString(concatenatedText, {
         width: textOptions && textOptions.lineBreak === false ? Infinity : availableSize.width,
         ...textOptions,
       });
+    }
   }
 
-  desiredSizes.set(paragraph, AD.Size.create(availableSize.width, desiredHeight));
+  desiredSizes.set(paragraph, AD.Size.create(availableSize.width, paragraphHeight));
 
   return desiredSizes;
 }
@@ -313,6 +329,8 @@ function measureAtom(
       return measureHyperLink(pdf, resources, textStyle, atom, availableSize);
     case "TocSeparator":
       return measureTocSeparator(pdf, textStyle, availableSize, availableRowSpace);
+    case "LineBreak":
+      return measureLineBreak(pdf, resources, textStyle, availableSize);
     case "LinkTarget":
       return {
         width: availableSize.width,
@@ -323,6 +341,19 @@ function measureAtom(
   }
 }
 
+function measureLineBreak(
+  pdf: any,
+  resources: AD.Resources.Resources,
+  textStyle: AD.TextStyle.TextStyle,
+  availableSize: AD.Size.Size
+): AD.Size.Size {
+  const textSize = measureText(pdf, "A", textStyle, availableSize);
+  return {
+    height: textSize.height,
+    width: 0,
+  };
+}
+
 function measureTextRun(
   pdf: any,
   resources: AD.Resources.Resources,

package/src/abstract-document-exporters/pdf/render.ts

@@ -241,6 +241,13 @@ function renderParagraph(
   let currentWidth = 0;
   let previousAtomType: string | undefined;
   for (const atom of paragraph.children) {
+    if (atom.type === "LineBreak") {
+      currentRow.push(atom);
+      rows.push(currentRow);
+      currentRow = [];
+      continue;
+    }
+
     if (!previousAtomType) {
       // First atom
       previousAtomType = atom.type;
@@ -320,7 +327,7 @@ function renderParagraph(
 
     let rowHeight = 0;
 
-    const lastIndex = row.length - 1;
+    const lastIndex = row[row.length - 1]?.type === "LineBreak" ? row.length - 2 : row.length - 1;
     for (const [i, atom] of row.entries()) {
       const atomSize = getDesiredSize(atom, desiredSizes);
       renderAtom(
@@ -387,6 +394,8 @@ function renderAtom(
       return;
     case "LinkTarget":
       return;
+    case "LineBreak":
+      return;
   }
 }
 

package/src/abstract-document-jsx/index.ts

@@ -16,6 +16,7 @@ import {
   TextField as TextField1,
   TextRun as TextRun1,
   PageBreak as PageBreak1,
+  LineBreak as LineBreak1,
   //Resources,
   //MasterPage,
   //ParagraphStyle,
@@ -54,6 +55,7 @@ export const Markdown = (props: Markdown1.MarkdownProps): JSX.Element => Markdow
 export const TextField = (props: TextField1.TextFieldProps): JSX.Element => TextField1.create(props) as any;
 export const TextRun = (props: TextRun1.TextRunProps): JSX.Element => TextRun1.create(props) as any;
 export const PageBreak = (props: PageBreak1.PageBreakProps): JSX.Element => PageBreak1.create(props) as any;
+export const LineBreak = (props: LineBreak1.LineBreakProps): JSX.Element => LineBreak1.create(props) as any;
 
 export function render(element: any): any {
   if (typeof element.type !== "function") {