datastake-daf 0.6.411 → 0.6.413

package/dist/components/index.js

@@ -13279,11 +13279,13 @@ const PAGE_HEIGHT = 1587;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
 const SECTION_SPACING = 24; // Space between sections
-const PAGE_TOP_PADDING = 30; // Padding at top of new page (after header)
-const PAGE_BOTTOM_PADDING = 30; // Padding before footer
+const FIRST_PAGE_TOP_PADDING = 30; // Padding after header on first page
+const NEW_PAGE_TOP_PADDING = 30; // Padding after header on new pages
+const LAST_SECTION_BOTTOM_PADDING = 30; // Padding after last section
+const PAGE_BOTTOM_MARGIN = 30; // Safety margin before footer
 
-// Available content height per page
-const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT - PAGE_TOP_PADDING - PAGE_BOTTOM_PADDING;
+// Available content height per page (excluding header, footer, and safety margins)
+const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT - PAGE_BOTTOM_MARGIN;
 const Row = _ref => {
   let {
     widgets,
@@ -13335,9 +13337,9 @@ function PdfView(_ref2) {
     if (keys.length !== config.length) return;
     let _pages = [1];
     let currentPage = 1;
-    let currentPageHeight = 0; // Height used on current page (excluding header/footer)
+    let currentPageContentHeight = 0; // Tracks content height on current page (excluding header)
 
-    // Reset all margins first
+    // Reset all styles first
     keys.forEach(k => {
       const {
         ref
@@ -13353,56 +13355,48 @@ function PdfView(_ref2) {
       } = sectionsConfig[k];
       const isFirstSection = i === 0;
       const isLastSection = i === keys.length - 1;
-      const isFirstOnPage = currentPageHeight === 0;
+      const isFirstSectionOnPage = currentPageContentHeight === 0;
 
-      // Calculate height needed for this section
-      let sectionHeightWithSpacing = height;
-
-      // Add spacing before section (except first on page)
-      if (!isFirstOnPage) {
-        sectionHeightWithSpacing += SECTION_SPACING;
+      // For first section of entire document
+      if (isFirstSection) {
+        ref.current.style.marginTop = "".concat(HEADER_HEIGHT + FIRST_PAGE_TOP_PADDING, "px");
+        currentPageContentHeight = height + FIRST_PAGE_TOP_PADDING;
+        if (isLastSection) {
+          ref.current.style.paddingBottom = "".concat(LAST_SECTION_BOTTOM_PADDING, "px");
+          currentPageContentHeight += LAST_SECTION_BOTTOM_PADDING;
+        }
+        return;
       }
 
-      // Check if section fits on current page
-      if (currentPageHeight + sectionHeightWithSpacing > AVAILABLE_HEIGHT && !isFirstOnPage) {
-        // Section doesn't fit, move to next page
-
-        // Add bottom margin to previous section to fill remaining space
-        const remainingSpace = AVAILABLE_HEIGHT - currentPageHeight;
-        const previousKey = keys[i - 1];
-        if (sectionsConfig[previousKey]) {
-          sectionsConfig[previousKey].ref.current.style.marginBottom = "".concat(remainingSpace + PAGE_BOTTOM_PADDING, "px");
-        }
+      // Calculate space needed for this section including spacing before it
+      const spacingBefore = isFirstSectionOnPage ? NEW_PAGE_TOP_PADDING : SECTION_SPACING;
+      const bottomPadding = isLastSection ? LAST_SECTION_BOTTOM_PADDING : 0;
+      const totalSpaceNeeded = spacingBefore + height + bottomPadding;
 
-        // Start new page
+      // Check if we need to move to next page
+      if (currentPageContentHeight + totalSpaceNeeded > AVAILABLE_HEIGHT) {
+        // Move to new page
         currentPage += 1;
         _pages.push(currentPage);
-        currentPageHeight = 0;
 
-        // Add top margin for new page
-        ref.current.style.marginTop = "".concat(HEADER_HEIGHT + PAGE_TOP_PADDING, "px");
+        // Calculate and apply bottom margin to fill previous page
+        const usedSpace = currentPageContentHeight;
+        const remainingSpace = AVAILABLE_HEIGHT - usedSpace;
+        const previousKey = keys[i - 1];
+        sectionsConfig[previousKey].ref.current.style.marginBottom = "".concat(remainingSpace + PAGE_BOTTOM_MARGIN, "px");
 
-        // Update height calculation for this section on new page
-        currentPageHeight = height;
+        // This section starts the new page
+        ref.current.style.marginTop = "".concat(HEADER_HEIGHT + NEW_PAGE_TOP_PADDING, "px");
+        currentPageContentHeight = height + NEW_PAGE_TOP_PADDING + bottomPadding;
       } else {
         // Section fits on current page
-
-        if (isFirstSection) {
-          // First section gets header spacing
-          ref.current.style.marginTop = "".concat(HEADER_HEIGHT + PAGE_TOP_PADDING, "px");
-        } else if (isFirstOnPage) {
-          // First section on a new page (after page break)
-          ref.current.style.marginTop = "".concat(PAGE_TOP_PADDING, "px");
-        } else {
-          // Regular section spacing
-          ref.current.style.marginTop = "".concat(SECTION_SPACING, "px");
-        }
-        currentPageHeight += sectionHeightWithSpacing;
+        ref.current.style.marginTop = "".concat(spacingBefore, "px");
+        currentPageContentHeight += totalSpaceNeeded;
       }
 
-      // Add padding to last section
+      // Add bottom padding to last section
       if (isLastSection) {
-        ref.current.style.paddingBottom = "".concat(PAGE_BOTTOM_PADDING, "px");
+        ref.current.style.paddingBottom = "".concat(LAST_SECTION_BOTTOM_PADDING, "px");
       }
     });
     setPages(_pages);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.411",
+	"version": "0.6.413",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Dashboard/PdfView/index.jsx

@@ -7,11 +7,13 @@ const PAGE_HEIGHT = 1587;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
 const SECTION_SPACING = 24; // Space between sections
-const PAGE_TOP_PADDING = 30; // Padding at top of new page (after header)
-const PAGE_BOTTOM_PADDING = 30; // Padding before footer
+const FIRST_PAGE_TOP_PADDING = 30; // Padding after header on first page
+const NEW_PAGE_TOP_PADDING = 30; // Padding after header on new pages
+const LAST_SECTION_BOTTOM_PADDING = 30; // Padding after last section
+const PAGE_BOTTOM_MARGIN = 30; // Safety margin before footer
 
-// Available content height per page
-const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT - PAGE_TOP_PADDING - PAGE_BOTTOM_PADDING;
+// Available content height per page (excluding header, footer, and safety margins)
+const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT - PAGE_BOTTOM_MARGIN;
 
 const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
   const ref = useRef();
@@ -63,9 +65,9 @@ export default function PdfView({
 
     let _pages = [1];
     let currentPage = 1;
-    let currentPageHeight = 0; // Height used on current page (excluding header/footer)
+    let currentPageContentHeight = 0; // Tracks content height on current page (excluding header)
 
-    // Reset all margins first
+    // Reset all styles first
     keys.forEach(k => {
       const { ref } = sectionsConfig[k];
       ref.current.style.marginTop = '0px';
@@ -77,57 +79,49 @@ export default function PdfView({
       const { height, ref } = sectionsConfig[k];
       const isFirstSection = i === 0;
       const isLastSection = i === keys.length - 1;
-      const isFirstOnPage = currentPageHeight === 0;
-
-      // Calculate height needed for this section
-      let sectionHeightWithSpacing = height;
-      
-      // Add spacing before section (except first on page)
-      if (!isFirstOnPage) {
-        sectionHeightWithSpacing += SECTION_SPACING;
-      }
+      const isFirstSectionOnPage = currentPageContentHeight === 0;
 
-      // Check if section fits on current page
-      if (currentPageHeight + sectionHeightWithSpacing > AVAILABLE_HEIGHT && !isFirstOnPage) {
-        // Section doesn't fit, move to next page
+      // For first section of entire document
+      if (isFirstSection) {
+        ref.current.style.marginTop = `${HEADER_HEIGHT + FIRST_PAGE_TOP_PADDING}px`;
+        currentPageContentHeight = height + FIRST_PAGE_TOP_PADDING;
         
-        // Add bottom margin to previous section to fill remaining space
-        const remainingSpace = AVAILABLE_HEIGHT - currentPageHeight;
-        const previousKey = keys[i - 1];
-        if (sectionsConfig[previousKey]) {
-          sectionsConfig[previousKey].ref.current.style.marginBottom = `${remainingSpace + PAGE_BOTTOM_PADDING}px`;
+        if (isLastSection) {
+          ref.current.style.paddingBottom = `${LAST_SECTION_BOTTOM_PADDING}px`;
+          currentPageContentHeight += LAST_SECTION_BOTTOM_PADDING;
         }
+        return;
+      }
+
+      // Calculate space needed for this section including spacing before it
+      const spacingBefore = isFirstSectionOnPage ? NEW_PAGE_TOP_PADDING : SECTION_SPACING;
+      const bottomPadding = isLastSection ? LAST_SECTION_BOTTOM_PADDING : 0;
+      const totalSpaceNeeded = spacingBefore + height + bottomPadding;
 
-        // Start new page
+      // Check if we need to move to next page
+      if (currentPageContentHeight + totalSpaceNeeded > AVAILABLE_HEIGHT) {
+        // Move to new page
         currentPage += 1;
         _pages.push(currentPage);
-        currentPageHeight = 0;
         
-        // Add top margin for new page
-        ref.current.style.marginTop = `${HEADER_HEIGHT + PAGE_TOP_PADDING}px`;
+        // Calculate and apply bottom margin to fill previous page
+        const usedSpace = currentPageContentHeight;
+        const remainingSpace = AVAILABLE_HEIGHT - usedSpace;
+        const previousKey = keys[i - 1];
+        sectionsConfig[previousKey].ref.current.style.marginBottom = `${remainingSpace + PAGE_BOTTOM_MARGIN}px`;
         
-        // Update height calculation for this section on new page
-        currentPageHeight = height;
+        // This section starts the new page
+        ref.current.style.marginTop = `${HEADER_HEIGHT + NEW_PAGE_TOP_PADDING}px`;
+        currentPageContentHeight = height + NEW_PAGE_TOP_PADDING + bottomPadding;
       } else {
         // Section fits on current page
-        
-        if (isFirstSection) {
-          // First section gets header spacing
-          ref.current.style.marginTop = `${HEADER_HEIGHT + PAGE_TOP_PADDING}px`;
-        } else if (isFirstOnPage) {
-          // First section on a new page (after page break)
-          ref.current.style.marginTop = `${PAGE_TOP_PADDING}px`;
-        } else {
-          // Regular section spacing
-          ref.current.style.marginTop = `${SECTION_SPACING}px`;
-        }
-        
-        currentPageHeight += sectionHeightWithSpacing;
+        ref.current.style.marginTop = `${spacingBefore}px`;
+        currentPageContentHeight += totalSpaceNeeded;
       }
 
-      // Add padding to last section
+      // Add bottom padding to last section
       if (isLastSection) {
-        ref.current.style.paddingBottom = `${PAGE_BOTTOM_PADDING}px`;
+        ref.current.style.paddingBottom = `${LAST_SECTION_BOTTOM_PADDING}px`;
       }
     });