@softwear/latestcollectioncore 1.0.181 → 1.0.182

package/dist/reports.js

@@ -405,9 +405,24 @@ function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, opti
         originY = containerChain[0].object.y;
         absoluteLowerRightHandSide.x = originX / 10;
         absoluteLowerRightHandSide.y = originY / 10;
-        containerChain.forEach((link) => {
+        containerChain.forEach((link, linkIdx) => {
+            var _a;
+            const chainChild = (_a = containerChain[linkIdx + 1]) === null || _a === void 0 ? void 0 : _a.object;
             link.object.children.forEach((child) => {
-                if (!child.snapToBottom && (child.type != 'container' || containerRedrawsAfterContinuationPage(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+.
+                if (child.type === 'container' &&
+                    chainChild &&
+                    child === chainChild &&
+                    !containerRedrawsAfterContinuationPage(child)) {
+                    const c = child;
+                    originX += c.x;
+                    originY += c.y;
+                    return;
+                }
+                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);

package/package.json

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

package/src/reports.ts

@@ -477,9 +477,24 @@ function addPage(
     originY = containerChain[0].object.y
     absoluteLowerRightHandSide.x = originX / 10
     absoluteLowerRightHandSide.y = originY / 10
-    containerChain.forEach((link) => {
+    containerChain.forEach((link, linkIdx) => {
+      const chainChild = containerChain[linkIdx + 1]?.object
       link.object.children.forEach((child) => {
-        if (!child.snapToBottom && (child.type != 'container' || containerRedrawsAfterContinuationPage(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+.
+        if (
+          child.type === 'container' &&
+          chainChild &&
+          child === chainChild &&
+          !containerRedrawsAfterContinuationPage(child)
+        ) {
+          const c = child as ContainerLayoutObject
+          originX += c.x
+          originY += c.y
+          return
+        }
+        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)

package/test/reports.spec.ts

@@ -243,8 +243,8 @@ describe('genPDF', () => {
             {
               type: 'container',
               name: 'rows',
-              x: 0,
-              y: 0,
+              x: 30,
+              y: 40,
               width: 1800,
               height: 120,
               active: true,