datastake-daf 0.6.423 → 0.6.424

package/dist/components/index.js

@@ -13305,12 +13305,41 @@ DAFFooter.propTypes = {
 const PAGE_HEIGHT = 1587;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
-const PAGE_MARGIN_TOP = 20;
-const PAGE_MARGIN_BOTTOM = 20;
-const CONTENT_HEIGHT = 1200; // 1397px
-const SECTION_GAP = 24;
-const isHTMLElement = node => node instanceof HTMLElement;
-function PdfView(_ref) {
+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,
+    i,
+    onChangeHeight = () => {}
+  } = _ref;
+  const ref = React.useRef();
+  const [height, setHeight] = React.useState(0);
+  React.useEffect(() => {
+    const observer = new ResizeObserver(entries => {
+      for (const entry of entries) {
+        setHeight(entry.contentRect.height);
+      }
+    });
+    observer.observe(ref.current);
+    return () => observer.disconnect();
+  }, []);
+  React.useEffect(() => {
+    if (height) {
+      onChangeHeight(i, {
+        height,
+        ref
+      });
+    }
+  }, [height]);
+  return /*#__PURE__*/jsxRuntime.jsx("section", {
+    ref: ref,
+    style: widgets.style,
+    children: typeof widgets.render === 'function' ? widgets.render() : null
+  });
+};
+function PdfView(_ref2) {
   let {
     config = [],
     customClassName,
@@ -13320,224 +13349,125 @@ function PdfView(_ref) {
     accountId = 'IDD-0000000',
     documentId = 'IDD-0000000',
     downloadId = 'DWL-00000123'
-  } = _ref;
+  } = _ref2;
+  const [sectionsConfig, setSectionsConfig] = React.useState({});
   const [pages, setPages] = React.useState([1]);
-  const contentRef = React.useRef(null);
-  const sectionsRef = React.useRef([]);
-  const resizeTimeoutRef = React.useRef(null);
-  const isCalculatingRef = React.useRef(false);
-  const resetPaginationStyles = React.useCallback(sections => {
-    sections.forEach(section => {
-      if (!section) return;
-      section.style.marginTop = '';
-      section.style.marginBottom = '';
-      section.style.pageBreakBefore = '';
-      section.style.breakBefore = '';
-      section.removeAttribute('data-pdf-page');
-
-      // Reset all children
-      const allElements = section.querySelectorAll('*');
-      allElements.forEach(el => {
-        if (!isHTMLElement(el)) return;
-        el.style.marginTop = '';
-        el.style.marginBottom = '';
-        el.style.pageBreakBefore = '';
-        el.style.breakBefore = '';
-        el.removeAttribute('data-pdf-page');
-      });
-    });
-  }, []);
-  const getAllBreakableElements = React.useCallback(section => {
-    const elements = [];
-    const shouldInclude = el => {
-      if (!isHTMLElement(el)) return false;
-      const style = window.getComputedStyle(el);
-      if (style.display === 'inline' || style.display === 'contents') return false;
-      if (style.position === 'absolute' || style.position === 'fixed') return false;
-      if (el.offsetHeight === 0) return false;
-      return true;
-    };
-    const traverse = parent => {
-      Array.from(parent.children).forEach(child => {
-        if (shouldInclude(child)) {
-          elements.push(child);
-          traverse(child);
-        }
+  const doSizing = React.useCallback(() => {
+    const keys = Object.keys(sectionsConfig);
+    let _pages = [1];
+    let _page = 1;
+    if (keys.length === config.length) {
+      // Reset all margins and padding first
+      keys.forEach(k => {
+        const {
+          ref
+        } = sectionsConfig[k];
+        ref.current.style.marginTop = '0px';
+        ref.current.style.marginBottom = '0px';
+        ref.current.style.paddingBottom = '0px';
       });
-    };
-    traverse(section);
-    return elements;
-  }, []);
-  const paginateContent = React.useCallback(() => {
-    // Prevent recursive calls
-    if (isCalculatingRef.current) return;
-    const sections = sectionsRef.current.filter(Boolean);
-    if (sections.length === 0) return;
-    isCalculatingRef.current = true;
-    resetPaginationStyles(sections);
-
-    // Force layout recalc
-    sections.forEach(s => s.offsetHeight);
-    let currentPage = 1;
-    let currentPageHeight = 0;
-    sections.forEach((section, sectionIndex) => {
-      // Measure height after reset
-      const sectionHeight = section.offsetHeight;
-      const isFirstOnPage = currentPageHeight === 0;
-      const gapBefore = isFirstOnPage ? 0 : SECTION_GAP;
-      if (currentPageHeight + gapBefore + sectionHeight <= CONTENT_HEIGHT) {
-        // Fits in current page
-        section.setAttribute('data-pdf-page', currentPage.toString());
-        if (isFirstOnPage) {
-          // First item on page
-          if (currentPage === 1) {
-            // Very first section on first page - needs to be below header
-            section.style.marginTop = '0px'; // Container padding handles this
-          } else {
-            // First section on subsequent pages - no margin (container padding handles it)
-            section.style.marginTop = '0px';
+      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) {
+          ref.current.style.marginTop = "".concat(HEADER_HEIGHT, "px");
+          currentPageHeight = 0; // Content height tracking starts fresh
+        }
+
+        // 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
+          _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 = "".concat(remainingSpace, "px");
           }
+
+          // 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 {
-          // Not first item on page - add gap
-          section.style.marginTop = "".concat(SECTION_GAP, "px");
+          // Section fits on current page
+          currentPageHeight += height + sectionGap;
         }
-        currentPageHeight += gapBefore + sectionHeight;
-      } else {
-        // Doesn't fit - need to move to next page
-        const remainingSpace = CONTENT_HEIGHT - currentPageHeight;
-
-        // Calculate margin needed to push this section to the next page
-        // remainingSpace = space left on current page
-        // Then we need to skip: footer margin + footer + header margin + header
-        const pushMargin = remainingSpace + PAGE_MARGIN_BOTTOM + FOOTER_HEIGHT + PAGE_MARGIN_TOP + HEADER_HEIGHT;
-
-        // Move entire section to next page
-        currentPage += 1;
-        section.setAttribute('data-pdf-page', currentPage.toString());
-        section.style.pageBreakBefore = 'always';
-        section.style.breakBefore = 'page';
-        section.style.marginTop = "".concat(pushMargin, "px");
-
-        // Start fresh height counter for new page
-        currentPageHeight = sectionHeight;
-
-        // Check if section is too tall and needs internal breaks
-        if (sectionHeight > CONTENT_HEIGHT) {
-          // Try to break within section
-          const innerElements = getAllBreakableElements(section);
-          let pageHeightInSection = 0;
-          let sectionPage = currentPage;
-          for (const el of innerElements) {
-            const rect = el.getBoundingClientRect();
-            const sectionRect = section.getBoundingClientRect();
-            const relativeTop = rect.top - sectionRect.top;
-            const elHeight = rect.height;
-
-            // Check if this element would exceed the page
-            if (pageHeightInSection + elHeight > CONTENT_HEIGHT && relativeTop > 50) {
-              // Calculate remaining space on this page within the section
-              const remainingInSection = CONTENT_HEIGHT - pageHeightInSection;
-              const pushMarginInner = remainingInSection + PAGE_MARGIN_BOTTOM + FOOTER_HEIGHT + PAGE_MARGIN_TOP + HEADER_HEIGHT;
-              sectionPage += 1;
-              el.setAttribute('data-pdf-page', sectionPage.toString());
-              el.style.pageBreakBefore = 'always';
-              el.style.breakBefore = 'page';
-              el.style.marginTop = "".concat(pushMarginInner, "px");
-
-              // Reset page height for new page within section
-              pageHeightInSection = elHeight;
-            } else {
-              pageHeightInSection += elHeight;
-            }
-          }
 
-          // Update current page if we created additional pages
-          if (sectionPage > currentPage) {
-            currentPage = sectionPage;
-            currentPageHeight = pageHeightInSection;
-          }
+        // Add padding to last section
+        if (isLastSection) {
+          ref.current.style.paddingBottom = "".concat(PAGE_TOP_MARGIN, "px");
         }
-      }
-    });
-    setPages(Array.from({
-      length: currentPage
-    }, (_, idx) => idx + 1));
-
-    // Reset flag after a brief delay to allow next calculation
-    setTimeout(() => {
-      isCalculatingRef.current = false;
-    }, 100);
-  }, [getAllBreakableElements, resetPaginationStyles]);
-  React.useLayoutEffect(() => {
-    // Use requestAnimationFrame to ensure DOM is painted
-    const rafId = requestAnimationFrame(() => {
-      paginateContent();
-    });
-    return () => cancelAnimationFrame(rafId);
-  }, [paginateContent, config]);
+      });
+      setPages(_pages);
+    }
+  }, [sectionsConfig, config.length]);
   React.useEffect(() => {
-    const sections = sectionsRef.current.filter(Boolean);
-    if (sections.length === 0) return undefined;
-    const observer = new ResizeObserver(() => {
-      // Debounce the pagination calculation
-      if (resizeTimeoutRef.current) {
-        clearTimeout(resizeTimeoutRef.current);
-      }
-      resizeTimeoutRef.current = setTimeout(() => {
-        // Use requestAnimationFrame to avoid ResizeObserver loop warning
-        requestAnimationFrame(() => {
-          paginateContent();
-        });
-      }, 150);
-    });
-    sections.forEach(section => observer.observe(section));
-    return () => {
-      observer.disconnect();
-      if (resizeTimeoutRef.current) {
-        clearTimeout(resizeTimeoutRef.current);
-      }
-    };
-  }, [paginateContent, config.length]);
+    doSizing();
+  }, [doSizing]);
+  const onChangeHeight = React.useCallback((index, conf) => {
+    setSectionsConfig(prev => _objectSpread2(_objectSpread2({}, prev), {}, {
+      [index]: conf
+    }));
+  }, []);
   const contClassName = formatClassname(['daf-analysis daf-pdf-view', customClassName]);
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: contClassName,
-    style: {
-      position: 'relative',
-      minHeight: "".concat(PAGE_HEIGHT, "px")
-    },
-    children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+  const renderDashboard = React.useCallback(() => {
+    return /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "view-content",
       children: /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "daf-analysis-layout",
         children: /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "sections-cont",
-          ref: contentRef,
-          "data-pdf-content-root": "true",
-          style: {
-            marginTop: "".concat(HEADER_HEIGHT + PAGE_MARGIN_TOP, "px"),
-            // paddingBottom: `${FOOTER_HEIGHT + PAGE_MARGIN_BOTTOM}px !important`,
-            position: 'relative'
-          },
-          children: config.map((widgets, index) => /*#__PURE__*/jsxRuntime.jsx("section", {
-            ref: el => {
-              sectionsRef.current[index] = el;
-            },
-            style: widgets.style,
-            "data-pdf-section": "true",
-            children: typeof widgets.render === 'function' ? widgets.render() : null
-          }, "dashboard-section-".concat(index + 1)))
+          children: config.map((widgets, i) => /*#__PURE__*/jsxRuntime.jsx(Row, {
+            widgets: widgets,
+            i: i,
+            onChangeHeight: onChangeHeight
+          }, "dashboard-sections=".concat(i + 1)))
         })
       })
-    }), pages.map(page => /*#__PURE__*/jsxRuntime.jsxs(React.Fragment, {
+    });
+  }, [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: [/*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
-          top: (page - 1) * PAGE_HEIGHT + PAGE_MARGIN_TOP,
+          top: (page - 1) * PAGE_HEIGHT,
           width: '100%',
-          height: HEADER_HEIGHT,
+          height: HEADER_HEIGHT - 24,
           position: 'absolute',
           left: 0,
-          zIndex: 1000000,
-          pointerEvents: 'none'
+          zIndex: 1000000
         },
         className: "flex-row dashboard-header",
         children: [/*#__PURE__*/jsxRuntime.jsx("div", {
@@ -13552,15 +13482,14 @@ function PdfView(_ref) {
             alt: "logo"
           })
         })]
-      }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+      }, "headers-".concat(page)), /*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
-          top: page * PAGE_HEIGHT - FOOTER_HEIGHT - PAGE_MARGIN_BOTTOM,
+          top: page * PAGE_HEIGHT - FOOTER_HEIGHT,
           width: '100%',
           height: FOOTER_HEIGHT,
           position: 'absolute',
           left: 0,
-          zIndex: 1000000,
-          pointerEvents: 'none'
+          zIndex: 1000000
         },
         className: "dashboard-footer flex-row",
         children: [/*#__PURE__*/jsxRuntime.jsx("div", {
@@ -13596,8 +13525,8 @@ function PdfView(_ref) {
             children: page
           })
         })]
-      })]
-    }, "pdf-decor-".concat(page)))]
+      }, "footers-".concat(page))]
+    }))]
   });
 }
 PdfView.propTypes = {

package/package.json

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

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

@@ -1,17 +1,42 @@
 import moment from "moment";
 import PropTypes from 'prop-types';
-import { Fragment, useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { formatClassname } from "../../../../../helpers/ClassesHelper";
 
 const PAGE_HEIGHT = 1587;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
-const PAGE_MARGIN_TOP = 20;
-const PAGE_MARGIN_BOTTOM = 20;
-const CONTENT_HEIGHT = 1200; // 1397px
-const SECTION_GAP = 24;
+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 isHTMLElement = (node) => node instanceof HTMLElement;
+const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
+  const ref = useRef();
+  const [height, setHeight] = useState(0);
+
+  useEffect(() => {
+    const observer = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        setHeight(entry.contentRect.height);
+      }
+    });
+
+    observer.observe(ref.current);
+
+    return () => observer.disconnect();
+  }, []);
+
+  useEffect(() => {
+    if (height) {
+      onChangeHeight(i, { height, ref });
+    }
+  }, [height])
+
+  return (
+    <section ref={ref} style={widgets.style}>
+      {typeof widgets.render === 'function' ? widgets.render() : null}
+    </section>
+  )
+};
 
 export default function PdfView({
   config = [],
@@ -23,251 +48,120 @@ export default function PdfView({
   documentId = 'IDD-0000000',
   downloadId = 'DWL-00000123',
 }) {
+  const [sectionsConfig, setSectionsConfig] = useState({});
   const [pages, setPages] = useState([1]);
-  const contentRef = useRef(null);
-  const sectionsRef = useRef([]);
-  const resizeTimeoutRef = useRef(null);
-  const isCalculatingRef = useRef(false);
 
-  const resetPaginationStyles = useCallback((sections) => {
-    sections.forEach((section) => {
-      if (!section) return;
-      section.style.marginTop = '';
-      section.style.marginBottom = '';
-      section.style.pageBreakBefore = '';
-      section.style.breakBefore = '';
-      section.removeAttribute('data-pdf-page');
-      
-      // Reset all children
-      const allElements = section.querySelectorAll('*');
-      allElements.forEach((el) => {
-        if (!isHTMLElement(el)) return;
-        el.style.marginTop = '';
-        el.style.marginBottom = '';
-        el.style.pageBreakBefore = '';
-        el.style.breakBefore = '';
-        el.removeAttribute('data-pdf-page');
+  const doSizing = useCallback(() => {
+    const keys = Object.keys(sectionsConfig);
+    let _pages = [1];
+    let _page = 1;
+
+    if (keys.length === config.length) {
+      // Reset all margins and padding first
+      keys.forEach(k => {
+        const { ref } = sectionsConfig[k];
+        ref.current.style.marginTop = '0px';
+        ref.current.style.marginBottom = '0px';
+        ref.current.style.paddingBottom = '0px';
       });
-    });
-  }, []);
-
-  const getAllBreakableElements = useCallback((section) => {
-    const elements = [];
-    
-    const shouldInclude = (el) => {
-      if (!isHTMLElement(el)) return false;
-      const style = window.getComputedStyle(el);
-      if (style.display === 'inline' || style.display === 'contents') return false;
-      if (style.position === 'absolute' || style.position === 'fixed') return false;
-      if (el.offsetHeight === 0) return false;
-      return true;
-    };
 
-    const traverse = (parent) => {
-      Array.from(parent.children).forEach((child) => {
-        if (shouldInclude(child)) {
-          elements.push(child);
-          traverse(child);
-        }
-      });
-    };
+      let currentPageHeight = 0; // Track height accumulated on current page
+      const sectionGap = 24; // Gap between sections
 
-    traverse(section);
-    return elements;
-  }, []);
+      keys.forEach((k, i) => {
+        const { height, ref } = sectionsConfig[k];
+        const isFirstSection = i === 0;
+        const isLastSection = i === keys.length - 1;
 
-  const paginateContent = useCallback(() => {
-    // Prevent recursive calls
-    if (isCalculatingRef.current) return;
-    
-    const sections = sectionsRef.current.filter(Boolean);
-    if (sections.length === 0) return;
-
-    isCalculatingRef.current = true;
-
-    resetPaginationStyles(sections);
+        // First section on first page needs header space
+        if (isFirstSection) {
+          ref.current.style.marginTop = `${HEADER_HEIGHT}px`;
+          currentPageHeight = 0; // Content height tracking starts fresh
+        }
 
-    // Force layout recalc
-    sections.forEach(s => s.offsetHeight);
+        // Check if this section would exceed the page content limit
+        const willExceedPageLimit = currentPageHeight + height > CONTENT_HEIGHT_PER_PAGE;
 
-    let currentPage = 1;
-    let currentPageHeight = 0;
-    const breaks = [];
+        if (willExceedPageLimit && !isFirstSection) {
+          // Need to break to a new page
+          _page += 1;
+          _pages.push(_page);
 
-    sections.forEach((section, sectionIndex) => {
-      // Measure height after reset
-      const sectionHeight = section.offsetHeight;
-      const isFirstOnPage = currentPageHeight === 0;
-      const gapBefore = isFirstOnPage ? 0 : SECTION_GAP;
-      
-      if (currentPageHeight + gapBefore + sectionHeight <= CONTENT_HEIGHT) {
-        // Fits in current page
-        section.setAttribute('data-pdf-page', currentPage.toString());
-        
-        if (isFirstOnPage) {
-          // First item on page
-          if (currentPage === 1) {
-            // Very first section on first page - needs to be below header
-            section.style.marginTop = '0px'; // Container padding handles this
-          } else {
-            // First section on subsequent pages - no margin (container padding handles it)
-            section.style.marginTop = '0px';
-          }
-        } else {
-          // Not first item on page - add gap
-          section.style.marginTop = `${SECTION_GAP}px`;
-        }
-        currentPageHeight += gapBefore + sectionHeight;
-      } else {
-        // Doesn't fit - need to move to next page
-        const remainingSpace = CONTENT_HEIGHT - currentPageHeight;
-        
-        // Calculate margin needed to push this section to the next page
-        // remainingSpace = space left on current page
-        // Then we need to skip: footer margin + footer + header margin + header
-        const pushMargin = remainingSpace + PAGE_MARGIN_BOTTOM + FOOTER_HEIGHT + PAGE_MARGIN_TOP + HEADER_HEIGHT;
-        
-        // Move entire section to next page
-        currentPage += 1;
-        breaks.push({ section, type: 'section', page: currentPage });
-        section.setAttribute('data-pdf-page', currentPage.toString());
-        section.style.pageBreakBefore = 'always';
-        section.style.breakBefore = 'page';
-        section.style.marginTop = `${pushMargin}px`;
-        
-        // Start fresh height counter for new page
-        currentPageHeight = sectionHeight;
-        
-        // Check if section is too tall and needs internal breaks
-        if (sectionHeight > CONTENT_HEIGHT) {
-          // Try to break within section
-          const innerElements = getAllBreakableElements(section);
-          let pageHeightInSection = 0;
-          let sectionPage = currentPage;
+          // Calculate remaining space on current page
+          const remainingSpace = PAGE_HEIGHT - currentPageHeight - HEADER_HEIGHT - FOOTER_HEIGHT;
           
-          for (const el of innerElements) {
-            const rect = el.getBoundingClientRect();
-            const sectionRect = section.getBoundingClientRect();
-            const relativeTop = rect.top - sectionRect.top;
-            const elHeight = rect.height;
-            
-            // Check if this element would exceed the page
-            if (pageHeightInSection + elHeight > CONTENT_HEIGHT && relativeTop > 50) {
-              // Calculate remaining space on this page within the section
-              const remainingInSection = CONTENT_HEIGHT - pageHeightInSection;
-              const pushMarginInner = remainingInSection + PAGE_MARGIN_BOTTOM + FOOTER_HEIGHT + PAGE_MARGIN_TOP + HEADER_HEIGHT;
-              
-              sectionPage += 1;
-              breaks.push({ element: el, type: 'inner', page: sectionPage });
-              el.setAttribute('data-pdf-page', sectionPage.toString());
-              el.style.pageBreakBefore = 'always';
-              el.style.breakBefore = 'page';
-              el.style.marginTop = `${pushMarginInner}px`;
-              
-              // Reset page height for new page within section
-              pageHeightInSection = elHeight;
-            } else {
-              pageHeightInSection += elHeight;
-            }
+          // 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`;
           }
+
+          // Position this section at the top of the new page
+          ref.current.style.marginTop = `${HEADER_HEIGHT + PAGE_TOP_MARGIN}px`;
           
-          // Update current page if we created additional pages
-          if (sectionPage > currentPage) {
-            currentPage = sectionPage;
-            currentPageHeight = pageHeightInSection;
-          }
+          // Reset page height counter for new page
+          currentPageHeight = height + sectionGap;
+        } else {
+          // Section fits on current page
+          currentPageHeight += height + sectionGap;
         }
-      }
-    });
 
-    setPages(Array.from({ length: currentPage }, (_, idx) => idx + 1));
-    
-    // Reset flag after a brief delay to allow next calculation
-    setTimeout(() => {
-      isCalculatingRef.current = false;
-    }, 100);
-  }, [getAllBreakableElements, resetPaginationStyles]);
+        // Add padding to last section
+        if (isLastSection) {
+          ref.current.style.paddingBottom = `${PAGE_TOP_MARGIN}px`;
+        }
+      });
 
-  useLayoutEffect(() => {
-    // Use requestAnimationFrame to ensure DOM is painted
-    const rafId = requestAnimationFrame(() => {
-      paginateContent();
-    });
-    
-    return () => cancelAnimationFrame(rafId);
-  }, [paginateContent, config]);
+      setPages(_pages);
+    }
+  }, [sectionsConfig, config.length]);
 
   useEffect(() => {
-    const sections = sectionsRef.current.filter(Boolean);
-    if (sections.length === 0) return undefined;
-
-    const observer = new ResizeObserver(() => {
-      // Debounce the pagination calculation
-      if (resizeTimeoutRef.current) {
-        clearTimeout(resizeTimeoutRef.current);
-      }
-      
-      resizeTimeoutRef.current = setTimeout(() => {
-        // Use requestAnimationFrame to avoid ResizeObserver loop warning
-        requestAnimationFrame(() => {
-          paginateContent();
-        });
-      }, 150);
-    });
-
-    sections.forEach(section => observer.observe(section));
+    doSizing();
+  }, [doSizing]);
 
-    return () => {
-      observer.disconnect();
-      if (resizeTimeoutRef.current) {
-        clearTimeout(resizeTimeoutRef.current);
-      }
-    };
-  }, [paginateContent, config.length]);
+  const onChangeHeight = useCallback((index, conf) => {
+    setSectionsConfig((prev) => ({ ...prev, [index]: conf }))
+  }, []);
 
   const contClassName = formatClassname(['daf-analysis daf-pdf-view', customClassName]);
 
-  return (
-    <div className={contClassName} style={{ position: 'relative', minHeight: `${PAGE_HEIGHT}px` }}>
+  const renderDashboard = useCallback(() => {
+    return (
       <div className="view-content">
         <div className="daf-analysis-layout">
-          <div
-            className='sections-cont'
-            ref={contentRef}
-            data-pdf-content-root="true"
-            style={{
-              marginTop: `${HEADER_HEIGHT + PAGE_MARGIN_TOP}px`,
-              // paddingBottom: `${FOOTER_HEIGHT + PAGE_MARGIN_BOTTOM}px !important`,
-              position: 'relative',
-            }}
-          >
-            {config.map((widgets, index) => (
-              <section
-                key={`dashboard-section-${index + 1}`}
-                ref={(el) => {
-                  sectionsRef.current[index] = el;
-                }}
-                style={widgets.style}
-                data-pdf-section="true"
-              >
-                {typeof widgets.render === 'function' ? widgets.render() : null}
-              </section>
+          <div className='sections-cont'>
+            {config.map((widgets, i) => (
+              <Row
+                widgets={widgets}
+                key={`dashboard-sections=${i + 1}`}
+                i={i}
+                onChangeHeight={onChangeHeight}
+              />
             ))}
           </div>
         </div>
       </div>
+    );
+  }, [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) => (
-        <Fragment key={`pdf-decor-${page}`}>
+        <>
           <div
-            style={{ 
-              top: ((page - 1) * PAGE_HEIGHT) + PAGE_MARGIN_TOP, 
-              width: '100%', 
-              height: HEADER_HEIGHT, 
-              position: 'absolute', 
-              left: 0, 
-              zIndex: 1000000,
-              pointerEvents: 'none'
-            }}
+            style={{ top: ((page - 1) * PAGE_HEIGHT), width: '100%', height: HEADER_HEIGHT - 24, position: 'absolute', left: 0, zIndex: 1000000 }}
+            key={`headers-${page}`}
             className="flex-row dashboard-header"
           >
             <div className="flex flex-column justify-center flex-1">
@@ -278,15 +172,8 @@ export default function PdfView({
             </div>
           </div>
           <div
-            style={{ 
-              top: (page * PAGE_HEIGHT) - FOOTER_HEIGHT - PAGE_MARGIN_BOTTOM, 
-              width: '100%', 
-              height: FOOTER_HEIGHT, 
-              position: 'absolute', 
-              left: 0, 
-              zIndex: 1000000,
-              pointerEvents: 'none'
-            }}
+            style={{ top: (page * PAGE_HEIGHT) - FOOTER_HEIGHT, width: '100%', height: FOOTER_HEIGHT, position: 'absolute', left: 0, zIndex: 1000000 }}
+            key={`footers-${page}`}
             className="dashboard-footer flex-row"
           >
             <div className="flex flex-column justify-center">
@@ -320,7 +207,7 @@ export default function PdfView({
               <h5>{page}</h5>
             </div>
           </div>
-        </Fragment>
+        </>
       ))}
     </div>
   );