@softwear/latestcollectioncore 1.0.183 → 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. */
@@ -399,6 +419,7 @@ 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);
     }
     // Bounding box tracked for snap-to-bottom; continuation cursor is ALWAYS the passed-in coords.
     const absoluteLowerRightHandSide = { x: continuationOxTenths / 10, y: continuationOyTenths / 10 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.183",
+  "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
 
@@ -472,6 +499,7 @@ function addPage(
   }
   if (!context.measureOnly) {
     drawStaticPartOfPage(doc, layout, rootPrintBuffer, paperSize, options, context)
+    redrawRootDummyBodyContainersOnNewPage(doc, layout, rootPrintBuffer, paperSize, options, context, containerChain)
   }
   // Bounding box tracked for snap-to-bottom; continuation cursor is ALWAYS the passed-in coords.
   const absoluteLowerRightHandSide = { x: continuationOxTenths / 10, y: continuationOyTenths / 10 }

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')
+  })
 })