@onesaz/ui 0.3.15 → 0.3.16

package/dist/index.js

@@ -4859,6 +4859,29 @@ var PinnedRowsRenderer = ({
   if (pinnedRows.length === 0) return null;
   return /* @__PURE__ */ jsx35("tbody", { children: pinnedRows.map((row, rowIndex) => {
     const customClassName = getRowClassName?.({ row: row.original, rowIndex });
+    const visibleCells = row.getVisibleCells();
+    const colSpanSkipSet = /* @__PURE__ */ new Set();
+    const colSpanValues = /* @__PURE__ */ new Map();
+    visibleCells.forEach((cell, cellIndex) => {
+      if (colSpanSkipSet.has(cellIndex)) return;
+      const meta = cell.column.columnDef.meta;
+      const colSpanDef = meta?.colSpan;
+      if (colSpanDef) {
+        const value = cell.getValue();
+        let span;
+        if (typeof colSpanDef === "function") {
+          span = colSpanDef({ row: row.original, value, field: cell.column.id, rowIndex });
+        } else if (typeof colSpanDef === "number") {
+          span = colSpanDef;
+        }
+        if (span && span > 1) {
+          colSpanValues.set(cellIndex, span);
+          for (let j = 1; j < span && cellIndex + j < visibleCells.length; j++) {
+            colSpanSkipSet.add(cellIndex + j);
+          }
+        }
+      }
+    });
     return /* @__PURE__ */ jsx35(
       "tr",
       {
@@ -4868,7 +4891,8 @@ var PinnedRowsRenderer = ({
           position === "bottom" && "bottom-0 border-t-2 border-t-border",
           customClassName
         ),
-        children: row.getVisibleCells().map((cell) => {
+        children: visibleCells.map((cell, cellIndex) => {
+          if (colSpanSkipSet.has(cellIndex)) return null;
           const meta = cell.column.columnDef.meta;
           const align = meta?.align || "left";
           const wrapText = meta?.wrapText !== void 0 ? meta.wrapText : globalWrapText;
@@ -4878,9 +4902,19 @@ var PinnedRowsRenderer = ({
           const colWidth = columnWidths.get(cell.column.id);
           const width = colWidth?.width || cell.column.getSize();
           const pinnedInfo = pinnedColumnOffsets?.get(cell.column.id);
+          const htmlColSpan = colSpanValues.get(cellIndex);
+          let totalWidth = width;
+          if (htmlColSpan && htmlColSpan > 1) {
+            for (let j = 1; j < htmlColSpan && cellIndex + j < visibleCells.length; j++) {
+              const spannedCell = visibleCells[cellIndex + j];
+              const spannedColWidth = columnWidths.get(spannedCell.column.id);
+              totalWidth += spannedColWidth?.width || spannedCell.column.getSize();
+            }
+          }
           return /* @__PURE__ */ jsx35(
             "td",
             {
+              colSpan: htmlColSpan,
               className: cn(
                 "px-4 overflow-hidden bg-muted border-b border-border",
                 showCellVerticalBorder && "border-r border-border",
@@ -4892,8 +4926,8 @@ var PinnedRowsRenderer = ({
                 height: wrapText || scrollable ? "auto" : rowHeight,
                 minHeight: rowHeight,
                 textAlign: align,
-                width,
-                maxWidth: colWidth?.maxWidth || width,
+                width: htmlColSpan && htmlColSpan > 1 ? totalWidth : width,
+                maxWidth: htmlColSpan && htmlColSpan > 1 ? void 0 : colWidth?.maxWidth || width,
                 minWidth: colWidth?.minWidth || cell.column.columnDef.minSize,
                 ...pinnedInfo ? {
                   position: "sticky",
@@ -5025,7 +5059,7 @@ function DataGrid({
   height = 400,
   minHeight,
   maxHeight,
-  density = "standard",
+  density = "compact",
   showCellVerticalBorder = false,
   showColumnVerticalBorder = false,
   hideFooter = false,