@gridkitjs/react 0.5.0 → 0.7.0

package/dist/index.js

@@ -1,9 +1,15 @@
 // src/DataGrid/DataGrid.tsx
-import { useMemo as useMemo2, useRef as useRef4, useState as useState5 } from "react";
+import {
+  useImperativeHandle,
+  useMemo as useMemo3,
+  useRef as useRef4,
+  useState as useState5
+} from "react";
 import {
   applyColumnOrder,
   defineColumnsFromRows,
   fitColumnsToWidth,
+  groupRows,
   moveColumnBefore,
   resolveColumnWidths,
   resolveRowId,
@@ -13,7 +19,17 @@ import {
 
 // src/DataGrid/components/GridHeader.tsx
 import { createPortal } from "react-dom";
-import { KEYBOARD_STEP } from "@gridkitjs/core";
+import { buildKeyShortcuts, intentOf, KEYBOARD_STEP } from "@gridkitjs/core";
+
+// src/DataGrid/ariaAttr.ts
+function ariaAttr(condition, key, value) {
+  return condition ? { [key]: value } : {};
+}
+
+// src/DataGrid/classNames.ts
+function classNames(...values) {
+  return values.filter(Boolean).join(" ");
+}
 
 // src/DataGrid/useGridNavigation.ts
 import {
@@ -21,20 +37,22 @@ import {
   useRef,
   useState
 } from "react";
-var HEADER_ROW = -1;
+import {
+  clampFocus,
+  nextFocusForKey,
+  HEADER_ROW
+} from "@gridkitjs/core";
 var FALLBACK_PAGE = 10;
-function clampFocus(focus, rowCount, columnCount) {
-  return {
-    rowIndex: Math.min(Math.max(focus.rowIndex, HEADER_ROW), rowCount - 1),
-    columnIndex: Math.min(
-      Math.max(focus.columnIndex, 0),
-      Math.max(columnCount - 1, 0)
-    )
-  };
+function tabIndexFor(columnIndex, focusedColumnIndex) {
+  return columnIndex === focusedColumnIndex ? 0 : -1;
 }
 function cellAt(table, focus) {
   const row = focus.rowIndex === HEADER_ROW ? table.tHead?.rows[0] ?? null : table.tBodies[0]?.rows[focus.rowIndex] ?? null;
-  return row?.cells[focus.columnIndex] ?? null;
+  if (row === null) {
+    return null;
+  }
+  const columnIndex = Math.min(focus.columnIndex, row.cells.length - 1);
+  return row.cells[columnIndex] ?? null;
 }
 function useGridNavigation({
   tableRef,
@@ -78,83 +96,71 @@ function useGridNavigation({
     pending.current = true;
     setStored(next);
   }
-  function tabIndexFor(rowIndex, columnIndex) {
-    return rowIndex === focus.rowIndex && columnIndex === focus.columnIndex ? 0 : -1;
-  }
   function onKeyDown(event) {
-    if (event.altKey) {
+    const next = nextFocusForKey(
+      event.key,
+      {
+        ctrlKey: event.ctrlKey,
+        metaKey: event.metaKey,
+        altKey: event.altKey,
+        shiftKey: event.shiftKey
+      },
+      focus,
+      rowCount,
+      columnCount,
+      pageSize()
+    );
+    if (next === null) {
       return;
     }
-    const { rowIndex, columnIndex } = focus;
-    let next;
-    switch (event.key) {
-      case "ArrowLeft":
-        if (event.ctrlKey) return;
-        next = { rowIndex, columnIndex: columnIndex - 1 };
-        break;
-      case "ArrowRight":
-        if (event.ctrlKey) return;
-        next = { rowIndex, columnIndex: columnIndex + 1 };
-        break;
-      case "ArrowUp":
-        next = { rowIndex: rowIndex - 1, columnIndex };
-        break;
-      case "ArrowDown":
-        next = { rowIndex: rowIndex + 1, columnIndex };
-        break;
-      // Ctrl takes Home and End to the grid's ends rather than the row's, which
-      // is the one place Ctrl is navigation rather than reorder.
-      case "Home":
-        next = event.ctrlKey ? { rowIndex: HEADER_ROW, columnIndex: 0 } : { rowIndex, columnIndex: 0 };
-        break;
-      case "End":
-        next = event.ctrlKey ? { rowIndex: rowCount - 1, columnIndex: columnCount - 1 } : { rowIndex, columnIndex: columnCount - 1 };
-        break;
-      case "PageUp":
-        next = { rowIndex: rowIndex - pageSize(), columnIndex };
-        break;
-      case "PageDown":
-        next = { rowIndex: rowIndex + pageSize(), columnIndex };
-        break;
-      default:
-        return;
-    }
     event.preventDefault();
     focusCell(next.rowIndex, next.columnIndex);
   }
-  return { focus, tabIndexFor, focusCell, onKeyDown };
+  return {
+    focus,
+    tabIndexFor: (rowIndex, columnIndex) => tabIndexFor(
+      columnIndex,
+      rowIndex === focus.rowIndex ? focus.columnIndex : null
+    ),
+    focusCell,
+    onKeyDown
+  };
 }
 
 // src/DataGrid/useGridSelection.ts
-import { useMemo, useRef as useRef2 } from "react";
 import {
-  accessDotted,
+  useMemo,
+  useRef as useRef2
+} from "react";
+import {
+  applySelectionIntent,
   clearSelection,
   diffSelection,
+  resolveCell,
+  resolveColumns,
+  resolveRows,
   selectAll,
   selectCell,
-  selectOnly,
-  selectRange,
-  toggleCellSelection,
-  toggleSelection
+  toggleCellSelection
 } from "@gridkitjs/core";
-function intentOf(event) {
-  if (event.shiftKey) {
-    return "range";
+
+// src/DataGrid/commitIfChanged.ts
+function commitIfChanged(current, next, setState, onCommit) {
+  if (next === current) {
+    return false;
   }
-  return event.ctrlKey || event.metaKey ? "toggle" : "replace";
+  setState(next);
+  onCommit?.(next);
+  return true;
 }
-function applyIntent(selection, orderedIds, anchorId, id, intent, mode) {
-  switch (intent) {
-    case "toggle":
-      return toggleSelection(selection, id, mode);
-    // A range with no anchor yet spans from the id to itself, which is the
-    // plain click a first Shift-click may as well be.
-    case "range":
-      return selectRange(selection, orderedIds, anchorId ?? id, id, mode);
-    default:
-      return selectOnly(selection, id, mode);
-  }
+
+// src/DataGrid/useGridSelection.ts
+function keyboardSelectIntent(event) {
+  return {
+    ctrlKey: event.key === " " || event.ctrlKey,
+    metaKey: event.metaKey,
+    shiftKey: event.shiftKey
+  };
 }
 function countMessage(count, noun) {
   if (count === 0) {
@@ -162,6 +168,18 @@ function countMessage(count, noun) {
   }
   return count === 1 ? `1 ${noun} selected` : `${String(count)} ${noun}s selected`;
 }
+function useAsSet(values) {
+  return useMemo(() => new Set(values), [values]);
+}
+function useIndexedBy(values, key) {
+  return useMemo(
+    () => new Map(values.map((value) => [value[key], value])),
+    [values, key]
+  );
+}
+function useMappedArray(values, key) {
+  return useMemo(() => values.map((value) => value[key]), [values, key]);
+}
 function useGridSelection({
   rows,
   columns,
@@ -173,141 +191,106 @@ function useGridSelection({
   cellSelection,
   setCellSelection,
   callbacks,
-  announce
+  announce,
+  columnName
 }) {
   const rowMode = selectable?.rows ?? false;
   const columnMode = selectable?.columns ?? false;
   const cellMode = selectable?.cells ?? false;
-  const rowsById = useMemo(
-    () => new Map(rows.map((entry) => [entry.rowId, entry])),
-    [rows]
-  );
-  const rowIds = useMemo(() => rows.map((entry) => entry.rowId), [rows]);
-  const columnIds = useMemo(() => columns.map((entry) => entry.id), [columns]);
-  const selectedRowIds = useMemo(() => new Set(rowSelection), [rowSelection]);
-  const selectedColumnIds = useMemo(
-    () => new Set(columnSelection),
-    [columnSelection]
-  );
+  const rowsById = useIndexedBy(rows, "rowId");
+  const rowIds = useMappedArray(rows, "rowId");
+  const columnIds = useMappedArray(columns, "id");
+  const selectedRowIds = useAsSet(rowSelection);
+  const selectedColumnIds = useAsSet(columnSelection);
   const rowAnchor = useRef2(null);
   const columnAnchor = useRef2(null);
-  function resolveRows(ids) {
-    return ids.map((id) => rowsById.get(id)).filter((row) => row !== void 0);
-  }
-  function resolveColumns(ids) {
-    return ids.map((id) => {
-      const columnIndex = columns.findIndex((entry) => entry.id === id);
-      const column = columns[columnIndex];
-      return column === void 0 ? void 0 : { columnId: id, column, columnIndex };
-    }).filter((column) => column !== void 0);
-  }
-  function resolveCell(ref) {
-    if (ref === null) {
-      return null;
-    }
-    const entry = rowsById.get(ref.rowId);
-    const columnIndex = columns.findIndex(
-      (candidate) => candidate.id === ref.columnId
-    );
-    const column = columns[columnIndex];
-    if (entry === void 0 || column === void 0) {
-      return null;
-    }
-    return {
-      rowId: ref.rowId,
-      columnId: ref.columnId,
-      row: entry.row,
-      column,
-      rowIndex: entry.rowIndex,
-      columnIndex,
-      value: accessDotted(entry.row, column.column.field)
-    };
-  }
   function announceCount(changed, total, noun) {
     if (changed > 1) {
       announce(countMessage(total, noun));
     }
   }
   function commitRows(next) {
-    if (next === rowSelection) {
-      return;
-    }
-    setRowSelection(next);
-    const { added, removed } = diffSelection(rowSelection, next);
-    const addedRows = resolveRows(added);
-    const removedRows = resolveRows(removed);
-    for (const row of addedRows) {
-      callbacks.onRowSelect?.({ row, selection: next });
-    }
-    if (addedRows.length > 0) {
-      callbacks.onRowsSelect?.({ rows: addedRows, selection: next });
-    }
-    for (const row of removedRows) {
-      callbacks.onRowDeselect?.({ row, selection: next });
-    }
-    if (removedRows.length > 0) {
-      callbacks.onRowsDeselect?.({ rows: removedRows, selection: next });
-    }
-    callbacks.onRowSelectionChange?.({
-      added: addedRows,
-      removed: removedRows,
-      selected: resolveRows(next),
-      selection: next
+    commitIfChanged(rowSelection, next, setRowSelection, (committed) => {
+      const { added, removed } = diffSelection(rowSelection, committed);
+      const addedRows = resolveRows(rowsById, added);
+      const removedRows = resolveRows(rowsById, removed);
+      for (const row of addedRows) {
+        callbacks.onRowSelect?.({ row, selection: committed });
+      }
+      if (addedRows.length > 0) {
+        callbacks.onRowsSelect?.({ rows: addedRows, selection: committed });
+      }
+      for (const row of removedRows) {
+        callbacks.onRowDeselect?.({ row, selection: committed });
+      }
+      if (removedRows.length > 0) {
+        callbacks.onRowsDeselect?.({ rows: removedRows, selection: committed });
+      }
+      callbacks.onRowSelectionChange?.({
+        added: addedRows,
+        removed: removedRows,
+        selected: resolveRows(rowsById, committed),
+        selection: committed
+      });
+      announceCount(added.length + removed.length, committed.length, "row");
     });
-    announceCount(added.length + removed.length, next.length, "row");
   }
   function commitColumns(next) {
-    if (next === columnSelection) {
-      return;
-    }
-    setColumnSelection(next);
-    const { added, removed } = diffSelection(columnSelection, next);
-    const addedColumns = resolveColumns(added);
-    const removedColumns = resolveColumns(removed);
-    for (const column of addedColumns) {
-      callbacks.onColumnSelect?.({ column, selection: next });
-    }
-    if (addedColumns.length > 0) {
-      callbacks.onColumnsSelect?.({ columns: addedColumns, selection: next });
-    }
-    for (const column of removedColumns) {
-      callbacks.onColumnDeselect?.({ column, selection: next });
-    }
-    if (removedColumns.length > 0) {
-      callbacks.onColumnsDeselect?.({
-        columns: removedColumns,
-        selection: next
+    commitIfChanged(columnSelection, next, setColumnSelection, (committed) => {
+      const { added, removed } = diffSelection(columnSelection, committed);
+      const addedColumns = resolveColumns(columns, added);
+      const removedColumns = resolveColumns(columns, removed);
+      for (const column of addedColumns) {
+        callbacks.onColumnSelect?.({ column, selection: committed });
+      }
+      if (addedColumns.length > 0) {
+        callbacks.onColumnsSelect?.({
+          columns: addedColumns,
+          selection: committed
+        });
+      }
+      for (const column of removedColumns) {
+        callbacks.onColumnDeselect?.({ column, selection: committed });
+      }
+      if (removedColumns.length > 0) {
+        callbacks.onColumnsDeselect?.({
+          columns: removedColumns,
+          selection: committed
+        });
+      }
+      callbacks.onColumnSelectionChange?.({
+        added: addedColumns,
+        removed: removedColumns,
+        selected: resolveColumns(columns, committed),
+        selection: committed
       });
-    }
-    callbacks.onColumnSelectionChange?.({
-      added: addedColumns,
-      removed: removedColumns,
-      selected: resolveColumns(next),
-      selection: next
+      announceCount(added.length + removed.length, committed.length, "column");
     });
-    announceCount(added.length + removed.length, next.length, "column");
   }
   function commitCell(next) {
-    if (next === cellSelection) {
-      return;
-    }
-    setCellSelection(next);
-    const selected = resolveCell(next);
-    const deselected = resolveCell(cellSelection);
-    if (deselected !== null) {
-      callbacks.onCellDeselect?.({ cell: deselected, selection: next });
-    }
-    if (selected !== null) {
-      callbacks.onCellSelect?.({ cell: selected, selection: next });
-    }
-    callbacks.onCellSelectionChange?.({
-      selected,
-      deselected,
-      selection: next
+    commitIfChanged(cellSelection, next, setCellSelection, (committed) => {
+      const selected = resolveCell(rowsById, columns, committed);
+      const deselected = resolveCell(rowsById, columns, cellSelection);
+      if (deselected !== null) {
+        callbacks.onCellDeselect?.({ cell: deselected, selection: committed });
+      }
+      if (selected !== null) {
+        callbacks.onCellSelect?.({ cell: selected, selection: committed });
+      }
+      callbacks.onCellSelectionChange?.({
+        selected,
+        deselected,
+        selection: committed
+      });
+      if (selected !== null) {
+        announce(
+          `${columnName(selected.columnId)}, row ${String(selected.rowIndex + 1)}, selected`
+        );
+      }
     });
   }
   function selectRow(rowId, intent) {
-    const next = applyIntent(
+    const next = applySelectionIntent(
       rowSelection,
       rowIds,
       rowAnchor.current,
@@ -321,7 +304,7 @@ function useGridSelection({
     commitRows(next);
   }
   function selectColumn(columnId, intent) {
-    const next = applyIntent(
+    const next = applySelectionIntent(
       columnSelection,
       columnIds,
       columnAnchor.current,
@@ -364,8 +347,8 @@ function useGridSelection({
 
 // src/DataGrid/components/GridHeader.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
-function ChevronsUpDownIcon() {
-  return /* @__PURE__ */ jsxs(
+function Icon({ children }) {
+  return /* @__PURE__ */ jsx(
     "svg",
     {
       viewBox: "0 0 24 24",
@@ -375,27 +358,25 @@ function ChevronsUpDownIcon() {
       strokeLinecap: "round",
       strokeLinejoin: "round",
       "aria-hidden": "true",
-      children: [
-        /* @__PURE__ */ jsx("path", { d: "m7 15 5 5 5-5" }),
-        /* @__PURE__ */ jsx("path", { d: "m7 9 5-5 5 5" })
-      ]
+      children
     }
   );
 }
+function ChevronsUpDownIcon() {
+  return /* @__PURE__ */ jsxs(Icon, { children: [
+    /* @__PURE__ */ jsx("path", { d: "m7 15 5 5 5-5" }),
+    /* @__PURE__ */ jsx("path", { d: "m7 9 5-5 5 5" })
+  ] });
+}
 function ChevronUpIcon() {
-  return /* @__PURE__ */ jsx(
-    "svg",
-    {
-      viewBox: "0 0 24 24",
-      fill: "none",
-      stroke: "currentColor",
-      strokeWidth: 2,
-      strokeLinecap: "round",
-      strokeLinejoin: "round",
-      "aria-hidden": "true",
-      children: /* @__PURE__ */ jsx("path", { d: "m18 15-6-6-6 6" })
-    }
-  );
+  return /* @__PURE__ */ jsx(Icon, { children: /* @__PURE__ */ jsx("path", { d: "m18 15-6-6-6 6" }) });
+}
+function GroupIcon() {
+  return /* @__PURE__ */ jsxs(Icon, { children: [
+    /* @__PURE__ */ jsx("rect", { x: "3", y: "3", width: "7", height: "7", rx: "1" }),
+    /* @__PURE__ */ jsx("rect", { x: "14", y: "3", width: "7", height: "7", rx: "1" }),
+    /* @__PURE__ */ jsx("rect", { x: "8.5", y: "14", width: "7", height: "7", rx: "1" })
+  ] });
 }
 function GridHeader({
   columns,
@@ -403,10 +384,13 @@ function GridHeader({
   drag,
   sort,
   sortableColumns,
+  grouping,
+  groupableColumns,
+  groupToggleIconColumns,
   nav,
   selection
 }) {
-  const { beforeId } = drag.dropTarget ?? {};
+  const beforeId = drag.dropTarget?.kind === "column-order" ? drag.dropTarget.beforeId : void 0;
   const draggedEntry = columns.find((entry) => entry.id === drag.draggedColumnId) ?? null;
   return /* @__PURE__ */ jsxs("thead", { children: [
     /* @__PURE__ */ jsx("tr", { className: "grid-header", role: "row", "aria-rowindex": 1, children: columns.map((entry, index) => {
@@ -419,21 +403,30 @@ function GridHeader({
       const sortable = column.sortable ?? sortableColumns;
       const sortDirection = sort.directionFor(entry.id);
       const sortPriority = sort.priorityFor(entry.id);
-      const shortcuts = [
-        entry.reorderable ? "Control+ArrowLeft Control+ArrowRight" : "",
-        entry.resizable ? "Alt+ArrowLeft Alt+ArrowRight" : "",
-        sortable ? "Alt+ArrowUp" : ""
-      ].filter(Boolean).join(" ");
+      const groupable = column.groupable ?? groupableColumns;
+      const showGroupToggleIcon = column.groupToggleIcon ?? groupToggleIconColumns;
+      const isGrouped = grouping.groupBy.some(
+        (level) => level.columnId === entry.id
+      );
+      const shortcuts = buildKeyShortcuts({
+        reorderable: entry.reorderable,
+        resizable: entry.resizable,
+        sortable,
+        groupable
+      });
       return /* @__PURE__ */ jsxs(
         "th",
         {
           scope: "col",
+          role: "columnheader",
           "data-gridkit-column": entry.id,
           "aria-colindex": index + 1,
           tabIndex: nav.tabIndexFor(HEADER_ROW, index),
-          ...selection.columnMode !== false && {
-            "aria-selected": selected
-          },
+          ...ariaAttr(
+            selection.columnMode !== false,
+            "aria-selected",
+            selected
+          ),
           onFocus: () => {
             nav.focusCell(HEADER_ROW, index);
           },
@@ -441,7 +434,7 @@ function GridHeader({
             if (drag.justDragged()) {
               return;
             }
-            if (event.target instanceof Element && (event.target.closest(".header-resize-handle") !== null || event.target.closest(".header-sort-toggle") !== null)) {
+            if (event.target instanceof Element && (event.target.closest(".header-resize-handle") !== null || event.target.closest(".header-sort-toggle") !== null || event.target.closest(".header-group-toggle") !== null)) {
               return;
             }
             selection.selectColumn(entry.id, intentOf(event));
@@ -459,28 +452,38 @@ function GridHeader({
               resize.nudge(entry, direction * KEYBOARD_STEP);
               return;
             }
+            if (event.key === "Enter" && event.altKey && entry.resizable) {
+              event.preventDefault();
+              resize.sizeToContent(entry);
+              return;
+            }
             if (event.key === "ArrowUp" && event.altKey && sortable) {
               event.preventDefault();
               sort.toggle(entry, { shiftKey: event.shiftKey });
               return;
             }
+            if (event.key === "ArrowDown" && event.altKey && groupable) {
+              event.preventDefault();
+              grouping.toggleGroupBy(entry.id);
+              return;
+            }
             if (event.key === " " || event.key === "Enter") {
               event.preventDefault();
               selection.selectColumn(
                 entry.id,
-                intentOf({
-                  ctrlKey: event.key === " " || event.ctrlKey,
-                  metaKey: event.metaKey,
-                  shiftKey: event.shiftKey
-                })
+                intentOf(keyboardSelectIntent(event))
               );
               return;
             }
             nav.onKeyDown(event);
           },
-          className: [
+          className: classNames(
             "header-cell",
-            entry.reorderable ? "is-reorderable" : "",
+            // The grab affordance a header showing either drag
+            // destination shares — a column dragged only for grouping
+            // (`groupByDraggable` without `reorderable`) grabs the same
+            // way one dragged only for reordering does.
+            entry.reorderable || entry.groupByDraggable ? "is-reorderable" : "",
             selected ? "is-selected" : "",
             resizing ? "is-resizing" : "",
             dragging ? "is-dragging" : "",
@@ -488,17 +491,47 @@ function GridHeader({
             dropAfter ? "is-drop-after" : "",
             column.wrap?.header ? "is-wrapped" : "",
             column.headerClassName ?? ""
-          ].filter(Boolean).join(" "),
-          ...shortcuts !== "" && { "aria-keyshortcuts": shortcuts },
-          ...sortable && sortDirection !== null && {
-            "aria-sort": sortDirection === "asc" ? "ascending" : "descending"
-          },
-          ...entry.reorderable && {
+          ),
+          ...ariaAttr(shortcuts !== "", "aria-keyshortcuts", shortcuts),
+          ...ariaAttr(
+            sortable && sortDirection !== null,
+            "aria-sort",
+            sortDirection === "asc" ? "ascending" : "descending"
+          ),
+          ...(entry.reorderable || entry.groupByDraggable) && {
             onPointerDown: (event) => {
               drag.startDrag(entry, event);
             }
           },
           children: [
+            groupable && showGroupToggleIcon && /*
+             * Inline, before the label, rather than absolutely
+             * positioned like the sort toggle and resize handle: those
+             * two already share the header's right edge, and a third
+             * overlay there would need its own carve-out. Sitting in
+             * normal flow costs nothing but a few pixels of label width.
+             * A pointer affordance only, same as the other two — the
+             * keyboard equivalent is Alt+ArrowDown on the header itself.
+             */
+            /* @__PURE__ */ jsx(
+              "span",
+              {
+                className: classNames(
+                  "header-group-toggle",
+                  isGrouped ? "is-grouped" : ""
+                ),
+                "aria-hidden": "true",
+                tabIndex: -1,
+                onPointerDown: (event) => {
+                  event.stopPropagation();
+                },
+                onClick: (event) => {
+                  event.stopPropagation();
+                  grouping.toggleGroupBy(entry.id);
+                },
+                children: /* @__PURE__ */ jsx(GroupIcon, {})
+              }
+            ),
             entry.label,
             sortable && /*
              * A pointer affordance only, and hidden from assistive
@@ -509,10 +542,10 @@ function GridHeader({
             /* @__PURE__ */ jsxs(
               "span",
               {
-                className: [
+                className: classNames(
                   "header-sort-toggle",
                   sortDirection !== null ? `is-sorted-${sortDirection}` : ""
-                ].filter(Boolean).join(" "),
+                ),
                 "aria-hidden": "true",
                 tabIndex: -1,
                 onPointerDown: (event) => {
@@ -570,10 +603,109 @@ function GridHeader({
   ] });
 }
 
-// src/DataGrid/components/GridRow.tsx
-import { accessDotted as accessDotted2 } from "@gridkitjs/core";
+// src/DataGrid/components/GridBody.tsx
+import { useMemo as useMemo2 } from "react";
+import { groupRowId, intentOf as intentOf2 } from "@gridkitjs/core";
+
+// src/DataGrid/components/GridGroupRow.tsx
 import { memo } from "react";
-import { jsx as jsx2 } from "react/jsx-runtime";
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+function formatGroupValue(value) {
+  if (value === null || value === void 0) {
+    return "(blank)";
+  }
+  if (value instanceof Date) {
+    return value.toLocaleString();
+  }
+  switch (typeof value) {
+    case "string":
+    case "number":
+    case "boolean":
+    case "bigint":
+    case "symbol":
+      return String(value);
+    case "function":
+      return "(function)";
+    default:
+      return JSON.stringify(value);
+  }
+}
+function GridGroupRowComponent({
+  columnCount,
+  groupId,
+  level,
+  columnLabel,
+  value,
+  expanded,
+  count,
+  rowIndex,
+  posinset,
+  setsize,
+  focused
+}) {
+  return /* @__PURE__ */ jsx2(
+    "tr",
+    {
+      role: "row",
+      "aria-rowindex": rowIndex + 2,
+      "aria-level": level + 1,
+      "aria-expanded": expanded,
+      "aria-setsize": setsize,
+      "aria-posinset": posinset,
+      "data-gridkit-group": groupId,
+      className: classNames(
+        "grid-group-row",
+        `is-group-level-${String(level)}`
+      ),
+      children: /* @__PURE__ */ jsx2(
+        "td",
+        {
+          role: "gridcell",
+          colSpan: columnCount,
+          tabIndex: focused ? 0 : -1,
+          "aria-keyshortcuts": "Space Enter",
+          className: "grid-group-cell",
+          children: /* @__PURE__ */ jsxs2(
+            "div",
+            {
+              className: "grid-group-cell-content",
+              style: { paddingInlineStart: `${String(level * 1.25 + 0.5)}rem` },
+              children: [
+                /* @__PURE__ */ jsx2(
+                  "span",
+                  {
+                    className: classNames(
+                      "group-toggle",
+                      expanded ? "is-expanded" : "is-collapsed"
+                    ),
+                    "aria-hidden": "true"
+                  }
+                ),
+                /* @__PURE__ */ jsxs2("span", { className: "group-label", children: [
+                  columnLabel,
+                  ": ",
+                  formatGroupValue(value)
+                ] }),
+                /* @__PURE__ */ jsxs2("span", { className: "group-count", children: [
+                  "(",
+                  count,
+                  ")"
+                ] })
+              ]
+            }
+          )
+        }
+      )
+    }
+  );
+}
+var GridGroupRow = memo(GridGroupRowComponent);
+var GridGroupRow_default = GridGroupRow;
+
+// src/DataGrid/components/GridRow.tsx
+import { accessDotted } from "@gridkitjs/core";
+import { memo as memo2 } from "react";
+import { jsx as jsx3 } from "react/jsx-runtime";
 function GridRowComponent({
   columns,
   rowId,
@@ -587,31 +719,32 @@ function GridRowComponent({
   rowsSelectable,
   cellsSelectable
 }) {
-  return /* @__PURE__ */ jsx2(
+  return /* @__PURE__ */ jsx3(
     "tr",
     {
       role: "row",
       "aria-rowindex": rowIndex + 2,
-      ...rowsSelectable && { "aria-selected": selected },
-      className: ["grid-row", selected ? "is-selected" : ""].filter(Boolean).join(" "),
+      ...ariaAttr(rowsSelectable, "aria-selected", selected),
+      className: classNames("grid-row", selected ? "is-selected" : ""),
       children: columns.map(({ id, column, alignment }, columnIndex) => {
-        const value = accessDotted2(row, column.field);
+        const value = accessDotted(row, column.field);
         const cellSelected = id === selectedColumnId;
-        return /* @__PURE__ */ jsx2(
+        return /* @__PURE__ */ jsx3(
           "td",
           {
             role: "gridcell",
             "data-gridkit-column": id,
             "aria-colindex": columnIndex + 1,
-            tabIndex: columnIndex === focusedColumnIndex ? 0 : -1,
-            ...cellsSelectable && { "aria-selected": cellSelected },
-            className: [
+            tabIndex: tabIndexFor(columnIndex, focusedColumnIndex),
+            ...ariaAttr(cellsSelectable, "aria-selected", cellSelected),
+            ...ariaAttr(cellsSelectable, "aria-keyshortcuts", "Space Enter"),
+            className: classNames(
               "grid-cell",
               id === activeColumnId ? "is-resizing" : "",
               cellSelected || selectedColumnIds.has(id) ? "is-selected" : "",
               column.wrap?.cells ? "is-wrapped" : "",
               column.cellClassName ?? ""
-            ].filter(Boolean).join(" "),
+            ),
             style: { textAlign: alignment },
             children: column.cellTemplate ? column.cellTemplate({ value, row, rowIndex, rowId, selected }) : value
           },
@@ -621,11 +754,11 @@ function GridRowComponent({
     }
   );
 }
-var GridRow = memo(GridRowComponent);
+var GridRow = memo2(GridRowComponent);
 var GridRow_default = GridRow;
 
 // src/DataGrid/components/GridBody.tsx
-import { jsx as jsx3 } from "react/jsx-runtime";
+import { jsx as jsx4 } from "react/jsx-runtime";
 function cellFrom(target) {
   if (!(target instanceof Element)) {
     return null;
@@ -642,21 +775,58 @@ function cellFrom(target) {
     columnId
   };
 }
+function groupRowFrom(target) {
+  if (!(target instanceof Element)) {
+    return null;
+  }
+  const row = target.closest("tr[data-gridkit-group]");
+  const groupId = row?.getAttribute("data-gridkit-group");
+  if (!(row instanceof HTMLTableRowElement) || groupId === null || groupId === void 0) {
+    return null;
+  }
+  return { rowIndex: row.sectionRowIndex, groupId };
+}
+function groupAriaMeta(rows) {
+  const totals = /* @__PURE__ */ new Map();
+  for (const entry of rows) {
+    if (!("kind" in entry)) continue;
+    const parentKey = groupRowId(entry.path.slice(0, -1));
+    totals.set(parentKey, (totals.get(parentKey) ?? 0) + 1);
+  }
+  const seen = /* @__PURE__ */ new Map();
+  const meta = /* @__PURE__ */ new Map();
+  for (const entry of rows) {
+    if (!("kind" in entry)) continue;
+    const parentKey = groupRowId(entry.path.slice(0, -1));
+    const posinset = (seen.get(parentKey) ?? 0) + 1;
+    seen.set(parentKey, posinset);
+    meta.set(entry.groupId, {
+      posinset,
+      setsize: totals.get(parentKey) ?? posinset
+    });
+  }
+  return meta;
+}
 function GridBody({
   columns,
   rows,
   activeColumnId,
   nav,
-  selection
+  selection,
+  grouping
 }) {
   const { selectedCell, rowMode, cellMode } = selection;
+  const ariaMeta = useMemo2(() => groupAriaMeta(rows), [rows]);
   function targetOf(target) {
     const position = cellFrom(target);
     const entry = position === null ? void 0 : rows[position.rowIndex];
-    return position === null || entry === void 0 ? null : { position, rowId: entry.rowId };
+    if (position === null || entry === void 0 || "kind" in entry) {
+      return null;
+    }
+    return { position, rowId: entry.rowId };
   }
   function select(rowId, columnId, modifiers) {
-    const intent = intentOf(modifiers);
+    const intent = intentOf2(modifiers);
     if (rowMode !== false) {
       selection.selectRow(rowId, intent);
     }
@@ -664,78 +834,161 @@ function GridBody({
       selection.selectCell({ rowId, columnId }, intent);
     }
   }
-  return /* @__PURE__ */ jsx3(
+  return /* @__PURE__ */ jsx4(
     "tbody",
     {
       className: "grid-body",
       onFocus: (event) => {
+        const group = groupRowFrom(event.target);
+        if (group !== null) {
+          nav.focusCell(group.rowIndex, 0);
+          return;
+        }
         const found = targetOf(event.target);
         if (found === null) return;
         nav.focusCell(found.position.rowIndex, found.position.columnIndex);
       },
       onClick: (event) => {
+        const group = groupRowFrom(event.target);
+        if (group !== null) {
+          grouping.toggleExpansion(group.groupId);
+          return;
+        }
         const found = targetOf(event.target);
         if (found === null) return;
         select(found.rowId, found.position.columnId, event);
       },
       onKeyDown: (event) => {
+        const group = groupRowFrom(event.target);
+        if (group !== null) {
+          if (event.key === "ArrowLeft" || event.key === "ArrowRight") {
+            event.preventDefault();
+            return;
+          }
+          if (event.key === " " || event.key === "Enter") {
+            event.preventDefault();
+            grouping.toggleExpansion(group.groupId);
+            return;
+          }
+          nav.onKeyDown(event);
+          return;
+        }
         if (event.key === " " || event.key === "Enter") {
           const found = targetOf(event.target);
           if (found === null) return;
           event.preventDefault();
-          select(found.rowId, found.position.columnId, {
-            ctrlKey: event.key === " " || event.ctrlKey,
-            metaKey: event.metaKey,
-            shiftKey: event.shiftKey
-          });
+          select(
+            found.rowId,
+            found.position.columnId,
+            keyboardSelectIntent(event)
+          );
           return;
         }
         nav.onKeyDown(event);
       },
-      children: rows.map(({ rowId, row, rowIndex }) => /* @__PURE__ */ jsx3(
-        GridRow_default,
-        {
-          columns,
-          rowId,
-          row,
-          rowIndex,
-          activeColumnId,
-          selectedColumnIds: selection.selectedColumnIds,
-          selected: selection.selectedRowIds.has(rowId),
-          selectedColumnId: selectedCell?.rowId === rowId ? selectedCell.columnId : null,
-          focusedColumnIndex: nav.focus.rowIndex === rowIndex ? nav.focus.columnIndex : null,
-          rowsSelectable: rowMode !== false,
-          cellsSelectable: cellMode !== false
-        },
-        rowId
-      ))
+      children: rows.map(
+        (entry) => "kind" in entry ? /* @__PURE__ */ jsx4(
+          GridGroupRow_default,
+          {
+            columnCount: columns.length,
+            groupId: entry.groupId,
+            level: entry.level,
+            columnLabel: columns.find((column) => column.id === entry.columnId)?.label ?? entry.columnId,
+            value: entry.value,
+            expanded: entry.expanded,
+            count: entry.count,
+            rowIndex: entry.rowIndex,
+            posinset: ariaMeta.get(entry.groupId)?.posinset ?? 1,
+            setsize: ariaMeta.get(entry.groupId)?.setsize ?? 1,
+            focused: nav.focus.rowIndex === entry.rowIndex
+          },
+          entry.groupId
+        ) : /* @__PURE__ */ jsx4(
+          GridRow_default,
+          {
+            columns,
+            rowId: entry.rowId,
+            row: entry.row,
+            rowIndex: entry.rowIndex,
+            activeColumnId,
+            selectedColumnIds: selection.selectedColumnIds,
+            selected: selection.selectedRowIds.has(entry.rowId),
+            selectedColumnId: selectedCell?.rowId === entry.rowId ? selectedCell.columnId : null,
+            focusedColumnIndex: nav.focus.rowIndex === entry.rowIndex ? nav.focus.columnIndex : null,
+            rowsSelectable: rowMode !== false,
+            cellsSelectable: cellMode !== false
+          },
+          entry.rowId
+        )
+      )
     }
   );
 }
 
-// src/DataGrid/useColumnDrag.ts
+// src/DataGrid/components/GroupByBar.tsx
+import { createPortal as createPortal2 } from "react-dom";
+import { resolveKeyboardDropTarget } from "@gridkitjs/core";
+
+// src/DataGrid/groupByDropTarget.ts
+import {
+  movesGroupBy,
+  resolveDropBefore
+} from "@gridkitjs/core";
+
+// src/DataGrid/useDragReorder.ts
 import {
   useRef as useRef3,
   useState as useState2
 } from "react";
-import {
-  movesColumn,
-  resolveDropBefore
-} from "@gridkitjs/core";
+
+// src/DataGrid/pointerGesture.ts
+function startPointerGesture(element, pointerId, handlers) {
+  element.setPointerCapture(pointerId);
+  function stop() {
+    element.removeEventListener("pointermove", move);
+    element.removeEventListener("pointerup", end);
+    element.removeEventListener("pointercancel", cancel);
+    window.removeEventListener("keydown", onKeyDown);
+    if (element.hasPointerCapture(pointerId)) {
+      element.releasePointerCapture(pointerId);
+    }
+  }
+  function move(event) {
+    handlers.onMove(event);
+  }
+  function end() {
+    stop();
+    handlers.onEnd();
+  }
+  function cancel() {
+    stop();
+    handlers.onCancel();
+  }
+  function onKeyDown(event) {
+    if (event.key === "Escape") {
+      cancel();
+    }
+  }
+  element.addEventListener("pointermove", move);
+  element.addEventListener("pointerup", end);
+  element.addEventListener("pointercancel", cancel);
+  window.addEventListener("keydown", onKeyDown);
+}
+
+// src/DataGrid/useDragReorder.ts
 var DRAG_THRESHOLD = 4;
-function headerAt(x, y) {
-  const element = document.elementFromPoint(x, y);
-  return element?.closest("th[data-gridkit-column]") ?? null;
+function elementAt(x, y, selector) {
+  return document.elementFromPoint(x, y)?.closest(selector) ?? null;
 }
 function sideOf(element, x) {
   const rect = element.getBoundingClientRect();
   return x < rect.left + rect.width / 2 ? "before" : "after";
 }
-function useColumnDrag({
-  order,
+function useDragReorder({
+  resolveTarget,
   onDrop
 }) {
-  const [draggedColumnId, setDraggedColumnId] = useState2(null);
+  const [draggedId, setDraggedId] = useState2(null);
   const [dropTarget, setDropTarget] = useState2(null);
   const [ghostTransform, setGhostTransform] = useState2(null);
   const dragged = useRef3(false);
@@ -744,87 +997,256 @@ function useColumnDrag({
     dragged.current = false;
     return answer;
   }
-  function startDrag(entry, event) {
-    const header = event.currentTarget;
+  function startDrag(id, grabElement, event) {
     const { pointerId, clientX: startX } = event;
-    const grabX = startX - header.getBoundingClientRect().left;
+    const grabX = startX - grabElement.getBoundingClientRect().left;
     let dragging = false;
     let target = null;
     function placeGhost(x, y) {
       setGhostTransform(`translate(${String(x - grabX)}px, ${String(y)}px)`);
     }
-    header.setPointerCapture(pointerId);
-    function move(moveEvent) {
-      const { clientX, clientY } = moveEvent;
-      if (!dragging) {
-        if (Math.abs(clientX - startX) < DRAG_THRESHOLD) {
-          return;
-        }
-        dragging = true;
-        dragged.current = true;
-        setDraggedColumnId(entry.id);
-      }
-      placeGhost(clientX, clientY);
-      const over = headerAt(clientX, clientY);
-      const overId = over?.getAttribute("data-gridkit-column");
-      const beforeId = over && overId ? resolveDropBefore(order, overId, sideOf(over, clientX)) : void 0;
-      target = beforeId !== void 0 && movesColumn(order, entry.id, beforeId) ? { kind: "column-order", beforeId } : null;
-      setDropTarget(target);
-    }
-    function stop() {
-      header.removeEventListener("pointermove", move);
-      header.removeEventListener("pointerup", end);
-      header.removeEventListener("pointercancel", cancel);
-      window.removeEventListener("keydown", onKeyDown);
-      if (header.hasPointerCapture(pointerId)) {
-        header.releasePointerCapture(pointerId);
-      }
+    function reset() {
       setGhostTransform(null);
-      setDraggedColumnId(null);
+      setDraggedId(null);
       setDropTarget(null);
     }
-    function end() {
-      const dropped = target;
-      stop();
-      if (dragging && dropped !== null) {
-        onDrop(dropped, entry.id);
+    startPointerGesture(grabElement, pointerId, {
+      onMove(moveEvent) {
+        const { clientX, clientY } = moveEvent;
+        if (!dragging) {
+          if (Math.abs(clientX - startX) < DRAG_THRESHOLD) {
+            return;
+          }
+          dragging = true;
+          dragged.current = true;
+          setDraggedId(id);
+        }
+        placeGhost(clientX, clientY);
+        target = resolveTarget(clientX, clientY, id);
+        setDropTarget(target);
+      },
+      onEnd() {
+        const dropped = target;
+        reset();
+        if (dragging && dropped !== null) {
+          onDrop(dropped, id);
+        }
+      },
+      // Escape and a cancelled pointer both leave the order as it was.
+      onCancel() {
+        target = null;
+        reset();
       }
+    });
+  }
+  return {
+    draggedId,
+    dropTarget,
+    ghostTransform,
+    startDrag,
+    justDragged
+  };
+}
+
+// src/DataGrid/groupByDropTarget.ts
+function resolveGroupByDropTarget(clientX, clientY, movedId, groupBy) {
+  const overBar = elementAt(clientX, clientY, "[data-gridkit-group-by-bar]");
+  if (overBar === null) {
+    return null;
+  }
+  const overChip = elementAt(clientX, clientY, "[data-gridkit-group-chip]");
+  const chipId = overChip?.getAttribute("data-gridkit-group-chip");
+  const beforeColumnId = overChip && chipId ? resolveDropBefore(
+    groupBy.map((entry) => entry.columnId),
+    chipId,
+    sideOf(overChip, clientX)
+  ) : null;
+  return movesGroupBy(groupBy, movedId, beforeColumnId) ? { kind: "group-by", beforeColumnId } : null;
+}
+
+// src/DataGrid/useGroupByDrag.ts
+function useGroupByDrag({
+  groupBy,
+  onDrop
+}) {
+  const drag = useDragReorder({
+    resolveTarget: (clientX, clientY, movedId) => resolveGroupByDropTarget(clientX, clientY, movedId, groupBy),
+    onDrop: (target, movedId) => {
+      onDrop(movedId, target.beforeColumnId);
     }
-    function cancel() {
-      target = null;
-      stop();
-    }
-    function onKeyDown(keyEvent) {
-      if (keyEvent.key === "Escape") {
-        cancel();
-      }
+  });
+  return {
+    draggedColumnId: drag.draggedId,
+    dropTarget: drag.dropTarget,
+    ghostTransform: drag.ghostTransform,
+    startDrag: (columnId, event) => {
+      drag.startDrag(columnId, event.currentTarget, event);
+    },
+    justDragged: drag.justDragged
+  };
+}
+
+// src/DataGrid/components/GroupByBar.tsx
+import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
+function GroupByBar({
+  columns,
+  grouping,
+  columnName,
+  headerDragEligible,
+  headerDragBlocked,
+  headerDropTarget
+}) {
+  const { groupBy } = grouping;
+  const groupByIds = groupBy.map((entry) => entry.columnId);
+  const chipDrag = useGroupByDrag({
+    groupBy,
+    onDrop: (movedId, beforeColumnId) => {
+      grouping.moveGroupBy(movedId, beforeColumnId);
     }
-    header.addEventListener("pointermove", move);
-    header.addEventListener("pointerup", end);
-    header.addEventListener("pointercancel", cancel);
-    window.addEventListener("keydown", onKeyDown);
+  });
+  const activeDropTarget = chipDrag.dropTarget ?? headerDropTarget;
+  const isDragTarget = chipDrag.draggedColumnId !== null || headerDragEligible;
+  const showPlaceholder = groupBy.length === 0 && columns.some((entry) => entry.groupByDraggable);
+  function labelFor(columnId) {
+    return columns.find((entry) => entry.id === columnId)?.label ?? columnId;
   }
-  function moveByKeyboard(entry, direction) {
-    const index = order.indexOf(entry.id);
-    if (index === -1) {
+  function moveByKeyboard(columnId, direction) {
+    const beforeColumnId = resolveKeyboardDropTarget(
+      groupByIds,
+      columnId,
+      direction
+    );
+    if (beforeColumnId === void 0) {
       return;
     }
-    const targetIndex = direction === -1 ? index - 1 : index + 2;
-    if (targetIndex < 0) {
+    grouping.moveGroupBy(columnId, beforeColumnId);
+  }
+  return /* @__PURE__ */ jsxs3(
+    "div",
+    {
+      className: classNames(
+        "gridkit-group-by-bar",
+        isDragTarget ? "is-drag-target" : "",
+        headerDragBlocked ? "is-drag-blocked" : ""
+      ),
+      "data-gridkit-group-by-bar": "",
+      role: "group",
+      "aria-label": "Grouped by",
+      children: [
+        showPlaceholder && /* @__PURE__ */ jsx5("span", { className: "group-by-bar-placeholder", children: "Drag a column here to group by it" }),
+        groupBy.map((entry, index) => {
+          const dropBefore = activeDropTarget?.beforeColumnId === entry.columnId;
+          const dropAfter = activeDropTarget?.beforeColumnId === null && index === groupBy.length - 1;
+          const dragging = chipDrag.draggedColumnId === entry.columnId;
+          return /* @__PURE__ */ jsxs3(
+            "span",
+            {
+              className: classNames(
+                "group-by-chip",
+                dragging ? "is-dragging" : "",
+                dropBefore ? "is-drop-before" : "",
+                dropAfter ? "is-drop-after" : ""
+              ),
+              "data-gridkit-group-chip": entry.columnId,
+              tabIndex: 0,
+              "aria-label": groupBy.length > 1 ? `${columnName(entry.columnId)}, level ${String(index + 1)} of ${String(groupBy.length)}` : columnName(entry.columnId),
+              "aria-keyshortcuts": "Control+ArrowLeft Control+ArrowRight",
+              onPointerDown: (event) => {
+                chipDrag.startDrag(entry.columnId, event);
+              },
+              onKeyDown: (event) => {
+                const horizontal = event.key === "ArrowLeft" || event.key === "ArrowRight";
+                if (horizontal && event.ctrlKey) {
+                  event.preventDefault();
+                  moveByKeyboard(
+                    entry.columnId,
+                    event.key === "ArrowLeft" ? -1 : 1
+                  );
+                }
+              },
+              children: [
+                /* @__PURE__ */ jsx5("span", { className: "group-by-chip-label", children: labelFor(entry.columnId) }),
+                /* @__PURE__ */ jsx5(
+                  "button",
+                  {
+                    type: "button",
+                    className: "group-by-chip-remove",
+                    "aria-label": `Stop grouping by ${columnName(entry.columnId)}`,
+                    onPointerDown: (event) => {
+                      event.stopPropagation();
+                    },
+                    onClick: () => {
+                      grouping.toggleGroupBy(entry.columnId);
+                    },
+                    children: "\xD7"
+                  }
+                )
+              ]
+            },
+            entry.columnId
+          );
+        }),
+        chipDrag.draggedColumnId !== null && chipDrag.ghostTransform !== null && createPortal2(
+          /* @__PURE__ */ jsx5(
+            "span",
+            {
+              className: "group-by-chip drag-ghost",
+              style: { transform: chipDrag.ghostTransform },
+              "aria-hidden": "true",
+              children: labelFor(chipDrag.draggedColumnId)
+            }
+          ),
+          document.body
+        )
+      ]
+    }
+  );
+}
+
+// src/DataGrid/useColumnDrag.ts
+import {
+  movesColumn,
+  resolveDropBefore as resolveDropBefore2,
+  resolveKeyboardDropTarget as resolveKeyboardDropTarget2
+} from "@gridkitjs/core";
+function useColumnDrag({
+  order,
+  groupBy,
+  groupByDraggableIds,
+  onDrop
+}) {
+  const drag = useDragReorder({
+    resolveTarget(clientX, clientY, movedId) {
+      const over = elementAt(clientX, clientY, "th[data-gridkit-column]");
+      const overId = over?.getAttribute("data-gridkit-column");
+      const beforeId = over && overId ? resolveDropBefore2(order, overId, sideOf(over, clientX)) : void 0;
+      if (beforeId !== void 0) {
+        return movesColumn(order, movedId, beforeId) ? { kind: "column-order", beforeId } : null;
+      }
+      const alreadyGrouped = groupBy.some(
+        (entry) => entry.columnId === movedId
+      );
+      return groupByDraggableIds.has(movedId) && !alreadyGrouped ? resolveGroupByDropTarget(clientX, clientY, movedId, groupBy) : null;
+    },
+    onDrop
+  });
+  function startDrag(entry, event) {
+    drag.startDrag(entry.id, event.currentTarget, event);
+  }
+  function moveByKeyboard(entry, direction) {
+    const beforeId = resolveKeyboardDropTarget2(order, entry.id, direction);
+    if (beforeId === void 0) {
       return;
     }
-    onDrop(
-      { kind: "column-order", beforeId: order[targetIndex] ?? null },
-      entry.id
-    );
+    onDrop({ kind: "column-order", beforeId }, entry.id);
   }
   return {
-    draggedColumnId,
-    dropTarget,
-    ghostTransform,
+    draggedColumnId: drag.draggedId,
+    dropTarget: drag.dropTarget,
+    ghostTransform: drag.ghostTransform,
     startDrag,
     moveByKeyboard,
-    justDragged
+    justDragged: drag.justDragged
   };
 }
 
@@ -837,6 +1259,7 @@ import {
   beginColumnResize,
   clampColumnWidth,
   resolveColumnConstraints,
+  revertColumnSize,
   sizeColumnToContent
 } from "@gridkitjs/core";
 
@@ -885,57 +1308,39 @@ function useColumnResize({
     let width = session.startWidth;
     event.preventDefault();
     event.stopPropagation();
-    handle.setPointerCapture(pointerId);
     setActiveColumnId(session.columnId);
-    function move(moveEvent) {
-      width = applyColumnResize(session, moveEvent.clientX);
-      commit(base, session.columnId, width, "move");
-    }
-    function stop() {
-      handle.removeEventListener("pointermove", move);
-      handle.removeEventListener("pointerup", end);
-      handle.removeEventListener("pointercancel", cancel);
-      window.removeEventListener("keydown", onKeyDown);
-      if (handle.hasPointerCapture(pointerId)) {
-        handle.releasePointerCapture(pointerId);
-      }
-      setActiveColumnId(null);
-    }
-    function end() {
-      stop();
-      if (width !== session.startWidth) {
-        commit(base, session.columnId, width, "end");
-      }
-    }
-    function cancel() {
-      stop();
-      setSizing((current) => {
-        const next = Object.fromEntries(
-          Object.entries(current).filter(
-            ([columnId]) => columnId !== session.columnId
-          )
-        );
-        if (session.columnId in base) {
-          next[session.columnId] = base[session.columnId];
+    startPointerGesture(handle, pointerId, {
+      onMove(moveEvent) {
+        width = applyColumnResize(session, moveEvent.clientX);
+        commit(base, session.columnId, width, "move");
+      },
+      onEnd() {
+        setActiveColumnId(null);
+        if (width !== session.startWidth) {
+          commit(base, session.columnId, width, "end");
         }
-        onColumnResize?.({
-          columnId: session.columnId,
-          width: session.startWidth,
-          sizing: next,
-          phase: "end"
+      },
+      /**
+       * Escape puts back only the dragged column's pre-drag width, merged
+       * into whatever the sizing state is *now* — not the `base` snapshot
+       * taken at drag-start — so a different column resized via keyboard
+       * while this drag was still open keeps its change instead of being
+       * clobbered by a stale restore.
+       */
+      onCancel() {
+        setActiveColumnId(null);
+        setSizing((current) => {
+          const next = revertColumnSize(current, base, session.columnId);
+          onColumnResize?.({
+            columnId: session.columnId,
+            width: session.startWidth,
+            sizing: next,
+            phase: "end"
+          });
+          return next;
         });
-        return next;
-      });
-    }
-    function onKeyDown(keyEvent) {
-      if (keyEvent.key === "Escape") {
-        cancel();
       }
-    }
-    handle.addEventListener("pointermove", move);
-    handle.addEventListener("pointerup", end);
-    handle.addEventListener("pointercancel", cancel);
-    window.addEventListener("keydown", onKeyDown);
+    });
   }
   function sizeToContent(entry) {
     const table = tableRef.current;
@@ -983,11 +1388,9 @@ function useColumnSort({
 }) {
   function toggle(entry, event) {
     const next = toggleColumnSort(sort, entry.id, { stack: event.shiftKey });
-    if (next === sort) {
-      return;
-    }
-    setSort(next);
-    onColumnSortChange?.({ columnId: entry.id, sort: next });
+    commitIfChanged(sort, next, setSort, (committed) => {
+      onColumnSortChange?.({ columnId: entry.id, sort: committed });
+    });
   }
   return {
     sort,
@@ -1018,8 +1421,62 @@ function useElementWidth(ref, enabled) {
   return width;
 }
 
+// src/DataGrid/useRowGrouping.ts
+import {
+  collapseAllGroups,
+  expandAllGroups,
+  moveGroupByBefore,
+  toggleGroupExpansion
+} from "@gridkitjs/core";
+function useRowGrouping({
+  groupBy,
+  setGroupBy,
+  expansion,
+  setExpansion,
+  onGroupByChange,
+  onGroupExpansionChange
+}) {
+  function commitExpansion(next, groupId) {
+    commitIfChanged(expansion, next, setExpansion, (committed) => {
+      onGroupExpansionChange?.({ groupId, expansion: committed });
+    });
+  }
+  function commitGroupBy(next, columnId) {
+    commitIfChanged(groupBy, next, setGroupBy, (committed) => {
+      onGroupByChange?.({ columnId, groupBy: committed });
+    });
+  }
+  function toggleGroupBy(columnId) {
+    const isGrouped = groupBy.some((entry) => entry.columnId === columnId);
+    const next = isGrouped ? groupBy.filter((entry) => entry.columnId !== columnId) : [...groupBy, { columnId }];
+    commitGroupBy(next, columnId);
+  }
+  function moveGroupBy(columnId, beforeColumnId) {
+    commitGroupBy(
+      moveGroupByBefore(groupBy, columnId, beforeColumnId),
+      columnId
+    );
+  }
+  return {
+    groupBy,
+    expansion,
+    isExpanded: (groupId) => !expansion.includes(groupId),
+    toggleExpansion: (groupId) => {
+      commitExpansion(toggleGroupExpansion(expansion, groupId), groupId);
+    },
+    expandAll: () => {
+      commitExpansion(expandAllGroups(expansion), null);
+    },
+    collapseAll: (rows) => {
+      commitExpansion(collapseAllGroups(rows), null);
+    },
+    toggleGroupBy,
+    moveGroupBy
+  };
+}
+
 // src/DataGrid/DataGrid.tsx
-import { jsx as jsx4, jsxs as jsxs2 } from "react/jsx-runtime";
+import { jsx as jsx6, jsxs as jsxs4 } from "react/jsx-runtime";
 function DataGridComponent({
   dataSource,
   columns,
@@ -1041,9 +1498,18 @@ function DataGridComponent({
   sortableColumns = false,
   defaultColumnSort,
   onColumnSortChange,
+  groupableColumns = false,
+  groupToggleIconColumns = true,
+  groupByDraggableColumns = false,
+  groupByBarVisibility = "auto",
+  defaultGroupBy,
+  onGroupByChange,
+  defaultGroupExpansion,
+  onGroupExpansionChange,
   defaultFilter,
   label,
   labelledBy,
+  ref,
   ...callbacks
 }) {
   const hoverRows = hoverable?.rows ?? true;
@@ -1059,6 +1525,10 @@ function DataGridComponent({
     defaultColumnOrder ?? []
   );
   const [sort, setSort] = useState5(defaultColumnSort ?? []);
+  const [groupBy, setGroupBy] = useState5(defaultGroupBy ?? []);
+  const [expansion, setExpansion] = useState5(
+    defaultGroupExpansion ?? []
+  );
   const [filter] = useState5(defaultFilter ?? []);
   const [announcement, setAnnouncement] = useState5("");
   const [rowSelection, setRowSelection] = useState5(
@@ -1070,7 +1540,7 @@ function DataGridComponent({
   const [cellSelection, setCellSelection] = useState5(
     defaultCellSelection ?? null
   );
-  const rows = useMemo2(
+  const rows = useMemo3(
     () => dataSource?.map((row, rowIndex) => ({
       rowId: resolveRowId(row, rowIndex, getRowId),
       row,
@@ -1078,21 +1548,22 @@ function DataGridComponent({
     })) ?? [],
     [dataSource, getRowId]
   );
-  const definedColumns = useMemo2(() => {
+  const definedColumns = useMemo3(() => {
     if (columns && columns.length !== 0) return columns;
     if (dataSource && dataSource.length > 0)
       return defineColumnsFromRows(dataSource);
     return [];
   }, [columns, dataSource]);
-  const orderedColumns = useMemo2(
+  const orderedColumns = useMemo3(
     () => applyColumnOrder(definedColumns, order),
     [definedColumns, order]
   );
-  const resolved = useMemo2(() => {
+  const resolved = useMemo3(() => {
     const widths = resolveColumnWidths(orderedColumns, sizing, {
       sizes: columnSizeDefaults,
       resizable: resizableColumns,
-      reorderable: reorderableColumns
+      reorderable: reorderableColumns,
+      groupByDraggable: groupByDraggableColumns
     });
     return resizeMode === "fit" && viewportWidth !== null ? fitColumnsToWidth(widths, viewportWidth, columnSizeDefaults) : widths;
   }, [
@@ -1102,12 +1573,23 @@ function DataGridComponent({
     viewportWidth,
     columnSizeDefaults,
     resizableColumns,
-    reorderableColumns
+    reorderableColumns,
+    groupByDraggableColumns
   ]);
-  const shownRows = useMemo2(
+  const shownRows = useMemo3(
     () => resolveShownRows(rows, filter, sort, resolved),
     [rows, filter, sort, resolved]
   );
+  const displayRows = useMemo3(
+    () => groupRows(shownRows, groupBy, expansion, resolved),
+    [shownRows, groupBy, expansion, resolved]
+  );
+  const displayDataRows = useMemo3(
+    () => groupBy.length === 0 ? shownRows : displayRows.filter(
+      (entry) => !("kind" in entry)
+    ),
+    [displayRows, groupBy.length, shownRows]
+  );
   function columnName(columnId) {
     const entry = resolved.find((candidate) => candidate.id === columnId);
     if (entry === void 0) {
@@ -1133,16 +1615,62 @@ function DataGridComponent({
     columnSizeDefaults,
     onColumnResize: handleColumnResize
   });
+  function handleGroupByChange(event) {
+    onGroupByChange?.(event);
+    const entry = event.groupBy.find(
+      (candidate) => candidate.columnId === event.columnId
+    );
+    if (entry === void 0) {
+      announce(`${columnName(event.columnId)}, grouping removed`);
+      return;
+    }
+    announce(
+      event.groupBy.length > 1 ? `Grouped by ${columnName(event.columnId)}, level ${String(event.groupBy.indexOf(entry) + 1)} of ${String(event.groupBy.length)}` : `Grouped by ${columnName(event.columnId)}`
+    );
+  }
+  function handleGroupExpansionChange(event) {
+    onGroupExpansionChange?.(event);
+    if (event.groupId === null) {
+      announce(
+        event.expansion.length === 0 ? "All groups expanded" : "All groups collapsed"
+      );
+      return;
+    }
+    announce(
+      event.expansion.includes(event.groupId) ? "Group collapsed" : "Group expanded"
+    );
+  }
+  const grouping = useRowGrouping({
+    groupBy,
+    setGroupBy,
+    expansion,
+    setExpansion,
+    onGroupByChange: handleGroupByChange,
+    onGroupExpansionChange: handleGroupExpansionChange
+  });
   const nav = useGridNavigation({
     tableRef,
-    rowCount: shownRows.length,
+    // Group headers are addressable rows too — the whole point of the flat
+    // `DisplayRow[]` shape is that they share one position space with data
+    // rows, so navigation counts them the same way.
+    rowCount: displayRows.length,
     columnCount: resolved.length
   });
-  const displayedIds = useMemo2(
+  const displayedIds = useMemo3(
     () => orderedColumns.map((column) => column.id ?? column.field),
     [orderedColumns]
   );
+  const groupByDraggableIds = useMemo3(
+    () => new Set(
+      resolved.filter((entry) => entry.groupByDraggable).map((entry) => entry.id)
+    ),
+    [resolved]
+  );
   function handleDrop(target, movedId) {
+    if (target.kind === "group-by") {
+      grouping.moveGroupBy(movedId, target.beforeColumnId);
+      return;
+    }
     const next = moveColumnBefore(displayedIds, movedId, target.beforeId);
     if (next === displayedIds) {
       return;
@@ -1155,7 +1683,16 @@ function DataGridComponent({
     );
     nav.focusCell(HEADER_ROW, position);
   }
-  const drag = useColumnDrag({ order: displayedIds, onDrop: handleDrop });
+  const drag = useColumnDrag({
+    order: displayedIds,
+    groupBy,
+    groupByDraggableIds,
+    onDrop: handleDrop
+  });
+  const draggedColumnAlreadyGrouped = drag.draggedColumnId !== null && groupBy.some((entry) => entry.columnId === drag.draggedColumnId);
+  const dragEligibleForGroupBy = drag.draggedColumnId !== null && groupByDraggableIds.has(drag.draggedColumnId) && !draggedColumnAlreadyGrouped;
+  const showGroupByBar = groupByBarVisibility === "always" || groupByBarVisibility === "auto" && (groupBy.length > 0 || dragEligibleForGroupBy);
+  const headerGroupByDropTarget = drag.dropTarget?.kind === "group-by" ? drag.dropTarget : null;
   function handleColumnSortChange(event) {
     onColumnSortChange?.(event);
     const entry = event.sort.find(
@@ -1176,7 +1713,7 @@ function DataGridComponent({
     onColumnSortChange: handleColumnSortChange
   });
   const selection = useGridSelection({
-    rows: shownRows,
+    rows: displayDataRows,
     columns: resolved,
     selectable,
     rowSelection,
@@ -1186,20 +1723,77 @@ function DataGridComponent({
     cellSelection,
     setCellSelection,
     callbacks,
-    announce
+    announce,
+    columnName
   });
   const multiselectable = selection.rowMode === "multiple" || selection.columnMode === "multiple";
-  return /* @__PURE__ */ jsxs2("div", { className: "gridkit-data-grid-viewport", ref: viewportRef, children: [
-    /* @__PURE__ */ jsxs2(
+  useImperativeHandle(ref, () => ({
+    get element() {
+      return viewportRef.current;
+    },
+    get table() {
+      return tableRef.current;
+    },
+    getRows: () => shownRows,
+    getDisplayRows: () => displayRows,
+    getColumns: () => resolved,
+    getColumnSizing: () => sizing,
+    getColumnOrder: () => order,
+    getColumnSort: () => sort,
+    getGroupBy: () => groupBy,
+    getGroupExpansion: () => expansion,
+    getRowSelection: () => rowSelection,
+    getColumnSelection: () => columnSelection,
+    getCellSelection: () => cellSelection,
+    getFocusedCell: () => nav.focus,
+    focusCell: nav.focusCell,
+    clearSelection: selection.clear,
+    selectAllRows: selection.selectAllRows,
+    expandAllGroups: grouping.expandAll,
+    collapseAllGroups: () => {
+      grouping.collapseAll(displayRows);
+    },
+    scrollToRow: (rowId, options) => {
+      const index = displayRows.findIndex(
+        (entry) => !("kind" in entry) && entry.rowId === rowId
+      );
+      if (index === -1) return;
+      tableRef.current?.tBodies[0]?.rows[index]?.scrollIntoView(options);
+    },
+    scrollToColumn: (columnId, options) => {
+      const cells = tableRef.current?.querySelectorAll("[data-gridkit-column]");
+      const cell = cells ? Array.from(cells).find(
+        (entry) => entry.getAttribute("data-gridkit-column") === columnId
+      ) : void 0;
+      cell?.scrollIntoView(options);
+    }
+  }));
+  return /* @__PURE__ */ jsxs4("div", { className: "gridkit-data-grid-viewport", ref: viewportRef, children: [
+    showGroupByBar && /* @__PURE__ */ jsx6(
+      GroupByBar,
+      {
+        columns: resolved,
+        grouping,
+        columnName,
+        headerDragEligible: dragEligibleForGroupBy,
+        headerDragBlocked: draggedColumnAlreadyGrouped,
+        headerDropTarget: headerGroupByDropTarget
+      }
+    ),
+    /* @__PURE__ */ jsxs4(
       "table",
       {
         ref: tableRef,
-        role: "grid",
-        "aria-rowcount": shownRows.length + 1,
+        role: groupBy.length > 0 ? "treegrid" : "grid",
+        "aria-rowcount": displayRows.length + 1,
         "aria-colcount": resolved.length,
-        ...multiselectable && { "aria-multiselectable": true },
-        ...labelledBy !== void 0 && { "aria-labelledby": labelledBy },
-        ...labelledBy === void 0 && label !== void 0 && { "aria-label": label },
+        ...ariaAttr(multiselectable, "aria-multiselectable", true),
+        ...ariaAttr(labelledBy !== void 0, "aria-labelledby", labelledBy),
+        ...ariaAttr(
+          labelledBy === void 0 && label !== void 0,
+          "aria-label",
+          label
+        ),
         onKeyDown: (event) => {
           if (event.key === "Escape") {
             if (drag.draggedColumnId !== null || resize.activeColumnId !== null)
@@ -1214,7 +1808,7 @@ function DataGridComponent({
           }
         },
         style: { width: totalColumnWidth(resolved) },
-        className: [
+        className: classNames(
           "gridkit-data-grid",
           borders ? `borders-${borders}` : "",
           // Hover is on by default and selection off, so one set of classes
@@ -1226,10 +1820,10 @@ function DataGridComponent({
           selection.rowMode === false ? "" : "selectable-rows",
           selection.columnMode === false ? "" : "selectable-columns",
           selection.cellMode === false ? "" : "selectable-cells"
-        ].filter(Boolean).join(" "),
+        ),
         children: [
-          /* @__PURE__ */ jsx4("colgroup", { children: resolved.map((entry) => /* @__PURE__ */ jsx4("col", { style: { width: entry.width } }, entry.id)) }),
-          /* @__PURE__ */ jsx4(
+          /* @__PURE__ */ jsx6("colgroup", { children: resolved.map((entry) => /* @__PURE__ */ jsx6("col", { style: { width: entry.width } }, entry.id)) }),
+          /* @__PURE__ */ jsx6(
             GridHeader,
             {
               columns: resolved,
@@ -1237,24 +1831,28 @@ function DataGridComponent({
               drag,
               sort: columnSort,
               sortableColumns,
+              grouping,
+              groupableColumns,
+              groupToggleIconColumns,
               nav,
               selection
             }
           ),
-          /* @__PURE__ */ jsx4(
+          /* @__PURE__ */ jsx6(
             GridBody,
             {
               columns: resolved,
-              rows: shownRows,
+              rows: displayRows,
               activeColumnId: resize.activeColumnId,
               nav,
-              selection
+              selection,
+              grouping
             }
           )
         ]
       }
     ),
-    /* @__PURE__ */ jsx4("div", { className: "gridkit-sr-only", role: "status", "aria-live": "polite", children: announcement })
+    /* @__PURE__ */ jsx6("div", { className: "gridkit-sr-only", role: "status", "aria-live": "polite", children: announcement })
   ] });
 }
 export {