@sustaina/shared-ui 1.70.0 → 1.70.1

package/dist/index.mjs

@@ -9753,23 +9753,33 @@ var TableHeaderRows = ({
       leafRunning += centerHeaders[gi].colSpan;
     }
     const virtualCols = columnVirtual.virtualColumns;
-    const useColumnSizing = columnResizing?.enabled ?? virtual?.enabled ?? false;
+    const groupedVirtualCols = [];
+    for (const vc of virtualCols) {
+      const gi = leafToGroupIdx[vc.index];
+      if (gi === void 0) continue;
+      const last = groupedVirtualCols[groupedVirtualCols.length - 1];
+      if (last && last.gi === gi) {
+        last.vcs.push(vc);
+      } else {
+        groupedVirtualCols.push({ gi, vcs: [vc] });
+      }
+    }
     return /* @__PURE__ */ jsxs(TableRow, { children: [
       leftHeaders.map((header) => resolveHeaderCell(header, headerGroup, groupIndex)),
       columnVirtual.virtualPaddingLeft > 0 && /* @__PURE__ */ jsx("th", { "aria-hidden": "true", style: { width: columnVirtual.virtualPaddingLeft } }),
-      virtualCols.map((vc, vcIdx) => {
-        const gi = leafToGroupIdx[vc.index];
-        if (gi === void 0) return null;
+      groupedVirtualCols.map(({ gi, vcs }) => {
         const groupHeader = centerHeaders[gi];
-        const leafCol = centerLeafCols[vc.index];
-        const isFirst = vcIdx === 0 || leafToGroupIdx[virtualCols[vcIdx - 1].index] !== gi;
-        const isLast = vcIdx === virtualCols.length - 1 || leafToGroupIdx[virtualCols[vcIdx + 1].index] !== gi;
         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;
+        const widthCalc = useColumnSizing ? `calc((${vcs.map((vc) => `var(--col-${toCSSId(centerLeafCols[vc.index].id)}-size, ${centerLeafCols[vc.index].getSize()})`).join(" + ")}) * 1px)` : void 0;
+        const nextCenterHeader = centerHeaders[gi + 1];
+        const showSeparator = groupHeader.column.columnDef?.meta?.columnSeparatorProps?.show ?? components?.columnSeparatorProps?.headerCell?.show ?? (gi !== centerHeaders.length - 1 && (!groupHeader.isPlaceholder || !nextCenterHeader?.isPlaceholder));
         return /* @__PURE__ */ jsxs(
           TableHead,
           {
-            colSpan: 1,
+            "data-testid": `table-head-${groupHeader.id}`,
+            colSpan: vcs.length,
             ...tableHeadCellProps,
             ...groupHeader.column.columnDef?.meta?.headerProps,
             className: cn(
@@ -9779,16 +9789,26 @@ var TableHeaderRows = ({
             ),
             style: {
               ...style,
-              width: useColumnSizing ? `calc(var(--col-${toCSSId(leafCol.id)}-size, ${leafCol.getSize()}) * 1px)` : void 0,
+              width: widthCalc,
+              minWidth: useColumnSizing ? groupHeader.column.columnDef.minSize : void 0,
+              maxWidth: useColumnSizing ? groupHeader.column.columnDef.maxSize : void 0,
               ...tableHeadCellProps?.style,
               ...groupHeader.column.columnDef?.meta?.headerProps?.style
             },
             children: [
-              isFirst && !groupHeader.isPlaceholder ? flexRender(groupHeader.column.columnDef.header, groupHeader.getContext()) : null,
-              /* @__PURE__ */ jsx(ColumnSeparator_default, { ...components?.columnSeparatorProps?.headerCell, show: isLast })
+              !groupHeader.isPlaceholder ? flexRender(groupHeader.column.columnDef.header, groupHeader.getContext()) : null,
+              /* @__PURE__ */ jsx(
+                ColumnSeparator_default,
+                {
+                  ...components?.columnSeparatorProps?.headerCell,
+                  ...groupHeader.column.columnDef?.meta?.columnSeparatorProps,
+                  show: showSeparator
+                }
+              ),
+              /* @__PURE__ */ jsx(ColumnResizer_default, { header: groupHeader, ...components?.columnResizerProps })
             ]
           },
-          `${groupHeader.id}-${leafCol.id}`
+          `${groupHeader.id}-${vcs[0].index}`
         );
       }),
       columnVirtual.virtualPaddingRight > 0 && /* @__PURE__ */ jsx("th", { "aria-hidden": "true", style: { width: columnVirtual.virtualPaddingRight } }),