datastake-daf 0.6.417 → 0.6.418

package/dist/components/index.js

@@ -13343,9 +13343,9 @@ function PdfView(_ref2) {
     if (!allRefsReady) return;
     let _pages = [1];
     let currentPage = 1;
-    let remainingHeight = USABLE_HEIGHT;
+    let accumulatedHeightOnPage = 0;
 
-    // Reset all margins first
+    // Reset all styles first
     keys.forEach(k => {
       const {
         ref
@@ -13354,6 +13354,7 @@ function PdfView(_ref2) {
         ref.current.style.marginTop = '0px';
         ref.current.style.marginBottom = '0px';
         ref.current.style.paddingBottom = '0px';
+        ref.current.style.paddingTop = '0px';
       }
     });
     keys.forEach((k, i) => {
@@ -13364,53 +13365,48 @@ function PdfView(_ref2) {
       if (!ref || !ref.current) return;
       const isFirst = i === 0;
       const isLast = i === keys.length - 1;
-      const startOfPageMargin = HEADER_HEIGHT + TOP_PADDING;
 
-      // First section of first page gets header spacing
+      // For first section on first page
       if (isFirst) {
-        ref.current.style.marginTop = "".concat(startOfPageMargin, "px");
-        remainingHeight = USABLE_HEIGHT;
-      }
-
-      // Calculate space needed for this section (including spacing if not first on page)
-      const sectionTotalHeight = height + (isFirst || remainingHeight === USABLE_HEIGHT ? 0 : SECTION_SPACING);
+        ref.current.style.paddingTop = "".concat(HEADER_HEIGHT + TOP_PADDING, "px");
+        accumulatedHeightOnPage = height;
+      } else {
+        // Calculate what the new accumulated height would be with this section
+        const potentialAccumulated = accumulatedHeightOnPage + SECTION_SPACING + height;
+
+        // Check if we need a page break
+        const needsPageBreak = potentialAccumulated > SPLIT_THRESHOLD || accumulatedHeightOnPage + SECTION_SPACING + height > USABLE_HEIGHT;
+        if (needsPageBreak) {
+          // Calculate remaining space and add it as margin to previous section
+          const remainingSpace = USABLE_HEIGHT - accumulatedHeightOnPage;
+          const previousKey = keys[i - 1];
+          if (sectionsConfig[previousKey]) {
+            const {
+              ref: prevRef
+            } = sectionsConfig[previousKey];
+            if (prevRef && prevRef.current) {
+              // Add margin bottom to fill the rest of the page + space for header
+              prevRef.current.style.marginBottom = "".concat(remainingSpace + HEADER_HEIGHT + BOTTOM_PADDING, "px");
+            }
+          }
 
-      // Check if adding this section would exceed the remaining height
-      const wouldExceedPage = sectionTotalHeight > remainingHeight;
+          // Start new page
+          currentPage += 1;
+          _pages.push(currentPage);
 
-      // Check if the accumulated height on current page + this section exceeds 65% threshold
-      const currentPageUsed = USABLE_HEIGHT - remainingHeight;
-      const totalWithThisSection = currentPageUsed + sectionTotalHeight;
-      const wouldExceedThreshold = totalWithThisSection > SPLIT_THRESHOLD;
-      if (!isFirst && (wouldExceedPage || wouldExceedThreshold)) {
-        // Move to next page
-        const previousKey = keys[i - 1];
-        if (sectionsConfig[previousKey]) {
-          const {
-            ref: prevRef
-          } = sectionsConfig[previousKey];
-          if (prevRef && prevRef.current) {
-            // Add margin to push to next page
-            prevRef.current.style.marginBottom = "".concat(remainingHeight * 0.4 + HEADER_HEIGHT, "px");
-          }
-        }
+          // Add top padding for new page (header + top padding)
+          ref.current.style.paddingTop = "".concat(HEADER_HEIGHT + TOP_PADDING, "px");
 
-        // Start new page - position after header and top padding
-        currentPage += 1;
-        _pages.push(currentPage);
-        ref.current.style.marginTop = "".concat(startOfPageMargin, "px");
-        remainingHeight = USABLE_HEIGHT - height;
-      } else {
-        // Section fits on current page
-        if (!isFirst && remainingHeight !== USABLE_HEIGHT) {
-          ref.current.style.marginTop = "".concat(SECTION_SPACING, "px");
-          remainingHeight -= height + SECTION_SPACING;
+          // Reset accumulated height for new page
+          accumulatedHeightOnPage = height;
         } else {
-          remainingHeight -= height;
+          // Section fits on current page
+          ref.current.style.marginTop = "".concat(SECTION_SPACING, "px");
+          accumulatedHeightOnPage = potentialAccumulated;
         }
       }
 
-      // Add padding to last section
+      // Add bottom padding to last section
       if (isLast) {
         ref.current.style.paddingBottom = "".concat(BOTTOM_PADDING, "px");
       }
@@ -13452,7 +13448,7 @@ function PdfView(_ref2) {
         style: {
           top: (page - 1) * PAGE_HEIGHT,
           width: '100%',
-          height: HEADER_HEIGHT - 24,
+          height: HEADER_HEIGHT,
           position: 'absolute',
           left: 0,
           zIndex: 1000000

package/package.json

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

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

@@ -71,15 +71,16 @@ export default function PdfView({
 
     let _pages = [1];
     let currentPage = 1;
-    let remainingHeight = USABLE_HEIGHT;
+    let accumulatedHeightOnPage = 0;
 
-    // Reset all margins first
+    // Reset all styles first
     keys.forEach(k => {
       const { ref } = sectionsConfig[k];
       if (ref.current) {
         ref.current.style.marginTop = '0px';
         ref.current.style.marginBottom = '0px';
         ref.current.style.paddingBottom = '0px';
+        ref.current.style.paddingTop = '0px';
       }
     });
 
@@ -89,52 +90,49 @@ export default function PdfView({
       
       const isFirst = i === 0;
       const isLast = i === keys.length - 1;
-      const startOfPageMargin = HEADER_HEIGHT + TOP_PADDING;
 
-      // First section of first page gets header spacing
+      // For first section on first page
       if (isFirst) {
-        ref.current.style.marginTop = `${startOfPageMargin}px`;
-        remainingHeight = USABLE_HEIGHT;
-      }
-
-      // Calculate space needed for this section (including spacing if not first on page)
-      const sectionTotalHeight = height + (isFirst || remainingHeight === USABLE_HEIGHT ? 0 : SECTION_SPACING);
-      
-      // Check if adding this section would exceed the remaining height
-      const wouldExceedPage = sectionTotalHeight > remainingHeight;
-      
-      // Check if the accumulated height on current page + this section exceeds 65% threshold
-      const currentPageUsed = USABLE_HEIGHT - remainingHeight;
-      const totalWithThisSection = currentPageUsed + sectionTotalHeight;
-      const wouldExceedThreshold = totalWithThisSection > SPLIT_THRESHOLD;
-
-      if (!isFirst && (wouldExceedPage || wouldExceedThreshold)) {
-        // Move to next page
-        const previousKey = keys[i - 1];
-        if (sectionsConfig[previousKey]) {
-          const { ref: prevRef } = sectionsConfig[previousKey];
-          if (prevRef && prevRef.current) {
-            // Add margin to push to next page
-            prevRef.current.style.marginBottom = `${(remainingHeight * 0.4) + HEADER_HEIGHT}px`;
+        ref.current.style.paddingTop = `${HEADER_HEIGHT + TOP_PADDING}px`;
+        accumulatedHeightOnPage = height;
+      } else {
+        // Calculate what the new accumulated height would be with this section
+        const potentialAccumulated = accumulatedHeightOnPage + SECTION_SPACING + height;
+        
+        // Check if we need a page break
+        const needsPageBreak = potentialAccumulated > SPLIT_THRESHOLD || 
+                               (accumulatedHeightOnPage + SECTION_SPACING + height) > USABLE_HEIGHT;
+
+        if (needsPageBreak) {
+          // Calculate remaining space and add it as margin to previous section
+          const remainingSpace = USABLE_HEIGHT - accumulatedHeightOnPage;
+          const previousKey = keys[i - 1];
+          
+          if (sectionsConfig[previousKey]) {
+            const { ref: prevRef } = sectionsConfig[previousKey];
+            if (prevRef && prevRef.current) {
+              // Add margin bottom to fill the rest of the page + space for header
+              prevRef.current.style.marginBottom = `${remainingSpace + HEADER_HEIGHT + BOTTOM_PADDING}px`;
+            }
           }
-        }
 
-        // Start new page - position after header and top padding
-        currentPage += 1;
-        _pages.push(currentPage);
-        ref.current.style.marginTop = `${startOfPageMargin}px`;
-        remainingHeight = USABLE_HEIGHT - height;
-      } else {
-        // Section fits on current page
-        if (!isFirst && remainingHeight !== USABLE_HEIGHT) {
-          ref.current.style.marginTop = `${SECTION_SPACING}px`;
-          remainingHeight -= (height + SECTION_SPACING);
+          // Start new page
+          currentPage += 1;
+          _pages.push(currentPage);
+          
+          // Add top padding for new page (header + top padding)
+          ref.current.style.paddingTop = `${HEADER_HEIGHT + TOP_PADDING}px`;
+          
+          // Reset accumulated height for new page
+          accumulatedHeightOnPage = height;
         } else {
-          remainingHeight -= height;
+          // Section fits on current page
+          ref.current.style.marginTop = `${SECTION_SPACING}px`;
+          accumulatedHeightOnPage = potentialAccumulated;
         }
       }
 
-      // Add padding to last section
+      // Add bottom padding to last section
       if (isLast) {
         ref.current.style.paddingBottom = `${BOTTOM_PADDING}px`;
       }
@@ -181,7 +179,7 @@ export default function PdfView({
             style={{ 
               top: ((page - 1) * PAGE_HEIGHT), 
               width: '100%', 
-              height: HEADER_HEIGHT - 24, 
+              height: HEADER_HEIGHT, 
               position: 'absolute', 
               left: 0, 
               zIndex: 1000000