@softwear/latestcollectioncore 1.0.182 → 1.0.184

package/dist/reports.js

@@ -61,6 +61,26 @@ function containerLoopSource(container, printBuffer) {
         return [printBuffer];
     return getProperty(container.source, printBuffer);
 }
+/**
+ * Top-level empty-source containers (invoice “billTo” bands, wrappers) sit beside overflowing repeats.
+ * 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, layout, rootPrintBuffer, paperSize, options, context, containerChain) {
+    const overflowingRootContainer = containerChain.length > 0 ? containerChain[0].object : undefined;
+    layout.objects.forEach((object) => {
+        if (object.type !== 'container')
+            return;
+        if (overflowingRootContainer !== undefined && object === overflowingRootContainer)
+            return;
+        const c = object;
+        if (c.printOnlyAtStart === true || c.printOnlyAtEnd === true)
+            return;
+        if (!dummyLayoutSource(c.source))
+            return;
+        addObjectToPDF(0, 0, doc, object, rootPrintBuffer, paperSize, layout, options, rootPrintBuffer, [], context);
+    });
+}
 /** jsPDF font style strings. fontStyle bitmask: 0=normal, 1=bold, 2=italic, 3=bold+italic */
 const FONT_STYLES = ['normal', 'bold', 'italic', 'bolditalic'];
 /** Recursively collect used custom fonts from layout objects (text/field with fontFamily) and layout default. */
@@ -380,6 +400,9 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
     }
 }
 function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, containerChain, context) {
+    /** 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;
@@ -396,45 +419,55 @@ function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, opti
     }
     if (!context.measureOnly) {
         drawStaticPartOfPage(doc, layout, rootPrintBuffer, paperSize, options, context);
+        redrawRootDummyBodyContainersOnNewPage(doc, layout, rootPrintBuffer, paperSize, options, context, containerChain);
     }
-    const absoluteLowerRightHandSide = { x: originX / 10, y: originY / 10 };
-    // Now draw all the parent containers of the current container
+    // Bounding box tracked for snap-to-bottom; continuation cursor is ALWAYS the passed-in coords.
+    const absoluteLowerRightHandSide = { x: continuationOxTenths / 10, y: continuationOyTenths / 10 };
     if (containerChain.length > 0) {
-        // Let origin start at (x,y) of the outermost container
+        // Re-draw ancestor frames on the new page (local coordinates). Do NOT treat this pass as another
+        // repeat iteration: skip repeatContainer advancement on the innermost link—the real loop resumes
+        // after addPage returns with continuationOxTenths / continuationOyTenths.
         originX = containerChain[0].object.x;
         originY = containerChain[0].object.y;
-        absoluteLowerRightHandSide.x = originX / 10;
-        absoluteLowerRightHandSide.y = originY / 10;
+        absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, originX / 10);
+        absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, originY / 10);
         containerChain.forEach((link, linkIdx) => {
             var _a;
-            const chainChild = (_a = containerChain[linkIdx + 1]) === null || _a === void 0 ? void 0 : _a.object;
+            const deeperLinkChild = (_a = containerChain[linkIdx + 1]) === null || _a === void 0 ? void 0 : _a.object;
             link.object.children.forEach((child) => {
                 if (child.snapToBottom)
                     return;
-                // Advance past bound repeat containers on the overflow path (they are not redrawn here; the
-                // innermost link draws their leaves). Without this, nested x/y offsets are lost on page 2+.
+                // Skip inner repeat container on chain: advancing origin by x,y is enough; the live loop draws rows.
                 if (child.type === 'container' &&
-                    chainChild &&
-                    child === chainChild &&
+                    deeperLinkChild &&
+                    child === deeperLinkChild &&
                     !containerRedrawsAfterContinuationPage(child)) {
                     const c = child;
                     originX += c.x;
                     originY += c.y;
                     return;
                 }
-                if (child.type != 'container' || containerRedrawsAfterContinuationPage(child)) {
+                if (child.type !== 'container' || containerRedrawsAfterContinuationPage(child)) {
                     const childLowerRightHandSide = addObjectToPDF(originX, originY, doc, child, link.printBuffer, paperSize, layout, options, rootPrintBuffer, [], context);
                     absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, childLowerRightHandSide.x);
                     absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, childLowerRightHandSide.y);
                 }
             });
-            if (link.object.repeatContainer == 'horizontal')
-                originX = absoluteLowerRightHandSide.x * 10;
-            if (link.object.repeatContainer == 'vertical')
-                originY = absoluteLowerRightHandSide.y * 10;
+            const isLastLinkOnChain = linkIdx >= containerChain.length - 1;
+            if (!isLastLinkOnChain) {
+                if (link.object.repeatContainer === 'horizontal')
+                    originX = absoluteLowerRightHandSide.x * 10;
+                if (link.object.repeatContainer === 'vertical')
+                    originY = absoluteLowerRightHandSide.y * 10;
+            }
         });
     }
-    return { originX: originX, originY: originY, x: absoluteLowerRightHandSide.x, y: absoluteLowerRightHandSide.y };
+    return {
+        originX: continuationOxTenths,
+        originY: continuationOyTenths,
+        x: absoluteLowerRightHandSide.x,
+        y: absoluteLowerRightHandSide.y,
+    };
 }
 function drawBottomDwellers(object, originX, originY, absoluteLowerRightHandSide, bottomChildY, paperSize, doc, layout, rootPrintBuffer, options, newContainerChain, container, context) {
     let childRelativeToBottomDrawn = false;

package/package.json

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

package/src/reports.ts

@@ -118,6 +118,33 @@ function containerLoopSource(container: ContainerLayoutObject, printBuffer: any)
   return getProperty(container.source as string, printBuffer)
 }
 
+/**
+ * Top-level empty-source containers (invoice “billTo” bands, wrappers) sit beside overflowing repeats.
+ * 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
+
+  layout.objects.forEach((object) => {
+    if (object.type !== 'container') return
+    if (overflowingRootContainer !== undefined && object === overflowingRootContainer) return
+    const c = object as ContainerLayoutObject
+    if (c.printOnlyAtStart === true || c.printOnlyAtEnd === true) return
+    if (!dummyLayoutSource(c.source)) return
+    addObjectToPDF(0, 0, doc, object, rootPrintBuffer, paperSize, layout, options, rootPrintBuffer, [], context)
+  })
+}
+
 /** jsPDF font style strings. fontStyle bitmask: 0=normal, 1=bold, 2=italic, 3=bold+italic */
 const FONT_STYLES = ['normal', 'bold', 'italic', 'bolditalic'] as const
 
@@ -453,6 +480,10 @@ function addPage(
   containerChain: { object: ContainerLayoutObject; printBuffer: any }[],
   context: RenderContext
 ): { originX: number; originY: number; x: number; y: number } {
+  /** 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
@@ -468,25 +499,28 @@ function addPage(
   }
   if (!context.measureOnly) {
     drawStaticPartOfPage(doc, layout, rootPrintBuffer, paperSize, options, context)
+    redrawRootDummyBodyContainersOnNewPage(doc, layout, rootPrintBuffer, paperSize, options, context, containerChain)
   }
-  const absoluteLowerRightHandSide = { x: originX / 10, y: originY / 10 }
-  // Now draw all the parent containers of the current container
+  // Bounding box tracked for snap-to-bottom; continuation cursor is ALWAYS the passed-in coords.
+  const absoluteLowerRightHandSide = { x: continuationOxTenths / 10, y: continuationOyTenths / 10 }
   if (containerChain.length > 0) {
-    // Let origin start at (x,y) of the outermost container
+    // Re-draw ancestor frames on the new page (local coordinates). Do NOT treat this pass as another
+    // repeat iteration: skip repeatContainer advancement on the innermost link—the real loop resumes
+    // after addPage returns with continuationOxTenths / continuationOyTenths.
     originX = containerChain[0].object.x
     originY = containerChain[0].object.y
-    absoluteLowerRightHandSide.x = originX / 10
-    absoluteLowerRightHandSide.y = originY / 10
+    absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, originX / 10)
+    absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, originY / 10)
+
     containerChain.forEach((link, linkIdx) => {
-      const chainChild = containerChain[linkIdx + 1]?.object
+      const deeperLinkChild = containerChain[linkIdx + 1]?.object
       link.object.children.forEach((child) => {
         if (child.snapToBottom) return
-        // Advance past bound repeat containers on the overflow path (they are not redrawn here; the
-        // innermost link draws their leaves). Without this, nested x/y offsets are lost on page 2+.
+        // Skip inner repeat container on chain: advancing origin by x,y is enough; the live loop draws rows.
         if (
           child.type === 'container' &&
-          chainChild &&
-          child === chainChild &&
+          deeperLinkChild &&
+          child === deeperLinkChild &&
           !containerRedrawsAfterContinuationPage(child)
         ) {
           const c = child as ContainerLayoutObject
@@ -494,17 +528,25 @@ function addPage(
           originY += c.y
           return
         }
-        if (child.type != 'container' || containerRedrawsAfterContinuationPage(child)) {
+        if (child.type !== 'container' || containerRedrawsAfterContinuationPage(child)) {
           const childLowerRightHandSide = addObjectToPDF(originX, originY, doc, child, link.printBuffer, paperSize, layout, options, rootPrintBuffer, [], context)
           absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, childLowerRightHandSide.x)
           absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, childLowerRightHandSide.y)
         }
       })
-      if (link.object.repeatContainer == 'horizontal') originX = absoluteLowerRightHandSide.x * 10
-      if (link.object.repeatContainer == 'vertical') originY = absoluteLowerRightHandSide.y * 10
+      const isLastLinkOnChain = linkIdx >= containerChain.length - 1
+      if (!isLastLinkOnChain) {
+        if (link.object.repeatContainer === 'horizontal') originX = absoluteLowerRightHandSide.x * 10
+        if (link.object.repeatContainer === 'vertical') originY = absoluteLowerRightHandSide.y * 10
+      }
     })
   }
-  return { originX: originX, originY: originY, x: absoluteLowerRightHandSide.x, y: absoluteLowerRightHandSide.y }
+  return {
+    originX: continuationOxTenths,
+    originY: continuationOyTenths,
+    x: absoluteLowerRightHandSide.x,
+    y: absoluteLowerRightHandSide.y,
+  }
 }
 
 function drawBottomDwellers(

package/test/reports.spec.ts

@@ -263,4 +263,72 @@ describe('genPDF', () => {
     expect(pdfText).toContain('ROW_0_MARK')
     expect(pdfText).toContain('ROW_35_MARK')
   })
+
+  it('redraws top-level empty-source body containers on every continuation page beside an overflowing sibling', async () => {
+    const chromeText = {
+      type: 'text' as const,
+      name: 'chrome-label',
+      x: 0,
+      y: 0,
+      width: 300,
+      height: 48,
+      active: true,
+      text: 'CHROME_EACH_PAGE',
+      textAlign: 1 as const,
+      fontFamily: 'Helvetica',
+      fontSize: 28,
+      fontStyle: 0,
+    }
+    const lineField = {
+      type: 'field' as const,
+      name: 'ln',
+      x: 0,
+      y: 0,
+      width: 800,
+      height: 96,
+      active: true,
+      source: 'line',
+      textAlign: 1 as const,
+      fontFamily: 'Helvetica',
+      fontSize: 36,
+      fontStyle: 0,
+    }
+    const ITEMS = Array.from({ length: 48 }, (_, i) => ({ line: `SKU_${i}` }))
+    const layout: Layout = {
+      name: 'sibling-chrome',
+      paperSize: { width: 210, height: 297, footerHeight: 20 },
+      objects: [
+        {
+          type: 'container',
+          name: 'addressBand',
+          x: 60,
+          y: 440,
+          width: 400,
+          height: 280,
+          active: true,
+          source: '',
+          children: [chromeText],
+        },
+        {
+          type: 'container',
+          name: 'lines',
+          x: 500,
+          y: 440,
+          width: 1500,
+          height: 200,
+          active: true,
+          source: 'ITEMS',
+          repeatContainer: 'vertical' as const,
+          children: [lineField],
+        },
+      ],
+    }
+
+    const doc = await genPDF(layout, { ITEMS })
+    expect(doc.getNumberOfPages()).toBeGreaterThanOrEqual(2)
+    const pdfText = Buffer.from(doc.output('arraybuffer')).toString('latin1')
+    const chromeMatches = pdfText.match(/\(CHROME_EACH_PAGE\)/g)
+    expect(chromeMatches?.length ?? 0).toBeGreaterThanOrEqual(doc.getNumberOfPages())
+    expect(pdfText).toContain('SKU_20')
+  })
 })