abstract-document 6.3.0 → 6.5.0

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:20211111111559Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<77a95761fb895f18a58fc19cfe3b8fcb> <77a95761fb895f18a58fc19cfe3b8fcb>]
+/ID [<cf0bc121be9f78bc94997565360fce90> <cf0bc121be9f78bc94997565360fce90>]
 >>
 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:20211111111559Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<cb84b1b3fe918e0055f2a4d0ca9d1264> <cb84b1b3fe918e0055f2a4d0ca9d1264>]
+/ID [<41e6127e78ee3efe2c987b26324c3347> <41e6127e78ee3efe2c987b26324c3347>]
 >>
 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:20211111111559Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -126,7 +126,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<26247618318ffdcb70e370945b92bb11> <26247618318ffdcb70e370945b92bb11>]
+/ID [<1bf6530e544b32c0fdb03695babaa7c1> <1bf6530e544b32c0fdb03695babaa7c1>]
 >>
 startxref
 1076

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211111111559Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<d05fa0260b32c53af7988528e0f3a907> <d05fa0260b32c53af7988528e0f3a907>]
+/ID [<bb4e849828d6652e881b71e25a89302a> <bb4e849828d6652e881b71e25a89302a>]
 >>
 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:20211111111559Z)
+(D:20220105111759Z)
 endobj
 12 0 obj
 <<
@@ -150,7 +150,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<7562eadd53e15b73b819e4f60e6fcbef> <7562eadd53e15b73b819e4f60e6fcbef>]
+/ID [<aff467c850a90b8753d7857e8c793026> <aff467c850a90b8753d7857e8c793026>]
 >>
 startxref
 1439

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

@@ -79,7 +79,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211111111559Z)
+(D:20220105111758Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<38e2f3cd32d0c1b2f14b4e9296bfae96> <38e2f3cd32d0c1b2f14b4e9296bfae96>]
+/ID [<0ff0e795ffbd1e504a7e1c674a4e4be6> <0ff0e795ffbd1e504a7e1c674a4e4be6>]
 >>
 startxref
 1212

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211111111559Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<8b849bcdc7f0598866933937a0613a59> <8b849bcdc7f0598866933937a0613a59>]
+/ID [<34aa326327ae950341773bad4e6b0ff8> <34aa326327ae950341773bad4e6b0ff8>]
 >>
 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

@@ -82,40 +82,42 @@ function splitSection(
     const [leadingSpace, trailingSpace] = getLeadingAndTrailingSpace(resources, section, elements);
     const availableHeight = contentRect.height + leadingSpace + trailingSpace;
     if (elementsHeight > availableHeight) {
-      if (element.type === "Table") {
-        //Try to split table
+      if (element.type === "Table" && element.children.length > 1) {
+        //Remove last element
         elements.pop();
         elementsHeight -= elementSize.height;
-        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) {
-            const [newTableHead, newTableRest] = splitTableAt(
-              pdfKit,
-              document,
-              resources,
-              desiredSizes,
-              element,
-              rowIndex
-            );
-            tableHead = newTableHead;
-            tableRest = newTableRest;
-            break;
-          }
+
+        //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);
+          tableSplit.push(tableHead);
+        } else {
+          i--;
+        }
+        if (tableTail) {
+          tableSplit.push(tableTail);
         }
 
-        elements.push(tableHead);
+        //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);
         elements = [];
         elementsHeight = 0;
 
-        //Add split table to children to process tableRest
-        children = [...children.slice(0, i), tableHead, tableRest, ...children.slice(i + 1)];
         continue;
       }
 
@@ -137,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>,
@@ -351,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);
             }
           },
         });

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

@@ -5,7 +5,7 @@ import { paginate, Page } from "./paginate";
 import { updatePageRefs } from "./update-refs";
 import BlobStream from "blob-stream";
 import { renderImage } from "./render-image";
-import { registerFonts, getFontName } from "./font";
+import { registerFonts, getFontNameStyle } from "./font";
 
 type RowSpans = Map<number, { rowSpanLeft: number; colSpan: number }>;
 
@@ -467,7 +467,7 @@ function drawHyperLink(
   isLastAtom: boolean,
   availableWidth: number
 ): void {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const isInternalLink = hyperLink.target.startsWith("#") && !hyperLink.target.startsWith("#page=");
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
   const isSingleAtom = isFirstAtom && isLastAtom;
@@ -536,7 +536,7 @@ function drawText(
   isLastAtom: boolean,
   availableWidth: number
 ): void {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
   const isSingleAtom = isFirstAtom && isLastAtom;
   pdf
@@ -573,7 +573,7 @@ function drawText(
 }
 
 function drawDottedLine(pdf: any, finalRect: AD.Rect.Rect, textStyle: AD.TextStyle.TextStyle): void {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
 
   const oneDotW = pdf.widthOfString(".", {
@@ -629,14 +629,15 @@ function renderTable(
   ) as AD.TableStyle.TableStyle;
   const availableWidth = finalRect.width;
   let y = finalRect.y + style.margins.top;
-  for (let [index, row] of table.children.entries()) {
+  const rows = [...table.headerRows, ...table.children];
+  for (let [index, row] of rows.entries()) {
     const rowSize = getDesiredSize(row, desiredSizes);
     let x = finalRect.x + style.margins.left;
     if (style.alignment === "Center") x += 0.5 * (availableWidth - rowSize.width);
     else if (style.alignment === "Right") x += availableWidth - rowSize.width;
     const rowRect = AD.Rect.create(x, y, rowSize.width, rowSize.height);
     const isTop = index === 0;
-    const isBottom = index === table.children.length - 1;
+    const isBottom = index === rows.length - 1;
     renderRow(resources, pdf, desiredSizes, rowRect, style.cellStyle, table, row, index, isTop, isBottom);
     y += rowSize.height;
   }
@@ -656,7 +657,6 @@ function renderRow(
 ): void {
   let x = finalRect.x;
   const rowSize = getDesiredSize(row, desiredSizes);
-  let cellIndexSpan = 0;
   for (const [cellIndex, cell] of row.children.entries()) {
     if (cell.dummy) {
       const dummySize = getDesiredSize(cell, desiredSizes);
@@ -667,7 +667,7 @@ function renderRow(
     let height = rowSize.height;
     if (cell.rowSpan > 1) {
       for (let index = rowIndex + 1; index < rowIndex + cell.rowSpan; index++) {
-        height += getDesiredSize(table.children[index], desiredSizes).height;
+        height += getDesiredSize([...table.headerRows, ...table.children][index], desiredSizes).height;
       }
     }
     const cellSize = getDesiredSize(cell, desiredSizes);
@@ -676,7 +676,6 @@ function renderRow(
     const isLast = cellIndex === row.children.length - 1;
     renderCell(resources, pdf, desiredSizes, cellRect, tableCellStyle, cell, isFirst, isLast, isTop, isBottom);
     x += cellSize.width;
-    cellIndexSpan++;
   }
 }