@alfresco/adf-core 9.2.0-38540765902 → 9.2.0-38587349677

package/fesm2022/adf-core.mjs

@@ -26661,21 +26661,27 @@ const getFormLayoutColumnWidth = (numberOfColumns, columns, columnIndex) => {
     const defaultColumnWidth = 100 / normalizedColumnCount;
     const columnFields = columns?.[columnIndex]?.fields ?? [];
     if (columnFields.length === 0) {
-        return isColumnCoveredByPreviousField(columns, columnIndex) ? '0' : `${defaultColumnWidth}`;
+        const useCoveredColumnRule = hasCoveredColumnPlaceholders(normalizedColumnCount, columns) && isColumnCoveredByPreviousField(columns, columnIndex);
+        return useCoveredColumnRule ? '0' : `${defaultColumnWidth}`;
     }
-    const maxColspan = Math.max(...columnFields.map((field) => field.colspan || 1));
+    const maxColspan = getFieldsSpan(columnFields);
     return `${Math.min(100, defaultColumnWidth * maxColspan)}`;
 };
+const getFieldsSpan = (fields) => Math.max(1, ...fields.map((field) => field.colspan || 1));
+const getColumnSpan = (column) => getFieldsSpan(column?.fields ?? []);
+const hasCoveredColumnPlaceholders = (numberOfColumns, columns) => {
+    if (!columns?.length) {
+        return false;
+    }
+    const totalSpan = columns.reduce((sum, column) => sum + getColumnSpan(column), 0);
+    return totalSpan > numberOfColumns;
+};
 const isColumnCoveredByPreviousField = (columns, columnIndex) => {
     if (!columns || columnIndex <= 0) {
         return false;
     }
     for (let previousColumnIndex = 0; previousColumnIndex < columnIndex; previousColumnIndex++) {
-        const previousFields = columns[previousColumnIndex]?.fields ?? [];
-        if (previousFields.length === 0) {
-            continue;
-        }
-        const previousColumnSpan = Math.max(...previousFields.map((field) => field.colspan || 1));
+        const previousColumnSpan = getColumnSpan(columns[previousColumnIndex]);
         if (previousColumnIndex + previousColumnSpan > columnIndex) {
             return true;
         }