datastake-daf 0.6.424 → 0.6.425

package/dist/components/index.js

@@ -13303,11 +13303,9 @@ DAFFooter.propTypes = {
 };
 
 const PAGE_HEIGHT = 1587;
+// margin-top: 20, bottom: 20;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
-const CONTENT_HEIGHT_PER_PAGE = 1200; // Maximum content height per page
-const PAGE_TOP_MARGIN = 30; // Margin at the top of content on new pages
-
 const Row = _ref => {
   let {
     widgets,
@@ -13357,68 +13355,48 @@ function PdfView(_ref2) {
     let _pages = [1];
     let _page = 1;
     if (keys.length === config.length) {
-      // Reset all margins and padding first
+      let incrHeight = 0;
       keys.forEach(k => {
         const {
           ref
         } = sectionsConfig[k];
-        ref.current.style.marginTop = '0px';
         ref.current.style.marginBottom = '0px';
-        ref.current.style.paddingBottom = '0px';
+        // ref.current.style.marginTop = '15px';
       });
-      let currentPageHeight = 0; // Track height accumulated on current page
-      const sectionGap = 24; // Gap between sections
-
       keys.forEach((k, i) => {
         const {
           height,
           ref
         } = sectionsConfig[k];
-        const isFirstSection = i === 0;
-        const isLastSection = i === keys.length - 1;
-
-        // First section on first page needs header space
-        if (isFirstSection) {
+        if (i === 0) {
           ref.current.style.marginTop = "".concat(HEADER_HEIGHT, "px");
-          currentPageHeight = 0; // Content height tracking starts fresh
+          incrHeight += HEADER_HEIGHT;
         }
-
-        // Check if this section would exceed the page content limit
-        const willExceedPageLimit = currentPageHeight + height > CONTENT_HEIGHT_PER_PAGE;
-        if (willExceedPageLimit && !isFirstSection) {
-          // Need to break to a new page
+        const newHeight = incrHeight + height;
+        if (i === keys.length - 1) {
+          ref.current.style.paddingBottom = '30px';
+        }
+        if (newHeight > PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT) {
+          const dif = Math.abs(PAGE_HEIGHT - incrHeight);
+          ref.current.style.marginTop = '30px';
           _page += 1;
           _pages.push(_page);
-
-          // Calculate remaining space on current page
-          const remainingSpace = PAGE_HEIGHT - currentPageHeight - HEADER_HEIGHT - FOOTER_HEIGHT;
-
-          // Add margin to previous section to push current section to next page
           if (sectionsConfig[keys[i - 1]]) {
             const {
-              ref: prevRef
+              ref: topRef
             } = sectionsConfig[keys[i - 1]];
-            prevRef.current.style.marginBottom = "".concat(remainingSpace, "px");
+            topRef.current.style.marginBottom = "".concat(dif + HEADER_HEIGHT - 24, "px");
+            incrHeight = height + 24 + HEADER_HEIGHT;
+            // console.log('margin', dif);
           }
-
-          // Position this section at the top of the new page
-          ref.current.style.marginTop = "".concat(HEADER_HEIGHT + PAGE_TOP_MARGIN, "px");
-
-          // Reset page height counter for new page
-          currentPageHeight = height + sectionGap;
         } else {
-          // Section fits on current page
-          currentPageHeight += height + sectionGap;
-        }
-
-        // Add padding to last section
-        if (isLastSection) {
-          ref.current.style.paddingBottom = "".concat(PAGE_TOP_MARGIN, "px");
+          incrHeight = newHeight + 24;
         }
+        // console.groupEnd();
       });
       setPages(_pages);
     }
-  }, [sectionsConfig, config.length]);
+  }, [sectionsConfig]);
   React.useEffect(() => {
     doSizing();
   }, [doSizing]);

package/package.json

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

package/src/@daf/core/components/Dashboard/PdfView/PdfView.stories.js

@@ -189,15 +189,5 @@ export const Primary = {
       },
     ],
   },
-  render: (args) => (
-    <div style={{
-      height: '100vh',
-      overflowY: 'auto',
-        background: "#f8f8f8",
-        padding: "20px",
-      }}
-    >
-      <PdfView {...args} />
-    </div>
-  ),
-};
+}
+

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

@@ -4,10 +4,9 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { formatClassname } from "../../../../../helpers/ClassesHelper";
 
 const PAGE_HEIGHT = 1587;
+// margin-top: 20, bottom: 20;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
-const CONTENT_HEIGHT_PER_PAGE = 1200; // Maximum content height per page
-const PAGE_TOP_MARGIN = 30; // Margin at the top of content on new pages
 
 const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
   const ref = useRef();
@@ -57,64 +56,48 @@ export default function PdfView({
     let _page = 1;
 
     if (keys.length === config.length) {
-      // Reset all margins and padding first
+      let incrHeight = 0;
+
       keys.forEach(k => {
         const { ref } = sectionsConfig[k];
-        ref.current.style.marginTop = '0px';
         ref.current.style.marginBottom = '0px';
-        ref.current.style.paddingBottom = '0px';
-      });
-
-      let currentPageHeight = 0; // Track height accumulated on current page
-      const sectionGap = 24; // Gap between sections
+        // ref.current.style.marginTop = '15px';
+      })
 
       keys.forEach((k, i) => {
         const { height, ref } = sectionsConfig[k];
-        const isFirstSection = i === 0;
-        const isLastSection = i === keys.length - 1;
 
-        // First section on first page needs header space
-        if (isFirstSection) {
+        if (i === 0) {
           ref.current.style.marginTop = `${HEADER_HEIGHT}px`;
-          currentPageHeight = 0; // Content height tracking starts fresh
+          incrHeight += HEADER_HEIGHT;
         }
 
-        // Check if this section would exceed the page content limit
-        const willExceedPageLimit = currentPageHeight + height > CONTENT_HEIGHT_PER_PAGE;
+        const newHeight = incrHeight + height;
+
+        if (i === keys.length - 1) {
+          ref.current.style.paddingBottom = '30px';
+        }
 
-        if (willExceedPageLimit && !isFirstSection) {
-          // Need to break to a new page
+        if (newHeight > PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT) {
+          const dif = Math.abs(PAGE_HEIGHT - incrHeight);
+          ref.current.style.marginTop = '30px';
           _page += 1;
           _pages.push(_page);
 
-          // Calculate remaining space on current page
-          const remainingSpace = PAGE_HEIGHT - currentPageHeight - HEADER_HEIGHT - FOOTER_HEIGHT;
-          
-          // Add margin to previous section to push current section to next page
           if (sectionsConfig[keys[i - 1]]) {
-            const { ref: prevRef } = sectionsConfig[keys[i - 1]];
-            prevRef.current.style.marginBottom = `${remainingSpace}px`;
+            const { ref: topRef } = sectionsConfig[keys[i - 1]];
+            topRef.current.style.marginBottom = `${dif + HEADER_HEIGHT - 24}px`;
+            incrHeight = height + 24 + HEADER_HEIGHT;
+            // console.log('margin', dif);
           }
-
-          // Position this section at the top of the new page
-          ref.current.style.marginTop = `${HEADER_HEIGHT + PAGE_TOP_MARGIN}px`;
-          
-          // Reset page height counter for new page
-          currentPageHeight = height + sectionGap;
         } else {
-          // Section fits on current page
-          currentPageHeight += height + sectionGap;
-        }
-
-        // Add padding to last section
-        if (isLastSection) {
-          ref.current.style.paddingBottom = `${PAGE_TOP_MARGIN}px`;
+          incrHeight = newHeight + 24;
         }
-      });
-
+        // console.groupEnd();
+      })
       setPages(_pages);
     }
-  }, [sectionsConfig, config.length]);
+  }, [sectionsConfig]);
 
   useEffect(() => {
     doSizing();