@softwear/latestcollectioncore 1.0.179 → 1.0.180

package/dist/reports.js

@@ -381,6 +381,7 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
 }
 function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, containerChain, context) {
     context.pendingRootStartBumpTenths = 0;
+    context.applyRootStartBumpToThisCall = false;
     if (context.mode === 'measurement') {
         // Track page count in measurement mode
         if (context.currentPageCount === undefined) {
@@ -455,7 +456,12 @@ function drawBottomDwellers(object, originX, originY, absoluteLowerRightHandSide
  */
 addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize, layout, options, rootPrintBuffer, containerChain, context) {
     var _a, _b;
-    const rootBump = containerChain.length === 0 ? (_a = context.pendingRootStartBumpTenths) !== null && _a !== void 0 ? _a : 0 : 0;
+    let rootBump = 0;
+    if (context.applyRootStartBumpToThisCall) {
+        rootBump = (_a = context.pendingRootStartBumpTenths) !== null && _a !== void 0 ? _a : 0;
+        context.applyRootStartBumpToThisCall = false;
+        context.pendingRootStartBumpTenths = 0;
+    }
     const x = (originX + object.x) / 10;
     const y = (originY + object.y + rootBump) / 10;
     const width = object.width / 10;
@@ -689,12 +695,14 @@ function genPDF(layout, printBuffer, options = {}) {
             !object.printOnlyAtEnd &&
             !object.printOnlyAtStart)
             .forEach((object) => {
+            measurementContext.applyRootStartBumpToThisCall = true;
             measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
         });
         layout.objects
             .filter((object) => object.type == 'container' && object.printOnlyAtEnd)
             .forEach((object) => {
+            measurementContext.applyRootStartBumpToThisCall = true;
             measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
         });
@@ -728,12 +736,14 @@ function genPDF(layout, printBuffer, options = {}) {
             !object.printOnlyAtEnd &&
             !object.printOnlyAtStart)
             .forEach((object) => {
+            renderContext.applyRootStartBumpToThisCall = true;
             renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
         });
         // 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);
         printOnlyAtEndContainers.forEach((object) => {
+            renderContext.applyRootStartBumpToThisCall = true;
             renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
         });

package/package.json

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

package/src/reports.ts

@@ -46,7 +46,9 @@ interface RenderContext {
   imageAssets?: Map<string, PdfImageAsset>
   /** Layout default font used when object.fontFamily is undefined */
   defaultFontFamily?: string
-  /** Vertical pad for root draws after printOnlyAtStart; set per root container; addPage resets to 0 after each page break. */
+  /** Set with {@link pendingRootStartBumpTenths} only for top-level genPDF container draws; consumed on first addObjectToPDF read. */
+  applyRootStartBumpToThisCall?: boolean
+  /** Vertical pad (tenths-mm) so body roots sit below rendered printOnlyAtStart siblings; use with applyRootStartBumpToThisCall only. */
   pendingRootStartBumpTenths?: number
 }
 
@@ -448,6 +450,7 @@ function addPage(
   context: RenderContext
 ): { originX: number; originY: number; x: number; y: number } {
   context.pendingRootStartBumpTenths = 0
+  context.applyRootStartBumpToThisCall = false
   if (context.mode === 'measurement') {
     // Track page count in measurement mode
     if (context.currentPageCount === undefined) {
@@ -544,7 +547,12 @@ addObjectToPDF = function (
   containerChain: { object: ContainerLayoutObject; printBuffer: any }[],
   context: RenderContext
 ): { x: number; y: number } {
-  const rootBump = containerChain.length === 0 ? context.pendingRootStartBumpTenths ?? 0 : 0
+  let rootBump = 0
+  if (context.applyRootStartBumpToThisCall) {
+    rootBump = context.pendingRootStartBumpTenths ?? 0
+    context.applyRootStartBumpToThisCall = false
+    context.pendingRootStartBumpTenths = 0
+  }
   const x = (originX + object.x) / 10
   const y = (originY + object.y + rootBump) / 10
   const width = object.width / 10
@@ -817,12 +825,14 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
         !(object as ContainerLayoutObject).printOnlyAtStart
     )
     .forEach((object) => {
+      measurementContext.applyRootStartBumpToThisCall = true
       measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
       addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
     })
   layout.objects
     .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd)
     .forEach((object) => {
+      measurementContext.applyRootStartBumpToThisCall = true
       measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
       addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
     })
@@ -863,6 +873,7 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
         !(object as ContainerLayoutObject).printOnlyAtStart
     )
     .forEach((object) => {
+      renderContext.applyRootStartBumpToThisCall = true
       renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
       addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
     })
@@ -872,6 +883,7 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
     (object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd
   )
   printOnlyAtEndContainers.forEach((object) => {
+    renderContext.applyRootStartBumpToThisCall = true
     renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
     addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
   })