@mui/x-data-grid-pro 6.4.0 → 6.6.0

package/node/hooks/features/rowPinning/useGridRowPinningPreProcessors.js

@@ -36,6 +36,7 @@ function addPinnedRow({
     isAutoGenerated
   };
   (0, _utils.insertNodeInTree)({
+    previousTree: null,
     node,
     tree,
     treeDepths

package/node/hooks/features/treeData/gridTreeDataUtils.js

@@ -19,7 +19,6 @@ const filterRowTreeFromTreeData = params => {
     disableChildrenFiltering,
     isRowMatchingFilters
   } = params;
-  const visibleRowsLookup = {};
   const filteredRowsLookup = {};
   const filteredDescendantCountLookup = {};
   const filterTreeNode = (node, isParentMatchingFilters, areAncestorsExpanded) => {
@@ -62,13 +61,7 @@ const filterRowTreeFromTreeData = params => {
           break;
         }
     }
-    visibleRowsLookup[node.id] = shouldPassFilters && areAncestorsExpanded;
     filteredRowsLookup[node.id] = shouldPassFilters;
-
-    // TODO: 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] = shouldPassFilters && areAncestorsExpanded && !!node.childrenExpanded;
-    }
     if (!shouldPassFilters) {
       return 0;
     }
@@ -86,7 +79,6 @@ const filterRowTreeFromTreeData = params => {
     }
   }
   return {
-    visibleRowsLookup,
     filteredRowsLookup,
     filteredDescendantCountLookup
   };

package/node/hooks/features/treeData/useGridTreeDataPreProcessors.js

@@ -16,6 +16,7 @@ var _components = require("../../../components");
 var _createRowTree = require("../../../utils/tree/createRowTree");
 var _sortRowTree = require("../../../utils/tree/sortRowTree");
 var _updateRowTree = require("../../../utils/tree/updateRowTree");
+var _utils = require("../../../utils/tree/utils");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["hideDescendantCount"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -86,6 +87,7 @@ const useGridTreeDataPreProcessors = (privateApiRef, props) => {
     };
     if (params.updates.type === 'full') {
       return (0, _createRowTree.createRowTree)({
+        previousTree: params.previousTree,
         nodes: params.updates.rows.map(getRowTreeBuilderNode),
         defaultGroupingExpansionDepth: props.defaultGroupingExpansionDepth,
         isGroupExpandedByDefault: props.isGroupExpandedByDefault,
@@ -129,6 +131,7 @@ const useGridTreeDataPreProcessors = (privateApiRef, props) => {
   (0, _internals.useGridRegisterStrategyProcessor)(privateApiRef, _gridTreeDataUtils.TREE_DATA_STRATEGY, 'rowTreeCreation', createRowTreeForTreeData);
   (0, _internals.useGridRegisterStrategyProcessor)(privateApiRef, _gridTreeDataUtils.TREE_DATA_STRATEGY, 'filtering', filterRows);
   (0, _internals.useGridRegisterStrategyProcessor)(privateApiRef, _gridTreeDataUtils.TREE_DATA_STRATEGY, 'sorting', sortRows);
+  (0, _internals.useGridRegisterStrategyProcessor)(privateApiRef, _gridTreeDataUtils.TREE_DATA_STRATEGY, 'visibleRowsLookupCreation', _utils.getVisibleRowsLookup);
 
   /**
    * 1ST RENDER

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-pro v6.4.0
+ * @mui/x-data-grid-pro v6.6.0
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/node/internals/index.js

@@ -7,6 +7,7 @@ var _exportNames = {
   DataGridProVirtualScroller: true,
   GridColumnHeaders: true,
   DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS: true,
+  useGridColumnHeaders: true,
   useGridColumnResize: true,
   columnResizeStateInitializer: true,
   useGridColumnPinning: true,
@@ -33,7 +34,8 @@ var _exportNames = {
   updateRowTree: true,
   sortRowTree: true,
   insertNodeInTree: true,
-  removeNodeFromTree: true
+  removeNodeFromTree: true,
+  getVisibleRowsLookup: true
 };
 Object.defineProperty(exports, "DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS", {
   enumerable: true,
@@ -95,6 +97,12 @@ Object.defineProperty(exports, "detailPanelStateInitializer", {
     return _useGridDetailPanel.detailPanelStateInitializer;
   }
 });
+Object.defineProperty(exports, "getVisibleRowsLookup", {
+  enumerable: true,
+  get: function () {
+    return _utils.getVisibleRowsLookup;
+  }
+});
 Object.defineProperty(exports, "insertNodeInTree", {
   enumerable: true,
   get: function () {
@@ -125,6 +133,12 @@ Object.defineProperty(exports, "updateRowTree", {
     return _updateRowTree.updateRowTree;
   }
 });
+Object.defineProperty(exports, "useGridColumnHeaders", {
+  enumerable: true,
+  get: function () {
+    return _useGridColumnHeaders.useGridColumnHeaders;
+  }
+});
 Object.defineProperty(exports, "useGridColumnPinning", {
   enumerable: true,
   get: function () {
@@ -230,6 +244,7 @@ Object.keys(_internals).forEach(function (key) {
 var _DataGridProVirtualScroller = require("../components/DataGridProVirtualScroller");
 var _GridColumnHeaders = require("../components/GridColumnHeaders");
 var _dataGridProDefaultSlotsComponents = require("../constants/dataGridProDefaultSlotsComponents");
+var _useGridColumnHeaders = require("../hooks/features/columnHeaders/useGridColumnHeaders");
 var _useGridColumnResize = require("../hooks/features/columnResize/useGridColumnResize");
 var _useGridColumnPinning = require("../hooks/features/columnPinning/useGridColumnPinning");
 var _useGridColumnPinningPreProcessors = require("../hooks/features/columnPinning/useGridColumnPinningPreProcessors");

package/node/material/icons.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GridPushPinRightIcon = exports.GridPushPinLeftIcon = void 0;
+exports.GridPushPinRightIcon = exports.GridPushPinLeftIcon = exports.GridHighlightOffIcon = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _utils = require("@mui/material/utils");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -24,4 +24,8 @@ const GridPushPinLeftIcon = (0, _utils.createSvgIcon)( /*#__PURE__*/(0, _jsxRunt
     fillRule: "evenodd"
   })
 }), 'PushPinLeft');
-exports.GridPushPinLeftIcon = GridPushPinLeftIcon;
+exports.GridPushPinLeftIcon = GridPushPinLeftIcon;
+const GridHighlightOffIcon = (0, _utils.createSvgIcon)( /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+  d: "M14.59 8L12 10.59 9.41 8 8 9.41 10.59 12 8 14.59 9.41 16 12 13.41 14.59 16 16 14.59 13.41 12 16 9.41 14.59 8zM12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"
+}), 'HighlightOff');
+exports.GridHighlightOffIcon = GridHighlightOffIcon;

package/node/material/index.js

@@ -9,7 +9,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _icons = require("./icons");
 const iconSlots = {
   ColumnMenuPinRightIcon: _icons.GridPushPinRightIcon,
-  ColumnMenuPinLeftIcon: _icons.GridPushPinLeftIcon
+  ColumnMenuPinLeftIcon: _icons.GridPushPinLeftIcon,
+  HeaderFilterClearIcon: _icons.GridHighlightOffIcon
 };
 const materialSlots = (0, _extends2.default)({}, iconSlots);
 var _default = materialSlots;

package/node/models/gridProSlotProps.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/node/utils/releaseInfo.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getReleaseInfo = void 0;
 var _utils = require("@mui/utils");
 const getReleaseInfo = () => {
-  const releaseInfo = "MTY4Mzg0MjQwMDAwMA==";
+  const releaseInfo = "MTY4NTU3MDQwMDAwMA==";
   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/node/utils/tree/createRowTree.js

@@ -21,6 +21,7 @@ const createRowTree = params => {
     dataRowIds.push(node.id);
     (0, _insertDataRowInTree.insertDataRowInTree)({
       tree,
+      previousTree: params.previousTree,
       id: node.id,
       path: node.path,
       onDuplicatePath: params.onDuplicatePath,

package/node/utils/tree/insertDataRowInTree.js

@@ -16,6 +16,7 @@ const insertDataRowInTree = ({
   id,
   path,
   updatedGroupsManager,
+  previousTree,
   tree,
   treeDepths,
   onDuplicatePath,
@@ -48,6 +49,7 @@ const insertDataRowInTree = ({
         updatedGroupsManager?.addAction(parentNodeId, 'insertChildren');
         (0, _utils.insertNodeInTree)({
           node: leafNode,
+          previousTree,
           tree,
           treeDepths
         });
@@ -61,6 +63,7 @@ const insertDataRowInTree = ({
           updatedGroupsManager?.addAction(parentNodeId, 'insertChildren');
           (0, _utils.updateGroupNodeIdAndAutoGenerated)({
             tree,
+            previousTree,
             treeDepths,
             node: existingNodeWithPartialPath,
             updatedNode: {
@@ -100,6 +103,7 @@ const insertDataRowInTree = ({
           defaultGroupingExpansionDepth,
           isGroupExpandedByDefault
         }),
+        previousTree,
         tree,
         treeDepths
       });

package/node/utils/tree/removeDataRowFromTree.js

@@ -54,6 +54,7 @@ const replaceDataGroupWithAutoGeneratedGroup = ({
   updatedGroupsManager?.addAction(node.parent, 'removeChildren');
   updatedGroupsManager?.addAction(node.parent, 'insertChildren');
   (0, _utils.updateGroupNodeIdAndAutoGenerated)({
+    previousTree: null,
     tree,
     treeDepths,
     node,

package/node/utils/tree/updateRowTree.js

@@ -21,6 +21,7 @@ const updateRowTree = params => {
       path
     } = params.nodes.inserted[i];
     (0, _insertDataRowInTree.insertDataRowInTree)({
+      previousTree: params.previousTree,
       tree,
       treeDepths,
       updatedGroupsManager,
@@ -58,6 +59,7 @@ const updateRowTree = params => {
         id
       });
       (0, _insertDataRowInTree.insertDataRowInTree)({
+        previousTree: params.previousTree,
         tree,
         treeDepths,
         updatedGroupsManager,

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.removeNodeFromTree = exports.insertNodeInTree = exports.getVisibleRowsLookup = exports.getNodePathInTree = exports.getGroupRowIdFromPath = exports.createUpdatedGroupsManager = exports.addGroupDefaultExpansion = 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"));
@@ -55,6 +55,7 @@ const addGroupDefaultExpansion = ({
 exports.addGroupDefaultExpansion = addGroupDefaultExpansion;
 const insertNodeInTree = ({
   node,
+  previousTree,
   tree,
   treeDepths
 }) => {
@@ -69,22 +70,25 @@ const insertNodeInTree = ({
   if (node.type === 'footer') {
     // For footers,
     // Register the node from its parent `footerId` property.
-    tree[node.parent] = (0, _extends2.default)({}, parentNode, {
-      footerId: node.id
-    });
+    parentNode.footerId = node.id;
   } else if (node.type === 'group' || node.type === 'leaf') {
     // For groups and leaves,
     // Register the node from its parents `children` and `childrenFromPath` properties.
-    const groupingField = node.groupingField ?? '__no_field__';
-    const groupingKey = node.groupingKey ?? '__no_key__';
-    tree[node.parent] = (0, _extends2.default)({}, parentNode, {
-      childrenFromPath: (0, _extends2.default)({}, parentNode.childrenFromPath, {
-        [groupingField]: (0, _extends2.default)({}, parentNode.childrenFromPath?.[groupingField], {
-          [groupingKey.toString()]: node.id
-        })
-      }),
-      children: [...parentNode.children, node.id]
-    });
+    const groupingFieldName = node.groupingField ?? '__no_field__';
+    const groupingKeyName = node.groupingKey ?? '__no_key__';
+    const groupingField = parentNode.childrenFromPath?.[groupingFieldName];
+    if (previousTree !== null && previousTree[parentNode.id] === tree[parentNode.id]) {
+      parentNode.children = [...parentNode.children, node.id];
+    } else {
+      parentNode.children.push(node.id);
+    }
+    if (groupingField == null) {
+      parentNode.childrenFromPath[groupingFieldName] = {
+        [groupingKeyName.toString()]: node.id
+      };
+    } else {
+      groupingField[groupingKeyName.toString()] = node.id;
+    }
   }
 };
 
@@ -149,6 +153,7 @@ exports.removeNodeFromTree = removeNodeFromTree;
 const updateGroupNodeIdAndAutoGenerated = ({
   node,
   updatedNode,
+  previousTree,
   tree,
   treeDepths
 }) => {
@@ -169,6 +174,7 @@ const updateGroupNodeIdAndAutoGenerated = ({
   // 3. Add the new group in the tree
   const groupNode = (0, _extends2.default)({}, node, updatedNode);
   insertNodeInTree({
+    previousTree,
     node: groupNode,
     tree,
     treeDepths
@@ -184,4 +190,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.4.0",
+  "version": "6.6.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.4.0",
-    "@mui/x-license-pro": "6.0.4",
+    "@mui/utils": "^5.13.1",
+    "@mui/x-data-grid": "6.6.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/typeOverloads/modules.d.ts

@@ -1,8 +1,18 @@
-import { GridRowId } from '@mui/x-data-grid';
+/// <reference types="react" />
+import { GridRowId, GridColumnHeaderParams, GridValidRowModel } from '@mui/x-data-grid';
 import type { GridRowScrollEndParams, GridRowOrderChangeParams, GridFetchRowsParams } from '../models';
 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> {
+    /**
+     * 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.
+     * @returns {React.ReactNode} The element to be rendered.
+     */
+    renderHeaderFilter?: (params: GridColumnHeaderParams<R, V, F>) => React.ReactNode;
+}
 export interface GridControlledStateEventLookupPro {
     /**
      * Fired when the open detail panels are changed.
@@ -60,4 +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> {
+    }
 }

package/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTY4Mzg0MjQwMDAwMA==";
+  const releaseInfo = "MTY4NTU3MDQwMDAwMA==";
   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/createRowTree.d.ts

@@ -1,7 +1,9 @@
+import { GridRowTreeConfig } from '@mui/x-data-grid';
 import { GridRowTreeCreationValue } from '@mui/x-data-grid/internals';
 import { RowTreeBuilderNode, GridTreePathDuplicateHandler } from './models';
 import { DataGridProProps } from '../../models/dataGridProProps';
 interface CreateRowTreeParams {
+    previousTree: GridRowTreeConfig | null;
     nodes: RowTreeBuilderNode[];
     defaultGroupingExpansionDepth: number;
     isGroupExpandedByDefault?: DataGridProProps['isGroupExpandedByDefault'];

package/utils/tree/createRowTree.js

@@ -15,6 +15,7 @@ export const createRowTree = params => {
     dataRowIds.push(node.id);
     insertDataRowInTree({
       tree,
+      previousTree: params.previousTree,
       id: node.id,
       path: node.path,
       onDuplicatePath: params.onDuplicatePath,

package/utils/tree/insertDataRowInTree.d.ts

@@ -20,6 +20,10 @@ interface InsertDataRowInTreeParams {
      * - `tree[nodeId].children.push(newNodeId)` => invalid
      */
     tree: GridRowTreeConfig;
+    /**
+     * Previous tree instance for comparison.
+     */
+    previousTree: GridRowTreeConfig | null;
     /**
      * Amount of nodes at each depth of the tree.
      * This object can be mutated.
@@ -47,5 +51,5 @@ interface InsertDataRowInTreeParams {
  * - if a node exists with the same partial path, it will register this node as the ancestor of the data row.
  * - if not, it will create an auto-generated node and register it as ancestor of the data row.
  */
-export declare const insertDataRowInTree: ({ id, path, updatedGroupsManager, tree, treeDepths, onDuplicatePath, isGroupExpandedByDefault, defaultGroupingExpansionDepth, }: InsertDataRowInTreeParams) => void;
+export declare const insertDataRowInTree: ({ id, path, updatedGroupsManager, previousTree, tree, treeDepths, onDuplicatePath, isGroupExpandedByDefault, defaultGroupingExpansionDepth, }: InsertDataRowInTreeParams) => void;
 export {};

package/utils/tree/insertDataRowInTree.js

@@ -10,6 +10,7 @@ export const insertDataRowInTree = ({
   id,
   path,
   updatedGroupsManager,
+  previousTree,
   tree,
   treeDepths,
   onDuplicatePath,
@@ -43,6 +44,7 @@ export const insertDataRowInTree = ({
         updatedGroupsManager == null ? void 0 : updatedGroupsManager.addAction(parentNodeId, 'insertChildren');
         insertNodeInTree({
           node: leafNode,
+          previousTree,
           tree,
           treeDepths
         });
@@ -56,6 +58,7 @@ export const insertDataRowInTree = ({
           updatedGroupsManager == null ? void 0 : updatedGroupsManager.addAction(parentNodeId, 'insertChildren');
           updateGroupNodeIdAndAutoGenerated({
             tree,
+            previousTree,
             treeDepths,
             node: existingNodeWithPartialPath,
             updatedNode: {
@@ -95,6 +98,7 @@ export const insertDataRowInTree = ({
           defaultGroupingExpansionDepth,
           isGroupExpandedByDefault
         }),
+        previousTree,
         tree,
         treeDepths
       });

package/utils/tree/removeDataRowFromTree.js

@@ -48,6 +48,7 @@ const replaceDataGroupWithAutoGeneratedGroup = ({
   updatedGroupsManager == null ? void 0 : updatedGroupsManager.addAction(node.parent, 'removeChildren');
   updatedGroupsManager == null ? void 0 : updatedGroupsManager.addAction(node.parent, 'insertChildren');
   updateGroupNodeIdAndAutoGenerated({
+    previousTree: null,
     tree,
     treeDepths,
     node,

package/utils/tree/updateRowTree.js

@@ -14,6 +14,7 @@ export const updateRowTree = params => {
       path
     } = params.nodes.inserted[i];
     insertDataRowInTree({
+      previousTree: params.previousTree,
       tree,
       treeDepths,
       updatedGroupsManager,
@@ -51,6 +52,7 @@ export const updateRowTree = params => {
         id
       });
       insertDataRowInTree({
+        previousTree: params.previousTree,
         tree,
         treeDepths,
         updatedGroupsManager,

package/utils/tree/utils.d.ts

@@ -1,4 +1,4 @@
-import { GridChildrenFromPathLookup, GridGroupNode, GridRowId, GridRowTreeConfig, GridTreeNode } from '@mui/x-data-grid';
+import { GridChildrenFromPathLookup, 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';
@@ -41,8 +41,9 @@ export declare const addGroupDefaultExpansion: ({ node, isGroupExpandedByDefault
 /**
  * Insert a node in the tree
  */
-export declare const insertNodeInTree: ({ node, tree, treeDepths, }: {
+export declare const insertNodeInTree: ({ node, previousTree, tree, treeDepths, }: {
     node: GridTreeNode;
+    previousTree: GridRowTreeConfig | null;
     tree: GridRowTreeConfig;
     treeDepths: GridTreeDepths;
 }) => void;
@@ -57,10 +58,15 @@ export declare const removeNodeFromTree: ({ node, tree, treeDepths, }: {
 /**
  * Updates the `id` and `isAutoGenerated` properties of a group node.
  */
-export declare const updateGroupNodeIdAndAutoGenerated: ({ node, updatedNode, tree, treeDepths, }: {
+export declare const updateGroupNodeIdAndAutoGenerated: ({ node, updatedNode, previousTree, tree, treeDepths, }: {
+    previousTree: GridRowTreeConfig | null;
     node: GridGroupNode;
     updatedNode: Pick<GridGroupNode, 'id' | 'isAutoGenerated'>;
     tree: GridRowTreeConfig;
     treeDepths: GridTreeDepths;
 }) => void;
 export declare const createUpdatedGroupsManager: () => GridRowTreeUpdatedGroupsManager;
+export declare const getVisibleRowsLookup: ({ tree, filteredRowsLookup, }: {
+    tree: GridRowsState['tree'];
+    filteredRowsLookup: GridFilterState['filteredRowsLookup'];
+}) => Record<GridRowId, boolean>;

package/utils/tree/utils.js

@@ -45,6 +45,7 @@ export const addGroupDefaultExpansion = ({
  */
 export const insertNodeInTree = ({
   node,
+  previousTree,
   tree,
   treeDepths
 }) => {
@@ -60,23 +61,26 @@ export const insertNodeInTree = ({
   if (node.type === 'footer') {
     // For footers,
     // Register the node from its parent `footerId` property.
-    tree[node.parent] = _extends({}, parentNode, {
-      footerId: node.id
-    });
+    parentNode.footerId = node.id;
   } else if (node.type === 'group' || node.type === 'leaf') {
     var _groupingField, _groupingKey, _parentNode$childrenF;
     // For groups and leaves,
     // Register the node from its parents `children` and `childrenFromPath` properties.
-    const groupingField = (_groupingField = node.groupingField) != null ? _groupingField : '__no_field__';
-    const groupingKey = (_groupingKey = node.groupingKey) != null ? _groupingKey : '__no_key__';
-    tree[node.parent] = _extends({}, parentNode, {
-      childrenFromPath: _extends({}, parentNode.childrenFromPath, {
-        [groupingField]: _extends({}, (_parentNode$childrenF = parentNode.childrenFromPath) == null ? void 0 : _parentNode$childrenF[groupingField], {
-          [groupingKey.toString()]: node.id
-        })
-      }),
-      children: [...parentNode.children, node.id]
-    });
+    const groupingFieldName = (_groupingField = node.groupingField) != null ? _groupingField : '__no_field__';
+    const groupingKeyName = (_groupingKey = node.groupingKey) != null ? _groupingKey : '__no_key__';
+    const groupingField = (_parentNode$childrenF = parentNode.childrenFromPath) == null ? void 0 : _parentNode$childrenF[groupingFieldName];
+    if (previousTree !== null && previousTree[parentNode.id] === tree[parentNode.id]) {
+      parentNode.children = [...parentNode.children, node.id];
+    } else {
+      parentNode.children.push(node.id);
+    }
+    if (groupingField == null) {
+      parentNode.childrenFromPath[groupingFieldName] = {
+        [groupingKeyName.toString()]: node.id
+      };
+    } else {
+      groupingField[groupingKeyName.toString()] = node.id;
+    }
   }
 };
 
@@ -140,6 +144,7 @@ export const removeNodeFromTree = ({
 export const updateGroupNodeIdAndAutoGenerated = ({
   node,
   updatedNode,
+  previousTree,
   tree,
   treeDepths
 }) => {
@@ -160,6 +165,7 @@ export const updateGroupNodeIdAndAutoGenerated = ({
   // 3. Add the new group in the tree
   const groupNode = _extends({}, node, updatedNode);
   insertNodeInTree({
+    previousTree,
     node: groupNode,
     tree,
     treeDepths
@@ -173,4 +179,36 @@ export const createUpdatedGroupsManager = () => ({
     }
     this.value[groupId][action] = true;
   }
-});
+});
+export 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;
+};