@rufous/ui 0.3.23 → 0.3.25

package/dist/main.js

@@ -1687,6 +1687,7 @@ var TextField = forwardRef3(({
   slotProps,
   InputProps,
   numberVariant,
+  step: stepProp,
   multiline = false,
   rows,
   maxRows,
@@ -1822,7 +1823,7 @@ var TextField = forwardRef3(({
       required,
       disabled,
       readOnly,
-      step: type === "number" && numberVariant ? STEP_BY_VARIANT[numberVariant] : void 0,
+      step: type === "number" ? stepProp ?? (numberVariant ? STEP_BY_VARIANT[numberVariant] : void 0) : void 0,
       min: type === "number" && numberVariant ? MIN_BY_VARIANT[numberVariant] : void 0,
       ...slotProps?.input,
       ...props,
@@ -4472,8 +4473,57 @@ import {
   ArrowDown,
   Trash2,
   Plus,
-  ChevronsUpDown
+  ChevronsUpDown,
+  Layers
 } from "lucide-react";
+function getAllGroupIds(rows, fields, getKey, depth = 0, parentId = "") {
+  if (!fields.length || !rows.length) return [];
+  const [field, ...rest] = fields;
+  const buckets = /* @__PURE__ */ new Map();
+  rows.forEach((row) => {
+    const k = getKey(row, field) || "(Blank)";
+    if (!buckets.has(k)) buckets.set(k, []);
+    buckets.get(k).push(row);
+  });
+  const out = [];
+  buckets.forEach((children, k) => {
+    const id = `${parentId}::${field}::${k}`;
+    out.push({ id, field, key: k, depth, count: children.length });
+    if (rest.length) out.push(...getAllGroupIds(children, rest, getKey, depth + 1, id));
+  });
+  return out;
+}
+function buildFlatEntries(rows, fields, getKey, expanded, depth = 0, parentId = "") {
+  if (!fields.length) return rows.map((row) => ({ kind: "data", row, depth }));
+  const [field, ...rest] = fields;
+  const buckets = /* @__PURE__ */ new Map();
+  rows.forEach((row) => {
+    const k = getKey(row, field) || "(Blank)";
+    if (!buckets.has(k)) buckets.set(k, []);
+    buckets.get(k).push(row);
+  });
+  const out = [];
+  buckets.forEach((children, k) => {
+    const id = `${parentId}::${field}::${k}`;
+    out.push({ kind: "group", id, field, key: k, depth, leafCount: children.length });
+    if (expanded.has(id)) {
+      out.push(...buildFlatEntries(children, rest, getKey, expanded, depth + 1, id));
+    }
+  });
+  return out;
+}
+function buildTreeEntries(rows, getChildren, expanded, depth = 0) {
+  const out = [];
+  rows.forEach((row) => {
+    const children = getChildren(row) ?? [];
+    const hasChildren = children.length > 0;
+    out.push({ kind: "data", row, depth, hasChildren });
+    if (hasChildren && expanded.has(row.id)) {
+      out.push(...buildTreeEntries(children, getChildren, expanded, depth + 1));
+    }
+  });
+  return out;
+}
 function FilterSelect({
   value,
   onChange,
@@ -4571,7 +4621,21 @@ function DataGrid({
   searchableColumns,
   onSearchChange,
   onFiltersChange,
-  hideTopExport = false
+  initialFilters,
+  toolbarOptions,
+  customToolbar,
+  customFooter,
+  hideTopExport = false,
+  rowGroupingModel,
+  defaultRowGroupingModel,
+  onRowGroupingModelChange,
+  rowGroupingColumnMode = "single",
+  groupingColDef,
+  defaultGroupingExpansionDepth = 0,
+  isGroupExpandedByDefault,
+  disableRowGrouping = false,
+  treeData = false,
+  getChildRows
 }) {
   const sxClass = useSx(sx);
   const [editingCell, setEditingCell] = useState9(null);
@@ -4631,10 +4695,46 @@ function DataGrid({
   const [focusFilterIdx, setFocusFilterIdx] = useState9(-1);
   const filterableColumnsProp = initialColumnsProp.filter((c) => c.filterable !== false);
   const initialFilterCol = String(filterableColumnsProp[0]?.field || filterableColumnsProp[0]?.key || "");
-  const [advancedFilters, setAdvancedFilters] = useState9([
-    { column: initialFilterCol, operator: getDefaultOperator(filterableColumnsProp[0]?.type), value: "", logic: "AND" }
-  ]);
+  const [advancedFilters, setAdvancedFilters] = useState9(() => {
+    if (initialFilters && initialFilters.length > 0) return initialFilters;
+    return [{ column: initialFilterCol, operator: getDefaultOperator(filterableColumnsProp[0]?.type), value: "", logic: "AND" }];
+  });
   const [colSearch, setColSearch] = useState9("");
+  const [internalGroupingModel, setInternalGroupingModel] = useState9(
+    defaultRowGroupingModel ?? []
+  );
+  const activeGroupingModel = rowGroupingModel ?? internalGroupingModel;
+  const isGroupingActive = activeGroupingModel.length > 0;
+  const setGroupingModel = (model) => {
+    if (!rowGroupingModel) setInternalGroupingModel(model);
+    onRowGroupingModelChange?.(model);
+  };
+  const addToGrouping = (field) => {
+    if (activeGroupingModel.includes(field)) return;
+    setGroupingModel([...activeGroupingModel, field]);
+  };
+  const removeFromGrouping = (field) => {
+    setGroupingModel(activeGroupingModel.filter((f) => f !== field));
+  };
+  const [expandedGroups, setExpandedGroups] = useState9(/* @__PURE__ */ new Set());
+  const prevGroupModelKeyRef = useRef10("");
+  const toggleGroup = (groupId) => {
+    setExpandedGroups((prev) => {
+      const next = new Set(prev);
+      if (next.has(groupId)) next.delete(groupId);
+      else next.add(groupId);
+      return next;
+    });
+  };
+  const [treeExpandedRows, setTreeExpandedRows] = useState9(/* @__PURE__ */ new Set());
+  const toggleTreeRow = (id) => {
+    setTreeExpandedRows((prev) => {
+      const next = new Set(prev);
+      if (next.has(id)) next.delete(id);
+      else next.add(id);
+      return next;
+    });
+  };
   useEffect9(() => {
     const handleMouseMove = (e) => {
       if (!resizingColumn) return;
@@ -4677,6 +4777,13 @@ function DataGrid({
       return next;
     });
   }, [initialColumnsProp]);
+  const getGroupValue = (item, field) => {
+    const col = resolvedColumns.find((c) => String(c.field) === field || String(c.key) === field);
+    const raw = item[field];
+    if (col?.groupingValueGetter) return String(col.groupingValueGetter(raw, item) ?? "");
+    if (col?.valueGetter) return String(col.valueGetter({ value: raw, row: item, field }) ?? "");
+    return raw == null ? "" : String(raw);
+  };
   const onFiltersChangeRef = useRef10(onFiltersChange);
   useEffect9(() => {
     onFiltersChangeRef.current = onFiltersChange;
@@ -4864,14 +4971,36 @@ function DataGrid({
       return 0;
     });
   }, [filteredData, sortField, sortDirection, resolvedColumns]);
+  useEffect9(() => {
+    const key = activeGroupingModel.join("\0");
+    if (key === prevGroupModelKeyRef.current) return;
+    prevGroupModelKeyRef.current = key;
+    if (!activeGroupingModel.length) {
+      setExpandedGroups(/* @__PURE__ */ new Set());
+      return;
+    }
+    const allGroups = getAllGroupIds(sortedData, activeGroupingModel, getGroupValue);
+    setExpandedGroups(new Set(
+      allGroups.filter((g) => isGroupExpandedByDefault ? isGroupExpandedByDefault({ id: g.id, field: g.field, key: g.key, depth: g.depth, count: g.count }) : defaultGroupingExpansionDepth === -1 || g.depth < defaultGroupingExpansionDepth).map((g) => g.id)
+    ));
+  }, [activeGroupingModel.join("\0")]);
+  const resolveChildren = getChildRows ?? ((row) => row.children ?? null);
+  const flatEntries = useMemo2(() => {
+    if (treeData) {
+      return buildTreeEntries(sortedData, resolveChildren, treeExpandedRows);
+    }
+    if (!isGroupingActive) return null;
+    return buildFlatEntries(sortedData, activeGroupingModel, getGroupValue, expandedGroups);
+  }, [treeData, isGroupingActive, sortedData, activeGroupingModel.join("\0"), expandedGroups, treeExpandedRows]);
   const isServer = paginationMode === "server";
-  const totalRows = isServer ? rowCount ?? data.length : filteredData.length;
+  const totalRows = isServer ? rowCount ?? data.length : flatEntries ? flatEntries.length : filteredData.length;
   const totalPages = Math.max(1, Math.ceil(totalRows / activePageSize));
-  const paginatedData = useMemo2(() => {
-    if (isServer) return data;
+  const displayRows = useMemo2(() => {
+    if (isServer) return data.map((row) => ({ kind: "data", row, depth: 0 }));
+    const source = flatEntries ?? sortedData.map((row) => ({ kind: "data", row, depth: 0 }));
     const start = (activePage - 1) * activePageSize;
-    return sortedData.slice(start, start + activePageSize);
-  }, [isServer, data, sortedData, activePage, activePageSize]);
+    return source.slice(start, start + activePageSize);
+  }, [isServer, data, flatEntries, sortedData, activePage, activePageSize]);
   const handleExport = () => {
     const exportableCols = resolvedColumns.filter((c) => !c.hidden && c.isExportable !== false);
     const headers = exportableCols.map((c) => c.headerName).join(",");
@@ -4921,8 +5050,57 @@ function DataGrid({
     const left = resolvedColumns.filter((c) => !c.hidden && c.pinned === "left");
     const mid = resolvedColumns.filter((c) => !c.hidden && !c.pinned);
     const right = resolvedColumns.filter((c) => !c.hidden && c.pinned === "right");
-    return [...left, ...mid, ...right];
-  }, [resolvedColumns]);
+    const dataCols = [...left, ...mid, ...right];
+    if (treeData) {
+      const treeCol = {
+        key: "__tree__",
+        field: "__tree__",
+        header: "",
+        headerName: "",
+        width: 44,
+        sortable: false,
+        filterable: false,
+        disableColumnMenu: true,
+        hideable: false
+      };
+      return [treeCol, ...dataCols];
+    }
+    if (!isGroupingActive) return dataCols;
+    if (rowGroupingColumnMode === "multiple") {
+      const groupCols = activeGroupingModel.map((gField, i) => {
+        const src = resolvedColumns.find((c) => String(c.field) === gField || String(c.key) === gField);
+        const def2 = typeof groupingColDef === "function" ? groupingColDef(gField) : groupingColDef;
+        return {
+          key: `__group_${i}__`,
+          field: `__group_${i}__`,
+          header: def2?.headerName ?? src?.header ?? src?.headerName ?? gField,
+          headerName: def2?.headerName ?? src?.header ?? src?.headerName ?? gField,
+          width: def2?.width ?? 160,
+          sortable: false,
+          filterable: false,
+          disableColumnMenu: true,
+          hideable: false,
+          __groupField: gField,
+          __groupIndex: i
+        };
+      });
+      return [...groupCols, ...dataCols];
+    }
+    const def = typeof groupingColDef === "function" ? groupingColDef(activeGroupingModel[0]) : groupingColDef;
+    const singleSrc = resolvedColumns.find((c) => String(c.field) === activeGroupingModel[0] || String(c.key) === activeGroupingModel[0]);
+    const singleGroupCol = {
+      key: "__group__",
+      field: "__group__",
+      header: def?.headerName ?? (activeGroupingModel.length === 1 ? singleSrc?.header ?? singleSrc?.headerName ?? "Group" : "Group"),
+      headerName: def?.headerName ?? (activeGroupingModel.length === 1 ? singleSrc?.header ?? singleSrc?.headerName ?? "Group" : "Group"),
+      width: def?.width ?? 200,
+      sortable: false,
+      filterable: false,
+      disableColumnMenu: true,
+      hideable: false
+    };
+    return [singleGroupCol, ...dataCols];
+  }, [resolvedColumns, isGroupingActive, activeGroupingModel, rowGroupingColumnMode, groupingColDef]);
   const getLeftOffset = (col, idx) => {
     if (col.pinned !== "left") return void 0;
     let offset2 = 0;
@@ -4957,7 +5135,14 @@ function DataGrid({
   };
   const activeMenuCol = activeMenu ? resolvedColumns.find((c) => String(c.field) === activeMenu) : null;
   const alignClass = (align) => align === "center" ? "dg-slot--center" : align === "right" ? "dg-slot--right" : "dg-slot--left";
-  return /* @__PURE__ */ React75.createElement("div", { className: ["dg-root", sxClass, className].filter(Boolean).join(" ") }, /* @__PURE__ */ React75.createElement("div", { className: "dg-header" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-header-info" }, /* @__PURE__ */ React75.createElement("h2", null, title), /* @__PURE__ */ React75.createElement("p", null, filteredData.length, " total records")), /* @__PURE__ */ React75.createElement("div", { className: "dg-header-actions" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-search-wrap" }, /* @__PURE__ */ React75.createElement(Search, { size: 15 }), /* @__PURE__ */ React75.createElement(
+  const tOpts = toolbarOptions ?? {};
+  const showSearch = !tOpts.hideSearch;
+  const showFilterBtn = !tOpts.hideFilter;
+  const showColumnsBtn = !tOpts.hideColumns;
+  const showExportBtn = !tOpts.hideExport && !hideTopExport;
+  const showTitle = !tOpts.hideTitle;
+  const showRecordCount = !tOpts.hideRecordCount;
+  return /* @__PURE__ */ React75.createElement("div", { className: ["dg-root", sxClass, className].filter(Boolean).join(" ") }, !tOpts.hideHeader && /* @__PURE__ */ React75.createElement("div", { className: `dg-header${customToolbar ? " dg-header--custom" : ""}` }, !customToolbar && (showTitle || showRecordCount) && /* @__PURE__ */ React75.createElement("div", { className: "dg-header-info" }, showTitle && /* @__PURE__ */ React75.createElement("h2", null, title), showRecordCount && /* @__PURE__ */ React75.createElement("p", null, filteredData.length, " total records")), /* @__PURE__ */ React75.createElement("div", { className: "dg-header-actions" }, customToolbar ?? /* @__PURE__ */ React75.createElement(React75.Fragment, null, showSearch && /* @__PURE__ */ React75.createElement("div", { className: "dg-search-wrap" }, /* @__PURE__ */ React75.createElement(Search, { size: 15 }), /* @__PURE__ */ React75.createElement(
     "input",
     {
       className: "dg-search",
@@ -4968,23 +5153,35 @@ function DataGrid({
         setCurrentPage(1);
       }
     }
-  )), /* @__PURE__ */ React75.createElement(Tooltip, { title: "Filters", placement: "top" }, /* @__PURE__ */ React75.createElement(
+  )), showFilterBtn && /* @__PURE__ */ React75.createElement(Tooltip, { title: "Filters", placement: "top" }, /* @__PURE__ */ React75.createElement(
     "button",
     {
       className: `dg-icon-btn ${hasActiveFilters ? "active" : ""}`,
       onClick: () => setShowAdvancedFilter(true)
     },
     /* @__PURE__ */ React75.createElement(Filter, { size: 16 })
-  )), /* @__PURE__ */ React75.createElement(Tooltip, { title: "Manage Columns", placement: "top" }, /* @__PURE__ */ React75.createElement(
+  )), showColumnsBtn && /* @__PURE__ */ React75.createElement(Tooltip, { title: "Manage Columns", placement: "top" }, /* @__PURE__ */ React75.createElement(
     "button",
     {
       className: "dg-icon-btn",
       onClick: () => setShowManageColumns(true)
     },
     /* @__PURE__ */ React75.createElement(Columns, { size: 16 })
-  )), !hideTopExport && /* @__PURE__ */ React75.createElement("button", { className: "dg-action-btn", onClick: handleExport }, /* @__PURE__ */ React75.createElement(Download, { size: 14 }), " Export CSV"), headerActions && /* @__PURE__ */ React75.createElement("div", { className: `dg-header-slot ${alignClass(headerActions.align)}` }, headerActions.content))), /* @__PURE__ */ React75.createElement("div", { className: `dg-toolbar ${alignClass(toolbarContent?.align)}` }, toolbarContent?.content || ""), /* @__PURE__ */ React75.createElement("div", { className: `dg-table-wrap${paginatedData.length === 0 && !loading ? " dg-table-wrap--empty" : ""}` }, loading && /* @__PURE__ */ React75.createElement("div", { className: "dg-loading-overlay" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-loading-spinner" })), /* @__PURE__ */ React75.createElement("table", { className: "dg-table" }, /* @__PURE__ */ React75.createElement("thead", null, /* @__PURE__ */ React75.createElement("tr", null, visibleColumns.map((col, idx) => {
+  )), showExportBtn && /* @__PURE__ */ React75.createElement("button", { className: "dg-action-btn", onClick: handleExport }, /* @__PURE__ */ React75.createElement(Download, { size: 14 }), " Export CSV")), headerActions && /* @__PURE__ */ React75.createElement("div", { className: `dg-header-slot ${alignClass(headerActions.align)}` }, headerActions.content))), !tOpts.hideHeader && /* @__PURE__ */ React75.createElement("div", { className: `dg-toolbar ${alignClass(toolbarContent?.align)}` }, toolbarContent?.content || ""), isGroupingActive && /* @__PURE__ */ React75.createElement("div", { className: "dg-grouping-bar" }, /* @__PURE__ */ React75.createElement("span", { className: "dg-grouping-bar-label" }, "Grouped by"), activeGroupingModel.map((gField) => {
+    const col = resolvedColumns.find((c) => String(c.field) === gField || String(c.key) === gField);
+    return /* @__PURE__ */ React75.createElement("div", { key: gField, className: "dg-group-chip" }, /* @__PURE__ */ React75.createElement(Layers, { size: 11 }), /* @__PURE__ */ React75.createElement("span", null, col?.header ?? col?.headerName ?? gField), !disableRowGrouping && /* @__PURE__ */ React75.createElement(
+      "button",
+      {
+        className: "dg-group-chip-remove",
+        onClick: () => removeFromGrouping(gField),
+        title: `Remove grouping by ${col?.header ?? gField}`
+      },
+      /* @__PURE__ */ React75.createElement(X2, { size: 10 })
+    ));
+  })), /* @__PURE__ */ React75.createElement("div", { className: `dg-table-wrap${filteredData.length === 0 && !loading ? " dg-table-wrap--empty" : ""} ${tOpts.hideHeader ? "rm-top-border" : ""} ${tOpts.hideFooter ? "rm-bottom-border" : ""}` }, loading && /* @__PURE__ */ React75.createElement("div", { className: "dg-loading-overlay" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-loading-spinner" })), /* @__PURE__ */ React75.createElement("table", { className: "dg-table" }, /* @__PURE__ */ React75.createElement("thead", null, /* @__PURE__ */ React75.createElement("tr", null, visibleColumns.map((col, idx) => {
     const colField = String(col.field);
-    const width = columnWidths[colField] || 200;
+    const colNativeWidth = col.width ? typeof col.width === "number" ? col.width : parseInt(String(col.width)) : 200;
+    const width = columnWidths[colField] || colNativeWidth;
     const leftOffset = getLeftOffset(col, idx);
     const rightOffset = getRightOffset(col, idx);
     const isSorted = sortField === col.field;
@@ -5035,79 +5232,150 @@ function DataGrid({
         }
       )))
     );
-  }), actions && /* @__PURE__ */ React75.createElement("th", { style: { width: 0, padding: 0 } }))), /* @__PURE__ */ React75.createElement("tbody", null, paginatedData.length > 0 && paginatedData.map((item) => /* @__PURE__ */ React75.createElement("tr", { key: item.id, className: "dg-tbody-row", onDoubleClick: () => onRowDoubleClick?.(item) }, visibleColumns.map((col, idx) => {
-    const colField = String(col.field);
-    const width = columnWidths[colField] || 200;
-    const leftOffset = getLeftOffset(col, idx);
-    const rightOffset = getRightOffset(col, idx);
-    return /* @__PURE__ */ React75.createElement(
-      "td",
-      {
-        key: `${item.id}-${colField}`,
-        className: `dg-td${col.pinned === "left" ? " pinned-left" : col.pinned === "right" ? " pinned-right" : ""}${col.editable ? " dg-td--editable" : ""} ${col.cellClassName || ""}`,
-        style: { width, minWidth: width, maxWidth: width, left: leftOffset, right: rightOffset, flex: col.flex },
-        onDoubleClick: () => onCellDoubleClick?.({ row: item, field: colField, value: item[col.field || ""] }),
-        onClick: col.editable ? () => {
-          const field = String(col.field);
-          const rawValue = item[col.field || ""];
-          const value = col.valueGetter ? col.valueGetter({ value: rawValue, row: item, field }) : rawValue;
-          setEditingCell({ rowId: item.id, field, value });
-        } : void 0
-      },
-      (() => {
-        const field = String(col.field);
-        const rawValue = item[col.field || ""];
-        let value = col.valueGetter ? col.valueGetter({ value: rawValue, row: item, field }) : rawValue;
-        if (col.editable && editingCell?.rowId === item.id && editingCell?.field === field) {
-          const inputType = col.type === "number" ? "number" : col.type === "date" ? "date" : "text";
-          const commit = (finalValue) => {
-            setEditingCell(null);
-            col.onEnter?.({ value: finalValue, row: item, field });
-          };
-          return /* @__PURE__ */ React75.createElement(
-            "input",
+  }), actions && /* @__PURE__ */ React75.createElement("th", { style: { width: 0, padding: 0 } }))), /* @__PURE__ */ React75.createElement("tbody", null, displayRows.length > 0 && displayRows.map((entry) => {
+    if (entry.kind === "group") {
+      const isExpanded = expandedGroups.has(entry.id);
+      const colDef = typeof groupingColDef === "function" ? groupingColDef(entry.field) : groupingColDef;
+      const fieldLabel = resolvedColumns.find(
+        (c) => String(c.field) === entry.field || String(c.key) === entry.field
+      )?.header ?? entry.field;
+      const totalCols = visibleColumns.length + (actions ? 1 : 0);
+      return /* @__PURE__ */ React75.createElement("tr", { key: entry.id, className: "dg-group-row" }, /* @__PURE__ */ React75.createElement("td", { colSpan: totalCols, className: "dg-group-cell" }, /* @__PURE__ */ React75.createElement(
+        "div",
+        {
+          className: "dg-group-cell-inner",
+          style: { paddingLeft: entry.depth * 20 },
+          onClick: () => toggleGroup(entry.id)
+        },
+        /* @__PURE__ */ React75.createElement("button", { className: "dg-group-toggle", onClick: (e) => {
+          e.stopPropagation();
+          toggleGroup(entry.id);
+        } }, isExpanded ? /* @__PURE__ */ React75.createElement(ChevronDown, { size: 15 }) : /* @__PURE__ */ React75.createElement(ChevronRight, { size: 15 })),
+        activeGroupingModel.length > 1 && /* @__PURE__ */ React75.createElement("span", { className: "dg-group-field-label" }, fieldLabel, ":"),
+        colDef?.renderCell ? colDef.renderCell({ groupKey: entry.key, field: entry.field, depth: entry.depth, leafCount: entry.leafCount }) : /* @__PURE__ */ React75.createElement("span", { className: "dg-group-key" }, entry.key),
+        !colDef?.hideDescendantCount && /* @__PURE__ */ React75.createElement("span", { className: "dg-group-count" }, entry.leafCount)
+      )));
+    }
+    const item = entry.row;
+    const rowDepth = entry.depth;
+    return /* @__PURE__ */ React75.createElement("tr", { key: item.id, className: "dg-tbody-row", onDoubleClick: () => onRowDoubleClick?.(item) }, visibleColumns.map((col, idx) => {
+      const colField = String(col.field);
+      if (colField === "__tree__") {
+        const treeColWidth = columnWidths["__tree__"] || 44;
+        const isExpanded = treeExpandedRows.has(item.id);
+        return /* @__PURE__ */ React75.createElement(
+          "td",
+          {
+            key: `${item.id}-__tree__`,
+            className: "dg-tree-cell",
+            style: { width: treeColWidth, minWidth: treeColWidth, maxWidth: treeColWidth }
+          },
+          /* @__PURE__ */ React75.createElement("div", { className: "dg-tree-cell-inner", style: { paddingLeft: rowDepth * 20 } }, entry.hasChildren ? /* @__PURE__ */ React75.createElement(
+            "button",
             {
-              className: "dg-cell-editor",
-              type: inputType,
-              autoFocus: true,
-              defaultValue: editingCell.value ?? "",
-              onClick: (e) => e.stopPropagation(),
-              onKeyDown: (e) => {
-                if (e.key === "Enter") commit(e.target.value);
-                if (e.key === "Escape") setEditingCell(null);
-              },
-              onBlur: (e) => {
-                const finalValue = e.target.value;
-                setEditingCell(null);
-                col.onBlur?.({ value: finalValue, row: item, field });
+              className: "dg-group-toggle",
+              onClick: (e) => {
+                e.stopPropagation();
+                toggleTreeRow(item.id);
               }
-            }
-          );
-        }
-        const formattedValue = col.valueFormatter ? col.valueFormatter({ value, row: item, field }) : value;
-        if (col.renderCell) {
-          return col.renderCell({ value, row: item, field });
-        }
-        if (col.render) {
-          return col.render(value, item);
+            },
+            isExpanded ? /* @__PURE__ */ React75.createElement(ChevronDown, { size: 15 }) : /* @__PURE__ */ React75.createElement(ChevronRight, { size: 15 })
+          ) : /* @__PURE__ */ React75.createElement("span", { style: { display: "inline-block", width: 22 } }))
+        );
+      }
+      if (colField === "__group__" || colField.startsWith("__group_")) {
+        const colDef = typeof groupingColDef === "function" ? groupingColDef(colField) : groupingColDef;
+        const leafField = colDef?.leafField;
+        let leafContent = null;
+        if (leafField) {
+          const leafCol = resolvedColumns.find((c) => String(c.field) === leafField || String(c.key) === leafField);
+          if (leafCol) {
+            const raw = item[String(leafCol.field)];
+            let val = leafCol.valueGetter ? leafCol.valueGetter({ value: raw, row: item, field: leafField }) : raw;
+            if (leafCol.valueFormatter) val = leafCol.valueFormatter({ value: val, row: item, field: leafField });
+            if (leafCol.renderCell) leafContent = leafCol.renderCell({ value: val, row: item, field: leafField });
+            else leafContent = val == null ? "" : String(val);
+          }
         }
-        return String(formattedValue ?? "");
-      })()
-    );
-  }), actions && /* @__PURE__ */ React75.createElement("td", { className: "dg-row-actions-cell" }, (() => {
-    const resolvedActions = typeof actions === "function" ? actions(item) : actions;
-    const visibleActions = resolvedActions.filter((a) => !a.show || a.show(item));
-    if (visibleActions.length === 0) return null;
-    return /* @__PURE__ */ React75.createElement("div", { className: "dg-row-actions" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-action-group" }, visibleActions.map((action, i) => /* @__PURE__ */ React75.createElement(Tooltip, { key: i, title: action.label, placement: "top" }, /* @__PURE__ */ React75.createElement(
-      "button",
-      {
-        className: "dg-row-action-btn",
-        style: { color: action.color || "var(--text-secondary)" },
-        onClick: () => action.onClick(item)
-      },
-      action.icon
-    )))));
-  })()))))), paginatedData.length === 0 && /* @__PURE__ */ React75.createElement("div", { className: "dg-empty-state" }, /* @__PURE__ */ React75.createElement("svg", { className: "dg-empty-icon", viewBox: "0 0 200 160", fill: "none", xmlns: "http://www.w3.org/2000/svg" }, /* @__PURE__ */ React75.createElement("rect", { x: "20", y: "30", width: "160", height: "100", rx: "8", fill: "var(--hover-color)", stroke: "var(--border-color)", strokeWidth: "1.5" }), /* @__PURE__ */ React75.createElement("rect", { x: "20", y: "30", width: "160", height: "28", rx: "8", fill: "var(--border-color)", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("rect", { x: "20", y: "50", width: "160", height: "8", rx: "0", fill: "var(--border-color)", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "72", y1: "30", x2: "72", y2: "130", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("line", { x1: "128", y1: "30", x2: "128", y2: "130", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("line", { x1: "20", y1: "78", x2: "180", y2: "78", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("line", { x1: "20", y1: "104", x2: "180", y2: "104", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("rect", { x: "32", y: "87", width: "28", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.4" }), /* @__PURE__ */ React75.createElement("rect", { x: "84", y: "87", width: "28", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.4" }), /* @__PURE__ */ React75.createElement("rect", { x: "140", y: "87", width: "28", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.4" }), /* @__PURE__ */ React75.createElement("rect", { x: "32", y: "113", width: "20", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.3" }), /* @__PURE__ */ React75.createElement("rect", { x: "84", y: "113", width: "32", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.3" }), /* @__PURE__ */ React75.createElement("rect", { x: "140", y: "113", width: "20", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.3" }), /* @__PURE__ */ React75.createElement("circle", { cx: "148", cy: "108", r: "26", fill: "var(--surface-color)", stroke: "var(--border-color)", strokeWidth: "1.5" }), /* @__PURE__ */ React75.createElement("circle", { cx: "145", cy: "105", r: "10", stroke: "var(--text-secondary)", strokeWidth: "2.5", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "152", y1: "113", x2: "161", y2: "122", stroke: "var(--text-secondary)", strokeWidth: "2.5", strokeLinecap: "round", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "141", y1: "101", x2: "149", y2: "109", stroke: "var(--text-secondary)", strokeWidth: "2", strokeLinecap: "round", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "149", y1: "101", x2: "141", y2: "109", stroke: "var(--text-secondary)", strokeWidth: "2", strokeLinecap: "round", opacity: "0.5" })), /* @__PURE__ */ React75.createElement("p", { className: "dg-empty-title" }, "No data found"), /* @__PURE__ */ React75.createElement("p", { className: "dg-empty-subtitle" }, filterText || hasActiveFilters ? "Try adjusting your search or filters" : "No records to display"))), pagination && /* @__PURE__ */ React75.createElement("div", { className: "dg-pagination" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-page-info" }, /* @__PURE__ */ React75.createElement(Tooltip, { title: "Export CSV", placement: "top" }, /* @__PURE__ */ React75.createElement("button", { className: "dg-icon-btn", onClick: handleExport }, /* @__PURE__ */ React75.createElement(Download, { size: 14 }))), /* @__PURE__ */ React75.createElement("div", { className: "dg-per-page" }, /* @__PURE__ */ React75.createElement("span", null, "Rows per page:"), /* @__PURE__ */ React75.createElement(
+        const groupColWidth = columnWidths[colField] || 200;
+        return /* @__PURE__ */ React75.createElement(
+          "td",
+          {
+            key: `${item.id}-${colField}`,
+            className: "dg-group-leaf-cell",
+            style: { width: groupColWidth, minWidth: groupColWidth, maxWidth: groupColWidth, paddingLeft: rowDepth * 20 + 32 }
+          },
+          leafContent
+        );
+      }
+      const width = columnWidths[colField] || 200;
+      const leftOffset = getLeftOffset(col, idx);
+      const rightOffset = getRightOffset(col, idx);
+      return /* @__PURE__ */ React75.createElement(
+        "td",
+        {
+          key: `${item.id}-${colField}`,
+          className: `dg-td${col.pinned === "left" ? " pinned-left" : col.pinned === "right" ? " pinned-right" : ""}${col.editable ? " dg-td--editable" : ""} ${col.cellClassName || ""}`,
+          style: { width, minWidth: width, maxWidth: width, left: leftOffset, right: rightOffset, flex: col.flex },
+          onDoubleClick: () => onCellDoubleClick?.({ row: item, field: colField, value: item[col.field || ""] }),
+          onClick: col.editable ? () => {
+            const field = String(col.field);
+            const rawValue = item[col.field || ""];
+            const value = col.valueGetter ? col.valueGetter({ value: rawValue, row: item, field }) : rawValue;
+            setEditingCell({ rowId: item.id, field, value });
+          } : void 0
+        },
+        (() => {
+          const field = String(col.field);
+          const rawValue = item[col.field || ""];
+          let value = col.valueGetter ? col.valueGetter({ value: rawValue, row: item, field }) : rawValue;
+          if (col.editable && editingCell?.rowId === item.id && editingCell?.field === field) {
+            const inputType = col.type === "number" ? "number" : col.type === "date" ? "date" : "text";
+            const commit = (finalValue) => {
+              setEditingCell(null);
+              col.onEnter?.({ value: finalValue, row: item, field });
+            };
+            return /* @__PURE__ */ React75.createElement(
+              "input",
+              {
+                className: "dg-cell-editor",
+                type: inputType,
+                autoFocus: true,
+                defaultValue: editingCell.value ?? "",
+                onClick: (e) => e.stopPropagation(),
+                onKeyDown: (e) => {
+                  if (e.key === "Enter") commit(e.target.value);
+                  if (e.key === "Escape") setEditingCell(null);
+                },
+                onBlur: (e) => {
+                  const finalValue = e.target.value;
+                  setEditingCell(null);
+                  col.onBlur?.({ value: finalValue, row: item, field });
+                }
+              }
+            );
+          }
+          const formattedValue = col.valueFormatter ? col.valueFormatter({ value, row: item, field }) : value;
+          if (col.renderCell) return col.renderCell({ value, row: item, field });
+          if (col.render) return col.render(value, item);
+          return String(formattedValue ?? "");
+        })()
+      );
+    }), actions && /* @__PURE__ */ React75.createElement("td", { className: "dg-row-actions-cell" }, (() => {
+      const resolvedActions = typeof actions === "function" ? actions(item) : actions;
+      const visibleActions = resolvedActions.filter((a) => !a.show || a.show(item));
+      if (visibleActions.length === 0) return null;
+      return /* @__PURE__ */ React75.createElement("div", { className: "dg-row-actions" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-action-group" }, visibleActions.map((action, i) => /* @__PURE__ */ React75.createElement(Tooltip, { key: i, title: action.label, placement: "top" }, /* @__PURE__ */ React75.createElement(
+        "button",
+        {
+          className: "dg-row-action-btn",
+          style: { color: action.color || "var(--text-secondary)" },
+          onClick: () => action.onClick(item)
+        },
+        action.icon
+      )))));
+    })()));
+  }))), filteredData.length === 0 && /* @__PURE__ */ React75.createElement("div", { className: "dg-empty-state" }, /* @__PURE__ */ React75.createElement("svg", { className: "dg-empty-icon", viewBox: "0 0 200 160", fill: "none", xmlns: "http://www.w3.org/2000/svg" }, /* @__PURE__ */ React75.createElement("rect", { x: "20", y: "30", width: "160", height: "100", rx: "8", fill: "var(--hover-color)", stroke: "var(--border-color)", strokeWidth: "1.5" }), /* @__PURE__ */ React75.createElement("rect", { x: "20", y: "30", width: "160", height: "28", rx: "8", fill: "var(--border-color)", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("rect", { x: "20", y: "50", width: "160", height: "8", rx: "0", fill: "var(--border-color)", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "72", y1: "30", x2: "72", y2: "130", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("line", { x1: "128", y1: "30", x2: "128", y2: "130", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("line", { x1: "20", y1: "78", x2: "180", y2: "78", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("line", { x1: "20", y1: "104", x2: "180", y2: "104", stroke: "var(--border-color)", strokeWidth: "1" }), /* @__PURE__ */ React75.createElement("rect", { x: "32", y: "87", width: "28", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.4" }), /* @__PURE__ */ React75.createElement("rect", { x: "84", y: "87", width: "28", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.4" }), /* @__PURE__ */ React75.createElement("rect", { x: "140", y: "87", width: "28", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.4" }), /* @__PURE__ */ React75.createElement("rect", { x: "32", y: "113", width: "20", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.3" }), /* @__PURE__ */ React75.createElement("rect", { x: "84", y: "113", width: "32", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.3" }), /* @__PURE__ */ React75.createElement("rect", { x: "140", y: "113", width: "20", height: "6", rx: "3", fill: "var(--border-color)", opacity: "0.3" }), /* @__PURE__ */ React75.createElement("circle", { cx: "148", cy: "108", r: "26", fill: "var(--surface-color)", stroke: "var(--border-color)", strokeWidth: "1.5" }), /* @__PURE__ */ React75.createElement("circle", { cx: "145", cy: "105", r: "10", stroke: "var(--text-secondary)", strokeWidth: "2.5", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "152", y1: "113", x2: "161", y2: "122", stroke: "var(--text-secondary)", strokeWidth: "2.5", strokeLinecap: "round", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "141", y1: "101", x2: "149", y2: "109", stroke: "var(--text-secondary)", strokeWidth: "2", strokeLinecap: "round", opacity: "0.5" }), /* @__PURE__ */ React75.createElement("line", { x1: "149", y1: "101", x2: "141", y2: "109", stroke: "var(--text-secondary)", strokeWidth: "2", strokeLinecap: "round", opacity: "0.5" })), /* @__PURE__ */ React75.createElement("p", { className: "dg-empty-title" }, "No data found"), /* @__PURE__ */ React75.createElement("p", { className: "dg-empty-subtitle" }, filterText || hasActiveFilters ? "Try adjusting your search or filters" : "No records to display"))), customFooter ? /* @__PURE__ */ React75.createElement("div", { className: "dg-pagination dg-pagination--custom" }, customFooter) : pagination && !tOpts.hideFooter && /* @__PURE__ */ React75.createElement("div", { className: "dg-pagination" }, /* @__PURE__ */ React75.createElement("div", { className: "dg-page-info" }, !tOpts.hideBottomExport && !tOpts.hideExport && /* @__PURE__ */ React75.createElement(Tooltip, { title: "Export CSV", placement: "top" }, /* @__PURE__ */ React75.createElement("button", { className: "dg-icon-btn", onClick: handleExport }, /* @__PURE__ */ React75.createElement(Download, { size: 14 }))), /* @__PURE__ */ React75.createElement("div", { className: "dg-per-page" }, /* @__PURE__ */ React75.createElement("span", null, "Rows per page:"), /* @__PURE__ */ React75.createElement(
     FilterSelect,
     {
       placement: "top",
@@ -5148,6 +5416,17 @@ function DataGrid({
       setShowAdvancedFilter(true);
       setActiveMenu(null);
     } }, /* @__PURE__ */ React75.createElement(Filter, { size: 14 }), " Filter\u2026"),
+    !disableRowGrouping && activeMenuCol?.groupable !== false && (() => {
+      const gField = String(activeMenuCol?.field ?? "");
+      const isGrouped = activeGroupingModel.includes(gField);
+      return isGrouped ? /* @__PURE__ */ React75.createElement("button", { className: "dg-menu-item", onClick: () => {
+        removeFromGrouping(gField);
+        setActiveMenu(null);
+      } }, /* @__PURE__ */ React75.createElement(Layers, { size: 14 }), " Ungroup") : /* @__PURE__ */ React75.createElement("button", { className: "dg-menu-item", onClick: () => {
+        addToGrouping(gField);
+        setActiveMenu(null);
+      } }, /* @__PURE__ */ React75.createElement(Layers, { size: 14 }), " Group by");
+    })(),
     /* @__PURE__ */ React75.createElement("button", { className: "dg-menu-item", onClick: () => toggleHide(activeMenu) }, /* @__PURE__ */ React75.createElement(EyeOff, { size: 14 }), " Hide column"),
     /* @__PURE__ */ React75.createElement("button", { className: "dg-menu-item", onClick: () => {
       setShowManageColumns(true);
@@ -8979,21 +9258,24 @@ import React106, {
 } from "react";
 import ReactDOM10 from "react-dom";
 import { ChevronDown as ChevronDown2, ChevronRight as ChevronRight2, X as X3, Search as Search2, Check, Minus } from "lucide-react";
+function nodeId(node) {
+  return node.id ?? node._id;
+}
 function collectDescendants(node) {
-  const ids = [String(node.id)];
+  const ids = [String(nodeId(node))];
   node.children?.forEach((c) => ids.push(...collectDescendants(c)));
   return ids;
 }
 function findNodeById(nodes, id) {
   for (const node of nodes) {
-    if (String(node.id) === id) return node;
+    if (String(nodeId(node)) === id) return node;
     const found = findNodeById(node.children ?? [], id);
     if (found) return found;
   }
   return null;
 }
 function getNodeState(node, selected) {
-  if (selected.has(String(node.id))) return "checked";
+  if (selected.has(String(nodeId(node)))) return "checked";
   if (!node.children?.length) return "unchecked";
   const states = node.children.map((c) => getNodeState(c, selected));
   if (states.every((s2) => s2 === "checked")) return "checked";
@@ -9015,7 +9297,7 @@ function getTopLevelSelected(nodes, selected) {
 function getAllSelected(nodes, selected) {
   const result = [];
   for (const node of nodes) {
-    if (selected.has(String(node.id))) result.push(node);
+    if (selected.has(String(nodeId(node)))) result.push(node);
     if (node.children?.length) result.push(...getAllSelected(node.children, selected));
   }
   return result;
@@ -9053,10 +9335,10 @@ function TreeNodeItem({
   onSelect,
   isFiltering
 }) {
-  const nodeId = String(node.id);
+  const nid = String(nodeId(node));
   const hasChildren = !!node.children?.length;
-  const isExpanded = isFiltering || expanded.has(nodeId);
-  const state = allowChildSelection ? getNodeState(node, selected) : selected.has(nodeId) ? "checked" : "unchecked";
+  const isExpanded = isFiltering || expanded.has(nid);
+  const state = allowChildSelection ? getNodeState(node, selected) : selected.has(nid) ? "checked" : "unchecked";
   return /* @__PURE__ */ React106.createElement("div", { className: "rf-tsn" }, /* @__PURE__ */ React106.createElement(
     "div",
     {
@@ -9071,7 +9353,7 @@ function TreeNodeItem({
         className: "rf-tsn__expand",
         onClick: (e) => {
           e.stopPropagation();
-          onToggleExpand(nodeId);
+          onToggleExpand(nid);
         }
       },
       isExpanded ? /* @__PURE__ */ React106.createElement(ChevronDown2, { size: 14 }) : /* @__PURE__ */ React106.createElement(ChevronRight2, { size: 14 })
@@ -9220,7 +9502,7 @@ function TreeSelect({
     };
   }, [open, computePosition3]);
   const handleSelect = (node) => {
-    const nodeId = String(node.id);
+    const nid = String(nodeId(node));
     if (isMultiple) {
       const newSet = new Set(selectedSet);
       if (allowChildSelection) {
@@ -9234,21 +9516,21 @@ function TreeSelect({
           onNodeSelect?.({ node });
         }
       } else {
-        if (newSet.has(nodeId)) {
-          newSet.delete(nodeId);
+        if (newSet.has(nid)) {
+          newSet.delete(nid);
           onNodeUnselect?.({ node });
         } else {
-          newSet.add(nodeId);
+          newSet.add(nid);
           onNodeSelect?.({ node });
         }
       }
-      onChange?.({ value: setToRecord(newSet) });
+      onChange?.({ value: setToRecord(newSet), node });
     } else {
-      if (selectedSet.has(nodeId)) {
-        onChange?.({ value: null });
+      if (selectedSet.has(nid)) {
+        onChange?.({ value: null, node: null });
         onNodeUnselect?.({ node });
       } else {
-        onChange?.({ value: node.id });
+        onChange?.({ value: nodeId(node), node });
         onNodeSelect?.({ node });
         closeDropdown();
       }
@@ -9263,7 +9545,7 @@ function TreeSelect({
   };
   const handleClear = (e) => {
     e.stopPropagation();
-    onChange?.({ value: isMultiple ? {} : null });
+    onChange?.({ value: isMultiple ? {} : null, node: null });
   };
   const handleRemoveTag = (e, node) => {
     e.stopPropagation();
@@ -9688,10 +9970,13 @@ function SmartSelect({
       return [...selected, ...filteredUnselected];
     }
     if (value != null) {
+      const selectedKey = getValue(value);
       const selectedLabel = getOptionLabel(value);
-      if (inputValue2 === selectedLabel) {
-        const selectedKey = getValue(value);
+      const inOpts = opts.some((o) => getValue(o) === selectedKey);
+      const selectedFallback = inOpts ? [] : [value];
+      if (!inputValue2 || inputValue2 === selectedLabel) {
         return [
+          ...selectedFallback,
           ...opts.filter((o) => getValue(o) === selectedKey),
           ...opts.filter((o) => getValue(o) !== selectedKey)
         ];