@flowaccount/pdfmake 1.0.6-staging.2 → 1.0.6-staging.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowaccount/pdfmake",
-  "version": "1.0.6-staging.2",
+  "version": "1.0.6-staging.3",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",

package/src/layoutBuilder.js

@@ -595,8 +595,9 @@ LayoutBuilder.prototype.processNode = function (node) {
 						}
 
 						// Reposition only items that belong to footer stack content
-						// (filter by Y position to exclude outer table border lines)
-						for (var i = preRenderState.itemCount; i < currentPage.items.length; i++) {
+						// Iterate ALL items (backgrounds are inserted at lower indices, not appended)
+						// Filter by Y position to exclude non-footer items
+						for (var i = 0; i < currentPage.items.length; i++) {
 							var item = currentPage.items[i];
 
 							// Skip the guide lines we just added (they're already positioned correctly)
@@ -632,127 +633,121 @@ LayoutBuilder.prototype.processNode = function (node) {
 						ctx.moveDown(gapHeight);
 					}
 				} else {
-					// MULTI-PAGE: keep remark at top, move footer to bottom, draw guide lines in gap
-					var currentPage = ctx.getCurrentPage();
-					var gapHeight = ctx.availableHeight;
+					// MULTI-PAGE: Process ALL pages from startPage+1 to current page
+					// Only move FOOTER items to bottom, keep remark at top
+					var pages = ctx.pages;
+					var pageMargins = ctx.pageMargins;
 
 					// Helper function to recursively find node with _isFooterTable
 					function findFooterTableNode(n) {
 						if (!n) return null;
 						if (n._isFooterTable) return n;
-
-						// Check in stack array
 						if (n.stack && Array.isArray(n.stack)) {
 							for (var i = 0; i < n.stack.length; i++) {
 								var found = findFooterTableNode(n.stack[i]);
 								if (found) return found;
 							}
 						}
-
-						// Check if node is an array (footer might be array of items)
 						if (Array.isArray(n)) {
 							for (var i = 0; i < n.length; i++) {
 								var found = findFooterTableNode(n[i]);
 								if (found) return found;
 							}
 						}
-
 						return null;
 					}
 
-					if (gapHeight > 0) {
-						// Find remark bottom Y position (footer starts after remark)
-						// The remark node has _isRemarkContent marker
-						var remarkBottomY = 0;
-						var remarkNode = null;
-
-						// Find the remark node and footer table node in the stack
-						var footerTableNode = null;
-						if (node.stack && node.stack.length > 0) {
-							for (var si = 0; si < node.stack.length; si++) {
-								if (node.stack[si] && node.stack[si]._isRemarkContent && node.stack[si].remark) {
-									remarkNode = node.stack[si];
-								}
-							}
-							// Footer table has _isFooterTable marker - search recursively
-							for (var si = node.stack.length - 1; si >= 0; si--) {
-								var found = findFooterTableNode(node.stack[si]);
-								if (found) {
-									footerTableNode = found;
-									break;
-								}
+					// Find footer table node to get its height
+					var footerTableNode = null;
+					if (node.stack && node.stack.length > 0) {
+						for (var si = node.stack.length - 1; si >= 0; si--) {
+							var found = findFooterTableNode(node.stack[si]);
+							if (found) {
+								footerTableNode = found;
+								break;
 							}
 						}
+					}
 
-						// Calculate remarkBottomY using footerTableNode._height (correct for multi-page)
-						// Footer is unbreakable, so its height is always on current page
-						// remarkNode._height is TOTAL height across all pages - NOT useful for multi-page
-						var footerStartY = ctx.y; // Default
-
-						if (footerTableNode && (footerTableNode._height || footerTableNode._minHeight)) {
-							// Use footer table height - this is reliable for multi-page
-							var footerHeight = footerTableNode._height || footerTableNode._minHeight;
-							footerStartY = ctx.y - footerHeight;
-							remarkBottomY = footerStartY; // Remark ends where footer starts
-						} else {
-							// Fallback: find lowest text line that's NOT inside footer table
-							var firstVectorY = ctx.y;
-							for (var fi = 0; fi < currentPage.items.length; fi++) {
-								var fitem = currentPage.items[fi];
-								if (fitem.type === 'vector' && fitem.item && fitem.item.type === 'line') {
-									var vecY = fitem.item.y1;
-									if (typeof vecY === 'number' && vecY < firstVectorY) {
-										firstVectorY = vecY;
+					var footerHeight = Math.abs((footerTableNode && footerTableNode._height) || 0);
+
+					// Only process the LAST page where footer is located
+					// Intermediate pages (remark only) should not be repositioned
+					var pageIdx = ctx.page;
+					if (pageIdx > preRenderState.startPage) {
+						var page = pages[pageIdx];
+						if (page && page.items && page.items.length > 0) {
+							var pageHeight = page.pageSize.height;
+							var bottomMargin = pageMargins.bottom;
+							var pageBottom = pageHeight - bottomMargin;
+
+							// Find footer start Y on this page (where footer items begin)
+							// Use footerHeight to identify footer area from the bottom of content
+							var contentBottom = 0;
+							for (var i = 0; i < page.items.length; i++) {
+								var item = page.items[i];
+								var itemBottom = 0;
+								if (item.item) {
+									if (typeof item.item.y === 'number') {
+										var h = item.item.h || item.item.height || 0;
+										itemBottom = item.item.y + h;
 									}
-								}
-							}
-							for (var fi = 0; fi < currentPage.items.length; fi++) {
-								var fitem = currentPage.items[fi];
-								if (fitem.type === 'line' && fitem.item) {
-									var lineY = fitem.item.y || 0;
-									var lineHeight = fitem.item.getHeight ? fitem.item.getHeight() : 15;
-									var lineBottom = lineY + lineHeight;
-									if (lineBottom <= firstVectorY && lineBottom > remarkBottomY) {
-										remarkBottomY = lineBottom;
+									if (typeof item.item.y2 === 'number' && item.item.y2 > itemBottom) {
+										itemBottom = item.item.y2;
 									}
 								}
+								if (itemBottom > contentBottom) {
+									contentBottom = itemBottom;
+								}
 							}
-							footerStartY = remarkBottomY > 0 ? remarkBottomY : firstVectorY;
-						}
-
-						// MULTI-PAGE: No guide lines - outer table borders extend through blank space
-						// Only reposition FOOTER items (items at Y >= footerStartY)
-						for (var i = 0; i < currentPage.items.length; i++) {
-							var item = currentPage.items[i];
 
-							// Skip guide lines we just added
-							if (item.item && item.item._footerGuideLine) continue;
+							// Footer starts at contentBottom - footerHeight
+							var footerStartY = contentBottom - footerHeight;
+
+							// Calculate gap: how much to move footer down
+							var gapHeight = pageBottom - contentBottom;
+							if (gapHeight > 0) {
+								// Only move items that are part of footer (Y >= footerStartY)
+								for (var i = 0; i < page.items.length; i++) {
+									var item = page.items[i];
+									var itemY = null;
+									if (item.item && typeof item.item.y1 === 'number') {
+										itemY = item.item.y1;
+									} else if (item.item && typeof item.item.y === 'number') {
+										itemY = item.item.y;
+									}
 
-							// Get item's starting Y position
-							var itemY = null;
-							if (item.item && typeof item.item.y1 === 'number') {
-								itemY = item.item.y1;
-							} else if (item.item && typeof item.item.y === 'number') {
-								itemY = item.item.y;
-							}
+									// Skip items above footer
+									if (itemY === null || itemY < footerStartY) continue;
 
-							// Only reposition if item is part of footer (Y >= footerStartY)
-							if (itemY === null || itemY < footerStartY) {
-								continue;
-							}
+									// Don't move items that are near the top margin (table headers)
+									// Use actual header height from repeatables instead of hardcoded threshold
+									var repeatableHeaderHeight = 0;
+									for (var ri = 0; ri < self.writer.repeatables.length; ri++) {
+										repeatableHeaderHeight += self.writer.repeatables[ri].height;
+									}
+									var headerThreshold = pageMargins.top + repeatableHeaderHeight;
+									if (itemY < headerThreshold) continue;
 
-							// Reposition this item
-							if (item.item && typeof item.item.y === 'number') {
-								item.item.y += gapHeight;
-							}
-							if (item.item && typeof item.item.y1 === 'number') {
-								item.item.y1 += gapHeight;
-							}
-							if (item.item && typeof item.item.y2 === 'number') {
-								item.item.y2 += gapHeight;
+									// Move footer item down
+									if (item.item && typeof item.item.y === 'number') {
+										item.item.y += gapHeight;
+									}
+									if (item.item && typeof item.item.y1 === 'number') {
+										item.item.y1 += gapHeight;
+									}
+									if (item.item && typeof item.item.y2 === 'number') {
+										item.item.y2 += gapHeight;
+									}
+								}
 							}
 						}
-						ctx.moveDown(gapHeight);
+					}
+
+					// Also update context for current page
+					var lastPageGapHeight = ctx.availableHeight;
+					if (lastPageGapHeight > 0) {
+						ctx.moveDown(lastPageGapHeight);
 					}
 				}
 			}