@mui/x-data-grid-pro 5.12.3 → 5.13.0

package/legacy/hooks/features/detailPanel/gridDetailPanelSelector.js

@@ -1,9 +1,22 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { createSelector } from '@mui/x-data-grid/internals';
 export var gridDetailPanelExpandedRowIdsSelector = function gridDetailPanelExpandedRowIdsSelector(state) {
   return state.detailPanel.expandedRowIds;
 };
 export var gridDetailPanelExpandedRowsContentCacheSelector = function gridDetailPanelExpandedRowsContentCacheSelector(state) {
   return state.detailPanel.contentCache;
 };
-export var gridDetailPanelExpandedRowsHeightCacheSelector = function gridDetailPanelExpandedRowsHeightCacheSelector(state) {
+export var gridDetailPanelRawHeightCacheSelector = function gridDetailPanelRawHeightCacheSelector(state) {
   return state.detailPanel.heightCache;
-};
+}; // TODO v6: Make this selector return the full object, including the autoHeight flag
+
+export var gridDetailPanelExpandedRowsHeightCacheSelector = createSelector(gridDetailPanelRawHeightCacheSelector, function (heightCache) {
+  return Object.entries(heightCache).reduce(function (acc, _ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        id = _ref2[0],
+        height = _ref2[1].height;
+
+    acc[id] = height || 0;
+    return acc;
+  }, {});
+});

package/legacy/hooks/features/detailPanel/index.js

@@ -1,3 +1,3 @@
 export * from './gridDetailPanelToggleColDef';
-export * from './gridDetailPanelSelector';
+export { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector } from './gridDetailPanelSelector';
 export * from './gridDetailPanelInterface';

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

@@ -1,21 +1,23 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useGridSelector, useGridApiEventHandler, useGridApiMethod, gridRowIdsSelector } from '@mui/x-data-grid';
 import { useGridRegisterPipeProcessor } from '@mui/x-data-grid/internals';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from './gridDetailPanelToggleColDef';
-import { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector } from './gridDetailPanelSelector';
+import { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector, gridDetailPanelRawHeightCacheSelector } from './gridDetailPanelSelector';
 export var detailPanelStateInitializer = function detailPanelStateInitializer(state, props) {
   var _ref, _props$detailPanelExp, _props$initialState, _props$initialState$d;
 
   return _extends({}, state, {
     detailPanel: {
+      heightCache: {},
       expandedRowIds: (_ref = (_props$detailPanelExp = props.detailPanelExpandedRowIds) != null ? _props$detailPanelExp : (_props$initialState = props.initialState) == null ? void 0 : (_props$initialState$d = _props$initialState.detailPanel) == null ? void 0 : _props$initialState$d.expandedRowIds) != null ? _ref : []
     }
   });
 };
 
-function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeight) {
+function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeight, previousHeightCache) {
   if (typeof getDetailPanelContent !== 'function') {
     return {};
   } // TODO change to lazy approach using a Proxy
@@ -29,12 +31,19 @@ function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeig
     return acc;
   }, {});
   var heightCache = rowIds.reduce(function (acc, id) {
+    var _previousHeightCache$;
+
     if (contentCache[id] == null) {
       return acc;
     }
 
     var params = apiRef.current.getRowParams(id);
-    acc[id] = getDetailPanelHeight(params);
+    var height = getDetailPanelHeight(params);
+    var autoHeight = height === 'auto';
+    acc[id] = {
+      autoHeight: autoHeight,
+      height: autoHeight ? (_previousHeightCache$ = previousHeightCache[id]) == null ? void 0 : _previousHeightCache$.height : height
+    };
     return acc;
   }, {});
   return {
@@ -117,10 +126,34 @@ export var useGridDetailPanel = function useGridDetailPanel(apiRef, props) {
     });
     apiRef.current.forceUpdate();
   }, [apiRef]);
+  var storeDetailPanelHeight = React.useCallback(function (id, height) {
+    var heightCache = gridDetailPanelRawHeightCacheSelector(apiRef.current.state);
+
+    if (!heightCache[id] || heightCache[id].height === height) {
+      return;
+    }
+
+    apiRef.current.setState(function (state) {
+      return _extends({}, state, {
+        detailPanel: _extends({}, state.detailPanel, {
+          heightCache: _extends({}, heightCache, _defineProperty({}, id, _extends({}, heightCache[id], {
+            height: height
+          })))
+        })
+      });
+    });
+    apiRef.current.unstable_requestPipeProcessorsApplication('rowHeight');
+  }, [apiRef]);
+  var detailPanelHasAutoHeight = React.useCallback(function (id) {
+    var heightCache = gridDetailPanelRawHeightCacheSelector(apiRef.current.state);
+    return heightCache[id] ? heightCache[id].autoHeight : false;
+  }, [apiRef]);
   var detailPanelApi = {
     toggleDetailPanel: toggleDetailPanel,
     getExpandedDetailPanels: getExpandedDetailPanels,
-    setExpandedDetailPanels: setExpandedDetailPanels
+    setExpandedDetailPanels: setExpandedDetailPanels,
+    unstable_storeDetailPanelHeight: storeDetailPanelHeight,
+    unstable_detailPanelHasAutoHeight: detailPanelHasAutoHeight
   };
   useGridApiMethod(apiRef, detailPanelApi, 'detailPanelApi');
   React.useEffect(function () {
@@ -135,7 +168,7 @@ export var useGridDetailPanel = function useGridDetailPanel(apiRef, props) {
   var updateCachesAndForceUpdate = React.useCallback(function () {
     apiRef.current.setState(function (state) {
       return _extends({}, state, {
-        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight))
+        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
       });
     });
     apiRef.current.forceUpdate();
@@ -150,7 +183,7 @@ export var useGridDetailPanel = function useGridDetailPanel(apiRef, props) {
 
     apiRef.current.setState(function (state) {
       return _extends({}, state, {
-        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight))
+        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
       });
     });
     previousGetDetailPanelContentProp.current = props.getDetailPanelContent;
@@ -166,7 +199,7 @@ export var useGridDetailPanel = function useGridDetailPanel(apiRef, props) {
     }
 
     updateCachesIfNeeded();
-    var heightCache = gridDetailPanelExpandedRowsHeightCacheSelector(apiRef.current.state);
+    var heightCache = gridDetailPanelExpandedRowsHeightCacheSelector(apiRef);
     return _extends({}, initialValue, {
       detail: (_heightCache$row$id = heightCache[row.id]) != null ? _heightCache$row$id : 0 // Fallback to zero because the cache might not be ready yet (e.g. page was changed)
 

package/legacy/hooks/features/detailPanel/useGridDetailPanelCache.js

@@ -0,0 +1,64 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import { useGridApiEventHandler, gridRowIdsSelector } from '@mui/x-data-grid';
+
+function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeight, previousHeightCache) {
+  if (typeof getDetailPanelContent !== 'function') {
+    return {};
+  } // TODO change to lazy approach using a Proxy
+  // only call getDetailPanelContent when asked for an id
+
+
+  var rowIds = gridRowIdsSelector(apiRef);
+  var contentCache = rowIds.reduce(function (acc, id) {
+    var params = apiRef.current.getRowParams(id);
+    acc[id] = getDetailPanelContent(params);
+    return acc;
+  }, {});
+  var heightCache = rowIds.reduce(function (acc, id) {
+    var _previousHeightCache$;
+
+    if (contentCache[id] == null) {
+      return acc;
+    }
+
+    var params = apiRef.current.getRowParams(id);
+    var height = getDetailPanelHeight(params);
+    var autoHeight = height === 'auto';
+    acc[id] = {
+      autoHeight: autoHeight,
+      height: !autoHeight ? height : (_previousHeightCache$ = previousHeightCache[id]) == null ? void 0 : _previousHeightCache$.height
+    };
+    return acc;
+  }, {});
+  return {
+    contentCache: contentCache,
+    heightCache: heightCache
+  };
+}
+
+export var useGridDetailPanelCache = function useGridDetailPanelCache(apiRef, props) {
+  var updateCaches = React.useCallback(function () {
+    apiRef.current.setState(function (state) {
+      return _extends({}, state, {
+        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
+      });
+    });
+    apiRef.current.forceUpdate();
+  }, [apiRef, props.getDetailPanelContent, props.getDetailPanelHeight]);
+  useGridApiEventHandler(apiRef, 'sortedRowsSet', updateCaches);
+  var isFirstRender = React.useRef(true);
+
+  if (isFirstRender.current) {
+    isFirstRender.current = false;
+    updateCaches();
+  }
+
+  React.useEffect(function () {
+    if (isFirstRender.current) {
+      return;
+    }
+
+    updateCaches();
+  }, [updateCaches]);
+};

package/legacy/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.12.3
+/** @license MUI v5.13.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/legacy/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export var getReleaseInfo = function getReleaseInfo() {
-  var releaseInfo = "MTY1NjAyMTYwMDAwMA==";
+  var releaseInfo = "MTY1NzE0NDgwMDAwMA==";
 
   if (process.env.NODE_ENV !== 'production') {
     // A simple hack to set the value in the test environment (has no build step).

package/models/dataGridProProps.d.ts

@@ -70,10 +70,10 @@ export interface DataGridProPropsWithDefaultValue extends DataGridPropsWithDefau
     /**
      * Function that returns the height of the row detail panel.
      * @param {GridRowParams} params With all properties from [[GridRowParams]].
-     * @returns {number} The height in pixels.
+     * @returns {number | string} The height in pixels or "auto" to use the content height.
      * @default "() => 500"
      */
-    getDetailPanelHeight: (params: GridRowParams) => number;
+    getDetailPanelHeight: (params: GridRowParams) => number | 'auto';
     /**
      * If `true`, the reordering of rows is enabled.
      * @default false

package/modern/DataGridPro/DataGridPro.js

@@ -318,7 +318,7 @@ DataGridProRaw.propTypes = {
   /**
    * Function that returns the height of the row detail panel.
    * @param {GridRowParams} params With all properties from [[GridRowParams]].
-   * @returns {number} The height in pixels.
+   * @returns {number | string} The height in pixels or "auto" to use the content height.
    * @default "() => 500"
    */
   getDetailPanelHeight: PropTypes.func,

package/modern/components/DataGridProVirtualScroller.js

@@ -3,7 +3,6 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 const _excluded = ["className", "disableVirtualization"];
 import * as React from 'react';
 import { styled, alpha } from '@mui/material/styles';
-import Box from '@mui/material/Box';
 import { unstable_composeClasses as composeClasses } from '@mui/material';
 import { useGridSelector, getDataGridUtilityClass, gridClasses, gridVisibleColumnFieldsSelector, gridRowsMetaSelector, useGridApiEventHandler } from '@mui/x-data-grid';
 import { GridVirtualScroller, GridVirtualScrollerContent, GridVirtualScrollerRenderZone, useGridVirtualScroller } from '@mui/x-data-grid/internals';
@@ -11,6 +10,7 @@ import { useGridApiContext } from '../hooks/utils/useGridApiContext';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
 import { gridPinnedColumnsSelector, GridPinnedPosition } from '../hooks/features/columnPinning';
 import { gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector, gridDetailPanelExpandedRowIdsSelector } from '../hooks/features/detailPanel';
+import { GridDetailPanel } from './GridDetailPanel';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export const filterColumns = (pinnedColumns, columns) => {
@@ -72,19 +72,6 @@ const VirtualScrollerDetailPanels = styled('div', {
 })({
   position: 'relative'
 });
-const VirtualScrollerDetailPanel = styled(Box, {
-  name: 'MuiDataGrid',
-  slot: 'DetailPanel',
-  overridesResolver: (props, styles) => styles.detailPanel
-})(({
-  theme
-}) => ({
-  zIndex: 2,
-  width: '100%',
-  position: 'absolute',
-  backgroundColor: theme.palette.background.default,
-  overflow: 'auto'
-}));
 const VirtualScrollerPinnedColumns = styled('div', {
   name: 'MuiDataGrid',
   slot: 'PinnedColumns',
@@ -208,15 +195,17 @@ const DataGridProVirtualScroller = /*#__PURE__*/React.forwardRef(function DataGr
       const exists = rowIndex !== undefined;
 
       if ( /*#__PURE__*/React.isValidElement(content) && exists) {
-        const height = detailPanelsHeights[id];
+        const hasAutoHeight = apiRef.current.unstable_detailPanelHasAutoHeight(id);
+        const height = hasAutoHeight ? 'auto' : detailPanelsHeights[id];
         const sizes = apiRef.current.unstable_getRowInternalSizes(id);
         const spacingTop = sizes?.spacingTop || 0;
         const top = rowsMeta.positions[rowIndex] + apiRef.current.unstable_getRowHeight(id) + spacingTop;
-        panels.push( /*#__PURE__*/_jsx(VirtualScrollerDetailPanel, {
+        panels.push( /*#__PURE__*/_jsx(GridDetailPanel, {
+          rowId: id,
           style: {
-            top,
-            height
+            top
           },
+          height: height,
           className: classes.detailPanel,
           children: content
         }, i));

package/modern/components/GridDetailPanel.js

@@ -0,0 +1,65 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["rowId", "height", "style"];
+import * as React from 'react';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import { useGridApiContext } from '../hooks/utils/useGridApiContext';
+import { jsx as _jsx } from "react/jsx-runtime";
+const DetailPanel = styled(Box, {
+  name: 'MuiDataGrid',
+  slot: 'DetailPanel',
+  overridesResolver: (props, styles) => styles.detailPanel
+})(({
+  theme
+}) => ({
+  zIndex: 2,
+  width: '100%',
+  position: 'absolute',
+  backgroundColor: theme.palette.background.default,
+  overflow: 'auto'
+}));
+
+const GridDetailPanel = props => {
+  const {
+    rowId,
+    height,
+    style: styleProp = {}
+  } = props,
+        other = _objectWithoutPropertiesLoose(props, _excluded);
+
+  const apiRef = useGridApiContext();
+  const ref = React.useRef();
+  React.useLayoutEffect(() => {
+    if (height === 'auto' && ref.current && typeof ResizeObserver === 'undefined') {
+      // Fallback for IE
+      apiRef.current.unstable_storeDetailPanelHeight(rowId, ref.current.clientHeight);
+    }
+  }, [apiRef, height, rowId]);
+  React.useLayoutEffect(() => {
+    const hasFixedHeight = height !== 'auto';
+
+    if (!ref.current || hasFixedHeight || typeof ResizeObserver === 'undefined') {
+      return undefined;
+    }
+
+    const resizeObserver = new ResizeObserver(entries => {
+      const [entry] = entries;
+      const observedHeight = entry.borderBoxSize && entry.borderBoxSize.length > 0 ? entry.borderBoxSize[0].blockSize : entry.contentRect.height;
+      apiRef.current.unstable_storeDetailPanelHeight(rowId, observedHeight);
+    });
+    resizeObserver.observe(ref.current);
+    return () => resizeObserver.disconnect();
+  }, [apiRef, height, rowId]);
+
+  const style = _extends({}, styleProp, {
+    height
+  });
+
+  return /*#__PURE__*/_jsx(DetailPanel, _extends({
+    ref: ref,
+    style: style
+  }, other));
+};
+
+export { GridDetailPanel };

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

@@ -1,3 +1,11 @@
+import { createSelector } from '@mui/x-data-grid/internals';
 export const gridDetailPanelExpandedRowIdsSelector = state => state.detailPanel.expandedRowIds;
 export const gridDetailPanelExpandedRowsContentCacheSelector = state => state.detailPanel.contentCache;
-export const gridDetailPanelExpandedRowsHeightCacheSelector = state => state.detailPanel.heightCache;
+export const gridDetailPanelRawHeightCacheSelector = state => state.detailPanel.heightCache; // TODO v6: Make this selector return the full object, including the autoHeight flag
+
+export const gridDetailPanelExpandedRowsHeightCacheSelector = createSelector(gridDetailPanelRawHeightCacheSelector, heightCache => Object.entries(heightCache).reduce((acc, [id, {
+  height
+}]) => {
+  acc[id] = height || 0;
+  return acc;
+}, {}));

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

@@ -1,3 +1,3 @@
 export * from './gridDetailPanelToggleColDef';
-export * from './gridDetailPanelSelector';
+export { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector } from './gridDetailPanelSelector';
 export * from './gridDetailPanelInterface';

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

@@ -3,16 +3,17 @@ import * as React from 'react';
 import { useGridSelector, useGridApiEventHandler, useGridApiMethod, gridRowIdsSelector } from '@mui/x-data-grid';
 import { useGridRegisterPipeProcessor } from '@mui/x-data-grid/internals';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from './gridDetailPanelToggleColDef';
-import { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector } from './gridDetailPanelSelector';
+import { gridDetailPanelExpandedRowIdsSelector, gridDetailPanelExpandedRowsContentCacheSelector, gridDetailPanelExpandedRowsHeightCacheSelector, gridDetailPanelRawHeightCacheSelector } from './gridDetailPanelSelector';
 export const detailPanelStateInitializer = (state, props) => {
   return _extends({}, state, {
     detailPanel: {
+      heightCache: {},
       expandedRowIds: props.detailPanelExpandedRowIds ?? props.initialState?.detailPanel?.expandedRowIds ?? []
     }
   });
 };
 
-function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeight) {
+function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeight, previousHeightCache) {
   if (typeof getDetailPanelContent !== 'function') {
     return {};
   } // TODO change to lazy approach using a Proxy
@@ -31,7 +32,12 @@ function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeig
     }
 
     const params = apiRef.current.getRowParams(id);
-    acc[id] = getDetailPanelHeight(params);
+    const height = getDetailPanelHeight(params);
+    const autoHeight = height === 'auto';
+    acc[id] = {
+      autoHeight,
+      height: autoHeight ? previousHeightCache[id]?.height : height
+    };
     return acc;
   }, {});
   return {
@@ -110,10 +116,36 @@ export const useGridDetailPanel = (apiRef, props) => {
     });
     apiRef.current.forceUpdate();
   }, [apiRef]);
+  const storeDetailPanelHeight = React.useCallback((id, height) => {
+    const heightCache = gridDetailPanelRawHeightCacheSelector(apiRef.current.state);
+
+    if (!heightCache[id] || heightCache[id].height === height) {
+      return;
+    }
+
+    apiRef.current.setState(state => {
+      return _extends({}, state, {
+        detailPanel: _extends({}, state.detailPanel, {
+          heightCache: _extends({}, heightCache, {
+            [id]: _extends({}, heightCache[id], {
+              height
+            })
+          })
+        })
+      });
+    });
+    apiRef.current.unstable_requestPipeProcessorsApplication('rowHeight');
+  }, [apiRef]);
+  const detailPanelHasAutoHeight = React.useCallback(id => {
+    const heightCache = gridDetailPanelRawHeightCacheSelector(apiRef.current.state);
+    return heightCache[id] ? heightCache[id].autoHeight : false;
+  }, [apiRef]);
   const detailPanelApi = {
     toggleDetailPanel,
     getExpandedDetailPanels,
-    setExpandedDetailPanels
+    setExpandedDetailPanels,
+    unstable_storeDetailPanelHeight: storeDetailPanelHeight,
+    unstable_detailPanelHasAutoHeight: detailPanelHasAutoHeight
   };
   useGridApiMethod(apiRef, detailPanelApi, 'detailPanelApi');
   React.useEffect(() => {
@@ -128,7 +160,7 @@ export const useGridDetailPanel = (apiRef, props) => {
   const updateCachesAndForceUpdate = React.useCallback(() => {
     apiRef.current.setState(state => {
       return _extends({}, state, {
-        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight))
+        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
       });
     });
     apiRef.current.forceUpdate();
@@ -143,7 +175,7 @@ export const useGridDetailPanel = (apiRef, props) => {
 
     apiRef.current.setState(state => {
       return _extends({}, state, {
-        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight))
+        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
       });
     });
     previousGetDetailPanelContentProp.current = props.getDetailPanelContent;
@@ -157,7 +189,7 @@ export const useGridDetailPanel = (apiRef, props) => {
     }
 
     updateCachesIfNeeded();
-    const heightCache = gridDetailPanelExpandedRowsHeightCacheSelector(apiRef.current.state);
+    const heightCache = gridDetailPanelExpandedRowsHeightCacheSelector(apiRef);
     return _extends({}, initialValue, {
       detail: heightCache[row.id] ?? 0 // Fallback to zero because the cache might not be ready yet (e.g. page was changed)
 

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

@@ -0,0 +1,62 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import { useGridApiEventHandler, gridRowIdsSelector } from '@mui/x-data-grid';
+
+function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeight, previousHeightCache) {
+  if (typeof getDetailPanelContent !== 'function') {
+    return {};
+  } // TODO change to lazy approach using a Proxy
+  // only call getDetailPanelContent when asked for an id
+
+
+  const rowIds = gridRowIdsSelector(apiRef);
+  const contentCache = rowIds.reduce((acc, id) => {
+    const params = apiRef.current.getRowParams(id);
+    acc[id] = getDetailPanelContent(params);
+    return acc;
+  }, {});
+  const heightCache = rowIds.reduce((acc, id) => {
+    if (contentCache[id] == null) {
+      return acc;
+    }
+
+    const params = apiRef.current.getRowParams(id);
+    const height = getDetailPanelHeight(params);
+    const autoHeight = height === 'auto';
+    acc[id] = {
+      autoHeight,
+      height: !autoHeight ? height : previousHeightCache[id]?.height
+    };
+    return acc;
+  }, {});
+  return {
+    contentCache,
+    heightCache
+  };
+}
+
+export const useGridDetailPanelCache = (apiRef, props) => {
+  const updateCaches = React.useCallback(() => {
+    apiRef.current.setState(state => {
+      return _extends({}, state, {
+        detailPanel: _extends({}, state.detailPanel, cacheContentAndHeight(apiRef, props.getDetailPanelContent, props.getDetailPanelHeight, state.detailPanel.heightCache))
+      });
+    });
+    apiRef.current.forceUpdate();
+  }, [apiRef, props.getDetailPanelContent, props.getDetailPanelHeight]);
+  useGridApiEventHandler(apiRef, 'sortedRowsSet', updateCaches);
+  const isFirstRender = React.useRef(true);
+
+  if (isFirstRender.current) {
+    isFirstRender.current = false;
+    updateCaches();
+  }
+
+  React.useEffect(() => {
+    if (isFirstRender.current) {
+      return;
+    }
+
+    updateCaches();
+  }, [updateCaches]);
+};

package/modern/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.12.3
+/** @license MUI v5.13.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/modern/utils/releaseInfo.js

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

package/node/DataGridPro/DataGridPro.js

@@ -342,7 +342,7 @@ DataGridProRaw.propTypes = {
   /**
    * Function that returns the height of the row detail panel.
    * @param {GridRowParams} params With all properties from [[GridRowParams]].
-   * @returns {number} The height in pixels.
+   * @returns {number | string} The height in pixels or "auto" to use the content height.
    * @default "() => 500"
    */
   getDetailPanelHeight: _propTypes.default.func,

package/node/components/DataGridProVirtualScroller.js

@@ -15,8 +15,6 @@ var React = _interopRequireWildcard(require("react"));
 
 var _styles = require("@mui/material/styles");
 
-var _Box = _interopRequireDefault(require("@mui/material/Box"));
-
 var _material = require("@mui/material");
 
 var _xDataGrid = require("@mui/x-data-grid");
@@ -31,6 +29,8 @@ var _columnPinning = require("../hooks/features/columnPinning");
 
 var _detailPanel = require("../hooks/features/detailPanel");
 
+var _GridDetailPanel = require("./GridDetailPanel");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["className", "disableVirtualization"];
@@ -102,19 +102,6 @@ const VirtualScrollerDetailPanels = (0, _styles.styled)('div', {
 })({
   position: 'relative'
 });
-const VirtualScrollerDetailPanel = (0, _styles.styled)(_Box.default, {
-  name: 'MuiDataGrid',
-  slot: 'DetailPanel',
-  overridesResolver: (props, styles) => styles.detailPanel
-})(({
-  theme
-}) => ({
-  zIndex: 2,
-  width: '100%',
-  position: 'absolute',
-  backgroundColor: theme.palette.background.default,
-  overflow: 'auto'
-}));
 const VirtualScrollerPinnedColumns = (0, _styles.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'PinnedColumns',
@@ -237,15 +224,17 @@ const DataGridProVirtualScroller = /*#__PURE__*/React.forwardRef(function DataGr
       const exists = rowIndex !== undefined;
 
       if ( /*#__PURE__*/React.isValidElement(content) && exists) {
-        const height = detailPanelsHeights[id];
+        const hasAutoHeight = apiRef.current.unstable_detailPanelHasAutoHeight(id);
+        const height = hasAutoHeight ? 'auto' : detailPanelsHeights[id];
         const sizes = apiRef.current.unstable_getRowInternalSizes(id);
         const spacingTop = (sizes == null ? void 0 : sizes.spacingTop) || 0;
         const top = rowsMeta.positions[rowIndex] + apiRef.current.unstable_getRowHeight(id) + spacingTop;
-        panels.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(VirtualScrollerDetailPanel, {
+        panels.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridDetailPanel.GridDetailPanel, {
+          rowId: id,
           style: {
-            top,
-            height
+            top
           },
+          height: height,
           className: classes.detailPanel,
           children: content
         }, i));