@softwear/latestcollectioncore 1.0.186 → 1.0.187

package/dist/reports.js

@@ -16,13 +16,13 @@ exports.genPDF = void 0;
 const jspdf_1 = require("jspdf");
 const date_fns_1 = require("date-fns");
 const deepCopy_1 = __importDefault(require("./deepCopy"));
-/** Measurement uses context `currentPageNumber` (1-based). Rendering normalizes jsPDF’s internal 0-based page index to 1-based so overlap rules match `pageNumber` fields. */
+/** Measurement uses context `currentPageNumber` (1-based). Rendering uses jsPDF’s `getCurrentPageInfo().pageNumber`, which is already 1-based (first page is 1). */
 function getCurrentPageNumber(doc, context) {
     var _a;
     if (context.mode === 'measurement') {
         return (_a = context.currentPageNumber) !== null && _a !== void 0 ? _a : 1;
     }
-    return doc.getCurrentPageInfo().pageNumber + 1;
+    return doc.getCurrentPageInfo().pageNumber;
 }
 // We have to declare some functions that will be called by other functions but also have to call those other functions
 // We overwrite the function definition as soon as those other functions have been declared
@@ -507,9 +507,14 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
     const layoutXtenths = originX + object.x;
     const layoutYtenths = originY + object.y;
     const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset !== null && printOnlyAtStartContainersOffset !== void 0 ? printOnlyAtStartContainersOffset : 0;
-    const effectivePrintOnlyAtStartContainersOffset = containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0;
+    /** Must consult current page on every read: `addPage` can move to page 2+ mid-invocation while this call stays open. */
+    const effectivePrintOnlyAtStartContainersOffsetNow = () => containerChain.length === 0 &&
+        rawPrintOnlyAtStartOffset > 0 &&
+        getCurrentPageNumber(doc, context) === 1
+        ? rawPrintOnlyAtStartOffset
+        : 0;
     const x = layoutXtenths / 10;
-    const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffset) / 10;
+    const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()) / 10;
     const width = object.width / 10;
     const height = object.height / 10;
     // Keep track of the lower righthandside of all objects in this container
@@ -530,7 +535,7 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
         }
         const nrContainers = source.length;
         let originX = layoutXtenths;
-        let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset;
+        let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow();
         for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
             const newContainerChain = containerChain.filter(function () {
                 return true;
@@ -542,7 +547,8 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
             if (useOrphanCheck && (object.pageBreak || originY + minHeightMm > paperSize.height - paperSize.footerHeight)) {
                 // We ran out of paper
                 originX = layoutXtenths;
-                originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset;
+                // Continuation sheets must not reuse the page-1-only overlap bump: addPage hasn't run yet so getCurrentPageNumber is still 1.
+                originY = layoutYtenths;
                 const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context);
                 originX = newOrigin.originX;
                 originY = newOrigin.originY;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.186",
+  "version": "1.0.187",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/reports.ts

@@ -50,12 +50,12 @@ interface RenderContext {
   defaultFontFamily?: string
 }
 
-/** Measurement uses context `currentPageNumber` (1-based). Rendering normalizes jsPDF’s internal 0-based page index to 1-based so overlap rules match `pageNumber` fields. */
+/** Measurement uses context `currentPageNumber` (1-based). Rendering uses jsPDF’s `getCurrentPageInfo().pageNumber`, which is already 1-based (first page is 1). */
 function getCurrentPageNumber(doc: jsPDF, context: RenderContext): number {
   if (context.mode === 'measurement') {
     return context.currentPageNumber ?? 1
   }
-  return doc.getCurrentPageInfo().pageNumber + 1
+  return doc.getCurrentPageInfo().pageNumber
 }
 
 // We have to declare some functions that will be called by other functions but also have to call those other functions
@@ -585,11 +585,16 @@ addObjectToPDF = function (
   const layoutXtenths = originX + object.x
   const layoutYtenths = originY + object.y
   const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset ?? 0
-  const effectivePrintOnlyAtStartContainersOffset =
-    containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0
+  /** Must consult current page on every read: `addPage` can move to page 2+ mid-invocation while this call stays open. */
+  const effectivePrintOnlyAtStartContainersOffsetNow = (): number =>
+    containerChain.length === 0 &&
+    rawPrintOnlyAtStartOffset > 0 &&
+    getCurrentPageNumber(doc, context) === 1
+      ? rawPrintOnlyAtStartOffset
+      : 0
 
   const x = layoutXtenths / 10
-  const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffset) / 10
+  const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()) / 10
   const width = object.width / 10
   const height = object.height / 10
   // Keep track of the lower righthandside of all objects in this container
@@ -613,7 +618,7 @@ addObjectToPDF = function (
     const nrContainers = source.length
 
     let originX = layoutXtenths
-    let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset
+    let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()
 
     for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
       const newContainerChain = containerChain.filter(function () {
@@ -626,7 +631,8 @@ addObjectToPDF = function (
       if (useOrphanCheck && (object.pageBreak || originY + minHeightMm > paperSize.height - paperSize.footerHeight)) {
         // We ran out of paper
         originX = layoutXtenths
-        originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset
+        // Continuation sheets must not reuse the page-1-only overlap bump: addPage hasn't run yet so getCurrentPageNumber is still 1.
+        originY = layoutYtenths
         const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context)
         originX = newOrigin.originX
         originY = newOrigin.originY