@softwear/latestcollectioncore 1.0.184 → 1.0.186

package/.prettierrc.json

@@ -4,5 +4,5 @@
   "htmlWhitespaceSensitivity": "ignore",
   "semi": false,
   "arrowParens": "always",
-  "printWidth": 180
-}
+  "printWidth": 280
+}

package/dist/pdf.d.ts

@@ -54,7 +54,10 @@ export interface ContainerLayoutObject extends BaseLayoutObject {
     minHeightBeforeBreak?: number;
     /** When true, container and children are drawn only once at the end of the report, not on every page */
     printOnlyAtEnd?: boolean;
-    /** Only effective on top-level `layout.objects` (PDF engine ignores this flag on nested containers). */
+    /**
+     * Only on top-level `layout.objects`. Same intent as onlyRenderOnFirstPage: drawn once on the first printable page,
+     * not repeated after overflow page breaks.
+     */
     printOnlyAtStart?: boolean;
 }
 export type LayoutObject = TextLayoutObject | FieldLayoutObject | RectangleLayoutObject | ImageLayoutObject | ContainerLayoutObject;

package/dist/reports.js

@@ -16,6 +16,14 @@ 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. */
+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;
+}
 // 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
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -24,7 +32,7 @@ let drawStaticPartOfPage = function (doc, layout, printBuffer, paperSize, option
 };
 // Forward declaration - parameters intentionally unused, function is overwritten below
 /* eslint-disable @typescript-eslint/no-unused-vars */
-let addObjectToPDF = function (_originX, _originY, _doc, _object, _printBuffer, _paperSize, _layout, _options, _rootPrintBuffer, _containerChain, _context) {
+let addObjectToPDF = function (_originX, _originY, _doc, _object, _printBuffer, _paperSize, _layout, _options, _rootPrintBuffer, _containerChain, _context, _printOnlyAtStartContainersOffset) {
     // to be assigned later
     return { x: 0, y: 0 };
 };
@@ -400,18 +408,12 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
     }
 }
 function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, containerChain, context) {
+    var _a;
     /** Absolute tenths where the overflowing repeat resumes; callers already computed this correctly. */
     const continuationOxTenths = originX;
     const continuationOyTenths = originY;
-    context.pendingRootStartBumpTenths = 0;
-    context.applyRootStartBumpToThisCall = false;
-    context.remainingRootStartBumpTenths = 0;
     if (context.mode === 'measurement') {
-        // Track page count in measurement mode
-        if (context.currentPageCount === undefined) {
-            context.currentPageCount = 1;
-        }
-        context.currentPageCount++;
+        context.currentPageNumber = ((_a = context.currentPageNumber) !== null && _a !== void 0 ? _a : 1) + 1;
     }
     else if (!context.measureOnly) {
         // Actually add page in rendering mode (skip when measuring for fillContainer)
@@ -438,10 +440,7 @@ function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, opti
                 if (child.snapToBottom)
                     return;
                 // Skip inner repeat container on chain: advancing origin by x,y is enough; the live loop draws rows.
-                if (child.type === 'container' &&
-                    deeperLinkChild &&
-                    child === deeperLinkChild &&
-                    !containerRedrawsAfterContinuationPage(child)) {
+                if (child.type === 'container' && deeperLinkChild && child === deeperLinkChild && !containerRedrawsAfterContinuationPage(child)) {
                     const c = child;
                     originX += c.x;
                     originY += c.y;
@@ -503,49 +502,35 @@ function drawBottomDwellers(object, originX, originY, absoluteLowerRightHandSide
  *
  * Use originX,originY as origin to displace the object's own x,y coordinates
  */
-addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize, layout, options, rootPrintBuffer, containerChain, context) {
-    var _a, _b, _c, _d, _f;
-    if (context.applyRootStartBumpToThisCall) {
-        context.remainingRootStartBumpTenths = (_a = context.pendingRootStartBumpTenths) !== null && _a !== void 0 ? _a : 0;
-        context.applyRootStartBumpToThisCall = false;
-        context.pendingRootStartBumpTenths = 0;
-    }
+addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize, layout, options, rootPrintBuffer, containerChain, context, printOnlyAtStartContainersOffset) {
+    var _a;
     const layoutXtenths = originX + object.x;
     const layoutYtenths = originY + object.y;
-    /** printOnlyAtStart offset only for outermost recursion and only until first positioning or addPage clears it */
-    const bumpForDrawNonContainer = containerChain.length === 0 ? (_b = context.remainingRootStartBumpTenths) !== null && _b !== void 0 ? _b : 0 : 0;
+    const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset !== null && printOnlyAtStartContainersOffset !== void 0 ? printOnlyAtStartContainersOffset : 0;
+    const effectivePrintOnlyAtStartContainersOffset = containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0;
     const x = layoutXtenths / 10;
-    const y = (layoutYtenths + bumpForDrawNonContainer) / 10;
+    const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffset) / 10;
     const width = object.width / 10;
     const height = object.height / 10;
     // Keep track of the lower righthandside of all objects in this container
     // We need to return this object so whatever calls addObjectToPDF knows how big our drawing was
     let absoluteLowerRightHandSide = { x: x + width, y: y + height };
     if (!object.active) {
-        if (bumpForDrawNonContainer !== 0)
-            context.remainingRootStartBumpTenths = 0;
         return absoluteLowerRightHandSide;
     }
     if (object.type != 'container') {
-        if (bumpForDrawNonContainer !== 0)
-            context.remainingRootStartBumpTenths = 0;
         drawSimpleObject(x, y, doc, object, printBuffer, width, height, options, context);
     }
     // Recursively draw all child objects from a container object
     if (object.type == 'container') {
         const source = containerLoopSource(object, printBuffer);
         if (source === undefined) {
-            (_c = options.onAlert) === null || _c === void 0 ? void 0 : _c.call(options, { header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 });
-            if (containerChain.length === 0)
-                context.remainingRootStartBumpTenths = 0;
+            (_a = options.onAlert) === null || _a === void 0 ? void 0 : _a.call(options, { header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 });
             return absoluteLowerRightHandSide;
         }
         const nrContainers = source.length;
-        let bumpOnce = containerChain.length === 0 ? (_d = context.remainingRootStartBumpTenths) !== null && _d !== void 0 ? _d : 0 : 0;
-        if (bumpOnce !== 0 && containerChain.length === 0)
-            context.remainingRootStartBumpTenths = 0;
         let originX = layoutXtenths;
-        let originY = layoutYtenths + bumpOnce;
+        let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset;
         for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
             const newContainerChain = containerChain.filter(function () {
                 return true;
@@ -557,7 +542,7 @@ 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 + (containerChain.length === 0 ? (_f = context.remainingRootStartBumpTenths) !== null && _f !== void 0 ? _f : 0 : 0);
+                originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset;
                 const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context);
                 originX = newOrigin.originX;
                 originY = newOrigin.originY;
@@ -731,10 +716,12 @@ function genPDF(layout, printBuffer, options = {}) {
         paperSize.width *= 10;
         paperSize.height *= 10;
         paperSize.footerHeight *= 10;
-        // First pass: Measurement mode - count pages without rendering
+        // First pass: Measurement mode — page count without visible output; overlaps must match render pass inputs.
         const measurementContext = {
             mode: 'measurement',
-            currentPageCount: 1, // Start with page 1
+            currentPageNumber: 1,
+            imageAssets,
+            defaultFontFamily: layout.defaultFontFamily,
         };
         // Create a minimal jsPDF instance for measurement (needed for some calculations)
         const measurementDoc = new jspdf_1.jsPDF({
@@ -747,37 +734,26 @@ function genPDF(layout, printBuffer, options = {}) {
         }
         drawStaticPartOfPage(measurementDoc, layout, printBuffer, paperSize, options, measurementContext);
         // Draw containers in measurement mode (same order as render)
-        let measurementTopPrintedStartBottomTenths = 0;
+        /** Max lower edge (layout units ×10 = tenths-mm) of print-only-at-start roots; deterministic for fixed layout+buffer once measure uses same context as render. */
+        let measuredPrintOnlyAtStartOffset = 0;
         layout.objects
             .filter((object) => object.type == 'container' && object.printOnlyAtStart === true)
             .forEach((object) => {
             const lh = addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
-            measurementTopPrintedStartBottomTenths = Math.max(measurementTopPrintedStartBottomTenths, lh.y * 10);
+            measuredPrintOnlyAtStartOffset = Math.max(measuredPrintOnlyAtStartOffset, lh.y * 10);
         });
         layout.objects
-            .filter((object) => object.type == 'container' &&
-            object.printOnlyAtEnd !== true &&
-            object.printOnlyAtStart !== true)
+            .filter((object) => object.type == 'container' && object.printOnlyAtEnd !== true && object.printOnlyAtStart !== true)
             .forEach((object) => {
-            const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
-            if (bumpTenths > 0) {
-                measurementContext.applyRootStartBumpToThisCall = true;
-                measurementContext.pendingRootStartBumpTenths = bumpTenths;
-            }
-            addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
+            addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y));
         });
         layout.objects
             .filter((object) => object.type == 'container' && object.printOnlyAtEnd === true)
             .forEach((object) => {
-            const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
-            if (bumpTenths > 0) {
-                measurementContext.applyRootStartBumpToThisCall = true;
-                measurementContext.pendingRootStartBumpTenths = bumpTenths;
-            }
-            addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
+            addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y));
         });
         // Get total page count from measurement pass
-        const totalPageCount = measurementContext.currentPageCount || 1;
+        const totalPageCount = measurementContext.currentPageNumber || 1;
         // Second pass: Rendering mode - actual PDF generation with pageCount available
         const doc = new jspdf_1.jsPDF({
             orientation: paperSizeCopy.width > paperSizeCopy.height ? 'landscape' : 'portrait',
@@ -793,35 +769,21 @@ function genPDF(layout, printBuffer, options = {}) {
             defaultFontFamily: layout.defaultFontFamily,
         };
         drawStaticPartOfPage(doc, layout, printBuffer, paperSize, options, renderContext);
-        let renderTopPrintedStartBottomTenths = 0;
         layout.objects
             .filter((object) => object.type == 'container' && object.printOnlyAtStart === true)
             .forEach((object) => {
-            const lh = addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
-            renderTopPrintedStartBottomTenths = Math.max(renderTopPrintedStartBottomTenths, lh.y * 10);
+            addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
         });
         // Draw containers in rendering mode (body containers after printOnlyAtStart)
         layout.objects
-            .filter((object) => object.type == 'container' &&
-            object.printOnlyAtEnd !== true &&
-            object.printOnlyAtStart !== true)
+            .filter((object) => object.type == 'container' && object.printOnlyAtEnd !== true && object.printOnlyAtStart !== true)
             .forEach((object) => {
-            const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
-            if (bumpTenths > 0) {
-                renderContext.applyRootStartBumpToThisCall = true;
-                renderContext.pendingRootStartBumpTenths = bumpTenths;
-            }
-            addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
+            addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y));
         });
         // Draw printOnlyAtEnd containers once at the end (at their layout coordinates on current page)
         const printOnlyAtEndContainers = layout.objects.filter((object) => object.type == 'container' && object.printOnlyAtEnd === true);
         printOnlyAtEndContainers.forEach((object) => {
-            const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
-            if (bumpTenths > 0) {
-                renderContext.applyRootStartBumpToThisCall = true;
-                renderContext.pendingRootStartBumpTenths = bumpTenths;
-            }
-            addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
+            addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y));
         });
         return doc;
     });

package/package.json

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

package/src/pdf.ts

@@ -61,7 +61,10 @@ export interface ContainerLayoutObject extends BaseLayoutObject {
   minHeightBeforeBreak?: number
   /** When true, container and children are drawn only once at the end of the report, not on every page */
   printOnlyAtEnd?: boolean
-  /** Only effective on top-level `layout.objects` (PDF engine ignores this flag on nested containers). */
+  /**
+   * Only on top-level `layout.objects`. Same intent as onlyRenderOnFirstPage: drawn once on the first printable page,
+   * not repeated after overflow page breaks.
+   */
   printOnlyAtStart?: boolean
 }
 

package/src/reports.ts

@@ -40,20 +40,22 @@ export interface GenPdfOptions {
 
 interface RenderContext {
   mode: RenderMode
+  /** Total pages from measurement pass; used for field sources like `pageCount` / `page`. */
   pageCount?: number
-  currentPageCount?: number // For measurement mode
+  /** 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>
   /** Layout default font used when object.fontFamily is undefined */
   defaultFontFamily?: string
-  /** Set with {@link pendingRootStartBumpTenths} only for top-level genPDF container draws; moved to remaining on entry. */
-  applyRootStartBumpToThisCall?: boolean
-  /** Vertical pad (tenths-mm) so body roots sit below rendered printOnlyAtStart siblings; use with applyRootStartBumpToThisCall only. */
-  pendingRootStartBumpTenths?: number
-  /**
-   * First-fragment bump for top-level draws from genPDF — applied with layout coords, then cleared after first positioning or addPage().
-   */
-  remainingRootStartBumpTenths?: number
+}
+
+/** 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 + 1
 }
 
 // We have to declare some functions that will be called by other functions but also have to call those other functions
@@ -76,7 +78,8 @@ let addObjectToPDF = function (
   _options: GenPdfOptions,
   _rootPrintBuffer: any,
   _containerChain: { object: ContainerLayoutObject; printBuffer: any }[],
-  _context: RenderContext
+  _context: RenderContext,
+  _printOnlyAtStartContainersOffset?: number
 ): { x: number; y: number } {
   // to be assigned later
   return { x: 0, y: 0 }
@@ -123,17 +126,8 @@ function containerLoopSource(container: ContainerLayoutObject, printBuffer: any)
  * They are not on the nested {@link containerChain}; redraw them whenever we append a continuation page.
  * Omit the overflowing root when it is chain[0] — redrawing it would recurse (e.g. wrapper around lines).
  */
-function redrawRootDummyBodyContainersOnNewPage(
-  doc: jsPDF,
-  layout: Layout,
-  rootPrintBuffer: any,
-  paperSize: PaperSize,
-  options: GenPdfOptions,
-  context: RenderContext,
-  containerChain: { object: ContainerLayoutObject; printBuffer: any }[]
-): void {
-  const overflowingRootContainer =
-    containerChain.length > 0 ? (containerChain[0].object as ContainerLayoutObject) : undefined
+function redrawRootDummyBodyContainersOnNewPage(doc: jsPDF, layout: Layout, rootPrintBuffer: any, paperSize: PaperSize, options: GenPdfOptions, context: RenderContext, containerChain: { object: ContainerLayoutObject; printBuffer: any }[]): void {
+  const overflowingRootContainer = containerChain.length > 0 ? (containerChain[0].object as ContainerLayoutObject) : undefined
 
   layout.objects.forEach((object) => {
     if (object.type !== 'container') return
@@ -333,17 +327,7 @@ function truncateTextToFitWidth(doc: jsPDF, text: string, maxWidth: number): str
   return truncatedText + ELLIPSIS
 }
 
-function drawSimpleObject(
-  x: number,
-  y: number,
-  doc: jsPDF,
-  object: LayoutObject,
-  printBuffer: any,
-  width: number,
-  height: number,
-  options: GenPdfOptions,
-  context: RenderContext
-): void {
+function drawSimpleObject(x: number, y: number, doc: jsPDF, object: LayoutObject, printBuffer: any, width: number, height: number, options: GenPdfOptions, context: RenderContext): void {
   let text = '' // Will hold text to display for either 'text' or 'field'
 
   // Get text from object for text objects
@@ -484,15 +468,8 @@ function addPage(
   const continuationOxTenths = originX
   const continuationOyTenths = originY
 
-  context.pendingRootStartBumpTenths = 0
-  context.applyRootStartBumpToThisCall = false
-  context.remainingRootStartBumpTenths = 0
   if (context.mode === 'measurement') {
-    // Track page count in measurement mode
-    if (context.currentPageCount === undefined) {
-      context.currentPageCount = 1
-    }
-    context.currentPageCount++
+    context.currentPageNumber = (context.currentPageNumber ?? 1) + 1
   } else if (!context.measureOnly) {
     // Actually add page in rendering mode (skip when measuring for fillContainer)
     doc.addPage()
@@ -517,12 +494,7 @@ function addPage(
       link.object.children.forEach((child) => {
         if (child.snapToBottom) return
         // Skip inner repeat container on chain: advancing origin by x,y is enough; the live loop draws rows.
-        if (
-          child.type === 'container' &&
-          deeperLinkChild &&
-          child === deeperLinkChild &&
-          !containerRedrawsAfterContinuationPage(child)
-        ) {
+        if (child.type === 'container' && deeperLinkChild && child === deeperLinkChild && !containerRedrawsAfterContinuationPage(child)) {
           const c = child as ContainerLayoutObject
           originX += c.x
           originY += c.y
@@ -607,21 +579,17 @@ addObjectToPDF = function (
   options: GenPdfOptions,
   rootPrintBuffer: any,
   containerChain: { object: ContainerLayoutObject; printBuffer: any }[],
-  context: RenderContext
+  context: RenderContext,
+  printOnlyAtStartContainersOffset?: number
 ): { x: number; y: number } {
-  if (context.applyRootStartBumpToThisCall) {
-    context.remainingRootStartBumpTenths = context.pendingRootStartBumpTenths ?? 0
-    context.applyRootStartBumpToThisCall = false
-    context.pendingRootStartBumpTenths = 0
-  }
   const layoutXtenths = originX + object.x
   const layoutYtenths = originY + object.y
-  /** printOnlyAtStart offset only for outermost recursion and only until first positioning or addPage clears it */
-  const bumpForDrawNonContainer =
-    containerChain.length === 0 ? context.remainingRootStartBumpTenths ?? 0 : 0
+  const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset ?? 0
+  const effectivePrintOnlyAtStartContainersOffset =
+    containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0
 
   const x = layoutXtenths / 10
-  const y = (layoutYtenths + bumpForDrawNonContainer) / 10
+  const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffset) / 10
   const width = object.width / 10
   const height = object.height / 10
   // Keep track of the lower righthandside of all objects in this container
@@ -629,11 +597,9 @@ addObjectToPDF = function (
   let absoluteLowerRightHandSide = { x: x + width, y: y + height }
 
   if (!object.active) {
-    if (bumpForDrawNonContainer !== 0) context.remainingRootStartBumpTenths = 0
     return absoluteLowerRightHandSide
   }
   if (object.type != 'container') {
-    if (bumpForDrawNonContainer !== 0) context.remainingRootStartBumpTenths = 0
     drawSimpleObject(x, y, doc, object, printBuffer, width, height, options, context)
   }
 
@@ -642,15 +608,12 @@ addObjectToPDF = function (
     const source = containerLoopSource(object as ContainerLayoutObject, printBuffer)
     if (source === undefined) {
       options.onAlert?.({ header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 })
-      if (containerChain.length === 0) context.remainingRootStartBumpTenths = 0
       return absoluteLowerRightHandSide
     }
     const nrContainers = source.length
 
-    let bumpOnce = containerChain.length === 0 ? context.remainingRootStartBumpTenths ?? 0 : 0
-    if (bumpOnce !== 0 && containerChain.length === 0) context.remainingRootStartBumpTenths = 0
     let originX = layoutXtenths
-    let originY = layoutYtenths + bumpOnce
+    let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset
 
     for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
       const newContainerChain = containerChain.filter(function () {
@@ -663,7 +626,7 @@ addObjectToPDF = function (
       if (useOrphanCheck && (object.pageBreak || originY + minHeightMm > paperSize.height - paperSize.footerHeight)) {
         // We ran out of paper
         originX = layoutXtenths
-        originY = layoutYtenths + (containerChain.length === 0 ? context.remainingRootStartBumpTenths ?? 0 : 0)
+        originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset
         const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context)
         originX = newOrigin.originX
         originY = newOrigin.originY
@@ -694,21 +657,7 @@ addObjectToPDF = function (
             measureBounds.y = Math.max(measureBounds.y, r.y)
           }
         })
-        const measureBottom = drawBottomDwellers(
-          object as ContainerLayoutObject,
-          measureOriginX,
-          measureOriginY,
-          { x: measureBounds.x, y: measureBounds.y },
-          measureBottomChildY,
-          paperSize,
-          doc,
-          layout,
-          rootPrintBuffer,
-          options,
-          measureChain,
-          container,
-          measureContext
-        )
+        const measureBottom = drawBottomDwellers(object as ContainerLayoutObject, measureOriginX, measureOriginY, { x: measureBounds.x, y: measureBounds.y }, measureBottomChildY, paperSize, doc, layout, rootPrintBuffer, options, measureChain, container, measureContext)
         measureBounds.y = Math.max(measureBounds.y, measureBottom.y)
         // Draw fillContainer rectangles as background
         fillContainerRects.forEach(function (rect: any) {
@@ -776,42 +725,14 @@ addObjectToPDF = function (
           originX = newOrigin.originX
           originY = newOrigin.originY
           absoluteLowerRightHandSide = { x: newOrigin.x, y: newOrigin.y }
-          const newestOrigin = drawBottomDwellers(
-            object as ContainerLayoutObject,
-            originX,
-            originY,
-            absoluteLowerRightHandSide,
-            bottomChildY,
-            paperSize,
-            doc,
-            layout,
-            rootPrintBuffer,
-            options,
-            newContainerChain,
-            container,
-            context
-          )
+          const newestOrigin = drawBottomDwellers(object as ContainerLayoutObject, originX, originY, absoluteLowerRightHandSide, bottomChildY, paperSize, doc, layout, rootPrintBuffer, options, newContainerChain, container, context)
           originX = newestOrigin.originX
           originY = newestOrigin.originY
           absoluteLowerRightHandSide = { x: newestOrigin.x, y: newestOrigin.y }
           continue
         }
       }
-      const newestOrigin = drawBottomDwellers(
-        object as ContainerLayoutObject,
-        originX,
-        originY,
-        absoluteLowerRightHandSide,
-        bottomChildY,
-        paperSize,
-        doc,
-        layout,
-        rootPrintBuffer,
-        options,
-        newContainerChain,
-        container,
-        context
-      )
+      const newestOrigin = drawBottomDwellers(object as ContainerLayoutObject, originX, originY, absoluteLowerRightHandSide, bottomChildY, paperSize, doc, layout, rootPrintBuffer, options, newContainerChain, container, context)
       originX = newestOrigin.originX
       originY = newestOrigin.originY
       absoluteLowerRightHandSide = { x: newestOrigin.x, y: newestOrigin.y }
@@ -870,10 +791,12 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
   paperSize.height *= 10
   paperSize.footerHeight *= 10
 
-  // First pass: Measurement mode - count pages without rendering
+  // First pass: Measurement mode — page count without visible output; overlaps must match render pass inputs.
   const measurementContext: RenderContext = {
     mode: 'measurement',
-    currentPageCount: 1, // Start with page 1
+    currentPageNumber: 1,
+    imageAssets,
+    defaultFontFamily: layout.defaultFontFamily,
   }
   // Create a minimal jsPDF instance for measurement (needed for some calculations)
   const measurementDoc = new jsPDF({
@@ -887,41 +810,27 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
   drawStaticPartOfPage(measurementDoc, layout, printBuffer, paperSize, options, measurementContext)
 
   // Draw containers in measurement mode (same order as render)
-  let measurementTopPrintedStartBottomTenths = 0
+  /** Max lower edge (layout units ×10 = tenths-mm) of print-only-at-start roots; deterministic for fixed layout+buffer once measure uses same context as render. */
+  let measuredPrintOnlyAtStartOffset = 0
   layout.objects
     .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart === true)
     .forEach((object) => {
       const lh = addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
-      measurementTopPrintedStartBottomTenths = Math.max(measurementTopPrintedStartBottomTenths, lh.y * 10)
+      measuredPrintOnlyAtStartOffset = Math.max(measuredPrintOnlyAtStartOffset, lh.y * 10)
     })
   layout.objects
-    .filter(
-      (object) =>
-        object.type == 'container' &&
-        (object as ContainerLayoutObject).printOnlyAtEnd !== true &&
-        (object as ContainerLayoutObject).printOnlyAtStart !== true
-    )
+    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd !== true && (object as ContainerLayoutObject).printOnlyAtStart !== true)
     .forEach((object) => {
-      const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
-      if (bumpTenths > 0) {
-        measurementContext.applyRootStartBumpToThisCall = true
-        measurementContext.pendingRootStartBumpTenths = bumpTenths
-      }
-      addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
+      addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y))
     })
   layout.objects
     .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd === true)
     .forEach((object) => {
-      const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
-      if (bumpTenths > 0) {
-        measurementContext.applyRootStartBumpToThisCall = true
-        measurementContext.pendingRootStartBumpTenths = bumpTenths
-      }
-      addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
+      addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y))
     })
 
   // Get total page count from measurement pass
-  const totalPageCount = measurementContext.currentPageCount || 1
+  const totalPageCount = measurementContext.currentPageNumber || 1
 
   // Second pass: Rendering mode - actual PDF generation with pageCount available
   const doc = new jsPDF({
@@ -939,42 +848,23 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
   }
   drawStaticPartOfPage(doc, layout, printBuffer, paperSize, options, renderContext)
 
-  let renderTopPrintedStartBottomTenths = 0
   layout.objects
     .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart === true)
     .forEach((object) => {
-      const lh = addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
-      renderTopPrintedStartBottomTenths = Math.max(renderTopPrintedStartBottomTenths, lh.y * 10)
+      addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
     })
 
   // Draw containers in rendering mode (body containers after printOnlyAtStart)
   layout.objects
-    .filter(
-      (object) =>
-        object.type == 'container' &&
-        (object as ContainerLayoutObject).printOnlyAtEnd !== true &&
-        (object as ContainerLayoutObject).printOnlyAtStart !== true
-    )
+    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd !== true && (object as ContainerLayoutObject).printOnlyAtStart !== true)
     .forEach((object) => {
-      const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
-      if (bumpTenths > 0) {
-        renderContext.applyRootStartBumpToThisCall = true
-        renderContext.pendingRootStartBumpTenths = bumpTenths
-      }
-      addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
+      addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y))
     })
 
   // Draw printOnlyAtEnd containers once at the end (at their layout coordinates on current page)
-  const printOnlyAtEndContainers = layout.objects.filter(
-    (object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd === true
-  )
+  const printOnlyAtEndContainers = layout.objects.filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd === true)
   printOnlyAtEndContainers.forEach((object) => {
-    const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
-    if (bumpTenths > 0) {
-      renderContext.applyRootStartBumpToThisCall = true
-      renderContext.pendingRootStartBumpTenths = bumpTenths
-    }
-    addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
+    addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext, Math.max(0, measuredPrintOnlyAtStartOffset - object.y))
   })
   return doc
 }