react-glide-table 2.1.0 → 2.2.1

package/README.md

@@ -259,6 +259,18 @@ import type { RowsPastePayload } from "react-glide-table/compound";
 Related props: `onRowsPaste`, `enableInsertPaste`, `enableSubtreeCopy`, `onCopyActionsReady`.  
 Helpers (`/core`): `buildRowsPastePayload`, `parseClipboardTSV`, `parseClipboardTSVWithDepths`, `serializeSelectionToTSV`, …
 
+## Column width
+
+`Column.width` sets the default size. `minWidth` / `maxWidth` are CSS constraints on header and body cells — they do not clamp drag-resize.
+
+```tsx
+<ProductTable.Column field="note" minWidth={80} maxWidth={240}>
+  Note
+</ProductTable.Column>
+```
+
+With `ColumnDef` (non-compound), put the same values on `meta.minWidth` / `meta.maxWidth`.
+
 ## Column resize
 
 Opt in with `enableColumnResize`. Drag the handle on the right edge of a header cell; double-click resets to the column’s default `width` / `size`.
@@ -272,7 +284,12 @@ Opt in with `enableColumnResize`. Drag the handle on the right edge of a header
   // onColumnSizingChange={setSizing}
 >
   <ProductTable.Header>
-    <ProductTable.Column field="name" width={200} minWidth={80} maxWidth={480}>
+    <ProductTable.Column
+      field="name"
+      width={200}
+      minResizeWidth={80}
+      maxResizeWidth={480}
+    >
       Name
     </ProductTable.Column>
     <ProductTable.Column field="sku" resizable={false}>
@@ -282,14 +299,15 @@ Opt in with `enableColumnResize`. Drag the handle on the right edge of a header
 </ProductTable>
 ```
 
-| Prop                                     | Role                                         |
-| ---------------------------------------- | -------------------------------------------- |
-| `enableColumnResize`                     | Turn on header drag resize (default `false`) |
-| `columnSizing` / `onColumnSizingChange`  | Controlled width map `{ [columnId]: px }`    |
-| `columnResizeMode`                       | `"onChange"` (live) or `"onEnd"`             |
-| `Column.width` / `minWidth` / `maxWidth` | Default / clamp sizes                        |
-| `Column.resizable={false}`               | Disable resize for one column                |
-| `classNames.resizeHandle`                | Style hook for the drag handle               |
+| Prop                                       | Role                                         |
+| ------------------------------------------ | -------------------------------------------- |
+| `enableColumnResize`                       | Turn on header drag resize (default `false`) |
+| `columnSizing` / `onColumnSizingChange`    | Controlled width map `{ [columnId]: px }`    |
+| `columnResizeMode`                         | `"onChange"` (live) or `"onEnd"`             |
+| `Column.width`                             | Default column size                          |
+| `Column.minResizeWidth` / `maxResizeWidth` | Drag-resize clamp sizes                      |
+| `Column.resizable={false}`                 | Disable resize for one column                |
+| `classNames.resizeHandle`                  | Style hook for the drag handle               |
 
 ## Column reorder
 

package/dist/compound.cjs

@@ -531,15 +531,29 @@ function flattenHeaderLeaves(column) {
 
 // src/components/ui/table/features/column-resize/columnResize.ts
 function getColumnSizeStyle(size, options) {
-  const { force = false, lockMax = false } = options ?? {};
-  if (!force && size === DATA_TABLE_COLUMN_SIZE) {
+  const { force = false, lockMax = false, minWidth, maxWidth } = options ?? {};
+  if (lockMax) {
+    return {
+      width: size,
+      minWidth: size,
+      maxWidth: size
+    };
+  }
+  const hasExplicitSize = force || size !== DATA_TABLE_COLUMN_SIZE;
+  if (!hasExplicitSize && minWidth == null && maxWidth == null) {
     return void 0;
   }
-  return {
-    width: size,
-    minWidth: size,
-    ...lockMax ? { maxWidth: size } : {}
-  };
+  const style = {};
+  if (hasExplicitSize) {
+    style.width = size;
+    style.minWidth = minWidth ?? size;
+  } else if (minWidth != null) {
+    style.minWidth = minWidth;
+  }
+  if (maxWidth != null) {
+    style.maxWidth = maxWidth;
+  }
+  return style;
 }
 
 // src/components/ui/table/features/inline-search/inlineSearch.ts
@@ -890,23 +904,49 @@ var useConvertTreeData = ({
 function getRowFieldValue(row, key) {
   return row[key];
 }
-function computeRowSpans(data, rowSpanKey) {
+function normalizeRowSpanParent(value) {
+  if (!value) return [];
+  return typeof value === "string" ? [value] : [...value];
+}
+function toParentSpanList(parentSpans) {
+  if (!parentSpans?.length) return [];
+  const first = parentSpans[0];
+  if (!Array.isArray(first)) {
+    return [parentSpans];
+  }
+  return parentSpans;
+}
+function buildStartRowLookup(spans) {
+  const startRows = new Array(spans.length);
+  let origin = 0;
+  for (let i = 0; i < spans.length; i++) {
+    if ((spans[i]?.rowSpan ?? 1) > 0) origin = i;
+    startRows[i] = origin;
+  }
+  return startRows;
+}
+function sharesParentGroup(parentStartRows, rowIndex) {
+  if (parentStartRows.length === 0 || rowIndex <= 0) return true;
+  return parentStartRows.every(
+    (startRows) => startRows[rowIndex - 1] === startRows[rowIndex]
+  );
+}
+function computeRowSpans(data, rowSpanKey, parentSpans) {
   if (data.length === 0) return [];
+  const parentStartRows = toParentSpanList(parentSpans).map(buildStartRowLookup);
   const result = [];
   for (let index = 0; index < data.length; index++) {
     const currentValue = getRowFieldValue(data[index], rowSpanKey);
     const previousValue = index > 0 ? getRowFieldValue(data[index - 1], rowSpanKey) : void 0;
-    if (index > 0 && currentValue === previousValue) {
+    if (index > 0 && currentValue === previousValue && sharesParentGroup(parentStartRows, index)) {
       result.push({ rowSpan: 0, isFirstInGroup: false });
       continue;
     }
     let span = 1;
     for (let nextIndex = index + 1; nextIndex < data.length; nextIndex++) {
-      if (getRowFieldValue(data[nextIndex], rowSpanKey) === currentValue) {
-        span++;
-      } else {
-        break;
-      }
+      if (getRowFieldValue(data[nextIndex], rowSpanKey) !== currentValue) break;
+      if (!sharesParentGroup(parentStartRows, nextIndex)) break;
+      span++;
     }
     result.push({ rowSpan: span, isFirstInGroup: true });
   }
@@ -928,10 +968,50 @@ function resolveRowSpanAt(rowSpans, rowIndex) {
   }
   return { startRow: rowIndex, rowSpan: 1 };
 }
+function findRowSpanColumn(spec, ref) {
+  return spec.find((column) => column.columnId === ref) ?? spec.find((column) => column.rowSpanKey === ref);
+}
 function buildColumnRowSpanMap(data, columnKeys) {
   const map = /* @__PURE__ */ new Map();
-  for (const { columnId, rowSpanKey } of columnKeys) {
-    map.set(columnId, computeRowSpans(data, rowSpanKey));
+  const visiting = /* @__PURE__ */ new Set();
+  const warnedCycles = /* @__PURE__ */ new Set();
+  const virtualParents = /* @__PURE__ */ new Map();
+  const spansForColumn = (columnId) => {
+    const cached = map.get(columnId);
+    if (cached !== void 0) return cached;
+    const column = columnKeys.find((item) => item.columnId === columnId);
+    if (!column) return void 0;
+    if (visiting.has(columnId)) {
+      if (!warnedCycles.has(columnId)) {
+        warnedCycles.add(columnId);
+        console.warn(
+          `[rowSpan] rowSpanParent cycle detected at column "${columnId}"; dropping the cyclic parent reference.`
+        );
+      }
+      return void 0;
+    }
+    visiting.add(columnId);
+    const parentSpans = (column.rowSpanParent ?? []).map((ref) => spansForParentRef(ref)).filter((spans2) => Boolean(spans2));
+    visiting.delete(columnId);
+    const spans = computeRowSpans(
+      data,
+      column.rowSpanKey,
+      parentSpans.length > 0 ? parentSpans : void 0
+    );
+    map.set(columnId, spans);
+    return spans;
+  };
+  const spansForParentRef = (ref) => {
+    const parentColumn = findRowSpanColumn(columnKeys, ref);
+    if (parentColumn) return spansForColumn(parentColumn.columnId);
+    const cached = virtualParents.get(ref);
+    if (cached !== void 0) return cached;
+    const spans = computeRowSpans(data, ref);
+    virtualParents.set(ref, spans);
+    return spans;
+  };
+  for (const column of columnKeys) {
+    spansForColumn(column.columnId);
   }
   return map;
 }
@@ -947,7 +1027,8 @@ function collectRowSpanColumns(columns) {
       if (!columnId || !columnDef.meta?.rowSpan) continue;
       result.push({
         columnId,
-        rowSpanKey: columnDef.meta.rowSpanKey ?? columnId
+        rowSpanKey: columnDef.meta.rowSpanKey ?? columnId,
+        rowSpanParent: normalizeRowSpanParent(columnDef.meta.rowSpanParent)
       });
     }
   };
@@ -1340,7 +1421,9 @@ function DataTableRow({
         const hasSelectionEdges = hasCellSelectionEdges(selectionEdgeStyle);
         const sizeStyle = getColumnSizeStyle(cell.column.getSize(), {
           force: enableColumnResize,
-          lockMax: enableColumnResize
+          lockMax: enableColumnResize,
+          minWidth: meta?.minWidth,
+          maxWidth: meta?.maxWidth
         });
         const freezeOffset = enableColumnFreeze ? freezeOffsets.get(columnId) : void 0;
         const freezeStyle = getColumnFreezeStyle(freezeOffset);
@@ -4163,7 +4246,9 @@ function DataTable({
                     const canResize = enableColumnResize && header.column.getCanResize();
                     const sizeStyle = getColumnSizeStyle(header.getSize(), {
                       force: enableColumnResize,
-                      lockMax: enableColumnResize
+                      lockMax: enableColumnResize,
+                      minWidth: header.column.columnDef.meta?.minWidth,
+                      maxWidth: header.column.columnDef.meta?.maxWidth
                     });
                     const freezeOffset = enableColumnFreeze ? resolveHeaderFreezeOffset(header.column, freezeOffsets) : void 0;
                     const freezeStyle = getColumnFreezeStyle(freezeOffset, {
@@ -4403,12 +4488,15 @@ function buildColumnDef(props, sort, onSort) {
     width,
     minWidth,
     maxWidth,
+    minResizeWidth,
+    maxResizeWidth,
     resizable,
     reorderable,
     frozen,
     align,
     rowSpan,
     rowSpanKey,
+    rowSpanParent,
     editable,
     editType,
     editInputProps,
@@ -4422,8 +4510,8 @@ function buildColumnDef(props, sort, onSort) {
     id: field,
     ...!virtual ? { accessorKey: field } : {},
     size: width ?? DATA_TABLE_COLUMN_SIZE,
-    ...minWidth != null ? { minSize: minWidth } : {},
-    ...maxWidth != null ? { maxSize: maxWidth } : {},
+    ...minResizeWidth != null ? { minSize: minResizeWidth } : {},
+    ...maxResizeWidth != null ? { maxSize: maxResizeWidth } : {},
     ...resizable === false ? { enableResizing: false } : {},
     header: sortable ? () => /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
       SortableHeader,
@@ -4443,6 +4531,7 @@ function buildColumnDef(props, sort, onSort) {
       align,
       rowSpan,
       rowSpanKey,
+      rowSpanParent,
       editable,
       editType,
       editInputProps,
@@ -4451,6 +4540,8 @@ function buildColumnDef(props, sort, onSort) {
       cellRender: render,
       frozen,
       reorderable,
+      minWidth,
+      maxWidth,
       className,
       headerClassName
     }

package/dist/compound.d.cts

@@ -1,7 +1,7 @@
 import * as react from 'react';
 import { ReactNode, ReactElement } from 'react';
-import { l as DataTableProps, r as TableColumnProps, T as TableColumnGroupProps, s as TableProps } from './types-CMUGtH-c.cjs';
-export { B as BuiltinCellKind, C as CellKind, a as CellRenderContext, b as CellRenderFn, c as CellRenderer, f as ColumnFreezeMeta, h as ColumnFreezeSide, i as DataTableClassNames, k as DataTableLabels, m as DataTableScrollSlotProps, n as DataTableSlots, P as PasteMode, R as RowSelectionMode, o as RowsPastePayload, p as SearchResultItem } from './types-CMUGtH-c.cjs';
+import { l as DataTableProps, r as TableColumnProps, T as TableColumnGroupProps, s as TableProps } from './types-CnsQ8GZb.cjs';
+export { B as BuiltinCellKind, C as CellKind, a as CellRenderContext, b as CellRenderFn, c as CellRenderer, f as ColumnFreezeMeta, h as ColumnFreezeSide, i as DataTableClassNames, k as DataTableLabels, m as DataTableScrollSlotProps, n as DataTableSlots, P as PasteMode, R as RowSelectionMode, o as RowsPastePayload, p as SearchResultItem } from './types-CnsQ8GZb.cjs';
 export { ColumnDef, ColumnOrderState, ColumnResizeMode, ColumnSizingState, RowSelectionState } from '@tanstack/react-table';
 
 /**

package/dist/compound.d.ts

@@ -1,7 +1,7 @@
 import * as react from 'react';
 import { ReactNode, ReactElement } from 'react';
-import { l as DataTableProps, r as TableColumnProps, T as TableColumnGroupProps, s as TableProps } from './types-CMUGtH-c.js';
-export { B as BuiltinCellKind, C as CellKind, a as CellRenderContext, b as CellRenderFn, c as CellRenderer, f as ColumnFreezeMeta, h as ColumnFreezeSide, i as DataTableClassNames, k as DataTableLabels, m as DataTableScrollSlotProps, n as DataTableSlots, P as PasteMode, R as RowSelectionMode, o as RowsPastePayload, p as SearchResultItem } from './types-CMUGtH-c.js';
+import { l as DataTableProps, r as TableColumnProps, T as TableColumnGroupProps, s as TableProps } from './types-CnsQ8GZb.js';
+export { B as BuiltinCellKind, C as CellKind, a as CellRenderContext, b as CellRenderFn, c as CellRenderer, f as ColumnFreezeMeta, h as ColumnFreezeSide, i as DataTableClassNames, k as DataTableLabels, m as DataTableScrollSlotProps, n as DataTableSlots, P as PasteMode, R as RowSelectionMode, o as RowsPastePayload, p as SearchResultItem } from './types-CnsQ8GZb.js';
 export { ColumnDef, ColumnOrderState, ColumnResizeMode, ColumnSizingState, RowSelectionState } from '@tanstack/react-table';
 
 /**

package/dist/compound.js

@@ -503,15 +503,29 @@ function flattenHeaderLeaves(column) {
 
 // src/components/ui/table/features/column-resize/columnResize.ts
 function getColumnSizeStyle(size, options) {
-  const { force = false, lockMax = false } = options ?? {};
-  if (!force && size === DATA_TABLE_COLUMN_SIZE) {
+  const { force = false, lockMax = false, minWidth, maxWidth } = options ?? {};
+  if (lockMax) {
+    return {
+      width: size,
+      minWidth: size,
+      maxWidth: size
+    };
+  }
+  const hasExplicitSize = force || size !== DATA_TABLE_COLUMN_SIZE;
+  if (!hasExplicitSize && minWidth == null && maxWidth == null) {
     return void 0;
   }
-  return {
-    width: size,
-    minWidth: size,
-    ...lockMax ? { maxWidth: size } : {}
-  };
+  const style = {};
+  if (hasExplicitSize) {
+    style.width = size;
+    style.minWidth = minWidth ?? size;
+  } else if (minWidth != null) {
+    style.minWidth = minWidth;
+  }
+  if (maxWidth != null) {
+    style.maxWidth = maxWidth;
+  }
+  return style;
 }
 
 // src/components/ui/table/features/inline-search/inlineSearch.ts
@@ -862,23 +876,49 @@ var useConvertTreeData = ({
 function getRowFieldValue(row, key) {
   return row[key];
 }
-function computeRowSpans(data, rowSpanKey) {
+function normalizeRowSpanParent(value) {
+  if (!value) return [];
+  return typeof value === "string" ? [value] : [...value];
+}
+function toParentSpanList(parentSpans) {
+  if (!parentSpans?.length) return [];
+  const first = parentSpans[0];
+  if (!Array.isArray(first)) {
+    return [parentSpans];
+  }
+  return parentSpans;
+}
+function buildStartRowLookup(spans) {
+  const startRows = new Array(spans.length);
+  let origin = 0;
+  for (let i = 0; i < spans.length; i++) {
+    if ((spans[i]?.rowSpan ?? 1) > 0) origin = i;
+    startRows[i] = origin;
+  }
+  return startRows;
+}
+function sharesParentGroup(parentStartRows, rowIndex) {
+  if (parentStartRows.length === 0 || rowIndex <= 0) return true;
+  return parentStartRows.every(
+    (startRows) => startRows[rowIndex - 1] === startRows[rowIndex]
+  );
+}
+function computeRowSpans(data, rowSpanKey, parentSpans) {
   if (data.length === 0) return [];
+  const parentStartRows = toParentSpanList(parentSpans).map(buildStartRowLookup);
   const result = [];
   for (let index = 0; index < data.length; index++) {
     const currentValue = getRowFieldValue(data[index], rowSpanKey);
     const previousValue = index > 0 ? getRowFieldValue(data[index - 1], rowSpanKey) : void 0;
-    if (index > 0 && currentValue === previousValue) {
+    if (index > 0 && currentValue === previousValue && sharesParentGroup(parentStartRows, index)) {
       result.push({ rowSpan: 0, isFirstInGroup: false });
       continue;
     }
     let span = 1;
     for (let nextIndex = index + 1; nextIndex < data.length; nextIndex++) {
-      if (getRowFieldValue(data[nextIndex], rowSpanKey) === currentValue) {
-        span++;
-      } else {
-        break;
-      }
+      if (getRowFieldValue(data[nextIndex], rowSpanKey) !== currentValue) break;
+      if (!sharesParentGroup(parentStartRows, nextIndex)) break;
+      span++;
     }
     result.push({ rowSpan: span, isFirstInGroup: true });
   }
@@ -900,10 +940,50 @@ function resolveRowSpanAt(rowSpans, rowIndex) {
   }
   return { startRow: rowIndex, rowSpan: 1 };
 }
+function findRowSpanColumn(spec, ref) {
+  return spec.find((column) => column.columnId === ref) ?? spec.find((column) => column.rowSpanKey === ref);
+}
 function buildColumnRowSpanMap(data, columnKeys) {
   const map = /* @__PURE__ */ new Map();
-  for (const { columnId, rowSpanKey } of columnKeys) {
-    map.set(columnId, computeRowSpans(data, rowSpanKey));
+  const visiting = /* @__PURE__ */ new Set();
+  const warnedCycles = /* @__PURE__ */ new Set();
+  const virtualParents = /* @__PURE__ */ new Map();
+  const spansForColumn = (columnId) => {
+    const cached = map.get(columnId);
+    if (cached !== void 0) return cached;
+    const column = columnKeys.find((item) => item.columnId === columnId);
+    if (!column) return void 0;
+    if (visiting.has(columnId)) {
+      if (!warnedCycles.has(columnId)) {
+        warnedCycles.add(columnId);
+        console.warn(
+          `[rowSpan] rowSpanParent cycle detected at column "${columnId}"; dropping the cyclic parent reference.`
+        );
+      }
+      return void 0;
+    }
+    visiting.add(columnId);
+    const parentSpans = (column.rowSpanParent ?? []).map((ref) => spansForParentRef(ref)).filter((spans2) => Boolean(spans2));
+    visiting.delete(columnId);
+    const spans = computeRowSpans(
+      data,
+      column.rowSpanKey,
+      parentSpans.length > 0 ? parentSpans : void 0
+    );
+    map.set(columnId, spans);
+    return spans;
+  };
+  const spansForParentRef = (ref) => {
+    const parentColumn = findRowSpanColumn(columnKeys, ref);
+    if (parentColumn) return spansForColumn(parentColumn.columnId);
+    const cached = virtualParents.get(ref);
+    if (cached !== void 0) return cached;
+    const spans = computeRowSpans(data, ref);
+    virtualParents.set(ref, spans);
+    return spans;
+  };
+  for (const column of columnKeys) {
+    spansForColumn(column.columnId);
   }
   return map;
 }
@@ -919,7 +999,8 @@ function collectRowSpanColumns(columns) {
       if (!columnId || !columnDef.meta?.rowSpan) continue;
       result.push({
         columnId,
-        rowSpanKey: columnDef.meta.rowSpanKey ?? columnId
+        rowSpanKey: columnDef.meta.rowSpanKey ?? columnId,
+        rowSpanParent: normalizeRowSpanParent(columnDef.meta.rowSpanParent)
       });
     }
   };
@@ -1312,7 +1393,9 @@ function DataTableRow({
         const hasSelectionEdges = hasCellSelectionEdges(selectionEdgeStyle);
         const sizeStyle = getColumnSizeStyle(cell.column.getSize(), {
           force: enableColumnResize,
-          lockMax: enableColumnResize
+          lockMax: enableColumnResize,
+          minWidth: meta?.minWidth,
+          maxWidth: meta?.maxWidth
         });
         const freezeOffset = enableColumnFreeze ? freezeOffsets.get(columnId) : void 0;
         const freezeStyle = getColumnFreezeStyle(freezeOffset);
@@ -4158,7 +4241,9 @@ function DataTable({
                     const canResize = enableColumnResize && header.column.getCanResize();
                     const sizeStyle = getColumnSizeStyle(header.getSize(), {
                       force: enableColumnResize,
-                      lockMax: enableColumnResize
+                      lockMax: enableColumnResize,
+                      minWidth: header.column.columnDef.meta?.minWidth,
+                      maxWidth: header.column.columnDef.meta?.maxWidth
                     });
                     const freezeOffset = enableColumnFreeze ? resolveHeaderFreezeOffset(header.column, freezeOffsets) : void 0;
                     const freezeStyle = getColumnFreezeStyle(freezeOffset, {
@@ -4398,12 +4483,15 @@ function buildColumnDef(props, sort, onSort) {
     width,
     minWidth,
     maxWidth,
+    minResizeWidth,
+    maxResizeWidth,
     resizable,
     reorderable,
     frozen,
     align,
     rowSpan,
     rowSpanKey,
+    rowSpanParent,
     editable,
     editType,
     editInputProps,
@@ -4417,8 +4505,8 @@ function buildColumnDef(props, sort, onSort) {
     id: field,
     ...!virtual ? { accessorKey: field } : {},
     size: width ?? DATA_TABLE_COLUMN_SIZE,
-    ...minWidth != null ? { minSize: minWidth } : {},
-    ...maxWidth != null ? { maxSize: maxWidth } : {},
+    ...minResizeWidth != null ? { minSize: minResizeWidth } : {},
+    ...maxResizeWidth != null ? { maxSize: maxResizeWidth } : {},
     ...resizable === false ? { enableResizing: false } : {},
     header: sortable ? () => /* @__PURE__ */ jsx8(
       SortableHeader,
@@ -4438,6 +4526,7 @@ function buildColumnDef(props, sort, onSort) {
       align,
       rowSpan,
       rowSpanKey,
+      rowSpanParent,
       editable,
       editType,
       editInputProps,
@@ -4446,6 +4535,8 @@ function buildColumnDef(props, sort, onSort) {
       cellRender: render,
       frozen,
       reorderable,
+      minWidth,
+      maxWidth,
       className,
       headerClassName
     }

package/dist/core.cjs

@@ -2296,23 +2296,49 @@ function applySelectionUpdater(mode, updater, previous) {
 function getRowFieldValue(row, key) {
   return row[key];
 }
-function computeRowSpans(data, rowSpanKey) {
+function normalizeRowSpanParent(value) {
+  if (!value) return [];
+  return typeof value === "string" ? [value] : [...value];
+}
+function toParentSpanList(parentSpans) {
+  if (!parentSpans?.length) return [];
+  const first = parentSpans[0];
+  if (!Array.isArray(first)) {
+    return [parentSpans];
+  }
+  return parentSpans;
+}
+function buildStartRowLookup(spans) {
+  const startRows = new Array(spans.length);
+  let origin = 0;
+  for (let i = 0; i < spans.length; i++) {
+    if ((spans[i]?.rowSpan ?? 1) > 0) origin = i;
+    startRows[i] = origin;
+  }
+  return startRows;
+}
+function sharesParentGroup(parentStartRows, rowIndex) {
+  if (parentStartRows.length === 0 || rowIndex <= 0) return true;
+  return parentStartRows.every(
+    (startRows) => startRows[rowIndex - 1] === startRows[rowIndex]
+  );
+}
+function computeRowSpans(data, rowSpanKey, parentSpans) {
   if (data.length === 0) return [];
+  const parentStartRows = toParentSpanList(parentSpans).map(buildStartRowLookup);
   const result = [];
   for (let index = 0; index < data.length; index++) {
     const currentValue = getRowFieldValue(data[index], rowSpanKey);
     const previousValue = index > 0 ? getRowFieldValue(data[index - 1], rowSpanKey) : void 0;
-    if (index > 0 && currentValue === previousValue) {
+    if (index > 0 && currentValue === previousValue && sharesParentGroup(parentStartRows, index)) {
       result.push({ rowSpan: 0, isFirstInGroup: false });
       continue;
     }
     let span = 1;
     for (let nextIndex = index + 1; nextIndex < data.length; nextIndex++) {
-      if (getRowFieldValue(data[nextIndex], rowSpanKey) === currentValue) {
-        span++;
-      } else {
-        break;
-      }
+      if (getRowFieldValue(data[nextIndex], rowSpanKey) !== currentValue) break;
+      if (!sharesParentGroup(parentStartRows, nextIndex)) break;
+      span++;
     }
     result.push({ rowSpan: span, isFirstInGroup: true });
   }
@@ -2334,10 +2360,50 @@ function resolveRowSpanAt(rowSpans, rowIndex) {
   }
   return { startRow: rowIndex, rowSpan: 1 };
 }
+function findRowSpanColumn(spec, ref) {
+  return spec.find((column) => column.columnId === ref) ?? spec.find((column) => column.rowSpanKey === ref);
+}
 function buildColumnRowSpanMap(data, columnKeys) {
   const map = /* @__PURE__ */ new Map();
-  for (const { columnId, rowSpanKey } of columnKeys) {
-    map.set(columnId, computeRowSpans(data, rowSpanKey));
+  const visiting = /* @__PURE__ */ new Set();
+  const warnedCycles = /* @__PURE__ */ new Set();
+  const virtualParents = /* @__PURE__ */ new Map();
+  const spansForColumn = (columnId) => {
+    const cached = map.get(columnId);
+    if (cached !== void 0) return cached;
+    const column = columnKeys.find((item) => item.columnId === columnId);
+    if (!column) return void 0;
+    if (visiting.has(columnId)) {
+      if (!warnedCycles.has(columnId)) {
+        warnedCycles.add(columnId);
+        console.warn(
+          `[rowSpan] rowSpanParent cycle detected at column "${columnId}"; dropping the cyclic parent reference.`
+        );
+      }
+      return void 0;
+    }
+    visiting.add(columnId);
+    const parentSpans = (column.rowSpanParent ?? []).map((ref) => spansForParentRef(ref)).filter((spans2) => Boolean(spans2));
+    visiting.delete(columnId);
+    const spans = computeRowSpans(
+      data,
+      column.rowSpanKey,
+      parentSpans.length > 0 ? parentSpans : void 0
+    );
+    map.set(columnId, spans);
+    return spans;
+  };
+  const spansForParentRef = (ref) => {
+    const parentColumn = findRowSpanColumn(columnKeys, ref);
+    if (parentColumn) return spansForColumn(parentColumn.columnId);
+    const cached = virtualParents.get(ref);
+    if (cached !== void 0) return cached;
+    const spans = computeRowSpans(data, ref);
+    virtualParents.set(ref, spans);
+    return spans;
+  };
+  for (const column of columnKeys) {
+    spansForColumn(column.columnId);
   }
   return map;
 }
@@ -2353,7 +2419,8 @@ function collectRowSpanColumns(columns) {
       if (!columnId || !columnDef.meta?.rowSpan) continue;
       result.push({
         columnId,
-        rowSpanKey: columnDef.meta.rowSpanKey ?? columnId
+        rowSpanKey: columnDef.meta.rowSpanKey ?? columnId,
+        rowSpanParent: normalizeRowSpanParent(columnDef.meta.rowSpanParent)
       });
     }
   };
@@ -3055,15 +3122,29 @@ function ResolvedTableCell({
 
 // src/components/ui/table/features/column-resize/columnResize.ts
 function getColumnSizeStyle(size, options) {
-  const { force = false, lockMax = false } = options ?? {};
-  if (!force && size === DATA_TABLE_COLUMN_SIZE) {
+  const { force = false, lockMax = false, minWidth, maxWidth } = options ?? {};
+  if (lockMax) {
+    return {
+      width: size,
+      minWidth: size,
+      maxWidth: size
+    };
+  }
+  const hasExplicitSize = force || size !== DATA_TABLE_COLUMN_SIZE;
+  if (!hasExplicitSize && minWidth == null && maxWidth == null) {
     return void 0;
   }
-  return {
-    width: size,
-    minWidth: size,
-    ...lockMax ? { maxWidth: size } : {}
-  };
+  const style = {};
+  if (hasExplicitSize) {
+    style.width = size;
+    style.minWidth = minWidth ?? size;
+  } else if (minWidth != null) {
+    style.minWidth = minWidth;
+  }
+  if (maxWidth != null) {
+    style.maxWidth = maxWidth;
+  }
+  return style;
 }
 
 // src/components/ui/table/features/column-reorder/useColumnReorder.ts