datastake-daf 0.6.433 → 0.6.435

package/package.json

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

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

@@ -1,25 +1,26 @@
 import moment from "moment";
-import PropTypes from "prop-types";
+import PropTypes from 'prop-types';
 import { useCallback, useEffect, useRef, useState } from "react";
 import { formatClassname } from "../../../../../helpers/ClassesHelper";
 
-const PAGE_HEIGHT = 1587; // full page height in px
+const PAGE_HEIGHT = 1587;
+// margin-top: 20, bottom: 20;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
-const GAP = 24; // space between rows
 
-const Row = ({ widgets, i, onChangeHeight = () => {} }) => {
+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);
+        setHeight(entry.contentRect.height * 0.8);
       }
     });
 
     observer.observe(ref.current);
+
     return () => observer.disconnect();
   }, []);
 
@@ -27,95 +28,96 @@ const Row = ({ widgets, i, onChangeHeight = () => {} }) => {
     if (height) {
       onChangeHeight(i, { height, ref });
     }
-  }, [height]);
+  }, [height])
 
   return (
     <section ref={ref} style={widgets.style}>
-      {typeof widgets.render === "function" ? widgets.render() : null}
+      {typeof widgets.render === 'function' ? widgets.render() : null}
     </section>
-  );
+  )
 };
 
 export default function PdfView({
   config = [],
   customClassName,
-  title = "Title",
-  imgSrc = "",
-  userId = "IDD-0000000",
-  accountId = "IDD-0000000",
-  documentId = "IDD-0000000",
-  downloadId = "DWL-00000123",
+  title = 'Title',
+  imgSrc = '',
+  userId = 'IDD-0000000',
+  accountId = 'IDD-0000000',
+  documentId = 'IDD-0000000',
+  downloadId = 'DWL-00000123',
 }) {
   const [sectionsConfig, setSectionsConfig] = useState({});
   const [pages, setPages] = useState([1]);
 
-  const onChangeHeight = useCallback((index, conf) => {
-    setSectionsConfig((prev) => ({ ...prev, [index]: conf }));
-  }, []);
-
   const doSizing = useCallback(() => {
     const keys = Object.keys(sectionsConfig);
-    if (keys.length !== config.length) return;
-
     let _pages = [1];
-    let currentPage = 1;
-    let accumulatedHeight = HEADER_HEIGHT;
-
-    // Reset margins before recalculation
-    keys.forEach((k) => {
-      const { ref } = sectionsConfig[k];
-      ref.current.style.marginTop = "0px";
-      ref.current.style.marginBottom = "0px";
-      ref.current.style.pageBreakBefore = "auto";
-    });
-
-    keys.forEach((k, i) => {
-      const { height, ref } = sectionsConfig[k];
-      const totalWithGap = accumulatedHeight + height + (i > 0 ? GAP : 0);
-      const maxContentHeight = PAGE_HEIGHT - FOOTER_HEIGHT - HEADER_HEIGHT - 30;
-
-      if (totalWithGap > maxContentHeight) {
-        // start a new page
-        currentPage += 1;
-        _pages.push(currentPage);
-
-        // push element down to next page visually
-        const overflow = PAGE_HEIGHT - accumulatedHeight;
-        ref.current.style.marginTop = `${120}px`;
-
-        // reset accumulated height for next page
-        accumulatedHeight = HEADER_HEIGHT + height + GAP;
-      } else {
-        accumulatedHeight = totalWithGap;
-      }
-
-      // Add bottom padding for last element
-      if (i === keys.length - 1) {
-        ref.current.style.paddingBottom = "30px";
-      }
-    });
-
-    setPages(_pages);
-  }, [sectionsConfig, config.length]);
+    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 = `${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 = `${dif + HEADER_HEIGHT - 24}px`;
+            incrHeight = height + 24 + HEADER_HEIGHT;
+            // console.log('margin', dif);
+          }
+        } else {
+          incrHeight = newHeight + 24;
+        }
+        // console.groupEnd();
+      })
+      setPages(_pages);
+    }
+  }, [sectionsConfig]);
 
   useEffect(() => {
     doSizing();
   }, [doSizing]);
 
-  const contClassName = formatClassname([
-    "daf-analysis daf-pdf-view",
-    customClassName,
-  ]);
+  const onChangeHeight = useCallback((index, conf) => {
+    setSectionsConfig((prev) => ({ ...prev, [index]: conf }))
+  }, []);
+
+  const contClassName = formatClassname(['daf-analysis daf-pdf-view', customClassName]);
 
   const renderDashboard = useCallback(() => {
     return (
       <div className="view-content">
         <div className="daf-analysis-layout">
-          <div className="sections-cont">
+          <div className='sections-cont'>
             {config.map((widgets, i) => (
               <Row
                 widgets={widgets}
-                key={`dashboard-section-${i}`}
+                key={`dashboard-sections=${i + 1}`}
                 i={i}
                 onChangeHeight={onChangeHeight}
               />
@@ -126,22 +128,23 @@ 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" }}>
+    <div className={contClassName} style={{ position: 'relative' }}>
       {renderDashboard()}
-
       {pages.map((page) => (
-        <div key={`page-${page}`}>
-          {/* HEADER */}
+        <>
           <div
-            style={{
-              top: (page - 1) * PAGE_HEIGHT,
-              width: "100%",
-              height: HEADER_HEIGHT,
-              position: "absolute",
-              left: 0,
-              zIndex: 1000000,
-            }}
+            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">
@@ -151,35 +154,35 @@ export default function PdfView({
               <img src={imgSrc} alt="logo" />
             </div>
           </div>
-
-          {/* FOOTER */}
           <div
-            style={{
-              top: page * PAGE_HEIGHT - FOOTER_HEIGHT,
-              width: "100%",
-              height: FOOTER_HEIGHT,
-              position: "absolute",
-              left: 0,
-              zIndex: 1000000,
-            }}
+            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">
-              <h5>{moment().format("DD MMM YYYY")}</h5>
+              <h5>{moment().format('DD MMM YYYY')}</h5>
             </div>
             <div className="flex flex-column justify-center">
               <div className="flex gap-2">
                 <h5>
-                  User ID: <strong>{userId}</strong>
+                  User ID:
+                  {' '}
+                  <strong>{userId}</strong>
                 </h5>
                 <h5>
-                  Account ID: <strong>{accountId}</strong>
+                  Account ID:
+                  {' '}
+                  <strong>{accountId}</strong>
                 </h5>
                 <h5>
-                  Document ID: <strong>{documentId}</strong>
+                  Document ID:
+                  {' '}
+                  <strong>{documentId}</strong>
                 </h5>
                 <h5>
-                  Download ID: <strong>{downloadId}</strong>
+                  Download ID:
+                  {' '}
+                  <strong>{downloadId}</strong>
                 </h5>
               </div>
             </div>
@@ -187,7 +190,7 @@ export default function PdfView({
               <h5>{page}</h5>
             </div>
           </div>
-        </div>
+        </>
       ))}
     </div>
   );
@@ -201,5 +204,4 @@ PdfView.propTypes = {
   userId: PropTypes.string,
   accountId: PropTypes.string,
   documentId: PropTypes.string,
-  downloadId: PropTypes.string,
-};
+}