-
diff --git a/src/templates/assets/rendertemplate.ejs b/src/templates/assets/rendertemplate.ejs
index 9415dae..f2c2775 100644
--- a/src/templates/assets/rendertemplate.ejs
+++ b/src/templates/assets/rendertemplate.ejs
@@ -1 +1,3 @@
-
<%- content %>
+
diff --git a/src/templates/assets/styles.css b/src/templates/assets/styles.css
index 1565a7c..4eff267 100644
--- a/src/templates/assets/styles.css
+++ b/src/templates/assets/styles.css
@@ -15,8 +15,16 @@ body {
box-sizing: border-box;
width: fit-content;
}
+.previewPages {
+ display: flex;
+ flex-direction: row;
+ align-items: flex-start;
+ gap: 32px;
+ width: fit-content;
+}
.previewWrapper {
position: relative;
+ flex-shrink: 0;
}
.previewDocument {
background: #ffffff;
@@ -28,8 +36,30 @@ body {
box-sizing: content-box;
}
+.renderPages {
+ display: flex;
+ flex-direction: column;
+}
+
.renderDocument {
box-sizing: content-box;
+ overflow: hidden;
+ break-after: page;
+ page-break-after: always;
+}
+
+.renderDocument:last-child {
+ break-after: auto;
+ page-break-after: auto;
+}
+
+.fcPaginationHidden {
+ display: none !important;
+}
+
+.fcPaginationVisible {
+ break-after: auto !important;
+ page-break-after: auto !important;
}
.documentText {
@@ -66,6 +96,10 @@ h4.documentTitle {
border: none;
}
+.documentPageBreak {
+ display: none;
+}
+
.contentPlaceholder {
border: 1px solid black;
max-height: 250px;
diff --git a/src/templates/pdffactory.js b/src/templates/pdffactory.js
index d3a41cd..cc27ba1 100644
--- a/src/templates/pdffactory.js
+++ b/src/templates/pdffactory.js
@@ -1,5 +1,6 @@
import log4js from 'log4js';
import puppeteer from 'puppeteer';
+import { PDFDocument } from 'pdf-lib';
import config from '../config.js';
import { getPuppeteerLaunchOptions } from '../puppeteerLaunchOptions.js';
@@ -100,6 +101,75 @@ async function withPage(run) {
}
}
+async function getPaginationPageCount(page) {
+ const pageCount = await page.evaluate(() => {
+ const api = window.__fcDocumentPagination;
+ if (!api || typeof api.getPageCount !== 'function') {
+ return 1;
+ }
+ return api.getPageCount() || 1;
+ });
+ return Math.max(1, Number(pageCount) || 1);
+}
+
+async function showPaginationPage(page, index) {
+ await page.evaluate((pageIndex) => {
+ const api = window.__fcDocumentPagination;
+ if (api && typeof api.showPage === 'function') {
+ api.showPage(pageIndex);
+ }
+ }, index);
+}
+
+async function measureVisiblePageHeight(page) {
+ return page.evaluate(() => {
+ const api = window.__fcDocumentPagination;
+ if (api && typeof api.measureVisiblePageHeight === 'function') {
+ return api.measureVisiblePageHeight();
+ }
+ const content = document.getElementById('content');
+ return content ? content.scrollHeight : 0;
+ });
+}
+
+function buildPdfOptions(options, height, isAutoHeight, isolatePage) {
+ return {
+ printBackground: true,
+ preferCSSPageSize: isolatePage !== true && isAutoHeight !== true,
+ width: options.width ? `${options.width}mm` : undefined,
+ height: height
+ ? isAutoHeight
+ ? `${height + 2}px`
+ : `${height}mm`
+ : undefined,
+ margin: {
+ top: '0mm',
+ right: '0mm',
+ bottom: '0mm',
+ left: '0mm',
+ },
+ };
+}
+
+export async function mergePdfBuffers(buffers = []) {
+ if (!Array.isArray(buffers) || buffers.length === 0) {
+ return Buffer.alloc(0);
+ }
+ if (buffers.length === 1) {
+ return Buffer.isBuffer(buffers[0]) ? buffers[0] : Buffer.from(buffers[0]);
+ }
+
+ const merged = await PDFDocument.create();
+ for (const bytes of buffers) {
+ const donor = await PDFDocument.load(bytes);
+ const copiedPages = await merged.copyPages(donor, donor.getPageIndices());
+ for (const copiedPage of copiedPages) {
+ merged.addPage(copiedPage);
+ }
+ }
+ return Buffer.from(await merged.save());
+}
+
/**
* Generates a PDF from HTML content using a persistent Puppeteer browser
* @param {string} html - The HTML content to convert to PDF
@@ -115,28 +185,34 @@ export async function generatePDF(html, options = {}) {
waitUntil: 'domcontentloaded',
});
- var height = options?.height || '50';
+ await page
+ .waitForFunction(
+ () => document.documentElement.getAttribute('data-paginated') === 'true',
+ { timeout: 15000 }
+ )
+ .catch(() => {});
- if (options.height == 'auto') {
- const calculatedHeight = await page.evaluate(() => {
- return document.getElementById('content').scrollHeight;
- });
+ const pageCount = await getPaginationPageCount(page);
+ const isAutoHeight = options.height == 'auto' || options.infiniteHeight == true;
+ const isolatePages = pageCount > 1;
+ const pdfBuffers = [];
- height = calculatedHeight;
+ for (let index = 0; index < pageCount; index += 1) {
+ if (isolatePages) {
+ await showPaginationPage(page, index);
+ }
+
+ var height = options?.height || '50';
+ if (isAutoHeight) {
+ height = await measureVisiblePageHeight(page);
+ }
+
+ pdfBuffers.push(
+ await page.pdf(buildPdfOptions(options, height, isAutoHeight, isolatePages))
+ );
}
- return page.pdf({
- printBackground: true,
- preferCSSPageSize: true,
- width: options.width ? `${options.width}mm` : undefined,
- height: height ? (options.height == 'auto' ? `${height + 2}px` : `${height}mm`) : undefined,
- margin: {
- top: '0mm',
- right: '0mm',
- bottom: '0mm',
- left: '0mm',
- },
- });
+ return mergePdfBuffers(pdfBuffers);
});
} catch (error) {
logger.error('Error generating PDF:', error.message);
diff --git a/src/templates/templatemanager.js b/src/templates/templatemanager.js
index 596e316..e397951 100644
--- a/src/templates/templatemanager.js
+++ b/src/templates/templatemanager.js
@@ -218,6 +218,13 @@ async function transformCustomElements(content) {
},
};
}),
+ (tree) =>
+ tree.match([{ tag: 'PageBreak' }, { tag: 'pagebreak' }], () => ({
+ tag: 'hr',
+ attrs: {
+ class: 'documentPageBreak',
+ },
+ })),
(tree) =>
tree.match({ tag: 'ProgressBar' }, (node) => {
return {
@@ -332,7 +339,7 @@ async function transformCustomElements(content) {
},
};
}),
- ]).process(content);
+ ]).process(content, { recognizeSelfClosing: true });
return result.html;
}
@@ -526,7 +533,10 @@ export class TemplateManager {
paddingLeft: `${padding.paddingLeft}mm`,
scale: `${scale}`,
baseCSS: baseCSS,
- previewPaginationScript: preview ? previewPaginationScript : '',
+ infiniteHeight: infiniteHeight,
+ pageWidth: `${pageWidth}mm`,
+ pageHeight: infiniteHeight ? 'auto' : `${pageHeight}mm`,
+ previewPaginationScript: previewPaginationScript,
},
defaultOptions
);