abstract-document 6.3.1 → 6.5.1

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single hyperlink right aligned.pdf

@@ -73,7 +73,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211115110806Z)
+(D:20220105141307Z)
 endobj
 12 0 obj
 <<
@@ -139,7 +139,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<292bde5e9905412d5dfe8f38e6d7b4a6> <292bde5e9905412d5dfe8f38e6d7b4a6>]
+/ID [<292acc6b74873eb3165156b4765d32f6> <292acc6b74873eb3165156b4765d32f6>]
 >>
 startxref
 1228

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

@@ -73,7 +73,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211115110806Z)
+(D:20220105141307Z)
 endobj
 12 0 obj
 <<
@@ -139,7 +139,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<b788f55ab38421ac7c38320ae42a7515> <b788f55ab38421ac7c38320ae42a7515>]
+/ID [<49ebf714736b5e00f2d5b0e2493746e7> <49ebf714736b5e00f2d5b0e2493746e7>]
 >>
 startxref
 1209

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single image svg color hex.pdf

@@ -108,7 +108,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20211115110806Z)
+(D:20220105141307Z)
 endobj
 10 0 obj
 <<
@@ -172,7 +172,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<b87606bf27cb53bc5ab50ec0ae1feb75> <b87606bf27cb53bc5ab50ec0ae1feb75>]
+/ID [<136b21712e916d94ce04ade13d9af411> <136b21712e916d94ce04ade13d9af411>]
 >>
 startxref
 1530

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single image svg color name.pdf

@@ -108,7 +108,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20211115110806Z)
+(D:20220105141307Z)
 endobj
 10 0 obj
 <<
@@ -172,7 +172,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<aefd76086b1785964fff830c0763206b> <aefd76086b1785964fff830c0763206b>]
+/ID [<50e0e1212fcc557e4fe351b43ff84b44> <50e0e1212fcc557e4fe351b43ff84b44>]
 >>
 startxref
 1530

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single image svg color url.pdf

@@ -154,7 +154,7 @@ endobj
 (PDFKit)
 endobj
 18 0 obj
-(D:20211115110806Z)
+(D:20220105141307Z)
 endobj
 15 0 obj
 <<
@@ -215,7 +215,7 @@ trailer
 /Size 19
 /Root 3 0 R
 /Info 15 0 R
-/ID [<5e7a8a322209fe69033ecf76715ca9bb> <5e7a8a322209fe69033ecf76715ca9bb>]
+/ID [<93791fa2ec3d2ec7399f89ea4d33cf84> <93791fa2ec3d2ec7399f89ea4d33cf84>]
 >>
 startxref
 1798

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:20211115110806Z)
+(D:20220105141307Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<02f50c6fca8984b4a8ad5124068a0eb8> <02f50c6fca8984b4a8ad5124068a0eb8>]
+/ID [<3c2711558dd2781b20915f96040e1526> <3c2711558dd2781b20915f96040e1526>]
 >>
 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:20211115110806Z)
+(D:20220105141307Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<3cb6d99d9f85b72b6beba8b6a69f7bfb> <3cb6d99d9f85b72b6beba8b6a69f7bfb>]
+/ID [<0db75c6289677f1ad17ef668515fa7d2> <0db75c6289677f1ad17ef668515fa7d2>]
 >>
 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:20211115110806Z)
+(D:20220105141308Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<657e4a37e0567967b0331e01abb73cc7> <657e4a37e0567967b0331e01abb73cc7>]
+/ID [<f83f69ea152c953d9f3747868dcf40eb> <f83f69ea152c953d9f3747868dcf40eb>]
 >>
 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:20211115110806Z)
+(D:20220105141308Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<560cb817631fc4dcd3482a519583178b> <560cb817631fc4dcd3482a519583178b>]
+/ID [<68d6858f9ade17df31d28c966a48cddb> <68d6858f9ade17df31d28c966a48cddb>]
 >>
 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:20211115110806Z)
+(D:20220105141308Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<88d03e939d8c2317b1c1ea68ef593a2e> <88d03e939d8c2317b1c1ea68ef593a2e>]
+/ID [<4df806dfcdd26f1dc01e62d192258a34> <4df806dfcdd26f1dc01e62d192258a34>]
 >>
 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:20211115110806Z)
+(D:20220105141308Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<d686e1de0b1e348a2bdc964e5d1fa287> <d686e1de0b1e348a2bdc964e5d1fa287>]
+/ID [<625a2072f50ef946504b36e8857533f5> <625a2072f50ef946504b36e8857533f5>]
 >>
 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:20211115110806Z)
+(D:20220105141308Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<bc7a0f84a3e8773d215383345b4c1587> <bc7a0f84a3e8773d215383345b4c1587>]
+/ID [<922a6b4f464a68b0aec8899672882b99> <922a6b4f464a68b0aec8899672882b99>]
 >>
 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:20211115110806Z)
+(D:20220105141307Z)
 endobj
 9 0 obj
 <<
@@ -126,7 +126,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<211669b49b8d2bc0cd29e15778c258e3> <211669b49b8d2bc0cd29e15778c258e3>]
+/ID [<5ce2a3270d9dd3762de37b24368a8488> <5ce2a3270d9dd3762de37b24368a8488>]
 >>
 startxref
 1076

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211115110806Z)
+(D:20220105141308Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<5649e9e88c1b5786d76e52dd9169f9d2> <5649e9e88c1b5786d76e52dd9169f9d2>]
+/ID [<f72ca66521f8ca61a6d10642fcbf6e53> <f72ca66521f8ca61a6d10642fcbf6e53>]
 >>
 startxref
 824

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

@@ -84,7 +84,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211115110806Z)
+(D:20220105141308Z)
 endobj
 12 0 obj
 <<
@@ -150,7 +150,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<1ee60aeb4a49d08b4c182df8e870701f> <1ee60aeb4a49d08b4c182df8e870701f>]
+/ID [<2d8f748580b709d467a8dfc2d8cedb2b> <2d8f748580b709d467a8dfc2d8cedb2b>]
 >>
 startxref
 1439

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

@@ -79,7 +79,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211115110805Z)
+(D:20220105141307Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<a1f45cacf8ce755c7fdfbbb3f26177c9> <a1f45cacf8ce755c7fdfbbb3f26177c9>]
+/ID [<3c7e24947b3759fe250cc7ebd277f800> <3c7e24947b3759fe250cc7ebd277f800>]
 >>
 startxref
 1212

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211115110806Z)
+(D:20220105141308Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<4209cde6d1cf32936e33e8cc45c05dee> <4209cde6d1cf32936e33e8cc45c05dee>]
+/ID [<80a4a883addd5daa68f7e212d82ef986> <80a4a883addd5daa68f7e212d82ef986>]
 >>
 startxref
 837

package/src/abstract-document-exporters/docx2/render-image.ts

@@ -50,11 +50,11 @@ function abstractComponentToDocX(
     //     preserveAspectRatio: "xMinYMin",
     //     //fontCallback: component.overrideSvgFont
     //     //  ? (_family: string, _bold: boolean, _italic: boolean) => {
-    //     //      return getFontName(textStyle);
+    //     //      return getFontNameStyle(textStyle);
     //     //    }
     //     //  : undefined,
     //     // fontCallback: (_family: string, _bold: boolean, _italic: boolean) => {
-    //     //   return getFontName(textStyle);
+    //     //   return getFontNameStyle(textStyle);
     //     // }
     //   });
     // }

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

@@ -22,18 +22,27 @@ export function registerFonts(
   }
 }
 
-export function getFontName(textStyle: AD.TextStyle.TextStyle): string {
-  const name = textStyle.fontFamily || "Helvetica";
-  if (textStyle.bold && textStyle.italic) {
+export function getFontNameStyle(textStyle: AD.TextStyle.TextStyle): string {
+  return getFontName(textStyle.fontFamily, textStyle.bold, textStyle.italic, textStyle.mediumBold);
+}
+
+export function getFontName(
+  fontFamily: string | undefined,
+  bold: boolean | undefined,
+  italic: boolean | undefined,
+  mediumBold: boolean | undefined
+): string {
+  const name = fontFamily || "Helvetica";
+  if (bold && italic) {
     return name + "-BoldOblique";
-  } else if (textStyle.bold) {
-    return name + "-Bold";
-  } else if (textStyle.italic) {
-    return name + "-Oblique";
-  } else if (textStyle.mediumBold && textStyle.italic) {
+  } else if (mediumBold && italic) {
     return name + "-MediumOblique";
-  } else if (textStyle.mediumBold) {
+  } else if (bold) {
+    return name + "-Bold";
+  } else if (mediumBold) {
     return name + "-Medium";
+  } else if (italic) {
+    return name + "-Oblique";
   } else {
     return name;
   }

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

@@ -2,7 +2,7 @@ import * as R from "ramda";
 import * as AD from "../../abstract-document/index";
 import { exhaustiveCheck } from "ts-exhaustive-check";
 import { Page } from "./paginate";
-import { registerFonts, getFontName } from "./font";
+import { registerFonts, getFontNameStyle } from "./font";
 
 //tslint:disable:no-any variable-name
 
@@ -195,8 +195,8 @@ export function measureTable(
   const infinityWidth = (tableAvailableWidth - fixedColumnsWidth) / numInfinityColumns;
   const columnWidths = table.columnWidths.map((w) => (isFinite(w) ? w : infinityWidth));
   const desiredSizes = new Map<any, AD.Size.Size>();
-
-  for (let row of table.children) {
+  const rows = [...table.headerRows, ...table.children];
+  for (let row of rows) {
     let column = 0;
     for (let cell of row.children) {
       const cellStyle = AD.Resources.getStyle(
@@ -229,7 +229,7 @@ export function measureTable(
     : table.columnWidths.reduce((a, b) => a + b, style.margins.left + style.margins.right);
 
   let desiredHeight = style.margins.top + style.margins.bottom;
-  for (let row of table.children) {
+  for (let row of rows) {
     let rowHeight = row.children.map((c) => getDesiredSize(c, desiredSizes).height).reduce((a, b) => Math.max(a, b), 0);
     desiredHeight += rowHeight;
     desiredSizes.set(row, AD.Size.create(desiredWidth, rowHeight));
@@ -373,7 +373,7 @@ function measureText(
   textStyle: AD.TextStyle.TextStyle,
   availableSize: AD.Size.Size
 ): AD.Size.Size {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
   pdf
     .font(font)

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

@@ -83,49 +83,35 @@ function splitSection(
     const availableHeight = contentRect.height + leadingSpace + trailingSpace;
     if (elementsHeight > availableHeight) {
       if (element.type === "Table" && element.children.length > 1) {
-        //Try to split table
+        //Remove last element
         elements.pop();
         elementsHeight -= elementSize.height;
-        let shouldPushTable = true;
-        let tableHead = {} as AD.Table.Table;
-        let tableRest = {} as AD.Table.Table;
-
-        //Find where to split table
-        for (const [rowIndex, row] of element.children.entries()) {
-          const rowSize = getDesiredSize(row, desiredSizes);
-          elementsHeight += rowSize.height;
-          if (elementsHeight > availableHeight) {
-            if (rowIndex === 0 && elements.length !== 0) {
-              shouldPushTable = false;
-              break;
-            }
-
-            const [newTableHead, newTableRest] = splitTableAt(
-              pdfKit,
-              document,
-              resources,
-              desiredSizes,
-              element,
-              Math.max(rowIndex, 1)
-            );
-            tableHead = newTableHead;
-            tableRest = newTableRest;
-            break;
-          }
-        }
 
-        if (shouldPushTable) {
+        //Try to split table
+        const [tableHead, tableTail] = splitTable(
+          pdfKit,
+          document,
+          resources,
+          desiredSizes,
+          element,
+          elementsHeight,
+          availableHeight,
+          elements.length
+        );
+
+        const tableSplit: AD.Table.Table[] = [];
+        if (tableHead) {
           elements.push(tableHead);
-          const newChildren: AD.Table.Table[] = [];
-          if (shouldPushTable) {
-            newChildren.push(tableHead);
-          }
-          newChildren.push(tableRest);
-          //Add split table to children to process tableRest
-          children = [...children.slice(0, i), ...newChildren, ...children.slice(i + 1)];
+          tableSplit.push(tableHead);
         } else {
           i--;
         }
+        if (tableTail) {
+          tableSplit.push(tableTail);
+        }
+
+        //Add split table to children to process tableTail in next iteration
+        children = [...children.slice(0, i), ...tableSplit, ...children.slice(i + 1)];
 
         currentPage = createPage(resources, desiredSizes, currentPage, section, elements, pages.length === 0);
         pages.push(currentPage);
@@ -153,6 +139,62 @@ function splitSection(
   return pages;
 }
 
+function splitTable(
+  pdfKit: any,
+  document: AD.AbstractDoc.AbstractDoc,
+  resources: AD.Resources.Resources,
+  desiredSizes: Map<{}, AD.Size.Size>,
+  table: AD.Table.Table,
+  elementsHeight: number,
+  availableHeight: number,
+  elementsLength: number
+): [AD.Table.Table | undefined, AD.Table.Table | undefined] {
+  let tableHead = undefined;
+  let tableRest = undefined;
+  elementsHeight += table.style.margins.top || 0;
+  if (table.headerRows.length > 0) {
+    const headerSize = table.headerRows.reduce((acc, row) => (acc += getDesiredSize(row, desiredSizes).height), 0);
+    elementsHeight += headerSize;
+  }
+
+  //Find where to split table
+  for (const [rowIndex, row] of table.children.entries()) {
+    const rowSize = getDesiredSize(row, desiredSizes);
+    elementsHeight += rowSize.height;
+
+    if (elementsHeight > availableHeight) {
+      if (rowIndex === 0 && elementsLength !== 0) {
+        //Not even first row fit on the page, shove it all to the next page
+        return [undefined, table];
+      }
+
+      const [newTableHead, newTableRest] = splitTableAt(
+        pdfKit,
+        document,
+        resources,
+        desiredSizes,
+        table,
+        Math.max(rowIndex, 1)
+      );
+
+      if (newTableHead.children.length > 0) {
+        tableHead = newTableHead;
+      }
+      if (newTableRest.children.length > 0) {
+        tableRest = newTableRest;
+      }
+      break;
+    }
+  }
+
+  if (!tableHead && !tableRest) {
+    //Didnt find a place to split the table, meaning the whole table fits on current page
+    return [table, undefined];
+  }
+
+  return [tableHead, tableRest];
+}
+
 function createPage(
   resources: AD.Resources.Resources,
   desiredSizes: Map<{}, AD.Size.Size>,
@@ -367,8 +409,16 @@ function splitTableAt(
   tailRows.push(...table.children.slice(splitIndex + 1));
 
   //Create tables and remeasure them
-  const tableHead = { ...table, children: headRows };
-  const tableTail = { ...table, children: tailRows };
+  const tableHead = {
+    ...table,
+    style: { ...table.style, margins: { ...table.style.margins, bottom: 0 } },
+    children: headRows,
+  };
+  const tableTail = {
+    ...table,
+    style: { ...table.style, margins: { ...table.style.margins, top: 0 } },
+    children: tailRows,
+  };
 
   const availableSize = getDesiredSize(table, desiredSizes);
   let pdf = new pdfKit();

package/src/abstract-document-exporters/pdf/pre-process.ts

@@ -283,8 +283,15 @@ function toChar(num: number): string {
 // }
 
 function preProcessTable(table: AD.Table.Table, resources: AD.Resources.Resources): AD.SectionElement.SectionElement {
+  const processedHeaders = [];
   const processedChildren = [];
   let rowSpans: Map<number, AD.TableCell.TableCell> = new Map();
+  if (table.headerRows) {
+    for (const row of table.headerRows) {
+      const header = preProcessTableRow(row, rowSpans, resources);
+      processedHeaders.push(header);
+    }
+  }
   for (const row of table.children) {
     const children = preProcessTableRow(row, rowSpans, resources);
     processedChildren.push(children);
@@ -294,6 +301,7 @@ function preProcessTable(table: AD.Table.Table, resources: AD.Resources.Resource
       columnWidths: table.columnWidths,
       styleName: table.styleName,
       style: table.style,
+      headerRows: processedHeaders,
     },
     processedChildren
   );

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

@@ -2,7 +2,7 @@ import * as AbstractImage from "abstract-image";
 import * as base64 from "base64-js";
 import svgToPdfKit from "svg-to-pdfkit";
 import * as AD from "../../abstract-document";
-import { getFontName, isFontAvailable } from "./font";
+import { getFontNameStyle, getFontName, isFontAvailable } from "./font";
 
 export function renderImage(
   resources: AD.Resources.Resources,
@@ -84,7 +84,7 @@ function abstractComponentToPdf(
             if (isFontAvailable(family, resources)) {
               return family;
             } else {
-              return getFontName(textStyle);
+              return getFontNameStyle(textStyle);
             }
           },
         });
@@ -115,13 +115,19 @@ function abstractComponentToPdf(
         .stroke(colorToRgb(component.strokeColor));
       break;
     case "text":
+      const font = getFontName(
+        component.fontFamily,
+        component.fontWeight === "bold",
+        component.italic,
+        component.fontWeight === "mediumBold"
+      );
       if (component.clockwiseRotationDegrees !== 0) {
         pdf.save();
         pdf.rotate(component.clockwiseRotationDegrees, {
           origin: [component.position.x, component.position.y],
         });
       }
-      pdf.font(component.fontFamily).fontSize(component.fontSize);
+      pdf.font(font).fontSize(component.fontSize);
       const stringWidth = pdf.widthOfString(component.text);
       const stringHeight = pdf.currentLineHeight();
       const dx =
@@ -137,7 +143,7 @@ function abstractComponentToPdf(
           ? -stringHeight * 0.5
           : 0;
       pdf
-        .font(component.fontFamily)
+        .font(font)
         .fontSize(component.fontSize)
         .fillColor(colorToRgb(component.textColor))
         .text(component.text, component.position.x + dx, component.position.y + dy, { lineBreak: false });