@softwear/latestcollectioncore 1.0.181 → 1.0.183

package/dist/reports.js

@@ -380,6 +380,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;
@@ -397,29 +400,53 @@ function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, opti
     if (!context.measureOnly) {
         drawStaticPartOfPage(doc, layout, rootPrintBuffer, paperSize, options, context);
     }
-    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;
-        containerChain.forEach((link) => {
+        absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, originX / 10);
+        absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, originY / 10);
+        containerChain.forEach((link, linkIdx) => {
+            var _a;
+            const deeperLinkChild = (_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;
+                // 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)) {
+                    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);
                 }
             });
-            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.181",
+  "version": "1.0.183",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/reports.ts

@@ -453,6 +453,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
@@ -469,27 +473,52 @@ function addPage(
   if (!context.measureOnly) {
     drawStaticPartOfPage(doc, layout, rootPrintBuffer, paperSize, options, context)
   }
-  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
-    containerChain.forEach((link) => {
+    absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, originX / 10)
+    absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, originY / 10)
+
+    containerChain.forEach((link, linkIdx) => {
+      const deeperLinkChild = containerChain[linkIdx + 1]?.object
       link.object.children.forEach((child) => {
-        if (!child.snapToBottom && (child.type != 'container' || containerRedrawsAfterContinuationPage(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)
+        ) {
+          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)
         }
       })
-      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

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