@softwear/latestcollectioncore 1.0.185 → 1.0.186

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 never advances jsPDF sheet count; rendering uses the active canvas page (1-based). */
+/** Measurement uses context `currentPageNumber` (1-based). Rendering normalizes jsPDF’s internal 0-based page index to 1-based so overlap rules match `pageNumber` fields. */
 function getCurrentPageNumber(doc, context) {
     var _a;
     if (context.mode === 'measurement') {
         return (_a = context.currentPageNumber) !== null && _a !== void 0 ? _a : 1;
     }
-    return doc.getCurrentPageInfo().pageNumber;
+    return doc.getCurrentPageInfo().pageNumber + 1;
 }
 // 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

package/package.json

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

package/src/reports.ts

@@ -42,7 +42,7 @@ interface RenderContext {
   mode: RenderMode
   /** Total pages from measurement pass; used for field sources like `pageCount` / `page`. */
   pageCount?: number
-  /** During measurement, logical printable page (starts at 1); incremented when {@link addPage} runs. In rendering use {@link getCurrentPageNumber} (jsPDF). */
+  /** During measurement, logical printable page (starts at 1); incremented when {@link addPage} runs. Rendering: see {@link getCurrentPageNumber} (1-based, matches pdf page fields). */
   currentPageNumber?: number
   measureOnly?: boolean // When true, skip drawing to measure bounds (for fillContainer rectangles)
   imageAssets?: Map<string, PdfImageAsset>
@@ -50,12 +50,12 @@ interface RenderContext {
   defaultFontFamily?: string
 }
 
-/** Measurement never advances jsPDF sheet count; rendering uses the active canvas page (1-based). */
+/** Measurement uses context `currentPageNumber` (1-based). Rendering normalizes jsPDF’s internal 0-based page index to 1-based so overlap rules match `pageNumber` fields. */
 function getCurrentPageNumber(doc: jsPDF, context: RenderContext): number {
   if (context.mode === 'measurement') {
     return context.currentPageNumber ?? 1
   }
-  return doc.getCurrentPageInfo().pageNumber
+  return doc.getCurrentPageInfo().pageNumber + 1
 }
 
 // We have to declare some functions that will be called by other functions but also have to call those other functions