@mui/x-data-grid-pro 7.24.1 → 7.26.0

package/modern/hooks/features/detailPanel/useGridDetailPanel.js

@@ -4,9 +4,6 @@ import { useGridSelector, useGridApiEventHandler, useGridApiMethod, gridDataRowI
 import { useGridRegisterPipeProcessor } from '@mui/x-data-grid/internals';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from "./gridDetailPanelToggleColDef.js";
 import { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector, gridDetailPanelRawHeightCacheSelector } from "./gridDetailPanelSelector.js";
-// FIXME: calling `api.updateDimensions()` here triggers a cycle where `updateDimensions` is
-// called 3 times when opening/closing a panel.
-
 export const detailPanelStateInitializer = (state, props) => {
   return _extends({}, state, {
     detailPanel: {
@@ -101,8 +98,6 @@ export const useGridDetailPanel = (apiRef, props) => {
         })
       });
     });
-    apiRef.current.updateDimensions();
-    apiRef.current.forceUpdate();
   }, [apiRef]);
   const storeDetailPanelHeight = React.useCallback((id, height) => {
     const heightCache = gridDetailPanelRawHeightCacheSelector(apiRef.current.state);
@@ -120,7 +115,6 @@ export const useGridDetailPanel = (apiRef, props) => {
         })
       });
     });
-    apiRef.current.updateDimensions();
     apiRef.current.requestPipeProcessorsApplication('rowHeight');
   }, [apiRef]);
   const detailPanelHasAutoHeight = React.useCallback(id => {
@@ -147,17 +141,19 @@ export const useGridDetailPanel = (apiRef, props) => {
     }
   }, [apiRef, props.detailPanelExpandedRowIds]);
   const updateCachesAndForceUpdate = React.useCallback(() => {
+    if (!props.getDetailPanelContent) {
+      return;
+    }
     apiRef.current.setState(state => {
       return _extends({}, state, {
         detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
       });
     });
-    apiRef.current.updateDimensions?.();
     apiRef.current.forceUpdate();
   }, [apiRef, props.getDetailPanelContent, props.getDetailPanelHeight]);
   useGridApiEventHandler(apiRef, 'sortedRowsSet', updateCachesAndForceUpdate);
-  const previousGetDetailPanelContentProp = React.useRef(null);
-  const previousGetDetailPanelHeightProp = React.useRef(null);
+  const previousGetDetailPanelContentProp = React.useRef(undefined);
+  const previousGetDetailPanelHeightProp = React.useRef(undefined);
   const updateCachesIfNeeded = React.useCallback(() => {
     if (props.getDetailPanelContent === previousGetDetailPanelContentProp.current && props.getDetailPanelHeight === previousGetDetailPanelHeightProp.current) {
       return;
@@ -167,7 +163,6 @@ export const useGridDetailPanel = (apiRef, props) => {
         detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
       });
     });
-    apiRef.current.updateDimensions?.();
     previousGetDetailPanelContentProp.current = props.getDetailPanelContent;
     previousGetDetailPanelHeightProp.current = props.getDetailPanelHeight;
   }, [apiRef, props.getDetailPanelContent, props.getDetailPanelHeight]);
@@ -181,7 +176,8 @@ export const useGridDetailPanel = (apiRef, props) => {
     initialValue.detail = heightCache[row.id] ?? 0; // Fallback to zero because the cache might not be ready yet (for example page was changed)
     return initialValue;
   }, [apiRef, expandedRowIds, updateCachesIfNeeded]);
-  useGridRegisterPipeProcessor(apiRef, 'rowHeight', addDetailHeight);
+  const enabled = props.getDetailPanelContent !== undefined;
+  useGridRegisterPipeProcessor(apiRef, 'rowHeight', addDetailHeight, enabled);
   const isFirstRender = React.useRef(true);
   if (isFirstRender.current) {
     updateCachesIfNeeded();
@@ -189,7 +185,6 @@ export const useGridDetailPanel = (apiRef, props) => {
   React.useEffect(() => {
     if (!isFirstRender.current) {
       updateCachesIfNeeded();
-      apiRef.current.hydrateRowsMeta();
     }
     isFirstRender.current = false;
   }, [apiRef, updateCachesIfNeeded]);

package/modern/hooks/features/index.js

@@ -6,4 +6,4 @@ export * from "./treeData/index.js";
 export * from "./detailPanel/index.js";
 export * from "./rowPinning/index.js";
 export * from "./dataSource/interfaces.js";
-export * from "./dataSource/cache.js";
+export { GridDataSourceCacheDefault } from "./dataSource/cache.js";

package/modern/hooks/features/infiniteLoader/useGridInfiniteLoader.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { useGridSelector, useGridApiOptionHandler, gridVisibleColumnDefinitionsSelector, useGridApiMethod, gridDimensionsSelector } from '@mui/x-data-grid';
-import { useGridVisibleRows, useTimeout } from '@mui/x-data-grid/internals';
+import { useGridSelector, useGridApiOptionHandler, gridVisibleColumnDefinitionsSelector, useGridApiMethod } from '@mui/x-data-grid';
+import { useGridVisibleRows, useTimeout, gridHorizontalScrollbarHeightSelector } from '@mui/x-data-grid/internals';
 import useEventCallback from '@mui/utils/useEventCallback';
 import { styled } from '@mui/system';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -40,8 +40,6 @@ export const useGridInfiniteLoader = (apiRef, props) => {
     }
   });
   const virtualScroller = apiRef.current.virtualScrollerRef.current;
-  const dimensions = useGridSelector(apiRef, gridDimensionsSelector);
-  const marginBottom = props.scrollEndThreshold - (dimensions.hasScrollX ? dimensions.scrollbarSize : 0);
   React.useEffect(() => {
     if (!isEnabled) {
       return;
@@ -50,6 +48,8 @@ export const useGridInfiniteLoader = (apiRef, props) => {
       return;
     }
     observer.current?.disconnect();
+    const horizontalScrollbarHeight = gridHorizontalScrollbarHeightSelector(apiRef.current.state);
+    const marginBottom = props.scrollEndThreshold - horizontalScrollbarHeight;
     observer.current = new IntersectionObserver(handleLoadMoreRows, {
       threshold: 1,
       root: virtualScroller,
@@ -58,7 +58,7 @@ export const useGridInfiniteLoader = (apiRef, props) => {
     if (triggerElement.current) {
       observer.current.observe(triggerElement.current);
     }
-  }, [virtualScroller, handleLoadMoreRows, isEnabled, marginBottom]);
+  }, [apiRef, virtualScroller, handleLoadMoreRows, isEnabled, props.scrollEndThreshold]);
   const updateTarget = node => {
     if (triggerElement.current !== node) {
       observer.current?.disconnect();

package/modern/hooks/features/serverSideTreeData/utils.js

@@ -1,9 +1,8 @@
 import { GRID_ROOT_GROUP_ID } from '@mui/x-data-grid';
-import { getTreeNodeDescendants } from '@mui/x-data-grid/internals';
+import { defaultGridFilterLookup, getTreeNodeDescendants } from '@mui/x-data-grid/internals';
 export function skipFiltering(rowTree) {
   const filteredRowsLookup = {};
   const filteredChildrenCountLookup = {};
-  const filteredDescendantCountLookup = {};
   const nodes = Object.values(rowTree);
   for (let i = 0; i < nodes.length; i += 1) {
     const node = nodes[i];
@@ -13,7 +12,7 @@ export function skipFiltering(rowTree) {
   return {
     filteredRowsLookup,
     filteredChildrenCountLookup,
-    filteredDescendantCountLookup
+    filteredDescendantCountLookup: defaultGridFilterLookup.filteredDescendantCountLookup
   };
 }
 export function skipSorting(rowTree) {

package/modern/index.js

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

package/modern/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTczNzY1ODgwMDAwMA==";
+  const releaseInfo = "MTczODg4MjgwMDAwMA==";
   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/modern/utils/tree/utils.js

@@ -166,7 +166,7 @@ export const getVisibleRowsLookup = ({
   }
   const visibleRowsLookup = {};
   const handleTreeNode = (node, areAncestorsExpanded) => {
-    const isPassingFiltering = filteredRowsLookup[node.id];
+    const isPassingFiltering = filteredRowsLookup[node.id] !== false;
     if (node.type === 'group') {
       node.children.forEach(childId => {
         const childNode = tree[childId];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-pro",
-  "version": "7.24.1",
+  "version": "7.26.0",
   "description": "The Pro plan edition of the Data Grid components (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",
@@ -39,9 +39,9 @@
     "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "reselect": "^5.1.1",
-    "@mui/x-internals": "7.24.1",
-    "@mui/x-license": "7.24.1",
-    "@mui/x-data-grid": "7.24.1"
+    "@mui/x-data-grid": "7.26.0",
+    "@mui/x-internals": "7.26.0",
+    "@mui/x-license": "7.26.0"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",

package/utils/releaseInfo.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getReleaseInfo = void 0;
 var _utils = require("@mui/utils");
 const getReleaseInfo = () => {
-  const releaseInfo = "MTczNzY1ODgwMDAwMA==";
+  const releaseInfo = "MTczODg4MjgwMDAwMA==";
   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/utils.d.ts

@@ -35,4 +35,4 @@ export declare const createUpdatedGroupsManager: () => GridRowTreeUpdatedGroupsM
 export declare const getVisibleRowsLookup: ({ tree, filteredRowsLookup, }: {
     tree: GridRowsState["tree"];
     filteredRowsLookup: GridFilterState["filteredRowsLookup"];
-}) => Record<GridRowId, boolean>;
+}) => import("@mui/x-data-grid/hooks/features/filter/gridFilterState").GridVisibleRowsLookupState;

package/utils/tree/utils.js

@@ -181,7 +181,7 @@ const getVisibleRowsLookup = ({
   }
   const visibleRowsLookup = {};
   const handleTreeNode = (node, areAncestorsExpanded) => {
-    const isPassingFiltering = filteredRowsLookup[node.id];
+    const isPassingFiltering = filteredRowsLookup[node.id] !== false;
     if (node.type === 'group') {
       node.children.forEach(childId => {
         const childNode = tree[childId];