datastake-daf 0.6.445 → 0.6.447

package/dist/components/index.js

@@ -14536,9 +14536,9 @@ DAFFooter.propTypes = {
 };
 
 const PAGE_HEIGHT = 1587;
-// margin-top: 20, bottom: 20;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
+const CONTENT_AREA_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT;
 const Row = _ref => {
   let {
     widgets,
@@ -14588,43 +14588,58 @@ function PdfView(_ref2) {
     let _pages = [1];
     let _page = 1;
     if (keys.length === config.length) {
-      let incrHeight = 0;
+      // Reset all margins first
       keys.forEach(k => {
         const {
           ref
         } = sectionsConfig[k];
         ref.current.style.marginBottom = '0px';
-        // ref.current.style.marginTop = '15px';
+        ref.current.style.marginTop = '0px';
+        ref.current.style.pageBreakInside = 'auto';
       });
+      let currentPageHeight = 0;
       keys.forEach((k, i) => {
         const {
           height,
           ref
         } = sectionsConfig[k];
+        const sectionHeight = height + 24; // Include margin/padding
+
+        // First section on first page needs header space
         if (i === 0) {
           ref.current.style.marginTop = "".concat(HEADER_HEIGHT, "px");
-          incrHeight += HEADER_HEIGHT;
+          currentPageHeight = sectionHeight;
+          return;
         }
-        const newHeight = incrHeight + height;
 
-        // ADD THIS CONDITION HERE - before the page break logic
-        if (i === keys.length - 1) {
-          ref.current.style.paddingBottom = '80px';
-        }
-        if (newHeight > PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT) {
-          const dif = Math.abs(PAGE_HEIGHT - incrHeight);
-          ref.current.style.marginTop = '30px';
+        // Check if section fits in remaining space of current page
+        const remainingSpace = CONTENT_AREA_HEIGHT - currentPageHeight;
+        if (sectionHeight > remainingSpace) {
+          // Section doesn't fit, move to next page
+          const {
+            ref: prevRef
+          } = sectionsConfig[keys[i - 1]];
+
+          // Add margin to previous section to push current section to next page
+          prevRef.current.style.marginBottom = "".concat(remainingSpace + FOOTER_HEIGHT, "px");
+
+          // Add top margin for new page header
+          ref.current.style.marginTop = "".concat(HEADER_HEIGHT, "px");
+
+          // Start new page
           _page += 1;
           _pages.push(_page);
-          if (sectionsConfig[keys[i - 1]]) {
-            const {
-              ref: topRef
-            } = sectionsConfig[keys[i - 1]];
-            topRef.current.style.marginBottom = "".concat(dif + HEADER_HEIGHT - 24, "px");
-            incrHeight = height + 24 + HEADER_HEIGHT;
-          }
+          currentPageHeight = sectionHeight;
         } else {
-          incrHeight = newHeight + 24;
+          // Section fits, add it to current page
+          ref.current.style.marginTop = '24px';
+          currentPageHeight += sectionHeight;
+        }
+
+        // Last section needs bottom margin for footer
+        if (i === keys.length - 1) {
+          const finalRemainingSpace = CONTENT_AREA_HEIGHT - currentPageHeight;
+          ref.current.style.marginBottom = "".concat(finalRemainingSpace + FOOTER_HEIGHT, "px");
         }
       });
       setPages(_pages);
@@ -14655,28 +14670,18 @@ function PdfView(_ref2) {
       })
     });
   }, [config, onChangeHeight]);
-
-  // <div className="daf-analysis">
-  // <Header title={t('Dashboard Title')} />
-
-  // <div className="content">
-  //   <div className="view-content">
-  //     <div className="daf-analysis-layout">
-  //       <div className='sections-cont w-pt'>
-  //         <section>
-
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: contClassName,
     style: {
       position: 'relative',
       minHeight: pages.length * PAGE_HEIGHT
     },
-    children: [renderDashboard(), pages.map(page => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [renderDashboard(), pages.map(page => /*#__PURE__*/jsxRuntime.jsxs("div", {
       children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
           top: (page - 1) * PAGE_HEIGHT,
           width: '100%',
-          height: HEADER_HEIGHT - 24,
+          height: HEADER_HEIGHT,
           position: 'absolute',
           left: 0,
           zIndex: 1000000
@@ -14694,7 +14699,7 @@ function PdfView(_ref2) {
             alt: "logo"
           })
         })]
-      }, "headers-".concat(page)), /*#__PURE__*/jsxRuntime.jsxs("div", {
+      }), /*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
           top: page * PAGE_HEIGHT - FOOTER_HEIGHT,
           width: '100%',
@@ -14737,8 +14742,8 @@ function PdfView(_ref2) {
             children: page
           })
         })]
-      }, "footers-".concat(page))]
-    }))]
+      })]
+    }, "page-".concat(page)))]
   });
 }
 PdfView.propTypes = {
@@ -14748,7 +14753,8 @@ PdfView.propTypes = {
   imgSrc: PropTypes__default["default"].string,
   userId: PropTypes__default["default"].string,
   accountId: PropTypes__default["default"].string,
-  documentId: PropTypes__default["default"].string
+  documentId: PropTypes__default["default"].string,
+  downloadId: PropTypes__default["default"].string
 };
 
 const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, formValues = {}) => {

package/package.json

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

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

@@ -4,9 +4,9 @@ import { useCallback, useEffect, useRef, useState, useLayoutEffect } 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_AREA_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT;
 
 const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
   const ref = useRef();
@@ -56,44 +56,57 @@ export default function PdfView({
     let _page = 1;
 
     if (keys.length === config.length) {
-      let incrHeight = 0;
-
+      // Reset all margins first
       keys.forEach(k => {
         const { ref } = sectionsConfig[k];
         ref.current.style.marginBottom = '0px';
-        // ref.current.style.marginTop = '15px';
-      })
+        ref.current.style.marginTop = '0px';
+        ref.current.style.pageBreakInside = 'auto';
+      });
+
+      let currentPageHeight = 0;
 
       keys.forEach((k, i) => {
         const { height, ref } = sectionsConfig[k];
-      
+        const sectionHeight = height + 24; // Include margin/padding
+        
+        // First section on first page needs header space
         if (i === 0) {
           ref.current.style.marginTop = `${HEADER_HEIGHT}px`;
-          incrHeight += HEADER_HEIGHT;
-        }
-      
-        const newHeight = incrHeight + height;
-      
-        // ADD THIS CONDITION HERE - before the page break logic
-        if (i === keys.length - 1) {
-          ref.current.style.paddingBottom = '80px';
+          currentPageHeight = sectionHeight;
+          return;
         }
-      
-        if (newHeight > PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT) {
-          const dif = Math.abs(PAGE_HEIGHT - incrHeight);
-          ref.current.style.marginTop = '30px';
+
+        // Check if section fits in remaining space of current page
+        const remainingSpace = CONTENT_AREA_HEIGHT - currentPageHeight;
+        
+        if (sectionHeight > remainingSpace) {
+          // Section doesn't fit, move to next page
+          const { ref: prevRef } = sectionsConfig[keys[i - 1]];
+          
+          // Add margin to previous section to push current section to next page
+          prevRef.current.style.marginBottom = `${remainingSpace + FOOTER_HEIGHT}px`;
+          
+          // Add top margin for new page header
+          ref.current.style.marginTop = `${HEADER_HEIGHT}px`;
+          
+          // Start new page
           _page += 1;
           _pages.push(_page);
-      
-          if (sectionsConfig[keys[i - 1]]) {
-            const { ref: topRef } = sectionsConfig[keys[i - 1]];
-            topRef.current.style.marginBottom = `${dif + HEADER_HEIGHT - 24}px`;
-            incrHeight = height + 24 + HEADER_HEIGHT;
-          }
+          currentPageHeight = sectionHeight;
         } else {
-          incrHeight = newHeight + 24;
+          // Section fits, add it to current page
+          ref.current.style.marginTop = '24px';
+          currentPageHeight += sectionHeight;
+        }
+
+        // Last section needs bottom margin for footer
+        if (i === keys.length - 1) {
+          const finalRemainingSpace = CONTENT_AREA_HEIGHT - currentPageHeight;
+          ref.current.style.marginBottom = `${finalRemainingSpace + FOOTER_HEIGHT}px`;
         }
       });
+
       setPages(_pages);
     }
   }, [sectionsConfig]);
@@ -127,23 +140,20 @@ export default function PdfView({
     );
   }, [config, onChangeHeight]);
 
-  // <div className="daf-analysis">
-  // <Header title={t('Dashboard Title')} />
-
-  // <div className="content">
-  //   <div className="view-content">
-  //     <div className="daf-analysis-layout">
-  //       <div className='sections-cont w-pt'>
-  //         <section>
-
   return (
     <div className={contClassName} style={{ position: 'relative', minHeight: pages.length * PAGE_HEIGHT }}>
       {renderDashboard()}
       {pages.map((page) => (
-        <>
+        <div key={`page-${page}`}>
           <div
-            style={{ top: ((page - 1) * PAGE_HEIGHT), width: '100%', height: HEADER_HEIGHT - 24, position: 'absolute', left: 0, zIndex: 1000000 }}
-            key={`headers-${page}`}
+            style={{ 
+              top: ((page - 1) * PAGE_HEIGHT), 
+              width: '100%', 
+              height: HEADER_HEIGHT, 
+              position: 'absolute', 
+              left: 0, 
+              zIndex: 1000000 
+            }}
             className="flex-row dashboard-header"
           >
             <div className="flex flex-column justify-center flex-1">
@@ -154,8 +164,14 @@ export default function PdfView({
             </div>
           </div>
           <div
-            style={{ top: (page * PAGE_HEIGHT) - FOOTER_HEIGHT, width: '100%', height: FOOTER_HEIGHT, position: 'absolute', left: 0, zIndex: 1000000 }}
-            key={`footers-${page}`}
+            style={{ 
+              top: (page * PAGE_HEIGHT) - FOOTER_HEIGHT, 
+              width: '100%', 
+              height: FOOTER_HEIGHT, 
+              position: 'absolute', 
+              left: 0, 
+              zIndex: 1000000 
+            }}
             className="dashboard-footer flex-row"
           >
             <div className="flex flex-column justify-center">
@@ -189,7 +205,7 @@ export default function PdfView({
               <h5>{page}</h5>
             </div>
           </div>
-        </>
+        </div>
       ))}
     </div>
   );
@@ -203,4 +219,5 @@ PdfView.propTypes = {
   userId: PropTypes.string,
   accountId: PropTypes.string,
   documentId: PropTypes.string,
-}
+  downloadId: PropTypes.string,
+}