@mui/x-data-grid-pro 6.5.0 → 6.7.0

package/node/utils/tree/insertDataRowInTree.js

@@ -47,12 +47,7 @@ const insertDataRowInTree = ({
           groupingKey: key
         };
         updatedGroupsManager?.addAction(parentNodeId, 'insertChildren');
-        (0, _utils.insertNodeInTree)({
-          node: leafNode,
-          previousTree,
-          tree,
-          treeDepths
-        });
+        (0, _utils.insertNodeInTree)(leafNode, tree, treeDepths, previousTree);
       } else {
         const existingNodeWithPartialPath = tree[existingNodeIdWithPartialPath];
 
@@ -94,19 +89,11 @@ const insertDataRowInTree = ({
         groupingKey: key,
         groupingField: field,
         children: [],
-        childrenFromPath: {}
+        childrenFromPath: {},
+        childrenExpanded: false
       };
       updatedGroupsManager?.addAction(parentNodeId, 'insertChildren');
-      (0, _utils.insertNodeInTree)({
-        node: (0, _utils.addGroupDefaultExpansion)({
-          node: autoGeneratedGroupNode,
-          defaultGroupingExpansionDepth,
-          isGroupExpandedByDefault
-        }),
-        previousTree,
-        tree,
-        treeDepths
-      });
+      (0, _utils.insertNodeInTree)((0, _utils.updateGroupDefaultExpansion)(autoGeneratedGroupNode, defaultGroupingExpansionDepth, isGroupExpandedByDefault), tree, treeDepths, previousTree);
       parentNodeId = nodeId;
     }
     // For the intermediary steps of the path
@@ -125,13 +112,10 @@ const insertDataRowInTree = ({
           groupingKey: key,
           groupingField: field,
           children: [],
-          childrenFromPath: {}
+          childrenFromPath: {},
+          childrenExpanded: false
         };
-        tree[existingNodeIdWithPartialPath] = (0, _utils.addGroupDefaultExpansion)({
-          node: groupNode,
-          defaultGroupingExpansionDepth,
-          isGroupExpandedByDefault
-        });
+        tree[existingNodeIdWithPartialPath] = (0, _utils.updateGroupDefaultExpansion)(groupNode, defaultGroupingExpansionDepth, isGroupExpandedByDefault);
       }
       parentNodeId = currentGroupNode.id;
     }

package/node/utils/tree/sortRowTree.js

@@ -5,6 +5,62 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sortRowTree = void 0;
 var _xDataGrid = require("@mui/x-data-grid");
+// Single-linked list node
+class Node {
+  constructor(data, next) {
+    this.next = void 0;
+    this.data = void 0;
+    this.next = next;
+    this.data = data;
+  }
+  insertAfter(list) {
+    if (!list.first || !list.last) {
+      return;
+    }
+    const next = this.next;
+    this.next = list.first;
+    list.last.next = next;
+  }
+}
+
+// Single-linked list container
+class List {
+  constructor(first, last) {
+    this.first = void 0;
+    this.last = void 0;
+    this.first = first;
+    this.last = last;
+  }
+  data() {
+    const array = [];
+    this.forEach(node => {
+      array.push(node.data);
+    });
+    return array;
+  }
+  forEach(fn) {
+    let current = this.first;
+    while (current !== null) {
+      fn(current);
+      current = current.next;
+    }
+  }
+  static from(array) {
+    if (array.length === 0) {
+      return new List(null, null);
+    }
+    let index = 0;
+    const first = new Node(array[index], null);
+    let current = first;
+    while (index + 1 < array.length) {
+      index += 1;
+      const node = new Node(array[index], null);
+      current.next = node;
+      current = node;
+    }
+    return new List(first, current);
+  }
+}
 const sortRowTree = params => {
   const {
     rowTree,
@@ -12,7 +68,6 @@ const sortRowTree = params => {
     sortRowList,
     shouldRenderGroupBelowLeaves
   } = params;
-  let sortedRows = [];
   const sortedGroupedByParentRows = new Map();
   const sortGroup = node => {
     const shouldSortGroup = !!sortRowList && (!disableChildrenSorting || node.depth === -1);
@@ -54,22 +109,13 @@ const sortRowTree = params => {
     sortedGroupedByParentRows.set(node.id, sortedRowIds);
   };
   sortGroup(rowTree[_xDataGrid.GRID_ROOT_GROUP_ID]);
-
-  // Flatten the sorted lists to have children just after their parent
-  const insertRowListIntoSortedRows = (startIndex, rowList) => {
-    sortedRows = [...sortedRows.slice(0, startIndex), ...rowList, ...sortedRows.slice(startIndex)];
-    let treeSize = 0;
-    rowList.forEach(rowId => {
-      treeSize += 1;
-      const children = sortedGroupedByParentRows.get(rowId);
-      if (children?.length) {
-        const subTreeSize = insertRowListIntoSortedRows(startIndex + treeSize, children);
-        treeSize += subTreeSize;
-      }
-    });
-    return treeSize;
-  };
-  insertRowListIntoSortedRows(0, sortedGroupedByParentRows.get(_xDataGrid.GRID_ROOT_GROUP_ID));
-  return sortedRows;
+  const rootList = List.from(sortedGroupedByParentRows.get(_xDataGrid.GRID_ROOT_GROUP_ID));
+  rootList.forEach(node => {
+    const children = sortedGroupedByParentRows.get(node.data);
+    if (children?.length) {
+      node.insertAfter(List.from(children));
+    }
+  });
+  return rootList.data();
 };
 exports.sortRowTree = sortRowTree;

package/node/utils/tree/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateGroupNodeIdAndAutoGenerated = exports.removeNodeFromTree = exports.insertNodeInTree = exports.getNodePathInTree = exports.getGroupRowIdFromPath = exports.createUpdatedGroupsManager = exports.addGroupDefaultExpansion = void 0;
+exports.updateGroupNodeIdAndAutoGenerated = exports.updateGroupDefaultExpansion = exports.removeNodeFromTree = exports.insertNodeInTree = exports.getVisibleRowsLookup = exports.getNodePathInTree = exports.getGroupRowIdFromPath = exports.createUpdatedGroupsManager = void 0;
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _toPropertyKey2 = _interopRequireDefault(require("@babel/runtime/helpers/toPropertyKey"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -31,11 +31,7 @@ const getNodePathInTree = ({
   return path;
 };
 exports.getNodePathInTree = getNodePathInTree;
-const addGroupDefaultExpansion = ({
-  node,
-  isGroupExpandedByDefault,
-  defaultGroupingExpansionDepth
-}) => {
+const updateGroupDefaultExpansion = (node, defaultGroupingExpansionDepth, isGroupExpandedByDefault) => {
   let childrenExpanded;
   if (node.id === _xDataGrid.GRID_ROOT_GROUP_ID) {
     childrenExpanded = true;
@@ -44,21 +40,15 @@ const addGroupDefaultExpansion = ({
   } else {
     childrenExpanded = defaultGroupingExpansionDepth === -1 || defaultGroupingExpansionDepth > node.depth;
   }
-  return (0, _extends2.default)({}, node, {
-    childrenExpanded
-  });
+  node.childrenExpanded = childrenExpanded;
+  return node;
 };
 
 /**
  * Insert a node in the tree
  */
-exports.addGroupDefaultExpansion = addGroupDefaultExpansion;
-const insertNodeInTree = ({
-  node,
-  previousTree,
-  tree,
-  treeDepths
-}) => {
+exports.updateGroupDefaultExpansion = updateGroupDefaultExpansion;
+const insertNodeInTree = (node, tree, treeDepths, previousTree) => {
   // 1. Insert node in the tree.
   tree[node.id] = node;
 
@@ -67,11 +57,7 @@ const insertNodeInTree = ({
 
   // 3. Register the new node in its parent.
   const parentNode = tree[node.parent];
-  if (node.type === 'footer') {
-    // For footers,
-    // Register the node from its parent `footerId` property.
-    parentNode.footerId = node.id;
-  } else if (node.type === 'group' || node.type === 'leaf') {
+  if (node.type === 'group' || node.type === 'leaf') {
     // For groups and leaves,
     // Register the node from its parents `children` and `childrenFromPath` properties.
     const groupingFieldName = node.groupingField ?? '__no_field__';
@@ -89,6 +75,10 @@ const insertNodeInTree = ({
     } else {
       groupingField[groupingKeyName.toString()] = node.id;
     }
+  } else if (node.type === 'footer') {
+    // For footers,
+    // Register the node from its parent `footerId` property.
+    parentNode.footerId = node.id;
   }
 };
 
@@ -173,12 +163,7 @@ const updateGroupNodeIdAndAutoGenerated = ({
 
   // 3. Add the new group in the tree
   const groupNode = (0, _extends2.default)({}, node, updatedNode);
-  insertNodeInTree({
-    previousTree,
-    node: groupNode,
-    tree,
-    treeDepths
-  });
+  insertNodeInTree(groupNode, tree, treeDepths, previousTree);
 };
 exports.updateGroupNodeIdAndAutoGenerated = updateGroupNodeIdAndAutoGenerated;
 const createUpdatedGroupsManager = () => ({
@@ -190,4 +175,37 @@ const createUpdatedGroupsManager = () => ({
     this.value[groupId][action] = true;
   }
 });
-exports.createUpdatedGroupsManager = createUpdatedGroupsManager;
+exports.createUpdatedGroupsManager = createUpdatedGroupsManager;
+const getVisibleRowsLookup = ({
+  tree,
+  filteredRowsLookup
+}) => {
+  if (!filteredRowsLookup) {
+    return {};
+  }
+  const visibleRowsLookup = {};
+  const handleTreeNode = (node, areAncestorsExpanded) => {
+    const isPassingFiltering = filteredRowsLookup[node.id];
+    if (node.type === 'group') {
+      node.children.forEach(childId => {
+        const childNode = tree[childId];
+        handleTreeNode(childNode, areAncestorsExpanded && !!node.childrenExpanded);
+      });
+    }
+    visibleRowsLookup[node.id] = isPassingFiltering && areAncestorsExpanded;
+
+    // TODO rows v6: Should we keep storing the visibility status of footer independently or rely on the group visibility in the selector ?
+    if (node.type === 'group' && node.footerId != null) {
+      visibleRowsLookup[node.footerId] = isPassingFiltering && areAncestorsExpanded && !!node.childrenExpanded;
+    }
+  };
+  const nodes = Object.values(tree);
+  for (let i = 0; i < nodes.length; i += 1) {
+    const node = nodes[i];
+    if (node.depth === 0) {
+      handleTreeNode(node, true);
+    }
+  }
+  return visibleRowsLookup;
+};
+exports.getVisibleRowsLookup = getVisibleRowsLookup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-pro",
-  "version": "6.5.0",
+  "version": "6.7.0",
   "description": "The Pro plan edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.21.0",
-    "@mui/utils": "^5.12.3",
-    "@mui/x-data-grid": "6.5.0",
-    "@mui/x-license-pro": "6.0.4",
+    "@mui/utils": "^5.13.1",
+    "@mui/x-data-grid": "6.7.0",
+    "@mui/x-license-pro": "6.6.0",
     "@types/format-util": "^1.0.2",
     "clsx": "^1.2.1",
     "prop-types": "^15.8.1",
@@ -43,8 +43,8 @@
   "peerDependencies": {
     "@mui/material": "^5.4.1",
     "@mui/system": "^5.4.1",
-    "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0"
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0"
   },
   "setupFiles": [
     "<rootDir>/src/setupTests.js"

package/themeAugmentation/overrides.d.ts

@@ -2,7 +2,7 @@ import { GridClassKey } from '@mui/x-data-grid';
 export interface DataGridProComponentNameToClassKey {
     MuiDataGrid: GridClassKey;
 }
-declare module '@mui/material/styles/overrides' {
+declare module '@mui/material/styles' {
     interface ComponentNameToClassKey extends DataGridProComponentNameToClassKey {
     }
 }

package/typeOverloads/modules.d.ts

@@ -1,17 +1,17 @@
 /// <reference types="react" />
-import { GridRowId, GridColumnHeaderParams, GridValidRowModel } from '@mui/x-data-grid';
+import { GridRowId } from '@mui/x-data-grid';
 import type { GridRowScrollEndParams, GridRowOrderChangeParams, GridFetchRowsParams } from '../models';
+import type { GridHeaderFilterCellProps } from '../components/headerFiltering/GridHeaderFilterCell';
 import type { GridColumnPinningInternalCache, GridPinnedColumns } from '../hooks/features/columnPinning/gridColumnPinningInterface';
 import type { GridCanBeReorderedPreProcessingContext } from '../hooks/features/columnReorder/columnReorderInterfaces';
 import { GridRowPinningInternalCache } from '../hooks/features/rowPinning/gridRowPinningInterface';
-export interface GridColDefPro<R extends GridValidRowModel = any, V = any, F = V> {
+export interface GridColDefPro {
     /**
      * Allows to render a component in the column header filter cell.
-     * @template R, V, F
-     * @param {GridColumnHeaderParams<R, V, F>} params Object containing parameters for the renderer.
+     * @param {GridHeaderFilterCellProps} params Object containing parameters for the renderer.
      * @returns {React.ReactNode} The element to be rendered.
      */
-    renderHeaderFilter?: (params: GridColumnHeaderParams<R, V, F>) => React.ReactNode;
+    renderHeaderFilter?: (params: GridHeaderFilterCellProps) => React.ReactNode;
 }
 export interface GridControlledStateEventLookupPro {
     /**
@@ -70,6 +70,6 @@ declare module '@mui/x-data-grid' {
 declare module '@mui/x-data-grid/internals' {
     interface GridApiCaches extends GridApiCachesPro {
     }
-    interface GridBaseColDef<R, V, F> extends GridColDefPro<R, V, F> {
+    interface GridBaseColDef extends GridColDefPro {
     }
 }

package/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTY4NDQ0MzYwMDAwMA==";
+  const releaseInfo = "MTY4NjI2MTYwMDAwMA==";
   if (process.env.NODE_ENV !== 'production') {
     // A simple hack to set the value in the test environment (has no build step).
     // eslint-disable-next-line no-useless-concat

package/utils/tree/insertDataRowInTree.js

@@ -1,5 +1,5 @@
 import { GRID_ROOT_GROUP_ID } from '@mui/x-data-grid';
-import { addGroupDefaultExpansion, getGroupRowIdFromPath, insertNodeInTree, updateGroupNodeIdAndAutoGenerated } from './utils';
+import { updateGroupDefaultExpansion, getGroupRowIdFromPath, insertNodeInTree, updateGroupNodeIdAndAutoGenerated } from './utils';
 /**
  * Inserts a data row in a tree.
  * For each steps of its path:
@@ -42,12 +42,7 @@ export const insertDataRowInTree = ({
           groupingKey: key
         };
         updatedGroupsManager == null ? void 0 : updatedGroupsManager.addAction(parentNodeId, 'insertChildren');
-        insertNodeInTree({
-          node: leafNode,
-          previousTree,
-          tree,
-          treeDepths
-        });
+        insertNodeInTree(leafNode, tree, treeDepths, previousTree);
       } else {
         const existingNodeWithPartialPath = tree[existingNodeIdWithPartialPath];
 
@@ -89,19 +84,11 @@ export const insertDataRowInTree = ({
         groupingKey: key,
         groupingField: field,
         children: [],
-        childrenFromPath: {}
+        childrenFromPath: {},
+        childrenExpanded: false
       };
       updatedGroupsManager == null ? void 0 : updatedGroupsManager.addAction(parentNodeId, 'insertChildren');
-      insertNodeInTree({
-        node: addGroupDefaultExpansion({
-          node: autoGeneratedGroupNode,
-          defaultGroupingExpansionDepth,
-          isGroupExpandedByDefault
-        }),
-        previousTree,
-        tree,
-        treeDepths
-      });
+      insertNodeInTree(updateGroupDefaultExpansion(autoGeneratedGroupNode, defaultGroupingExpansionDepth, isGroupExpandedByDefault), tree, treeDepths, previousTree);
       parentNodeId = nodeId;
     }
     // For the intermediary steps of the path
@@ -120,13 +107,10 @@ export const insertDataRowInTree = ({
           groupingKey: key,
           groupingField: field,
           children: [],
-          childrenFromPath: {}
+          childrenFromPath: {},
+          childrenExpanded: false
         };
-        tree[existingNodeIdWithPartialPath] = addGroupDefaultExpansion({
-          node: groupNode,
-          defaultGroupingExpansionDepth,
-          isGroupExpandedByDefault
-        });
+        tree[existingNodeIdWithPartialPath] = updateGroupDefaultExpansion(groupNode, defaultGroupingExpansionDepth, isGroupExpandedByDefault);
       }
       parentNodeId = currentGroupNode.id;
     }

package/utils/tree/sortRowTree.js

@@ -1,4 +1,60 @@
 import { GRID_ROOT_GROUP_ID } from '@mui/x-data-grid';
+// Single-linked list node
+class Node {
+  constructor(data, next) {
+    this.next = void 0;
+    this.data = void 0;
+    this.next = next;
+    this.data = data;
+  }
+  insertAfter(list) {
+    if (!list.first || !list.last) {
+      return;
+    }
+    const next = this.next;
+    this.next = list.first;
+    list.last.next = next;
+  }
+}
+
+// Single-linked list container
+class List {
+  constructor(first, last) {
+    this.first = void 0;
+    this.last = void 0;
+    this.first = first;
+    this.last = last;
+  }
+  data() {
+    const array = [];
+    this.forEach(node => {
+      array.push(node.data);
+    });
+    return array;
+  }
+  forEach(fn) {
+    let current = this.first;
+    while (current !== null) {
+      fn(current);
+      current = current.next;
+    }
+  }
+  static from(array) {
+    if (array.length === 0) {
+      return new List(null, null);
+    }
+    let index = 0;
+    const first = new Node(array[index], null);
+    let current = first;
+    while (index + 1 < array.length) {
+      index += 1;
+      const node = new Node(array[index], null);
+      current.next = node;
+      current = node;
+    }
+    return new List(first, current);
+  }
+}
 export const sortRowTree = params => {
   const {
     rowTree,
@@ -6,7 +62,6 @@ export const sortRowTree = params => {
     sortRowList,
     shouldRenderGroupBelowLeaves
   } = params;
-  let sortedRows = [];
   const sortedGroupedByParentRows = new Map();
   const sortGroup = node => {
     const shouldSortGroup = !!sortRowList && (!disableChildrenSorting || node.depth === -1);
@@ -48,21 +103,12 @@ export const sortRowTree = params => {
     sortedGroupedByParentRows.set(node.id, sortedRowIds);
   };
   sortGroup(rowTree[GRID_ROOT_GROUP_ID]);
-
-  // Flatten the sorted lists to have children just after their parent
-  const insertRowListIntoSortedRows = (startIndex, rowList) => {
-    sortedRows = [...sortedRows.slice(0, startIndex), ...rowList, ...sortedRows.slice(startIndex)];
-    let treeSize = 0;
-    rowList.forEach(rowId => {
-      treeSize += 1;
-      const children = sortedGroupedByParentRows.get(rowId);
-      if (children != null && children.length) {
-        const subTreeSize = insertRowListIntoSortedRows(startIndex + treeSize, children);
-        treeSize += subTreeSize;
-      }
-    });
-    return treeSize;
-  };
-  insertRowListIntoSortedRows(0, sortedGroupedByParentRows.get(GRID_ROOT_GROUP_ID));
-  return sortedRows;
+  const rootList = List.from(sortedGroupedByParentRows.get(GRID_ROOT_GROUP_ID));
+  rootList.forEach(node => {
+    const children = sortedGroupedByParentRows.get(node.data);
+    if (children != null && children.length) {
+      node.insertAfter(List.from(children));
+    }
+  });
+  return rootList.data();
 };

package/utils/tree/utils.d.ts

@@ -1,4 +1,4 @@
-import { GridChildrenFromPathLookup, GridGroupNode, GridRowId, GridRowTreeConfig, GridTreeNode } from '@mui/x-data-grid';
+import { GridFilterState, GridGroupNode, GridRowId, GridRowTreeConfig, GridRowsState, GridTreeNode } from '@mui/x-data-grid';
 import { GridTreeDepths, GridRowTreeUpdatedGroupsManager } from '@mui/x-data-grid/internals';
 import { RowTreeBuilderGroupingCriterion } from './models';
 import { DataGridProProps } from '../../models/dataGridProProps';
@@ -7,46 +7,11 @@ export declare const getNodePathInTree: ({ id, tree, }: {
     id: GridRowId;
     tree: GridRowTreeConfig;
 }) => RowTreeBuilderGroupingCriterion[];
-export declare const addGroupDefaultExpansion: ({ node, isGroupExpandedByDefault, defaultGroupingExpansionDepth, }: {
-    node: GridGroupNode;
-    isGroupExpandedByDefault?: DataGridProProps['isGroupExpandedByDefault'];
-    defaultGroupingExpansionDepth: number;
-}) => {
-    childrenExpanded: boolean;
-    isAutoGenerated: true;
-    type: "group";
-    groupingKey: import("@mui/x-data-grid").GridKeyValue | null;
-    groupingField: string | null;
-    children: GridRowId[];
-    footerId?: GridRowId | null | undefined;
-    childrenFromPath: GridChildrenFromPathLookup;
-    parent: GridRowId | null;
-    isPinned?: boolean | undefined;
-    id: GridRowId;
-    depth: number;
-} | {
-    childrenExpanded: boolean;
-    isAutoGenerated: false;
-    type: "group";
-    groupingKey: import("@mui/x-data-grid").GridKeyValue | null;
-    groupingField: string | null;
-    children: GridRowId[];
-    footerId?: GridRowId | null | undefined;
-    childrenFromPath: GridChildrenFromPathLookup;
-    parent: GridRowId | null;
-    isPinned?: boolean | undefined;
-    id: GridRowId;
-    depth: number;
-};
+export declare const updateGroupDefaultExpansion: (node: GridGroupNode, defaultGroupingExpansionDepth: number, isGroupExpandedByDefault?: DataGridProProps['isGroupExpandedByDefault']) => GridGroupNode;
 /**
  * Insert a node in the tree
  */
-export declare const insertNodeInTree: ({ node, previousTree, tree, treeDepths, }: {
-    node: GridTreeNode;
-    previousTree: GridRowTreeConfig | null;
-    tree: GridRowTreeConfig;
-    treeDepths: GridTreeDepths;
-}) => void;
+export declare const insertNodeInTree: (node: GridTreeNode, tree: GridRowTreeConfig, treeDepths: GridTreeDepths, previousTree: GridRowTreeConfig | null) => void;
 /**
  * Removes a node from the tree
  */
@@ -66,3 +31,7 @@ export declare const updateGroupNodeIdAndAutoGenerated: ({ node, updatedNode, pr
     treeDepths: GridTreeDepths;
 }) => void;
 export declare const createUpdatedGroupsManager: () => GridRowTreeUpdatedGroupsManager;
+export declare const getVisibleRowsLookup: ({ tree, filteredRowsLookup, }: {
+    tree: GridRowsState['tree'];
+    filteredRowsLookup: GridFilterState['filteredRowsLookup'];
+}) => Record<GridRowId, boolean>;