datastake-daf 0.6.251 → 0.6.253

package/dist/components/index.js

@@ -15422,226 +15422,6 @@ const PdfForm = _ref3 => {
     return organizedSections;
   };
   const organizedForm = React.useMemo(() => organizeFormByHeaders(form), [form]);
-
-  // Constants for height calculations (same as PdfView)
-  const PAGE_HEIGHT = 1587;
-  const FOOTER_HEIGHT = 70;
-  const HEADER_HEIGHT = 100;
-
-  // Helper function to estimate tree node height based on content and type
-  const estimateTreeNodeHeight = function (key, config, value) {
-    let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-    const baseHeight = 28; // Base height per tree node
-    const indentHeight = level * 2; // Additional height per level
-    let totalHeight = baseHeight + indentHeight;
-
-    // Adjust height based on node type
-    if ((config === null || config === void 0 ? void 0 : config.type) === 'header') {
-      totalHeight += 15; // Headers need more space
-    } else if ((config === null || config === void 0 ? void 0 : config.type) === 'textarea') {
-      totalHeight += 40; // Textareas are taller
-    } else if ((config === null || config === void 0 ? void 0 : config.type) === 'dataLink' || (config === null || config === void 0 ? void 0 : config.type) === 'dataLinkGroup') {
-      totalHeight += 20; // Data links often have more content
-    }
-
-    // Add height for value content if it exists
-    if (value && typeof value === 'string' && value.length > 50) {
-      totalHeight += Math.ceil(value.length / 50) * 15; // Multi-line content
-    }
-
-    // Add height for children recursively
-    if (config !== null && config !== void 0 && config.inputs) {
-      const childKeys = Object.keys(config.inputs).filter(childKey => {
-        const childConfig = config.inputs[childKey];
-        // Check showIf condition
-        if (childConfig !== null && childConfig !== void 0 && childConfig.showIf && !evaluateShowIfCondition(childConfig.showIf, data)) {
-          return false;
-        }
-        return true;
-      }).sort((a, b) => {
-        var _config$inputs$a3, _config$inputs$b3;
-        const positionA = ((_config$inputs$a3 = config.inputs[a]) === null || _config$inputs$a3 === void 0 ? void 0 : _config$inputs$a3.position) || 0;
-        const positionB = ((_config$inputs$b3 = config.inputs[b]) === null || _config$inputs$b3 === void 0 ? void 0 : _config$inputs$b3.position) || 0;
-        return positionA - positionB;
-      });
-      childKeys.forEach(childKey => {
-        const childConfig = config.inputs[childKey];
-        const childValue = (value === null || value === void 0 ? void 0 : value[childKey]) || (data === null || data === void 0 ? void 0 : data[childKey]);
-        totalHeight += estimateTreeNodeHeight(childKey, childConfig, childValue, level + 1);
-      });
-    }
-
-    // Handle array/repeated content
-    if (Array.isArray(value)) {
-      value.forEach(itemValue => {
-        totalHeight += estimateTreeNodeHeight(key, config, itemValue, level);
-      });
-    }
-    return totalHeight;
-  };
-
-  // Helper function to split section based on height constraints (goes deep if needed)
-  const createHeightConstrainedSections = (sectionKey, section) => {
-    const MAX_SECTION_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT - 150; // Conservative buffer
-    const subSections = [];
-
-    // Get all top-level items in the section with detailed analysis
-    const topLevelItems = Object.keys(section).filter(key => !(key === 'id' || key === 'label' || key === 'position' || key === 'subTitle')).map(key => {
-      var _section$key;
-      return {
-        key,
-        config: section[key],
-        estimatedHeight: estimateTreeNodeHeight(key, section[key], data === null || data === void 0 ? void 0 : data[key]),
-        canSplit: ((_section$key = section[key]) === null || _section$key === void 0 ? void 0 : _section$key.inputs) && Object.keys(section[key].inputs).length > 1 // Can this item be further split?
-      };
-    }).sort((a, b) => {
-      var _a$config, _b$config;
-      return (((_a$config = a.config) === null || _a$config === void 0 ? void 0 : _a$config.position) || 0) - (((_b$config = b.config) === null || _b$config === void 0 ? void 0 : _b$config.position) || 0);
-    });
-    let currentSubSection = _objectSpread2({}, section);
-
-    // Remove all items from the base section structure
-    Object.keys(section).forEach(key => {
-      if (!(key === 'id' || key === 'label' || key === 'position' || key === 'subTitle')) {
-        delete currentSubSection[key];
-      }
-    });
-    let currentHeight = 80; // Base height for section header
-    let subSectionIndex = 0;
-    topLevelItems.forEach((item, index) => {
-      const {
-        key,
-        config,
-        estimatedHeight,
-        canSplit
-      } = item;
-
-      // If a single item is too large and can be split, split it at the child level
-      if (estimatedHeight > MAX_SECTION_HEIGHT * 0.8 && canSplit) {
-        // 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) => {
-          // Check if current subsection has room
-          if (currentHeight + splitItem.estimatedHeight > MAX_SECTION_HEIGHT && Object.keys(currentSubSection).length > 4) {
-            // Save current sub-section
-            subSections.push({
-              key: "".concat(sectionKey, "_part_").concat(subSectionIndex),
-              section: _objectSpread2({}, currentSubSection),
-              title: section.label
-            });
-
-            // Start new sub-section
-            currentSubSection = {
-              id: section.id,
-              label: section.label,
-              position: section.position + subSectionIndex + 1,
-              subTitle: section.subTitle
-            };
-            currentHeight = 80;
-            subSectionIndex++;
-          }
-
-          // Add split item to current sub-section
-          currentSubSection[splitItem.key] = splitItem.config;
-          currentHeight += splitItem.estimatedHeight;
-        });
-      } else {
-        // Regular processing for items that fit or can't be split
-        // Check if adding this item would exceed height limit
-        if (currentHeight + estimatedHeight > MAX_SECTION_HEIGHT && Object.keys(currentSubSection).length > 4) {
-          // Save current sub-section
-          subSections.push({
-            key: "".concat(sectionKey, "_part_").concat(subSectionIndex),
-            section: _objectSpread2({}, currentSubSection),
-            title: section.label
-          });
-
-          // Start new sub-section
-          currentSubSection = {
-            id: section.id,
-            label: section.label,
-            position: section.position + subSectionIndex + 1,
-            subTitle: section.subTitle
-          };
-          currentHeight = 80;
-          subSectionIndex++;
-        }
-
-        // Add item to current sub-section
-        currentSubSection[key] = config;
-        currentHeight += estimatedHeight;
-      }
-    });
-
-    // Add the final sub-section if it has content
-    if (Object.keys(currentSubSection).length > 4) {
-      subSections.push({
-        key: subSectionIndex === 0 ? sectionKey : "".concat(sectionKey, "_part_").concat(subSectionIndex),
-        section: currentSubSection,
-        title: section.label
-      });
-    }
-    return subSections.length > 0 ? subSections : [{
-      key: sectionKey,
-      section: section,
-      title: section.label
-    }];
-  };
-
-  // Helper function to split large items at the child level
-  const splitLargeItem = (parentKey, parentConfig, parentValue, maxHeight) => {
-    if (!(parentConfig !== null && parentConfig !== void 0 && parentConfig.inputs)) {
-      return [{
-        key: parentKey,
-        config: parentConfig,
-        estimatedHeight: estimateTreeNodeHeight(parentKey, parentConfig, parentValue)
-      }];
-    }
-    const childItems = Object.keys(parentConfig.inputs).filter(childKey => {
-      const childConfig = parentConfig.inputs[childKey];
-      return !(childConfig !== null && childConfig !== void 0 && childConfig.showIf) || evaluateShowIfCondition(childConfig.showIf, data);
-    }).map(childKey => ({
-      key: childKey,
-      config: parentConfig.inputs[childKey],
-      estimatedHeight: estimateTreeNodeHeight(childKey, parentConfig.inputs[childKey], parentValue === null || parentValue === void 0 ? void 0 : parentValue[childKey])
-    })).sort((a, b) => {
-      var _a$config2, _b$config2;
-      return (((_a$config2 = a.config) === null || _a$config2 === void 0 ? void 0 : _a$config2.position) || 0) - (((_b$config2 = b.config) === null || _b$config2 === void 0 ? void 0 : _b$config2.position) || 0);
-    });
-    const splits = [];
-    let currentSplit = {
-      key: "".concat(parentKey, "_part_0"),
-      config: _objectSpread2(_objectSpread2({}, parentConfig), {}, {
-        inputs: {}
-      }),
-      estimatedHeight: 40 // Base height for parent structure
-    };
-    let splitIndex = 0;
-    childItems.forEach(child => {
-      if (currentSplit.estimatedHeight + child.estimatedHeight > maxHeight && Object.keys(currentSplit.config.inputs).length > 0) {
-        splits.push(currentSplit);
-        splitIndex++;
-        currentSplit = {
-          key: "".concat(parentKey, "_part_").concat(splitIndex),
-          config: _objectSpread2(_objectSpread2({}, parentConfig), {}, {
-            label: parentConfig.label,
-            inputs: {}
-          }),
-          estimatedHeight: 40
-        };
-      }
-      currentSplit.config.inputs[child.key] = child.config;
-      currentSplit.estimatedHeight += child.estimatedHeight;
-    });
-    if (Object.keys(currentSplit.config.inputs).length > 0) {
-      splits.push(currentSplit);
-    }
-    return splits.length > 0 ? splits : [{
-      key: parentKey,
-      config: parentConfig,
-      estimatedHeight: estimateTreeNodeHeight(parentKey, parentConfig, parentValue)
-    }];
-  };
   const pdfConfig = React.useMemo(() => {
     const sections = [];
     Object.keys(organizedForm).forEach(sectionKey => {
@@ -15649,40 +15429,28 @@ const PdfForm = _ref3 => {
       if (typeof section !== 'object' || !section.label) {
         return;
       }
-
-      // Create height-constrained sub-sections
-      const subSections = createHeightConstrainedSections(sectionKey, section);
-      subSections.forEach(_ref4 => {
-        let {
-          key,
-          section: subSection,
-          title
-        } = _ref4;
-        sections.push({
-          render: () => /*#__PURE__*/jsxRuntime.jsx("div", {
-            className: "pdf-form-section",
-            children: /*#__PURE__*/jsxRuntime.jsx(PdfFormContent, {
-              form: {
-                [key]: _objectSpread2(_objectSpread2({}, subSection), {}, {
-                  label: title
-                })
-              },
-              data: data,
-              t: t,
-              user: user,
-              title: formName,
-              source: source,
-              version: version,
-              getApiBaseUrl: getApiBaseUrl,
-              getAppHeader: getAppHeader,
-              app: app
-            })
-          }, key),
-          style: {
-            marginBottom: '20px',
-            padding: '0 20px'
-          }
-        });
+      sections.push({
+        render: () => /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "pdf-form-section",
+          children: /*#__PURE__*/jsxRuntime.jsx(PdfFormContent, {
+            form: {
+              [sectionKey]: section
+            },
+            data: data,
+            t: t,
+            user: user,
+            title: formName,
+            source: source,
+            version: version,
+            getApiBaseUrl: getApiBaseUrl,
+            getAppHeader: getAppHeader,
+            app: app
+          })
+        }, sectionKey),
+        style: {
+          marginBottom: '20px',
+          padding: '0 20px'
+        }
       });
     });
     return sections;
@@ -20737,29 +20505,12 @@ const DAFSteps = _ref => {
   let {
     direction = "vertical",
     current = 0,
-    items = [],
-    scrollThreshold = 4
+    items = []
   } = _ref;
-  const shouldScroll = items.length > scrollThreshold;
-  const scrollableStyles = shouldScroll ? _objectSpread2(_objectSpread2({}, direction === "vertical" ? {
-    maxHeight: "300px",
-    overflowY: "auto",
-    overflowX: "hidden"
-  } : {
-    maxWidth: "100%",
-    overflowX: "auto",
-    overflowY: "hidden",
-    whiteSpace: "nowrap"
-  }), {}, {
-    padding: "8px",
-    marginRight: direction === "vertical" ? "-8px" : "0",
-    paddingRight: direction === "vertical" ? "16px" : "8px"
-  }) : {};
-  return /*#__PURE__*/jsxRuntime.jsx(Widget, {
-    title: "Life Cycle",
-    className: "with-border-header",
-    children: /*#__PURE__*/jsxRuntime.jsx("div", {
-      style: scrollableStyles,
+  return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
+    children: /*#__PURE__*/jsxRuntime.jsx(Widget, {
+      title: "Life Cycle",
+      className: "with-border-header",
       children: /*#__PURE__*/jsxRuntime.jsx(antd.Steps, {
         direction: direction,
         current: current,
@@ -20774,14 +20525,12 @@ DAFSteps.propTypes = {
   items: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({
     title: PropTypes__default["default"].string.isRequired,
     description: PropTypes__default["default"].string
-  })),
-  scrollThreshold: PropTypes__default["default"].number
+  }))
 };
 DAFSteps.defaultProps = {
   direction: "vertical",
   current: 0,
-  items: [],
-  scrollThreshold: 4
+  items: []
 };
 
 /**

package/package.json

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

package/src/@daf/core/components/Dashboard/Steps/Steps.stories.js

@@ -17,11 +17,6 @@ VerticalSteps.args = {
     { title: "Step 1", description: "This is the first step" },
     { title: "Step 2", description: "This is the second step" },
     { title: "Step 3", description: "This is the third step" },
-    { title: "Step 3", description: "This is the third step" },
-    { title: "Step 3", description: "This is the third step" },
-    { title: "Step 3", description: "This is the third step" },
-    { title: "Step 3", description: "This is the third step" },
-    { title: "Step 3", description: "This is the third step" },
   ],
 };
 

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

@@ -3,35 +3,16 @@ import { Steps } from "antd";
 import Widget from "../../Dashboard/Widget/index.jsx";
 import PropTypes from "prop-types";
 
-const DAFSteps = ({ direction = "vertical", current = 0, items = [], scrollThreshold = 4 }) => {
-  const shouldScroll = items.length > scrollThreshold;
-  
-  const scrollableStyles = shouldScroll ? {
-    ...(direction === "vertical" ? {
-      maxHeight: "300px",
-      overflowY: "auto",
-      overflowX: "hidden"
-    } : {
-      maxWidth: "100%",
-      overflowX: "auto",
-      overflowY: "hidden",
-      whiteSpace: "nowrap"
-    }),
-    padding: "8px",
-    marginRight: direction === "vertical" ? "-8px" : "0",
-    paddingRight: direction === "vertical" ? "16px" : "8px"
-  } : {};
-
+const DAFSteps = ({ direction = "vertical", current = 0, items = [] }) => {
   return (
-    <Widget title="Life Cycle" className="with-border-header">
-      <div style={scrollableStyles}>
-        <Steps
-          direction={direction}
-          current={current}
-          items={items}
-        />
-      </div>
+    <><Widget title="Life Cycle" className="with-border-header">
+      <Steps
+        direction={direction}
+        current={current}
+        items={items}
+      />
     </Widget>
+    </>
   );
 };
 
@@ -44,14 +25,12 @@ DAFSteps.propTypes = {
       description: PropTypes.string,
     })
   ),
-  scrollThreshold: PropTypes.number,
 };
 
 DAFSteps.defaultProps = {
   direction: "vertical",
   current: 0,
   items: [],
-  scrollThreshold: 4,
 };
 
 export default DAFSteps;

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

@@ -525,227 +525,6 @@ const PdfForm = ({
 
   const organizedForm = useMemo(() => organizeFormByHeaders(form), [form]);
 
-  // Constants for height calculations (same as PdfView)
-  const PAGE_HEIGHT = 1587;
-  const FOOTER_HEIGHT = 70;
-  const HEADER_HEIGHT = 100;
-
-  // Helper function to estimate tree node height based on content and type
-  const estimateTreeNodeHeight = (key, config, value, level = 0) => {
-    const baseHeight = 28; // Base height per tree node
-    const indentHeight = level * 2; // Additional height per level
-    let totalHeight = baseHeight + indentHeight;
-
-    // Adjust height based on node type
-    if (config?.type === 'header') {
-      totalHeight += 15; // Headers need more space
-    } else if (config?.type === 'textarea') {
-      totalHeight += 40; // Textareas are taller
-    } else if (config?.type === 'dataLink' || config?.type === 'dataLinkGroup') {
-      totalHeight += 20; // Data links often have more content
-    }
-
-    // Add height for value content if it exists
-    if (value && typeof value === 'string' && value.length > 50) {
-      totalHeight += Math.ceil(value.length / 50) * 15; // Multi-line content
-    }
-
-    // Add height for children recursively
-    if (config?.inputs) {
-      const childKeys = Object.keys(config.inputs)
-        .filter(childKey => {
-          const childConfig = config.inputs[childKey];
-          // Check showIf condition
-          if (childConfig?.showIf && !evaluateShowIfCondition(childConfig.showIf, data)) {
-            return false;
-          }
-          return true;
-        })
-        .sort((a, b) => {
-          const positionA = config.inputs[a]?.position || 0;
-          const positionB = config.inputs[b]?.position || 0;
-          return positionA - positionB;
-        });
-      
-      childKeys.forEach(childKey => {
-        const childConfig = config.inputs[childKey];
-        const childValue = value?.[childKey] || data?.[childKey];
-        totalHeight += estimateTreeNodeHeight(childKey, childConfig, childValue, level + 1);
-      });
-    }
-
-    // Handle array/repeated content
-    if (Array.isArray(value)) {
-      value.forEach(itemValue => {
-        totalHeight += estimateTreeNodeHeight(key, config, itemValue, level);
-      });
-    }
-
-    return totalHeight;
-  };
-
-  // Helper function to split section based on height constraints (goes deep if needed)
-  const createHeightConstrainedSections = (sectionKey, section) => {
-    const MAX_SECTION_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT - 150; // Conservative buffer
-    const subSections = [];
-    
-    // Get all top-level items in the section with detailed analysis
-    const topLevelItems = Object.keys(section)
-      .filter(key => !(key === 'id' || key === 'label' || key === 'position' || key === 'subTitle'))
-      .map(key => ({
-        key,
-        config: section[key],
-        estimatedHeight: estimateTreeNodeHeight(key, section[key], data?.[key]),
-        canSplit: section[key]?.inputs && Object.keys(section[key].inputs).length > 1 // Can this item be further split?
-      }))
-      .sort((a, b) => (a.config?.position || 0) - (b.config?.position || 0));
-
-    let currentSubSection = {
-      ...section,
-    };
-    
-    // Remove all items from the base section structure
-    Object.keys(section).forEach(key => {
-      if (!(key === 'id' || key === 'label' || key === 'position' || key === 'subTitle')) {
-        delete currentSubSection[key];
-      }
-    });
-
-    let currentHeight = 80; // Base height for section header
-    let subSectionIndex = 0;
-
-    topLevelItems.forEach((item, index) => {
-      const { key, config, estimatedHeight, canSplit } = item;
-      
-      // If a single item is too large and can be split, split it at the child level
-      if (estimatedHeight > MAX_SECTION_HEIGHT * 0.8 && canSplit) {
-        // Split this large item into smaller parts
-        const childSplits = splitLargeItem(key, config, data?.[key], MAX_SECTION_HEIGHT * 0.6);
-        
-        childSplits.forEach((splitItem, splitIndex) => {
-          // Check if current subsection has room
-          if (currentHeight + splitItem.estimatedHeight > MAX_SECTION_HEIGHT && Object.keys(currentSubSection).length > 4) {
-            // Save current sub-section
-            subSections.push({
-              key: `${sectionKey}_part_${subSectionIndex}`,
-              section: { ...currentSubSection },
-              title: section.label
-            });
-
-            // Start new sub-section
-            currentSubSection = {
-              id: section.id,
-              label: section.label,
-              position: section.position + subSectionIndex + 1,
-              subTitle: section.subTitle
-            };
-            currentHeight = 80;
-            subSectionIndex++;
-          }
-
-          // Add split item to current sub-section
-          currentSubSection[splitItem.key] = splitItem.config;
-          currentHeight += splitItem.estimatedHeight;
-        });
-      } else {
-        // Regular processing for items that fit or can't be split
-        // Check if adding this item would exceed height limit
-        if (currentHeight + estimatedHeight > MAX_SECTION_HEIGHT && Object.keys(currentSubSection).length > 4) {
-          // Save current sub-section
-          subSections.push({
-            key: `${sectionKey}_part_${subSectionIndex}`,
-            section: { ...currentSubSection },
-            title: section.label
-          });
-
-          // Start new sub-section
-          currentSubSection = {
-            id: section.id,
-            label: section.label,
-            position: section.position + subSectionIndex + 1,
-            subTitle: section.subTitle
-          };
-          currentHeight = 80;
-          subSectionIndex++;
-        }
-
-        // Add item to current sub-section
-        currentSubSection[key] = config;
-        currentHeight += estimatedHeight;
-      }
-    });
-
-    // Add the final sub-section if it has content
-    if (Object.keys(currentSubSection).length > 4) {
-      subSections.push({
-        key: subSectionIndex === 0 ? sectionKey : `${sectionKey}_part_${subSectionIndex}`,
-        section: currentSubSection,
-        title: section.label
-      });
-    }
-
-    return subSections.length > 0 ? subSections : [{
-      key: sectionKey,
-      section: section,
-      title: section.label
-    }];
-  };
-
-  // Helper function to split large items at the child level
-  const splitLargeItem = (parentKey, parentConfig, parentValue, maxHeight) => {
-    if (!parentConfig?.inputs) {
-      return [{ key: parentKey, config: parentConfig, estimatedHeight: estimateTreeNodeHeight(parentKey, parentConfig, parentValue) }];
-    }
-
-    const childItems = Object.keys(parentConfig.inputs)
-      .filter(childKey => {
-        const childConfig = parentConfig.inputs[childKey];
-        return !childConfig?.showIf || evaluateShowIfCondition(childConfig.showIf, data);
-      })
-      .map(childKey => ({
-        key: childKey,
-        config: parentConfig.inputs[childKey],
-        estimatedHeight: estimateTreeNodeHeight(childKey, parentConfig.inputs[childKey], parentValue?.[childKey])
-      }))
-      .sort((a, b) => (a.config?.position || 0) - (b.config?.position || 0));
-
-    const splits = [];
-    let currentSplit = {
-      key: `${parentKey}_part_0`,
-      config: {
-        ...parentConfig,
-        inputs: {}
-      },
-      estimatedHeight: 40 // Base height for parent structure
-    };
-    let splitIndex = 0;
-
-    childItems.forEach(child => {
-      if (currentSplit.estimatedHeight + child.estimatedHeight > maxHeight && Object.keys(currentSplit.config.inputs).length > 0) {
-        splits.push(currentSplit);
-        splitIndex++;
-        currentSplit = {
-          key: `${parentKey}_part_${splitIndex}`,
-          config: {
-            ...parentConfig,
-            label: parentConfig.label,
-            inputs: {}
-          },
-          estimatedHeight: 40
-        };
-      }
-
-      currentSplit.config.inputs[child.key] = child.config;
-      currentSplit.estimatedHeight += child.estimatedHeight;
-    });
-
-    if (Object.keys(currentSplit.config.inputs).length > 0) {
-      splits.push(currentSplit);
-    }
-
-    return splits.length > 0 ? splits : [{ key: parentKey, config: parentConfig, estimatedHeight: estimateTreeNodeHeight(parentKey, parentConfig, parentValue) }];
-  };
-
   const pdfConfig = useMemo(() => {
     const sections = [];
     
@@ -756,32 +535,27 @@ const PdfForm = ({
         return;
       }
 
-      // Create height-constrained sub-sections
-      const subSections = createHeightConstrainedSections(sectionKey, section);
-      
-      subSections.forEach(({ key, section: subSection, title }) => {
-        sections.push({
-          render: () => (
-            <div key={key} className="pdf-form-section">
-              <PdfFormContent
-                form={{ [key]: { ...subSection, label: title } }}
-                data={data}
-                t={t}
-                user={user}
-                title={formName}
-                source={source}
-                version={version}
-                getApiBaseUrl={getApiBaseUrl}
-                getAppHeader={getAppHeader}
-                app={app}
-              />
-            </div>
-          ),
-          style: {
-            marginBottom: '20px',
-            padding: '0 20px'
-          }
-        });
+      sections.push({
+        render: () => (
+          <div key={sectionKey} className="pdf-form-section">
+            <PdfFormContent
+              form={{ [sectionKey]: section }}
+              data={data}
+              t={t}
+              user={user}
+              title={formName}
+              source={source}
+              version={version}
+              getApiBaseUrl={getApiBaseUrl}
+              getAppHeader={getAppHeader}
+              app={app}
+            />
+          </div>
+        ),
+        style: {
+          marginBottom: '20px',
+          padding: '0 20px'
+        }
       });
     });