abstract-document 6.5.0 → 6.7.1

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

@@ -16,19 +16,6 @@ endobj
 /F 4
 >>
 endobj
-11 0 obj
-<<
-/align /left
-/Subtype /Underline
-/QuadPoints [0 840 22.78 840 0 828.44 22.78 828.44]
-/Contents ()
-/Type /Annot
-/Rect [0 828.44 22.78 840]
-/Border [0 0 0]
-/C [0 0 1]
-/Align /left
->>
-endobj
 7 0 obj
 <<
 /Type /Page
@@ -36,7 +23,7 @@ endobj
 /MediaBox [0 0 595 842]
 /Contents 5 0 R
 /Resources 6 0 R
-/Annots [9 0 R 11 0 R]
+/Annots [9 0 R]
 >>
 endobj
 6 0 obj
@@ -77,20 +64,20 @@ Q
 
 endstream
 endobj
-13 0 obj
+12 0 obj
 (PDFKit)
 endobj
-14 0 obj
+13 0 obj
 (PDFKit)
 endobj
-15 0 obj
-(D:20220105111759Z)
+14 0 obj
+(D:20220216073733Z)
 endobj
-12 0 obj
+11 0 obj
 <<
-/Producer 13 0 R
-/Creator 14 0 R
-/CreationDate 15 0 R
+/Producer 12 0 R
+/Creator 13 0 R
+/CreationDate 14 0 R
 >>
 endobj
 10 0 obj
@@ -128,30 +115,29 @@ endobj
 >>
 endobj
 xref
-0 16
+0 15
 0000000000 65535 f 
-0000001335 00000 n 
-0000001392 00000 n 
-0000001273 00000 n 
-0000001252 00000 n 
-0000000574 00000 n 
-0000000484 00000 n 
-0000000357 00000 n 
+0000001128 00000 n 
+0000001185 00000 n 
+0000001066 00000 n 
+0000001045 00000 n 
+0000000367 00000 n 
+0000000277 00000 n 
+0000000157 00000 n 
 0000000015 00000 n 
 0000000051 00000 n 
-0000001154 00000 n 
-0000000157 00000 n 
-0000001078 00000 n 
-0000000992 00000 n 
-0000001017 00000 n 
-0000001042 00000 n 
+0000000947 00000 n 
+0000000871 00000 n 
+0000000785 00000 n 
+0000000810 00000 n 
+0000000835 00000 n 
 trailer
 <<
-/Size 16
+/Size 15
 /Root 3 0 R
-/Info 12 0 R
-/ID [<aff467c850a90b8753d7857e8c793026> <aff467c850a90b8753d7857e8c793026>]
+/Info 11 0 R
+/ID [<c1e3831a0a1cfe23bb4add233cb8639c> <c1e3831a0a1cfe23bb4add233cb8639c>]
 >>
 startxref
-1439
+1232
 %%EOF

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

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

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20220105111759Z)
+(D:20220216073733Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<34aa326327ae950341773bad4e6b0ff8> <34aa326327ae950341773bad4e6b0ff8>]
+/ID [<ccc074c40e75f05e59796219d4826e2d> <ccc074c40e75f05e59796219d4826e2d>]
 >>
 startxref
 837

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

@@ -98,7 +98,7 @@ function measureParagraph(
     paragraph.styleName,
     resources
   ) as AD.ParagraphStyle.ParagraphStyle;
-  const contentAvailableWidth = availableSize.width - (style.margins.left + style.margins.left);
+  const contentAvailableWidth = availableSize.width - (style.margins.left + style.margins.right);
   const contentAvailableHeight = availableSize.height - (style.margins.top + style.margins.bottom);
   const contentAvailableSize = AD.Size.create(contentAvailableWidth, contentAvailableHeight);
 
@@ -216,7 +216,9 @@ export function measureTable(
         const elementSizes = measureSectionElement(pdf, resources, elementAvailableSize, element);
         elementSizes.forEach((v, k) => desiredSizes.set(k, v));
         const elementSize = getDesiredSize(element, desiredSizes);
-        cellDesiredHeight += elementSize.height;
+        if (!AD.Position.isPositionAbsolute(element)) {
+          cellDesiredHeight += elementSize.height;
+        }
       }
 
       desiredSizes.set(cell, AD.Size.create(cellWidth, cellDesiredHeight));
@@ -253,7 +255,13 @@ function measureGroup(
   let desiredSizes = mergeMaps(
     keepTogether.children.map((e) => measureSectionElement(pdf, resources, availableSize, e))
   );
-  let desiredHeight = R.reduce((sum, e) => sum + getDesiredSize(e, desiredSizes).height, 0.0, keepTogether.children);
+  let desiredHeight = R.reduce(
+    (sum, e) => {
+      return sum + (AD.Position.isPositionAbsolute(e) ? 0 : getDesiredSize(e, desiredSizes).height);
+    },
+    0.0,
+    keepTogether.children
+  );
   desiredSizes.set(keepTogether, AD.Size.create(availableSize.width, desiredHeight));
   return desiredSizes;
 }

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

@@ -75,9 +75,10 @@ function splitSection(
       i--;
       continue;
     }
+    const isPositionAbsolute = AD.Position.isPositionAbsolute(element);
 
     elements.push(element);
-    elementsHeight += elementSize.height;
+    elementsHeight += isPositionAbsolute ? 0 : elementSize.height;
 
     const [leadingSpace, trailingSpace] = getLeadingAndTrailingSpace(resources, section, elements);
     const availableHeight = contentRect.height + leadingSpace + trailingSpace;
@@ -85,7 +86,7 @@ function splitSection(
       if (element.type === "Table" && element.children.length > 1) {
         //Remove last element
         elements.pop();
-        elementsHeight -= elementSize.height;
+        elementsHeight -= elementSize.height; //TODO: handle absolute positioned elements
 
         //Try to split table
         const [tableHead, tableTail] = splitTable(

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

@@ -373,11 +373,12 @@ function preProcessGroup(
   const children = R.unnest<AD.SectionElement.SectionElement>(
     group.children.map((e) => preProcessSectionElement(e, parentResources))
   );
-  if (group.keepTogether || AD.Resources.hasResources(group)) {
+  if (group.keepTogether || AD.Resources.hasResources(group) || group.style.position === "absolute") {
     return [
       AD.Group.create(
         {
           keepTogether: group.keepTogether,
+          style: group.style,
           ...AD.Resources.extractResources(group),
         },
         children

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

@@ -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 });

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

@@ -94,17 +94,21 @@ function renderPage(
   });
 
   const headerX = style.headerMargins.left;
-  let headerY = style.headerMargins.top;
+  const headerStart = style.headerMargins.top;
+  let headerY = headerStart;
   for (let element of page.header) {
     const elementSize = getDesiredSize(element, desiredSizes);
+    const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
       pdf,
       desiredSizes,
-      AD.Rect.create(headerX, headerY, elementSize.width, elementSize.height),
+      AD.Rect.create(headerX, isAbsolute ? headerStart : headerY, elementSize.width, elementSize.height),
       element
     );
-    headerY += elementSize.height;
+    if (!isAbsolute) {
+      headerY += elementSize.height;
+    }
   }
   headerY += style.headerMargins.bottom;
 
@@ -113,30 +117,38 @@ function renderPage(
     style.footerMargins.top + style.footerMargins.bottom
   );
   const footerX = style.footerMargins.left;
-  let footerY = pageHeight - (footerHeight - style.footerMargins.top);
+  const footerStart = pageHeight - (footerHeight - style.footerMargins.top);
+  let footerY = footerStart;
   for (let element of page.footer) {
     const elementSize = getDesiredSize(element, desiredSizes);
+    const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
       pdf,
       desiredSizes,
-      AD.Rect.create(footerX, footerY, elementSize.width, elementSize.height),
+      AD.Rect.create(footerX, isAbsolute ? footerStart : footerY, elementSize.width, elementSize.height),
       element
     );
-    footerY += elementSize.height;
+    if (!isAbsolute) {
+      footerY += elementSize.height;
+    }
   }
 
-  let y = contentRect.y;
+  const elementStart = contentRect.y;
+  let y = elementStart;
   for (const element of page.elements) {
     const elementSize = getDesiredSize(element, desiredSizes);
+    const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
       pdf,
       desiredSizes,
-      AD.Rect.create(contentRect.x, y, elementSize.width, elementSize.height),
+      AD.Rect.create(contentRect.x, isAbsolute ? elementStart : y, elementSize.width, elementSize.height),
       element
     );
-    y += elementSize.height;
+    if (!isAbsolute) {
+      y += elementSize.height;
+    }
   }
 }
 
@@ -189,17 +201,22 @@ function renderGroup(
   finalRect: AD.Rect.Rect,
   group: AD.Group.Group
 ): void {
-  let y = finalRect.y;
+  const finalX = finalRect.x + group.style.margins.left;
+  const startY = finalRect.y + group.style.margins.top;
+  let y = startY;
   for (const element of group.children) {
     const elementSize = getDesiredSize(element, desiredSizes);
+    const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
       pdf,
       desiredSizes,
-      AD.Rect.create(finalRect.x, y, elementSize.width, elementSize.height),
+      AD.Rect.create(finalX, isAbsolute ? startY : y, elementSize.width, elementSize.height),
       element
     );
-    y += elementSize.height;
+    if (!isAbsolute) {
+      y += elementSize.height;
+    }
   }
 }
 
@@ -283,6 +300,12 @@ function renderParagraph(
     const rowWidth = row.reduce((a, b) => a + getDesiredSize(b, desiredSizes).width, 0);
     let x = finalRect.x;
 
+    if (style.alignment === "Start" || style.alignment === "Justify") {
+      x += style.margins.left;
+    } else if (style.alignment === "End") {
+      x -= style.margins.right;
+    }
+
     if (row.length > 1 || row[0].type === "Image") {
       // Using continued with alignment "center" or "right" is broken:
       // https://github.com/foliojs/pdfkit/issues/240
@@ -490,33 +513,34 @@ function drawHyperLink(
   // so always set alignment to left and handle it through an x offset
   // if its just a single atom then we can use its alignment to partially support multi-line texts for other alignments
   if (isFirstAtom || alignment !== "left") {
-    pdf
-      .text(hyperLink.text, finalRect.x, finalRect.y, {
-        width: availableWidth,
-        underline: textStyle.underline || false,
-        align: isSingleAtom ? alignment : "left",
-        goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
-        indent: textStyle.indent || 0,
-        continued: alignment !== "left" ? false : !isLastAtom,
-        ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
-      })
-      .underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
+    pdf.text(hyperLink.text, finalRect.x, finalRect.y, {
+      width: availableWidth,
+      align: isSingleAtom ? alignment : "left",
+      goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
+      indent: textStyle.indent || 0,
+      continued: alignment !== "left" ? false : !isLastAtom,
+      baseline: textStyle.baseline || "top",
+      ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
+    });
+    if (textStyle.underline === undefined ? true : textStyle.underline) {
+      pdf.underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
         align: isSingleAtom ? alignment : "left",
         color: "blue",
       });
+    }
   } else {
-    pdf
-      .text(hyperLink.text, {
-        underline: textStyle.underline || false,
-        align: "left",
-        goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
-        indent: textStyle.indent || 0,
-        continued: !isLastAtom,
-        ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
-      })
-      .underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
+    pdf.text(hyperLink.text, {
+      align: "left",
+      goTo: isInternalLink ? hyperLink.target.substr(1) : undefined,
+      indent: textStyle.indent || 0,
+      continued: !isLastAtom,
+      ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
+    });
+    if (textStyle.underline === undefined ? true : textStyle.underline) {
+      pdf.underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
         color: "blue",
       });
+    }
   }
 
   resetTextOffset(pdf, textStyle);
@@ -557,6 +581,7 @@ function drawText(
       align: isSingleAtom ? alignment : "left",
       indent: textStyle.indent || 0,
       continued: alignment !== "left" ? false : !isLastAtom,
+      baseline: textStyle.baseline || "top",
       ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
     });
   } else {
@@ -704,8 +729,11 @@ function renderCell(
 
   let x = finalRect.x + style.padding.left;
   const availableHeight = finalRect.height;
-  let contentHeight = cell.children.map((c) => getDesiredSize(c, desiredSizes).height).reduce((a, b) => a + b, 0);
-  let y = finalRect.y + style.padding.top;
+  let contentHeight = cell.children
+    .map((c) => (AD.Position.isPositionAbsolute(c) ? 0 : getDesiredSize(c, desiredSizes).height))
+    .reduce((a, b) => a + b, 0);
+  const startY = finalRect.y + style.padding.top;
+  let y = startY;
   if (style.verticalAlignment === "Middle")
     y += 0.5 * (availableHeight - contentHeight - style.padding.top - style.padding.bottom);
   else if (style.verticalAlignment === "Bottom")
@@ -713,9 +741,12 @@ function renderCell(
 
   for (const element of cell.children) {
     const elementSize = getDesiredSize(element, desiredSizes);
-    const elementRect = AD.Rect.create(x, y, elementSize.width, elementSize.height);
+    const isAbsolute = AD.Position.isPositionAbsolute(element);
+    const elementRect = AD.Rect.create(x, isAbsolute ? startY : y, elementSize.width, elementSize.height);
     renderSectionElement(resources, pdf, desiredSizes, elementRect, element);
-    y += elementSize.height;
+    if (!isAbsolute) {
+      y += elementSize.height;
+    }
   }
 
   //Needed to counter aliasing caused by the cells background fill

package/lib/abstract-document/__tests__/markdown/test-defs/markdown.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../../../src/abstract-document/__tests__/markdown/test-defs/markdown.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,eAAO,MAAM,IAAI,EAAE,aAIlB,CAAC"}

package/lib/abstract-document/__tests__/markdown/test-defs/markdown.js

@@ -1,14 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.test = void 0;
-const react_1 = __importDefault(require("react"));
-const abstract_document_jsx_1 = require("../../../../abstract-document-jsx");
-exports.test = {
-    name: "Markdown",
-    abstractDocJsx: react_1.default.createElement(abstract_document_jsx_1.Markdown, { text: "H~2~O 2^10^ *Italic* **Bold** ***Italic and Bold***" }),
-    expectedMarkdown: {},
-};
-//# sourceMappingURL=markdown.js.map

package/lib/abstract-document/__tests__/markdown/test-defs/markdown.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../../../../src/abstract-document/__tests__/markdown/test-defs/markdown.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,6EAA6D;AAEhD,QAAA,IAAI,GAAkB;IACjC,IAAI,EAAE,UAAU;IAChB,cAAc,EAAE,8BAAC,gCAAQ,IAAC,IAAI,EAAC,qDAAqD,GAAG;IACvF,gBAAgB,EAAE,EAAE;CACrB,CAAC"}

package/lib/abstract-document/primitives/layout-foundation.js copy.map

@@ -1 +0,0 @@
-{"version":3,"file":"layout-foundation.js","sourceRoot":"","sources":["../../../src/abstract-document/primitives/layout-foundation.ts"],"names":[],"mappings":";;;AAcA,SAAgB,MAAM,CAAC,KAA6B;IAClD,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,EAAE,CAAC;IACjE,OAAO;QACL,GAAG;QACH,MAAM;QACN,IAAI;QACJ,KAAK;KACN,CAAC;AACJ,CAAC;AARD,wBAQC;AAED,SAAgB,YAAY,CAC1B,SAAuC,EACvC,UAAwC;IAExC,MAAM,CAAC,GAAG,SAAS,IAAI,MAAM,EAAE,CAAC;IAChC,MAAM,CAAC,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;IACjC,OAAO,MAAM,CAAC;QACZ,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG;QACnB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM;QAC5B,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI;QACtB,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK;KAC1B,CAAC,CAAC;AACL,CAAC;AAZD,oCAYC"}

package/lib/abstract-document-exporters/__tests__/docx2/test-defs/simple-table copy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"simple-table copy.d.ts","sourceRoot":"","sources":["../../../../../src/abstract-document-exporters/__tests__/docx2/test-defs/simple-table copy.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAWnD,eAAO,MAAM,IAAI,EAAE,aAqMlB,CAAC"}