abstract-document 6.7.1 → 6.8.1

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

@@ -74,6 +74,28 @@ function abstractComponentToPdf(
           }
         });
 
+        ["stroke-dasharray="].forEach((t) => {
+          let index = 0;
+          while (true) {
+            index = svgUpdated.indexOf(t, index);
+            if (index === -1) break;
+            let indexStart = svgUpdated.indexOf('"', index) + 1;
+            let indexEnd = svgUpdated.indexOf('"', indexStart);
+            index = indexEnd;
+
+            let dasharray = svgUpdated.substring(indexStart, indexEnd);
+
+            dasharray = dasharray
+              .split(" ")
+              .map((x) => parseFloat(x))
+              .filter((x) => x !== 0)
+              .join(" ");
+
+            svgUpdated =
+              svgUpdated.substring(0, indexStart) + dasharray + svgUpdated.substring(indexEnd, svgUpdated.length);
+          }
+        });
+
         const imageWidth = component.bottomRight.x - component.topLeft.x;
         const imageHeight = component.bottomRight.y - component.topLeft.y;
         svgToPdfKit(pdf, svgUpdated, component.topLeft.x, component.topLeft.y, {

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

@@ -113,7 +113,7 @@ function renderPage(
   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;
@@ -383,7 +383,7 @@ function renderAtom(
       renderHyperLink(resources, pdf, finalRect, textStyle, atom, alignment, isFirstAtom, isLastAtom, availableWidth);
       return;
     case "TocSeparator":
-      renderTocSeparator(pdf, finalRect, textStyle);
+      renderTocSeparator(pdf, finalRect, textStyle, atom);
       return;
     case "LinkTarget":
       return;
@@ -476,8 +476,13 @@ function renderHyperLink(
   drawHyperLink(pdf, finalRect, style, hyperLink, textAlignment, isFirstAtom, isLastAtom, availableWidth);
 }
 
-function renderTocSeparator(pdf: {}, finalRect: AD.Rect.Rect, textStyle: AD.TextStyle.TextStyle): void {
-  drawDottedLine(pdf, finalRect, textStyle);
+function renderTocSeparator(
+  pdf: {},
+  finalRect: AD.Rect.Rect,
+  textStyle: AD.TextStyle.TextStyle,
+  tocSeparator: AD.TocSeparator.TocSeparator
+): void {
+  drawDottedLine(pdf, finalRect, textStyle, tocSeparator);
 }
 
 function drawHyperLink(
@@ -597,19 +602,26 @@ function drawText(
   resetTextOffset(pdf, textStyle);
 }
 
-function drawDottedLine(pdf: any, finalRect: AD.Rect.Rect, textStyle: AD.TextStyle.TextStyle): void {
+function drawDottedLine(
+  pdf: any,
+  finalRect: AD.Rect.Rect,
+  textStyle: AD.TextStyle.TextStyle,
+  tocSeparator: AD.TocSeparator.TocSeparator
+): void {
   const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
 
+  const charSpacing = tocSeparator.width ? tocSeparator.width : 5;
+
   const oneDotW = pdf.widthOfString(".", {
     width: finalRect.width,
     height: finalRect.height,
-    characterSpacing: 5,
+    characterSpacing: charSpacing,
   });
   const twoDotsW = pdf.widthOfString("..", {
     width: finalRect.width,
     height: finalRect.height,
-    characterSpacing: 5,
+    characterSpacing: charSpacing,
   });
   const numberOfDots = Math.floor((finalRect.width - oneDotW) / (twoDotsW - oneDotW)) + 1;
   if (twoDotsW - oneDotW === 0 || numberOfDots < 1) {
@@ -633,7 +645,7 @@ function drawDottedLine(pdf: any, finalRect: AD.Rect.Rect, textStyle: AD.TextSty
     width: finalRect.width,
     height: finalRect.height,
     align: "right",
-    characterSpacing: 5,
+    characterSpacing: charSpacing,
   });
   resetTextOffset(pdf, textStyle);
 }