@sustaina/shared-ui 1.70.1 → 1.70.3

package/dist/index.js

@@ -9773,7 +9773,7 @@ var TableHeaderRows = ({
     const leftHeaders = table.getLeftHeaderGroups()[groupIndex]?.headers ?? [];
     const centerHeaders = table.getCenterHeaderGroups()[groupIndex]?.headers ?? [];
     const rightHeaders = table.getRightHeaderGroups()[groupIndex]?.headers ?? [];
-    const isLeafLevel = !centerHeaders[0] || centerHeaders[0].subHeaders.length === 0;
+    const isLeafLevel = !centerHeaders[0] || !centerHeaders.some((h) => h.subHeaders.length > 0);
     if (isLeafLevel) {
       return /* @__PURE__ */ jsxRuntime.jsxs(TableRow, { children: [
         leftHeaders.map((header) => resolveHeaderCell(header, headerGroup, groupIndex)),
@@ -9781,7 +9781,7 @@ var TableHeaderRows = ({
         columnVirtual.virtualColumns.map((vc) => {
           const header = centerHeaders[vc.index];
           if (!header) return null;
-          return renderHeaderCell(header, headerGroup, cellProps);
+          return resolveHeaderCell(header, headerGroup, groupIndex);
         }),
         columnVirtual.virtualPaddingRight > 0 && /* @__PURE__ */ jsxRuntime.jsx("th", { "aria-hidden": "true", style: { width: columnVirtual.virtualPaddingRight } }),
         rightHeaders.map((header) => resolveHeaderCell(header, headerGroup, groupIndex))
@@ -9812,6 +9812,13 @@ var TableHeaderRows = ({
       columnVirtual.virtualPaddingLeft > 0 && /* @__PURE__ */ jsxRuntime.jsx("th", { "aria-hidden": "true", style: { width: columnVirtual.virtualPaddingLeft } }),
       groupedVirtualCols.map(({ gi, vcs }) => {
         const groupHeader = centerHeaders[gi];
+        if (spannedIds.has(groupHeader.column.id)) return null;
+        const remainingRows = totalGroups - groupIndex;
+        let rowSpan;
+        if (groupHeader.isPlaceholder && groupHeader.column.columnDef.meta?.spanRows && remainingRows > 1) {
+          rowSpan = remainingRows;
+          spannedIds.add(groupHeader.column.id);
+        }
         const { classes, style } = getColumnPinningStyles(groupHeader.column);
         const tableHeadCellProps = typeof components?.tableHeadCellProps === "function" ? components.tableHeadCellProps({ header: groupHeader, table }) : components?.tableHeadCellProps;
         const useColumnSizing = groupHeader.column.columnDef?.meta?.useColumnSizing ?? columnResizing?.enabled ?? virtual?.enabled ?? false;
@@ -9821,8 +9828,9 @@ var TableHeaderRows = ({
         return /* @__PURE__ */ jsxRuntime.jsxs(
           TableHead,
           {
-            "data-testid": `table-head-${groupHeader.id}`,
+            "data-testid": `table-head-${groupHeader.column.id}`,
             colSpan: vcs.length,
+            rowSpan,
             ...tableHeadCellProps,
             ...groupHeader.column.columnDef?.meta?.headerProps,
             className: cn(
@@ -9839,7 +9847,7 @@ var TableHeaderRows = ({
               ...groupHeader.column.columnDef?.meta?.headerProps?.style
             },
             children: [
-              !groupHeader.isPlaceholder ? reactTable.flexRender(groupHeader.column.columnDef.header, groupHeader.getContext()) : null,
+              !groupHeader.isPlaceholder || rowSpan ? reactTable.flexRender(groupHeader.column.columnDef.header, groupHeader.getContext()) : null,
               /* @__PURE__ */ jsxRuntime.jsx(
                 ColumnSeparator_default,
                 {