@ceed/cds 1.25.0 → 1.26.0

package/dist/index.cjs

@@ -2136,14 +2136,15 @@ function reorderColumnsByGroupingModel(columns, columnGroupingModel) {
   }
   return reorderedColumns;
 }
-function flattenColumnGroups(items, groupPath = [], columnIndex = { current: 0 }) {
+function flattenColumnGroups(items, groupPath = [], columnIndex = { current: 0 }, visibleFields) {
   const result = [];
   for (const item of items) {
     if ("groupId" in item) {
       const newPath = [...groupPath, item.groupId];
       const children = Array.isArray(item.children) ? item.children : [item.children];
-      result.push(...flattenColumnGroups(children, newPath, columnIndex));
+      result.push(...flattenColumnGroups(children, newPath, columnIndex, visibleFields));
     } else {
+      if (visibleFields && !visibleFields.has(item.field)) continue;
       result.push({
         ...item,
         groupPath,
@@ -2153,9 +2154,9 @@ function flattenColumnGroups(items, groupPath = [], columnIndex = { current: 0 }
   }
   return result;
 }
-function calculateColumnGroups(columnGroupingModel, columns) {
+function calculateColumnGroups(columnGroupingModel, columns, visibleFields) {
   const fieldsInGroupingModel = extractFieldsFromGroupingModel(columnGroupingModel);
-  const flattenedColumns = flattenColumnGroups(columnGroupingModel);
+  const flattenedColumns = flattenColumnGroups(columnGroupingModel, [], { current: 0 }, visibleFields);
   const columnIndexMap = new Map(flattenedColumns.map((col) => [col.field, col.columnIndex]));
   const processedGroups = /* @__PURE__ */ new Map();
   const groupsByLevel = [];
@@ -2203,7 +2204,9 @@ function calculateColumnGroups(columnGroupingModel, columns) {
   groupsByLevel.forEach((level) => {
     level.sort((a, b) => a.startIndex - b.startIndex);
   });
-  return { groups: groupsByLevel, maxLevel, fieldsInGroupingModel };
+  const filteredGroupsByLevel = groupsByLevel.map((level) => level.filter((g) => g.colspan > 0)).filter((level) => level.length > 0);
+  const correctedMaxLevel = filteredGroupsByLevel.length > 0 ? filteredGroupsByLevel.length - 1 : -1;
+  return { groups: filteredGroupsByLevel, maxLevel: correctedMaxLevel, fieldsInGroupingModel };
 }
 function getTextAlign(props) {
   return !props.editMode && ["number", "date", "currency"].includes(props.type || "") ? "end" : "start";
@@ -3367,7 +3370,9 @@ function useDataTableRenderer({
   getId: _getId,
   isTotalSelected: _isTotalSelected,
   isRowSelectable,
-  columnGroupingModel
+  columnGroupingModel,
+  columnVisibilityModel,
+  onColumnVisibilityModelChange
 }) {
   if (pinnedColumns && columnGroupingModel) {
     throw new Error(
@@ -3383,12 +3388,35 @@ function useDataTableRenderer({
     initialState?.sorting?.sortModel ?? [],
     (0, import_react25.useCallback)((sortModel2) => onSortModelChange?.(sortModel2), [onSortModelChange])
   );
+  const [visibilityModel] = useControlledState(
+    columnVisibilityModel,
+    initialState?.columns?.columnVisibilityModel ?? {},
+    (0, import_react25.useCallback)(
+      (model) => onColumnVisibilityModelChange?.(model),
+      [onColumnVisibilityModelChange]
+    )
+  );
   const reorderedColumns = (0, import_react25.useMemo)(() => {
     if (!columnGroupingModel) return columnsProp;
     return reorderColumnsByGroupingModel(columnsProp, columnGroupingModel);
   }, [columnsProp, columnGroupingModel]);
-  const columnsByField = (0, import_react25.useMemo)(
+  const visibleColumns = (0, import_react25.useMemo)(
+    () => reorderedColumns.filter((col) => visibilityModel[col.field] !== false),
+    [reorderedColumns, visibilityModel]
+  );
+  const visibleFieldSet = (0, import_react25.useMemo)(() => new Set(visibleColumns.map((c) => c.field)), [visibleColumns]);
+  const allColumnsByField = (0, import_react25.useMemo)(
     () => reorderedColumns.reduce(
+      (acc, curr) => ({
+        ...acc,
+        [curr.field]: curr
+      }),
+      {}
+    ),
+    [reorderedColumns]
+  );
+  const visibleColumnsByField = (0, import_react25.useMemo)(
+    () => visibleColumns.reduce(
       (acc, curr) => ({
         ...acc,
         [curr.field]: {
@@ -3399,7 +3427,7 @@ function useDataTableRenderer({
       }),
       {}
     ),
-    [reorderedColumns]
+    [visibleColumns]
   );
   const sortComparator = (0, import_react25.useCallback)(
     (rowA, rowB) => {
@@ -3407,7 +3435,8 @@ function useDataTableRenderer({
         const { field, sort: direction } = sort;
         const a = rowA[field];
         const b = rowB[field];
-        const column = columnsByField[field];
+        const column = allColumnsByField[field];
+        if (!column) continue;
         let comparison = 0;
         if (column.sortComparator) {
           comparison = column.sortComparator({
@@ -3427,7 +3456,7 @@ function useDataTableRenderer({
       }
       return 0;
     },
-    [sortModel, columnsByField]
+    [sortModel, allColumnsByField]
   );
   const rows = (0, import_react25.useMemo)(
     () => sortModel.length ? [..._rows].sort(sortComparator) : _rows,
@@ -3491,44 +3520,54 @@ function useDataTableRenderer({
     () => _isTotalSelected ?? (selectableRowCount > 0 && (selectionModel?.length || 0) === selectableRowCount),
     [_isTotalSelected, selectionModel, selectableRowCount]
   );
-  const columnWidths = useColumnWidths(columnsByField);
+  const columnWidths = useColumnWidths(visibleColumnsByField);
   const getWidth = (0, import_react25.useCallback)(
-    (f) => columnWidths[f] ?? columnsByField[f].width ?? // Column prop 으로 지정된 width
-    columnsByField[f].minWidth ?? 0,
-    [columnWidths, columnsByField]
+    (f) => columnWidths[f] ?? allColumnsByField[f]?.width ?? // Column prop 으로 지정된 width
+    allColumnsByField[f]?.minWidth ?? 0,
+    [columnWidths, allColumnsByField]
   );
   const processedColumnGroups = (0, import_react25.useMemo)(() => {
     if (!columnGroupingModel) return null;
-    return calculateColumnGroups(columnGroupingModel, reorderedColumns);
-  }, [columnGroupingModel, reorderedColumns]);
+    return calculateColumnGroups(columnGroupingModel, visibleColumns, visibleFieldSet);
+  }, [columnGroupingModel, visibleColumns, visibleFieldSet]);
+  const effectivePinnedLeft = (0, import_react25.useMemo)(
+    () => pinnedColumns?.left?.filter((f) => visibleFieldSet.has(f)),
+    [pinnedColumns?.left, visibleFieldSet]
+  );
+  const effectivePinnedRight = (0, import_react25.useMemo)(
+    () => pinnedColumns?.right?.filter((f) => visibleFieldSet.has(f)),
+    [pinnedColumns?.right, visibleFieldSet]
+  );
   const columns = (0, import_react25.useMemo)(() => {
-    const baseColumns = reorderedColumns.length > 0 ? reorderedColumns : Object.keys(rows[0] || {}).map((key) => ({
+    const baseColumns = visibleColumns.length > 0 ? visibleColumns : reorderedColumns.length > 0 ? [] : Object.keys(rows[0] || {}).map((key) => ({
       field: key
     }));
     return baseColumns.map((column) => {
-      const isLeftPinned = pinnedColumns?.left?.includes(column.field);
-      const isRightPinned = pinnedColumns?.right?.includes(column.field);
+      const isLeftPinned = effectivePinnedLeft?.includes(column.field);
+      const isRightPinned = effectivePinnedRight?.includes(column.field);
       const isPinned = isLeftPinned || isRightPinned;
       return {
         ...column,
-        headerRef: columnsByField[column.field].headerRef,
-        tableColRef: columnsByField[column.field].tableColRef,
+        headerRef: visibleColumnsByField[column.field]?.headerRef,
+        tableColRef: visibleColumnsByField[column.field]?.tableColRef,
         isCellEditable: editMode && (typeof column.isCellEditable === "function" ? column.isCellEditable : column.isCellEditable ?? true),
         sort: sortModel.find((sort) => sort.field === column.field)?.sort,
-        sortOrder: columnsByField[column.field]?.sortOrder || sortOrder,
+        sortOrder: allColumnsByField[column.field]?.sortOrder || sortOrder,
         isPinned,
-        isLastStartPinnedColumn: isLeftPinned && [...pinnedColumns?.left || []].pop() === column.field,
-        isLastEndPinnedColumn: isRightPinned && (pinnedColumns?.right?.[0] ?? null) === column.field,
-        pinnedStartPosition: pinnedColumns?.left?.slice(0, isLeftPinned ? pinnedColumns.left.indexOf(column.field) : pinnedColumns.left.length).reduce((acc, curr) => acc + getWidth(curr), 0),
-        pinnedEndPosition: pinnedColumns?.right?.slice(isRightPinned ? pinnedColumns.right.indexOf(column.field) + 1 : 0).reduce((acc, curr) => acc + getWidth(curr), 0)
+        isLastStartPinnedColumn: isLeftPinned && [...effectivePinnedLeft || []].pop() === column.field,
+        isLastEndPinnedColumn: isRightPinned && (effectivePinnedRight?.[0] ?? null) === column.field,
+        pinnedStartPosition: effectivePinnedLeft?.slice(0, isLeftPinned ? effectivePinnedLeft.indexOf(column.field) : effectivePinnedLeft.length).reduce((acc, curr) => acc + getWidth(curr), 0),
+        pinnedEndPosition: effectivePinnedRight?.slice(isRightPinned ? effectivePinnedRight.indexOf(column.field) + 1 : 0).reduce((acc, curr) => acc + getWidth(curr), 0)
       };
     });
   }, [
+    visibleColumns,
     reorderedColumns,
     rows,
-    pinnedColumns?.left,
-    pinnedColumns?.right,
-    columnsByField,
+    effectivePinnedLeft,
+    effectivePinnedRight,
+    visibleColumnsByField,
+    allColumnsByField,
     editMode,
     sortModel,
     sortOrder,
@@ -3544,8 +3583,8 @@ function useDataTableRenderer({
   const handleSortChange = (0, import_react25.useCallback)(
     (props) => {
       const { field, currentSort, multiple } = props;
-      const column = columnsByField[field];
-      const columnSortOrder = column.sortOrder || sortOrder;
+      const column = allColumnsByField[field];
+      const columnSortOrder = column?.sortOrder || sortOrder;
       if (currentSort !== void 0) {
         const currentOrderIndex = columnSortOrder.indexOf(currentSort);
         const nextSortOrderIndex = (currentOrderIndex + 1) % columnSortOrder.length;
@@ -3562,7 +3601,7 @@ function useDataTableRenderer({
         setSortModel(newSortModel);
       }
     },
-    [sortOrder, columnsByField, sortModel, setSortModel]
+    [sortOrder, allColumnsByField, sortModel, setSortModel]
   );
   (0, import_react25.useEffect)(() => {
     if (!paginationModel) {
@@ -3988,6 +4027,10 @@ function Component(props, apiRef) {
     loading,
     columnGroupingModel: _________________,
     // columnGroupingModel is used in useDataTableRenderer
+    columnVisibilityModel: __________________,
+    // columnVisibilityModel is used in useDataTableRenderer
+    onColumnVisibilityModelChange: ___________________,
+    // onColumnVisibilityModelChange is used in useDataTableRenderer
     slots: {
       checkbox: RenderCheckbox = Checkbox_default,
       toolbar: Toolbar,
@@ -4227,7 +4270,7 @@ function Component(props, apiRef) {
             width: c.width
           }
         }
-      ))), /* @__PURE__ */ import_react28.default.createElement("thead", null, processedColumnGroups && processedColumnGroups.groups.map((levelGroups, level) => /* @__PURE__ */ import_react28.default.createElement("tr", { key: `group-level-${level}` }, checkboxSelection && level === 0 && /* @__PURE__ */ import_react28.default.createElement(
+      ))), /* @__PURE__ */ import_react28.default.createElement("thead", null, processedColumnGroups && processedColumnGroups.groups.length > 0 && processedColumnGroups.groups.map((levelGroups, level) => /* @__PURE__ */ import_react28.default.createElement("tr", { key: `group-level-${level}` }, checkboxSelection && level === 0 && /* @__PURE__ */ import_react28.default.createElement(
         "th",
         {
           rowSpan: processedColumnGroups.maxLevel + 2,
@@ -4247,7 +4290,7 @@ function Component(props, apiRef) {
             ...checkboxProps
           }
         )
-      ), level > 0 && Array.from({ length: levelGroups[0]?.startIndex || 0 }).map((_2, i) => /* @__PURE__ */ import_react28.default.createElement("th", { key: `empty-${level}-${i}` })), levelGroups.map((group, groupIndex) => {
+      ), level > 0 && Array.from({ length: levelGroups[0]?.startIndex || 0 }).map((_2, i) => /* @__PURE__ */ import_react28.default.createElement("th", { key: `empty-${level}-${i}` })), levelGroups.filter((g) => g.colspan > 0).map((group, groupIndex) => {
         const nextGroup = levelGroups[groupIndex + 1];
         const emptyCells = nextGroup ? nextGroup.startIndex - (group.startIndex + group.colspan) : columns.length - (group.startIndex + group.colspan);
         const params = { groupId: group.groupId };
@@ -4265,7 +4308,7 @@ function Component(props, apiRef) {
           },
           group.headerName ?? group.groupId
         ), emptyCells > 0 && Array.from({ length: emptyCells }).map((_2, i) => /* @__PURE__ */ import_react28.default.createElement("th", { key: `empty-between-${level}-${groupIndex}-${i}`, colSpan: 1 })));
-      }))), /* @__PURE__ */ import_react28.default.createElement("tr", null, !processedColumnGroups && checkboxSelection && /* @__PURE__ */ import_react28.default.createElement(
+      }))), /* @__PURE__ */ import_react28.default.createElement("tr", null, (!processedColumnGroups || processedColumnGroups.groups.length === 0) && checkboxSelection && /* @__PURE__ */ import_react28.default.createElement(
         "th",
         {
           style: {

package/dist/index.js

@@ -2010,14 +2010,15 @@ function reorderColumnsByGroupingModel(columns, columnGroupingModel) {
   }
   return reorderedColumns;
 }
-function flattenColumnGroups(items, groupPath = [], columnIndex = { current: 0 }) {
+function flattenColumnGroups(items, groupPath = [], columnIndex = { current: 0 }, visibleFields) {
   const result = [];
   for (const item of items) {
     if ("groupId" in item) {
       const newPath = [...groupPath, item.groupId];
       const children = Array.isArray(item.children) ? item.children : [item.children];
-      result.push(...flattenColumnGroups(children, newPath, columnIndex));
+      result.push(...flattenColumnGroups(children, newPath, columnIndex, visibleFields));
     } else {
+      if (visibleFields && !visibleFields.has(item.field)) continue;
       result.push({
         ...item,
         groupPath,
@@ -2027,9 +2028,9 @@ function flattenColumnGroups(items, groupPath = [], columnIndex = { current: 0 }
   }
   return result;
 }
-function calculateColumnGroups(columnGroupingModel, columns) {
+function calculateColumnGroups(columnGroupingModel, columns, visibleFields) {
   const fieldsInGroupingModel = extractFieldsFromGroupingModel(columnGroupingModel);
-  const flattenedColumns = flattenColumnGroups(columnGroupingModel);
+  const flattenedColumns = flattenColumnGroups(columnGroupingModel, [], { current: 0 }, visibleFields);
   const columnIndexMap = new Map(flattenedColumns.map((col) => [col.field, col.columnIndex]));
   const processedGroups = /* @__PURE__ */ new Map();
   const groupsByLevel = [];
@@ -2077,7 +2078,9 @@ function calculateColumnGroups(columnGroupingModel, columns) {
   groupsByLevel.forEach((level) => {
     level.sort((a, b) => a.startIndex - b.startIndex);
   });
-  return { groups: groupsByLevel, maxLevel, fieldsInGroupingModel };
+  const filteredGroupsByLevel = groupsByLevel.map((level) => level.filter((g) => g.colspan > 0)).filter((level) => level.length > 0);
+  const correctedMaxLevel = filteredGroupsByLevel.length > 0 ? filteredGroupsByLevel.length - 1 : -1;
+  return { groups: filteredGroupsByLevel, maxLevel: correctedMaxLevel, fieldsInGroupingModel };
 }
 function getTextAlign(props) {
   return !props.editMode && ["number", "date", "currency"].includes(props.type || "") ? "end" : "start";
@@ -3250,7 +3253,9 @@ function useDataTableRenderer({
   getId: _getId,
   isTotalSelected: _isTotalSelected,
   isRowSelectable,
-  columnGroupingModel
+  columnGroupingModel,
+  columnVisibilityModel,
+  onColumnVisibilityModelChange
 }) {
   if (pinnedColumns && columnGroupingModel) {
     throw new Error(
@@ -3266,12 +3271,35 @@ function useDataTableRenderer({
     initialState?.sorting?.sortModel ?? [],
     useCallback10((sortModel2) => onSortModelChange?.(sortModel2), [onSortModelChange])
   );
+  const [visibilityModel] = useControlledState(
+    columnVisibilityModel,
+    initialState?.columns?.columnVisibilityModel ?? {},
+    useCallback10(
+      (model) => onColumnVisibilityModelChange?.(model),
+      [onColumnVisibilityModelChange]
+    )
+  );
   const reorderedColumns = useMemo9(() => {
     if (!columnGroupingModel) return columnsProp;
     return reorderColumnsByGroupingModel(columnsProp, columnGroupingModel);
   }, [columnsProp, columnGroupingModel]);
-  const columnsByField = useMemo9(
+  const visibleColumns = useMemo9(
+    () => reorderedColumns.filter((col) => visibilityModel[col.field] !== false),
+    [reorderedColumns, visibilityModel]
+  );
+  const visibleFieldSet = useMemo9(() => new Set(visibleColumns.map((c) => c.field)), [visibleColumns]);
+  const allColumnsByField = useMemo9(
     () => reorderedColumns.reduce(
+      (acc, curr) => ({
+        ...acc,
+        [curr.field]: curr
+      }),
+      {}
+    ),
+    [reorderedColumns]
+  );
+  const visibleColumnsByField = useMemo9(
+    () => visibleColumns.reduce(
       (acc, curr) => ({
         ...acc,
         [curr.field]: {
@@ -3282,7 +3310,7 @@ function useDataTableRenderer({
       }),
       {}
     ),
-    [reorderedColumns]
+    [visibleColumns]
   );
   const sortComparator = useCallback10(
     (rowA, rowB) => {
@@ -3290,7 +3318,8 @@ function useDataTableRenderer({
         const { field, sort: direction } = sort;
         const a = rowA[field];
         const b = rowB[field];
-        const column = columnsByField[field];
+        const column = allColumnsByField[field];
+        if (!column) continue;
         let comparison = 0;
         if (column.sortComparator) {
           comparison = column.sortComparator({
@@ -3310,7 +3339,7 @@ function useDataTableRenderer({
       }
       return 0;
     },
-    [sortModel, columnsByField]
+    [sortModel, allColumnsByField]
   );
   const rows = useMemo9(
     () => sortModel.length ? [..._rows].sort(sortComparator) : _rows,
@@ -3374,44 +3403,54 @@ function useDataTableRenderer({
     () => _isTotalSelected ?? (selectableRowCount > 0 && (selectionModel?.length || 0) === selectableRowCount),
     [_isTotalSelected, selectionModel, selectableRowCount]
   );
-  const columnWidths = useColumnWidths(columnsByField);
+  const columnWidths = useColumnWidths(visibleColumnsByField);
   const getWidth = useCallback10(
-    (f) => columnWidths[f] ?? columnsByField[f].width ?? // Column prop 으로 지정된 width
-    columnsByField[f].minWidth ?? 0,
-    [columnWidths, columnsByField]
+    (f) => columnWidths[f] ?? allColumnsByField[f]?.width ?? // Column prop 으로 지정된 width
+    allColumnsByField[f]?.minWidth ?? 0,
+    [columnWidths, allColumnsByField]
   );
   const processedColumnGroups = useMemo9(() => {
     if (!columnGroupingModel) return null;
-    return calculateColumnGroups(columnGroupingModel, reorderedColumns);
-  }, [columnGroupingModel, reorderedColumns]);
+    return calculateColumnGroups(columnGroupingModel, visibleColumns, visibleFieldSet);
+  }, [columnGroupingModel, visibleColumns, visibleFieldSet]);
+  const effectivePinnedLeft = useMemo9(
+    () => pinnedColumns?.left?.filter((f) => visibleFieldSet.has(f)),
+    [pinnedColumns?.left, visibleFieldSet]
+  );
+  const effectivePinnedRight = useMemo9(
+    () => pinnedColumns?.right?.filter((f) => visibleFieldSet.has(f)),
+    [pinnedColumns?.right, visibleFieldSet]
+  );
   const columns = useMemo9(() => {
-    const baseColumns = reorderedColumns.length > 0 ? reorderedColumns : Object.keys(rows[0] || {}).map((key) => ({
+    const baseColumns = visibleColumns.length > 0 ? visibleColumns : reorderedColumns.length > 0 ? [] : Object.keys(rows[0] || {}).map((key) => ({
       field: key
     }));
     return baseColumns.map((column) => {
-      const isLeftPinned = pinnedColumns?.left?.includes(column.field);
-      const isRightPinned = pinnedColumns?.right?.includes(column.field);
+      const isLeftPinned = effectivePinnedLeft?.includes(column.field);
+      const isRightPinned = effectivePinnedRight?.includes(column.field);
       const isPinned = isLeftPinned || isRightPinned;
       return {
         ...column,
-        headerRef: columnsByField[column.field].headerRef,
-        tableColRef: columnsByField[column.field].tableColRef,
+        headerRef: visibleColumnsByField[column.field]?.headerRef,
+        tableColRef: visibleColumnsByField[column.field]?.tableColRef,
         isCellEditable: editMode && (typeof column.isCellEditable === "function" ? column.isCellEditable : column.isCellEditable ?? true),
         sort: sortModel.find((sort) => sort.field === column.field)?.sort,
-        sortOrder: columnsByField[column.field]?.sortOrder || sortOrder,
+        sortOrder: allColumnsByField[column.field]?.sortOrder || sortOrder,
         isPinned,
-        isLastStartPinnedColumn: isLeftPinned && [...pinnedColumns?.left || []].pop() === column.field,
-        isLastEndPinnedColumn: isRightPinned && (pinnedColumns?.right?.[0] ?? null) === column.field,
-        pinnedStartPosition: pinnedColumns?.left?.slice(0, isLeftPinned ? pinnedColumns.left.indexOf(column.field) : pinnedColumns.left.length).reduce((acc, curr) => acc + getWidth(curr), 0),
-        pinnedEndPosition: pinnedColumns?.right?.slice(isRightPinned ? pinnedColumns.right.indexOf(column.field) + 1 : 0).reduce((acc, curr) => acc + getWidth(curr), 0)
+        isLastStartPinnedColumn: isLeftPinned && [...effectivePinnedLeft || []].pop() === column.field,
+        isLastEndPinnedColumn: isRightPinned && (effectivePinnedRight?.[0] ?? null) === column.field,
+        pinnedStartPosition: effectivePinnedLeft?.slice(0, isLeftPinned ? effectivePinnedLeft.indexOf(column.field) : effectivePinnedLeft.length).reduce((acc, curr) => acc + getWidth(curr), 0),
+        pinnedEndPosition: effectivePinnedRight?.slice(isRightPinned ? effectivePinnedRight.indexOf(column.field) + 1 : 0).reduce((acc, curr) => acc + getWidth(curr), 0)
       };
     });
   }, [
+    visibleColumns,
     reorderedColumns,
     rows,
-    pinnedColumns?.left,
-    pinnedColumns?.right,
-    columnsByField,
+    effectivePinnedLeft,
+    effectivePinnedRight,
+    visibleColumnsByField,
+    allColumnsByField,
     editMode,
     sortModel,
     sortOrder,
@@ -3427,8 +3466,8 @@ function useDataTableRenderer({
   const handleSortChange = useCallback10(
     (props) => {
       const { field, currentSort, multiple } = props;
-      const column = columnsByField[field];
-      const columnSortOrder = column.sortOrder || sortOrder;
+      const column = allColumnsByField[field];
+      const columnSortOrder = column?.sortOrder || sortOrder;
       if (currentSort !== void 0) {
         const currentOrderIndex = columnSortOrder.indexOf(currentSort);
         const nextSortOrderIndex = (currentOrderIndex + 1) % columnSortOrder.length;
@@ -3445,7 +3484,7 @@ function useDataTableRenderer({
         setSortModel(newSortModel);
       }
     },
-    [sortOrder, columnsByField, sortModel, setSortModel]
+    [sortOrder, allColumnsByField, sortModel, setSortModel]
   );
   useEffect6(() => {
     if (!paginationModel) {
@@ -3871,6 +3910,10 @@ function Component(props, apiRef) {
     loading,
     columnGroupingModel: _________________,
     // columnGroupingModel is used in useDataTableRenderer
+    columnVisibilityModel: __________________,
+    // columnVisibilityModel is used in useDataTableRenderer
+    onColumnVisibilityModelChange: ___________________,
+    // onColumnVisibilityModelChange is used in useDataTableRenderer
     slots: {
       checkbox: RenderCheckbox = Checkbox_default,
       toolbar: Toolbar,
@@ -4110,7 +4153,7 @@ function Component(props, apiRef) {
             width: c.width
           }
         }
-      ))), /* @__PURE__ */ React25.createElement("thead", null, processedColumnGroups && processedColumnGroups.groups.map((levelGroups, level) => /* @__PURE__ */ React25.createElement("tr", { key: `group-level-${level}` }, checkboxSelection && level === 0 && /* @__PURE__ */ React25.createElement(
+      ))), /* @__PURE__ */ React25.createElement("thead", null, processedColumnGroups && processedColumnGroups.groups.length > 0 && processedColumnGroups.groups.map((levelGroups, level) => /* @__PURE__ */ React25.createElement("tr", { key: `group-level-${level}` }, checkboxSelection && level === 0 && /* @__PURE__ */ React25.createElement(
         "th",
         {
           rowSpan: processedColumnGroups.maxLevel + 2,
@@ -4130,7 +4173,7 @@ function Component(props, apiRef) {
             ...checkboxProps
           }
         )
-      ), level > 0 && Array.from({ length: levelGroups[0]?.startIndex || 0 }).map((_2, i) => /* @__PURE__ */ React25.createElement("th", { key: `empty-${level}-${i}` })), levelGroups.map((group, groupIndex) => {
+      ), level > 0 && Array.from({ length: levelGroups[0]?.startIndex || 0 }).map((_2, i) => /* @__PURE__ */ React25.createElement("th", { key: `empty-${level}-${i}` })), levelGroups.filter((g) => g.colspan > 0).map((group, groupIndex) => {
         const nextGroup = levelGroups[groupIndex + 1];
         const emptyCells = nextGroup ? nextGroup.startIndex - (group.startIndex + group.colspan) : columns.length - (group.startIndex + group.colspan);
         const params = { groupId: group.groupId };
@@ -4148,7 +4191,7 @@ function Component(props, apiRef) {
           },
           group.headerName ?? group.groupId
         ), emptyCells > 0 && Array.from({ length: emptyCells }).map((_2, i) => /* @__PURE__ */ React25.createElement("th", { key: `empty-between-${level}-${groupIndex}-${i}`, colSpan: 1 })));
-      }))), /* @__PURE__ */ React25.createElement("tr", null, !processedColumnGroups && checkboxSelection && /* @__PURE__ */ React25.createElement(
+      }))), /* @__PURE__ */ React25.createElement("tr", null, (!processedColumnGroups || processedColumnGroups.groups.length === 0) && checkboxSelection && /* @__PURE__ */ React25.createElement(
         "th",
         {
           style: {