datastake-daf 0.6.259 → 0.6.261

package/dist/components/index.js

@@ -15460,9 +15460,9 @@ const PdfForm = _ref3 => {
       debugEnvironment();
     }
 
-    // Slightly more generous base heights to account for actual rendering differences
-    const baseHeight = isPuppeteer ? 42 : 32; // Slightly more generous base heights
-    const indentHeight = level * (isPuppeteer ? 3.5 : 3); // Slightly more indent space
+    // More accurate base heights that align better with PdfView's ResizeObserver measurements
+    const baseHeight = isPuppeteer ? 48 : 38; // More accurate base heights to match actual rendering
+    const indentHeight = level * (isPuppeteer ? 4 : 3.5); // More accurate indent space
     let totalHeight = baseHeight + indentHeight;
 
     // Reasonable type-based adjustments based on actual rendered heights
@@ -15478,20 +15478,23 @@ const PdfForm = _ref3 => {
       totalHeight += isPuppeteer ? 50 : 40; // Ajax content with loading states
     }
 
-    // More accurate content height estimation based on actual character rendering
+    // More accurate content height estimation that better matches actual DOM measurements
     if (value && typeof value === 'string') {
       const cleanValue = value.trim();
-      if (cleanValue.length > 120) {
-        // Long text: estimate line wrapping based on average line length
-        const estimatedLines = Math.ceil(cleanValue.length / 50);
-        const lineHeight = isPuppeteer ? 18 : 16;
+      if (cleanValue.length > 150) {
+        // Long text: be more generous with line estimates
+        const estimatedLines = Math.ceil(cleanValue.length / 45); // Shorter assumed line length
+        const lineHeight = isPuppeteer ? 20 : 18; // Slightly taller line height
         totalHeight += estimatedLines * lineHeight;
-      } else if (cleanValue.length > 40) {
-        // Medium text: likely spans multiple lines
-        totalHeight += isPuppeteer ? 20 : 16;
+      } else if (cleanValue.length > 60) {
+        // Medium text: likely spans 2-3 lines
+        totalHeight += isPuppeteer ? 35 : 28;
+      } else if (cleanValue.length > 15) {
+        // Short-medium text: single to double line
+        totalHeight += isPuppeteer ? 18 : 14;
       } else if (cleanValue.length > 0) {
-        // Short text: single line with minimal padding
-        totalHeight += isPuppeteer ? 8 : 6;
+        // Very short text: single line with padding
+        totalHeight += isPuppeteer ? 12 : 10;
       }
     }
 
@@ -15517,8 +15520,8 @@ const PdfForm = _ref3 => {
         childrenHeight += estimateTreeNodeHeight(childKey, childConfig, childValue, level + 1);
       });
 
-      // Reasonable multiplier - not overly conservative
-      totalHeight += childrenHeight * (isPuppeteer ? 1.15 : 1.08);
+      // More accurate multiplier that accounts for spacing and margins in actual DOM
+      totalHeight += childrenHeight * (isPuppeteer ? 1.25 : 1.15);
     }
 
     // Handle array/repeated content with accurate estimates
@@ -15540,9 +15543,12 @@ const PdfForm = _ref3 => {
   const createHeightConstrainedSections = (sectionKey, section) => {
     const isPuppeteer = isPuppeteerEnvironment();
 
-    // Align exactly with PdfView calculations: PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT = 1387px
-    const MAX_SECTION_HEIGHT = PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT; // 1387px exactly as PdfView uses
-    const MIN_SECTION_HEIGHT = 200; // Minimum height to prevent tiny sections
+    // Align with PdfView but use a more conservative limit to prevent large margin calculations
+    // PdfView uses PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT = 1387px
+    // We'll use 85% of that to ensure sections fit comfortably and don't trigger large margins
+    const PDFVIEW_MAX_HEIGHT = PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT; // 1387px
+    const MAX_SECTION_HEIGHT = Math.floor(PDFVIEW_MAX_HEIGHT * 0.85); // ~1179px - more conservative
+    const MIN_SECTION_HEIGHT = 300; // Slightly larger minimum to ensure meaningful content
     const subSections = [];
 
     // Get all top-level items in the section with detailed analysis
@@ -15562,13 +15568,23 @@ const PdfForm = _ref3 => {
     // If the entire section fits, don't split it
     const totalSectionHeight = topLevelItems.reduce((sum, item) => sum + item.estimatedHeight, 0);
 
-    // Add some debugging for height calculations
-    if (typeof window !== 'undefined' && window.console && isPuppeteer) {
+    // Add detailed debugging for height calculations
+    if (typeof window !== 'undefined' && window.console) {
       console.log("Section ".concat(sectionKey, ":"), {
-        totalHeight: totalSectionHeight,
-        maxHeight: MAX_SECTION_HEIGHT,
+        totalEstimatedHeight: totalSectionHeight,
+        maxAllowedHeight: MAX_SECTION_HEIGHT,
+        pdfViewMaxHeight: PDFVIEW_MAX_HEIGHT,
+        utilizationPercentage: Math.round(totalSectionHeight / MAX_SECTION_HEIGHT * 100) + '%',
         shouldSplit: totalSectionHeight > MAX_SECTION_HEIGHT,
-        itemCount: topLevelItems.length
+        itemCount: topLevelItems.length,
+        itemSummary: topLevelItems.map(item => {
+          var _item$config;
+          return {
+            key: item.key,
+            height: item.estimatedHeight,
+            type: (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.type
+          };
+        })
       });
     }
     if (totalSectionHeight <= MAX_SECTION_HEIGHT) {
@@ -15586,7 +15602,7 @@ const PdfForm = _ref3 => {
         delete currentSubSection[key];
       }
     });
-    let currentHeight = isPuppeteer ? 100 : 80; // Reasonable base height
+    let currentHeight = isPuppeteer ? 120 : 100; // More accurate base height including section headers and margins
     let subSectionIndex = 0;
     topLevelItems.forEach((item, index) => {
       const {
@@ -15596,11 +15612,11 @@ const PdfForm = _ref3 => {
         canSplit
       } = item;
 
-      // More reasonable splitting thresholds
-      const SPLIT_THRESHOLD = 0.75; // Only split if item takes up more than 75% of page
+      // More conservative splitting thresholds to work better with PdfView
+      const SPLIT_THRESHOLD = 0.65; // Split if item takes up more than 65% of available space
 
-      // If a single item is extremely large and can be split, consider splitting it
-      if (estimatedHeight > MAX_SECTION_HEIGHT * SPLIT_THRESHOLD && canSplit && estimatedHeight > MIN_SECTION_HEIGHT * 2) {
+      // If a single item is large and can be split, consider splitting it
+      if (estimatedHeight > MAX_SECTION_HEIGHT * SPLIT_THRESHOLD && canSplit && estimatedHeight > MIN_SECTION_HEIGHT * 1.5) {
         // Split this large item into smaller parts
         const childSplits = splitLargeItem(key, config, data === null || data === void 0 ? void 0 : data[key], MAX_SECTION_HEIGHT * 0.6);
         childSplits.forEach((splitItem, splitIndex) => {
@@ -15620,7 +15636,7 @@ const PdfForm = _ref3 => {
               position: section.position + subSectionIndex + 1,
               subTitle: section.subTitle
             };
-            currentHeight = isPuppeteer ? 100 : 80;
+            currentHeight = isPuppeteer ? 120 : 100;
             subSectionIndex++;
           }
 
@@ -15632,7 +15648,11 @@ const PdfForm = _ref3 => {
         // Regular processing for items that fit or shouldn't be split
         // More lenient threshold - only split if really necessary and ensures meaningful sections
         const remainingItems = topLevelItems.length - index - 1;
-        const shouldSplitSection = currentHeight + estimatedHeight > MAX_SECTION_HEIGHT && currentHeight > MIN_SECTION_HEIGHT && Object.keys(currentSubSection).length > 4 && remainingItems > 0; // Ensure there are items left for next section
+        const shouldSplitSection = currentHeight + estimatedHeight > MAX_SECTION_HEIGHT && currentHeight > MIN_SECTION_HEIGHT * 0.8 &&
+        // More lenient minimum
+        Object.keys(currentSubSection).length > 3 &&
+        // Fewer items required
+        remainingItems > 0; // Ensure there are items left for next section
 
         if (shouldSplitSection) {
           // Save current sub-section
@@ -15649,7 +15669,7 @@ const PdfForm = _ref3 => {
             position: section.position + subSectionIndex + 1,
             subTitle: section.subTitle
           };
-          currentHeight = isPuppeteer ? 100 : 80;
+          currentHeight = isPuppeteer ? 120 : 100;
           subSectionIndex++;
         }
 
@@ -15670,10 +15690,12 @@ const PdfForm = _ref3 => {
       subSections.push(finalSubSection);
 
       // Debug final section creation
-      if (typeof window !== 'undefined' && window.console && isPuppeteer) {
+      if (typeof window !== 'undefined' && window.console) {
         console.log("Final section ".concat(finalSubSection.key, ":"), {
           itemCount: finalSectionKeys.length,
-          estimatedHeight: currentHeight
+          estimatedHeight: currentHeight,
+          utilizationPercentage: Math.round(currentHeight / MAX_SECTION_HEIGHT * 100) + '%',
+          isWithinLimits: currentHeight <= MAX_SECTION_HEIGHT
         });
       }
     }
@@ -15716,7 +15738,8 @@ const PdfForm = _ref3 => {
 
     // If total children height is not that large, don't split
     const totalChildrenHeight = childItems.reduce((sum, child) => sum + child.estimatedHeight, 0);
-    if (totalChildrenHeight <= maxHeight * 1.2) {
+    if (totalChildrenHeight <= maxHeight * 1.1) {
+      // More conservative threshold
       return [{
         key: parentKey,
         config: parentConfig,
@@ -15729,7 +15752,7 @@ const PdfForm = _ref3 => {
       config: _objectSpread2(_objectSpread2({}, parentConfig), {}, {
         inputs: {}
       }),
-      estimatedHeight: 50 // Reasonable base height for parent structure
+      estimatedHeight: 60 // More accurate base height for parent structure with styling
     };
     let splitIndex = 0;
     const minItemsPerSplit = 2; // Ensure at least 2 items per split to avoid tiny sections
@@ -15757,7 +15780,7 @@ const PdfForm = _ref3 => {
             // Keep original label without part indicator
             inputs: {}
           }),
-          estimatedHeight: 50
+          estimatedHeight: 60
         };
       }
 
@@ -15940,6 +15963,7 @@ function Widget(_ref) {
       children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "flex flex-row widget-header-items",
         children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+          className: "content-wrapper",
           children: [/*#__PURE__*/jsxRuntime.jsx("div", {
             className: "title cont",
             children: /*#__PURE__*/jsxRuntime.jsx("h1", {

package/package.json

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

package/src/@daf/core/components/Dashboard/Widget/_style.scss

@@ -133,6 +133,18 @@
     }
   }
 
+  .content-wrapper {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+
+  .content-wrapper h1,
+  .content-wrapper .description {
+    text-align: start; 
+    margin: 0; 
+  }
+
   .widget-body {
     flex: 1;
     padding: 0px var(--size-lg) var(--size-lg) var(--size-lg);

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

@@ -81,12 +81,12 @@ export default function Widget({
 			{!noTitle && (
 				<div className="widget-header flex-column">
 					<div className="flex flex-row widget-header-items">
-						<div>
-							<div className="title cont">
-								<h1>{title}</h1>
-							</div>
-							{description && <Paragraph className="description">{description}</Paragraph>}
+					<div className="content-wrapper">
+						<div className="title cont">
+							<h1>{title}</h1>
 						</div>
+						{description && <Paragraph className="description">{description}</Paragraph>}
+					</div>
 
 						{tooltip && (
 							<div className="cont icon-cont">

package/src/@daf/core/components/PdfForm/index.js

@@ -565,9 +565,9 @@ const PdfForm = ({
       debugEnvironment();
     }
     
-    // Slightly more generous base heights to account for actual rendering differences
-    const baseHeight = isPuppeteer ? 42 : 32; // Slightly more generous base heights
-    const indentHeight = level * (isPuppeteer ? 3.5 : 3); // Slightly more indent space
+    // More accurate base heights that align better with PdfView's ResizeObserver measurements
+    const baseHeight = isPuppeteer ? 48 : 38; // More accurate base heights to match actual rendering
+    const indentHeight = level * (isPuppeteer ? 4 : 3.5); // More accurate indent space
     let totalHeight = baseHeight + indentHeight;
 
     // Reasonable type-based adjustments based on actual rendered heights
@@ -583,20 +583,23 @@ const PdfForm = ({
       totalHeight += isPuppeteer ? 50 : 40; // Ajax content with loading states
     }
 
-    // More accurate content height estimation based on actual character rendering
+    // More accurate content height estimation that better matches actual DOM measurements
     if (value && typeof value === 'string') {
       const cleanValue = value.trim();
-      if (cleanValue.length > 120) {
-        // Long text: estimate line wrapping based on average line length
-        const estimatedLines = Math.ceil(cleanValue.length / 50);
-        const lineHeight = isPuppeteer ? 18 : 16;
+      if (cleanValue.length > 150) {
+        // Long text: be more generous with line estimates
+        const estimatedLines = Math.ceil(cleanValue.length / 45); // Shorter assumed line length
+        const lineHeight = isPuppeteer ? 20 : 18; // Slightly taller line height
         totalHeight += estimatedLines * lineHeight;
-      } else if (cleanValue.length > 40) {
-        // Medium text: likely spans multiple lines
-        totalHeight += isPuppeteer ? 20 : 16;
+      } else if (cleanValue.length > 60) {
+        // Medium text: likely spans 2-3 lines
+        totalHeight += isPuppeteer ? 35 : 28;
+      } else if (cleanValue.length > 15) {
+        // Short-medium text: single to double line
+        totalHeight += isPuppeteer ? 18 : 14;
       } else if (cleanValue.length > 0) {
-        // Short text: single line with minimal padding
-        totalHeight += isPuppeteer ? 8 : 6;
+        // Very short text: single line with padding
+        totalHeight += isPuppeteer ? 12 : 10;
       }
     }
 
@@ -624,8 +627,8 @@ const PdfForm = ({
         childrenHeight += estimateTreeNodeHeight(childKey, childConfig, childValue, level + 1);
       });
       
-      // Reasonable multiplier - not overly conservative
-      totalHeight += childrenHeight * (isPuppeteer ? 1.15 : 1.08);
+      // More accurate multiplier that accounts for spacing and margins in actual DOM
+      totalHeight += childrenHeight * (isPuppeteer ? 1.25 : 1.15);
     }
 
     // Handle array/repeated content with accurate estimates
@@ -648,9 +651,12 @@ const PdfForm = ({
   const createHeightConstrainedSections = (sectionKey, section) => {
     const isPuppeteer = isPuppeteerEnvironment();
     
-    // Align exactly with PdfView calculations: PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT = 1387px
-    const MAX_SECTION_HEIGHT = PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT; // 1387px exactly as PdfView uses
-    const MIN_SECTION_HEIGHT = 200; // Minimum height to prevent tiny sections
+    // Align with PdfView but use a more conservative limit to prevent large margin calculations
+    // PdfView uses PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT = 1387px
+    // We'll use 85% of that to ensure sections fit comfortably and don't trigger large margins
+    const PDFVIEW_MAX_HEIGHT = PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT; // 1387px
+    const MAX_SECTION_HEIGHT = Math.floor(PDFVIEW_MAX_HEIGHT * 0.85); // ~1179px - more conservative
+    const MIN_SECTION_HEIGHT = 300; // Slightly larger minimum to ensure meaningful content
     const subSections = [];
     
     // Get all top-level items in the section with detailed analysis
@@ -667,13 +673,20 @@ const PdfForm = ({
     // If the entire section fits, don't split it
     const totalSectionHeight = topLevelItems.reduce((sum, item) => sum + item.estimatedHeight, 0);
     
-    // Add some debugging for height calculations
-    if (typeof window !== 'undefined' && window.console && isPuppeteer) {
+    // Add detailed debugging for height calculations
+    if (typeof window !== 'undefined' && window.console) {
       console.log(`Section ${sectionKey}:`, {
-        totalHeight: totalSectionHeight,
-        maxHeight: MAX_SECTION_HEIGHT,
+        totalEstimatedHeight: totalSectionHeight,
+        maxAllowedHeight: MAX_SECTION_HEIGHT,
+        pdfViewMaxHeight: PDFVIEW_MAX_HEIGHT,
+        utilizationPercentage: Math.round((totalSectionHeight / MAX_SECTION_HEIGHT) * 100) + '%',
         shouldSplit: totalSectionHeight > MAX_SECTION_HEIGHT,
-        itemCount: topLevelItems.length
+        itemCount: topLevelItems.length,
+        itemSummary: topLevelItems.map(item => ({
+          key: item.key,
+          height: item.estimatedHeight,
+          type: item.config?.type
+        }))
       });
     }
     
@@ -696,17 +709,17 @@ const PdfForm = ({
       }
     });
 
-    let currentHeight = isPuppeteer ? 100 : 80; // Reasonable base height
+    let currentHeight = isPuppeteer ? 120 : 100; // More accurate base height including section headers and margins
     let subSectionIndex = 0;
 
     topLevelItems.forEach((item, index) => {
       const { key, config, estimatedHeight, canSplit } = item;
       
-      // More reasonable splitting thresholds
-      const SPLIT_THRESHOLD = 0.75; // Only split if item takes up more than 75% of page
+      // More conservative splitting thresholds to work better with PdfView
+      const SPLIT_THRESHOLD = 0.65; // Split if item takes up more than 65% of available space
       
-      // If a single item is extremely large and can be split, consider splitting it
-      if (estimatedHeight > MAX_SECTION_HEIGHT * SPLIT_THRESHOLD && canSplit && estimatedHeight > MIN_SECTION_HEIGHT * 2) {
+      // If a single item is large and can be split, consider splitting it
+      if (estimatedHeight > MAX_SECTION_HEIGHT * SPLIT_THRESHOLD && canSplit && estimatedHeight > MIN_SECTION_HEIGHT * 1.5) {
         // Split this large item into smaller parts
         const childSplits = splitLargeItem(key, config, data?.[key], MAX_SECTION_HEIGHT * 0.6);
         
@@ -730,7 +743,7 @@ const PdfForm = ({
               position: section.position + subSectionIndex + 1,
               subTitle: section.subTitle
             };
-            currentHeight = isPuppeteer ? 100 : 80;
+            currentHeight = isPuppeteer ? 120 : 100;
             subSectionIndex++;
           }
 
@@ -743,8 +756,8 @@ const PdfForm = ({
         // More lenient threshold - only split if really necessary and ensures meaningful sections
         const remainingItems = topLevelItems.length - index - 1;
         const shouldSplitSection = (currentHeight + estimatedHeight > MAX_SECTION_HEIGHT) && 
-                                  (currentHeight > MIN_SECTION_HEIGHT) && 
-                                  (Object.keys(currentSubSection).length > 4) &&
+                                  (currentHeight > MIN_SECTION_HEIGHT * 0.8) && // More lenient minimum
+                                  (Object.keys(currentSubSection).length > 3) && // Fewer items required
                                   (remainingItems > 0); // Ensure there are items left for next section
         
         if (shouldSplitSection) {
@@ -763,7 +776,7 @@ const PdfForm = ({
             position: section.position + subSectionIndex + 1,
             subTitle: section.subTitle
           };
-          currentHeight = isPuppeteer ? 100 : 80;
+          currentHeight = isPuppeteer ? 120 : 100;
           subSectionIndex++;
         }
 
@@ -788,10 +801,12 @@ const PdfForm = ({
       subSections.push(finalSubSection);
       
       // Debug final section creation
-      if (typeof window !== 'undefined' && window.console && isPuppeteer) {
+      if (typeof window !== 'undefined' && window.console) {
         console.log(`Final section ${finalSubSection.key}:`, {
           itemCount: finalSectionKeys.length,
-          estimatedHeight: currentHeight
+          estimatedHeight: currentHeight,
+          utilizationPercentage: Math.round((currentHeight / MAX_SECTION_HEIGHT) * 100) + '%',
+          isWithinLimits: currentHeight <= MAX_SECTION_HEIGHT
         });
       }
     }
@@ -832,7 +847,7 @@ const PdfForm = ({
 
     // If total children height is not that large, don't split
     const totalChildrenHeight = childItems.reduce((sum, child) => sum + child.estimatedHeight, 0);
-    if (totalChildrenHeight <= maxHeight * 1.2) {
+    if (totalChildrenHeight <= maxHeight * 1.1) { // More conservative threshold
       return [{ key: parentKey, config: parentConfig, estimatedHeight: estimateTreeNodeHeight(parentKey, parentConfig, parentValue) }];
     }
 
@@ -843,7 +858,7 @@ const PdfForm = ({
         ...parentConfig,
         inputs: {}
       },
-      estimatedHeight: 50 // Reasonable base height for parent structure
+      estimatedHeight: 60 // More accurate base height for parent structure with styling
     };
     let splitIndex = 0;
     const minItemsPerSplit = 2; // Ensure at least 2 items per split to avoid tiny sections
@@ -874,7 +889,7 @@ const PdfForm = ({
             label: parentConfig.label, // Keep original label without part indicator
             inputs: {}
           },
-          estimatedHeight: 50
+          estimatedHeight: 60
         };
       }