datastake-daf 0.6.410 → 0.6.412

package/dist/components/index.js

@@ -13275,10 +13275,16 @@ DAFFooter.propTypes = {
   isViewMode: PropTypes__default["default"].bool
 };
 
-const PAGE_HEIGHT = 1414;
-// margin-top: 20, bottom: 20;
+const PAGE_HEIGHT = 1587;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
+const SECTION_SPACING = 24; // Space between sections
+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
+
+// Available content height per page (excluding header and footer)
+const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT;
 const Row = _ref => {
   let {
     widgets,
@@ -13303,7 +13309,7 @@ const Row = _ref => {
         ref
       });
     }
-  }, [height]);
+  }, [height, i, onChangeHeight]);
   return /*#__PURE__*/jsxRuntime.jsx("section", {
     ref: ref,
     style: widgets.style,
@@ -13325,51 +13331,73 @@ function PdfView(_ref2) {
   const [pages, setPages] = React.useState([1]);
   const doSizing = React.useCallback(() => {
     const keys = Object.keys(sectionsConfig);
+
+    // Wait until all sections have been measured
+    if (keys.length !== config.length) return;
     let _pages = [1];
-    let _page = 1;
-    if (keys.length === config.length) {
-      let incrHeight = 0;
-      keys.forEach(k => {
-        const {
-          ref
-        } = sectionsConfig[k];
-        ref.current.style.marginBottom = '0px';
-        // ref.current.style.marginTop = '15px';
-      });
-      keys.forEach((k, i) => {
-        const {
-          height,
-          ref
-        } = sectionsConfig[k];
-        if (i === 0) {
-          ref.current.style.marginTop = "".concat(HEADER_HEIGHT, "px");
-          incrHeight += HEADER_HEIGHT;
-        }
-        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);
-          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;
-            // console.log('margin', dif);
-          }
-        } else {
-          incrHeight = newHeight + 24;
+    let currentPage = 1;
+    let currentPageContentHeight = 0; // Tracks content height on current page (excluding header)
+
+    // Reset all styles first
+    keys.forEach(k => {
+      const {
+        ref
+      } = sectionsConfig[k];
+      ref.current.style.marginTop = '0px';
+      ref.current.style.marginBottom = '0px';
+      ref.current.style.paddingBottom = '0px';
+    });
+    keys.forEach((k, i) => {
+      const {
+        height,
+        ref
+      } = sectionsConfig[k];
+      const isFirstSection = i === 0;
+      const isLastSection = i === keys.length - 1;
+      const isFirstSectionOnPage = currentPageContentHeight === 0;
+
+      // 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");
         }
-        // console.groupEnd();
-      });
-      setPages(_pages);
-    }
-  }, [sectionsConfig]);
+        return;
+      }
+
+      // Calculate space needed for this section including spacing before it
+      const spacingBefore = isFirstSectionOnPage ? NEW_PAGE_TOP_PADDING : SECTION_SPACING;
+      const totalSpaceNeeded = spacingBefore + height;
+
+      // Check if we need to move to next page
+      if (currentPageContentHeight + totalSpaceNeeded > AVAILABLE_HEIGHT) {
+        // Move to new page
+        currentPage += 1;
+        _pages.push(currentPage);
+
+        // 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, "px");
+
+        // This section starts the new page
+        ref.current.style.marginTop = "".concat(HEADER_HEIGHT + NEW_PAGE_TOP_PADDING, "px");
+        currentPageContentHeight = height + NEW_PAGE_TOP_PADDING;
+      } else {
+        // Section fits on current page
+        ref.current.style.marginTop = "".concat(spacingBefore, "px");
+        currentPageContentHeight += totalSpaceNeeded;
+      }
+
+      // Add bottom padding to last section
+      if (isLastSection) {
+        ref.current.style.paddingBottom = "".concat(LAST_SECTION_BOTTOM_PADDING, "px");
+      }
+    });
+    setPages(_pages);
+  }, [sectionsConfig, config.length]);
   React.useEffect(() => {
     doSizing();
   }, [doSizing]);
@@ -13390,32 +13418,22 @@ function PdfView(_ref2) {
             widgets: widgets,
             i: i,
             onChangeHeight: onChangeHeight
-          }, "dashboard-sections=".concat(i + 1)))
+          }, "dashboard-sections-".concat(i + 1)))
         })
       })
     });
   }, [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'
     },
-    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
@@ -13433,7 +13451,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%',
@@ -13476,8 +13494,8 @@ function PdfView(_ref2) {
             children: page
           })
         })]
-      }, "footers-".concat(page))]
-    }))]
+      })]
+    }, "page-".concat(page)))]
   });
 }
 PdfView.propTypes = {
@@ -13487,7 +13505,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.410",
+	"version": "0.6.412",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

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

@@ -3,10 +3,16 @@ import PropTypes from 'prop-types';
 import { useCallback, useEffect, useRef, useState } from "react";
 import { formatClassname } from "../../../../../helpers/ClassesHelper";
 
-const PAGE_HEIGHT = 1414;
-// margin-top: 20, bottom: 20;
+const PAGE_HEIGHT = 1587;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
+const SECTION_SPACING = 24; // Space between sections
+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
+
+// Available content height per page (excluding header and footer)
+const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT;
 
 const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
   const ref = useRef();
@@ -28,7 +34,7 @@ const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
     if (height) {
       onChangeHeight(i, { height, ref });
     }
-  }, [height])
+  }, [height, i, onChangeHeight])
 
   return (
     <section ref={ref} style={widgets.style}>
@@ -52,52 +58,72 @@ export default function PdfView({
 
   const doSizing = useCallback(() => {
     const keys = Object.keys(sectionsConfig);
-    let _pages = [1];
-    let _page = 1;
-
-    if (keys.length === config.length) {
-      let incrHeight = 0;
+    
+    // Wait until all sections have been measured
+    if (keys.length !== config.length) return;
 
-      keys.forEach(k => {
-        const { ref } = sectionsConfig[k];
-        ref.current.style.marginBottom = '0px';
-        // ref.current.style.marginTop = '15px';
-      })
-
-      keys.forEach((k, i) => {
-        const { height, ref } = sectionsConfig[k];
+    let _pages = [1];
+    let currentPage = 1;
+    let currentPageContentHeight = 0; // Tracks content height on current page (excluding header)
+
+    // Reset all styles first
+    keys.forEach(k => {
+      const { ref } = sectionsConfig[k];
+      ref.current.style.marginTop = '0px';
+      ref.current.style.marginBottom = '0px';
+      ref.current.style.paddingBottom = '0px';
+    });
 
-        if (i === 0) {
-          ref.current.style.marginTop = `${HEADER_HEIGHT}px`;
-          incrHeight += HEADER_HEIGHT;
+    keys.forEach((k, i) => {
+      const { height, ref } = sectionsConfig[k];
+      const isFirstSection = i === 0;
+      const isLastSection = i === keys.length - 1;
+      const isFirstSectionOnPage = currentPageContentHeight === 0;
+
+      // 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;
+        
+        if (isLastSection) {
+          ref.current.style.paddingBottom = `${LAST_SECTION_BOTTOM_PADDING}px`;
         }
+        return;
+      }
 
-        const newHeight = incrHeight + height;
+      // Calculate space needed for this section including spacing before it
+      const spacingBefore = isFirstSectionOnPage ? NEW_PAGE_TOP_PADDING : SECTION_SPACING;
+      const totalSpaceNeeded = spacingBefore + height;
+
+      // Check if we need to move to next page
+      if (currentPageContentHeight + totalSpaceNeeded > AVAILABLE_HEIGHT) {
+        // Move to new page
+        currentPage += 1;
+        _pages.push(currentPage);
+        
+        // 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}px`;
+        
+        // This section starts the new page
+        ref.current.style.marginTop = `${HEADER_HEIGHT + NEW_PAGE_TOP_PADDING}px`;
+        currentPageContentHeight = height + NEW_PAGE_TOP_PADDING;
+      } else {
+        // Section fits on current page
+        ref.current.style.marginTop = `${spacingBefore}px`;
+        currentPageContentHeight += totalSpaceNeeded;
+      }
 
-        if (i === keys.length - 1) {
-          ref.current.style.paddingBottom = '30px';
-        }
+      // Add bottom padding to last section
+      if (isLastSection) {
+        ref.current.style.paddingBottom = `${LAST_SECTION_BOTTOM_PADDING}px`;
+      }
+    });
 
-        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);
-
-          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;
-            // console.log('margin', dif);
-          }
-        } else {
-          incrHeight = newHeight + 24;
-        }
-        // console.groupEnd();
-      })
-      setPages(_pages);
-    }
-  }, [sectionsConfig]);
+    setPages(_pages);
+  }, [sectionsConfig, config.length]);
 
   useEffect(() => {
     doSizing();
@@ -117,7 +143,7 @@ export default function PdfView({
             {config.map((widgets, i) => (
               <Row
                 widgets={widgets}
-                key={`dashboard-sections=${i + 1}`}
+                key={`dashboard-sections-${i + 1}`}
                 i={i}
                 onChangeHeight={onChangeHeight}
               />
@@ -128,23 +154,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' }}>
       {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">
@@ -155,8 +178,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">
@@ -190,7 +219,7 @@ export default function PdfView({
               <h5>{page}</h5>
             </div>
           </div>
-        </>
+        </div>
       ))}
     </div>
   );
@@ -204,4 +233,5 @@ PdfView.propTypes = {
   userId: PropTypes.string,
   accountId: PropTypes.string,
   documentId: PropTypes.string,
-}
+  downloadId: PropTypes.string,
+}