abstract-document 6.5.1 → 6.7.2

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.ts

@@ -94,49 +94,61 @@ 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;
 
   const footerHeight = page.footer.reduce(
-    (a, b) => a + getDesiredSize(b, desiredSizes).height,
+    (a, b) => a + (AD.Position.isPositionAbsolute(b) ? 0 : getDesiredSize(b, desiredSizes).height),
     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