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

package/CHANGELOG.md

@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 5.13.0
+
+_Jul 7, 2022_
+
+We'd like to offer a big thanks to the 10 contributors who made this release possible. Here are some highlights ✨:
+
+- 🎁 `@mui/x-date-pickers` and `@mui/x-date-pickers-pro` are now in beta!
+
+- ✨ Allow detail panel's height to match its content (#5163) @m4theushw
+
+  ```tsx
+  <DataGridPro getDetailPanelHeight={() => 'auto'} />
+  ```
+
+- 🌍 Add Romanian (ro-RO) locale on the data grid (#5345) @rolule
+- 📚 Documentation improvements
+- 🐞 Bugfixes
+
+### `@mui/x-data-grid@v5.13.0` / `@mui/x-data-grid-pro@v5.13.0` / `@mui/x-data-grid-premium@v5.13.0`
+
+#### Changes
+
+- [DataGrid] Allows to customize variant of value input in filter panel (#4826) @alexfauquette
+- [DataGrid] Add Romanian (ro-RO) locale (#5345) @rolule
+- [DataGrid] Export Norwegian (nb-NO) locale (#5407) @cherniavskii
+- [DataGrid] Fix broken "start editing" integration with Japanese (#5414) @mnajdova
+- [DataGrid] Fix "stop editing" integration with IME e.g. Japanese (#5257) @Gumichocopengin8
+- [DataGrid] Fix dimensions computation with `autoHeight` and scroll x (#5401) @flaviendelangle
+- [DataGrid] Improve Slovak (sk-SK) locale (#5332) @msidlo
+- [DataGrid] Mention Premium plan in error messages and docs warnings (#5328) @cherniavskii
+- [DataGrid] Remove trailing spaces in filter input (#5279) @alexfauquette
+- [DataGridPro] Allow to infer detail panel height from content (#5163) @m4theushw
+- [DataGridPro] Fix the depth of nodes when switching from a non-flat tree to a flat tree (#5362) @flaviendelangle
+
+### `@mui/x-date-pickers@v5.0.0-beta.0` / `@mui/x-date-picker-pro@5.0.0-beta.0`
+
+#### Changes
+
+- [DateRangePicker] Fix keyboard selection (#5265) @alexfauquette
+- [DayPicker] Remove empty space at the bottom of the day view (#5073) @flaviendelangle
+- [pickers] Add missing type dependencies (#5331) @Methuselah96
+- [pickers] Pass the generics to the components in the theme augmentation (#5199) @toruticas
+
+### Docs
+
+- [docs] Explain how to use hooks inside a cell renderer (#5158) @flaviendelangle
+- [docs] Fix server-side pagination demo (#5361) @cherniavskii
+- [docs] Fix typo in the quick filter docs (#5313) @alexfauquette
+- [docs] Improve the "Getting started" page (#5293) @alexfauquette
+- [docs] New page for the pickers action bar customization (#5267) @flaviendelangle
+- [docs] Revise and split up "Overview" page into "Introduction" (#4692) @samuelsycamore
+- [docs] Use `useKeepGroupedColumnsHiddren` from the grid package on remaining demo (#5382) @flaviendelangle
+
 ## v5.12.3
 
 _Jun 23, 2022_

package/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/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) => {
@@ -74,19 +74,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',
@@ -210,15 +197,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__*/_jsx(VirtualScrollerDetailPanel, {
+        panels.push( /*#__PURE__*/_jsx(GridDetailPanel, {
+          rowId: id,
           style: {
-            top,
-            height
+            top
           },
+          height: height,
           className: classes.detailPanel,
           children: content
         }, i));

package/components/GridDetailPanel.d.ts

@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { SxProps, Theme } from '@mui/material/styles';
+import { GridRowId } from '@mui/x-data-grid';
+interface GridDetailPanelProps extends React.HTMLAttributes<HTMLDivElement> {
+    /**
+     * The system prop that allows defining system overrides as well as additional CSS styles.
+     */
+    sx?: SxProps<Theme>;
+    /**
+     * The panel height.
+     */
+    height: number | 'auto';
+    /**
+     * The row ID that this panel belongs to.
+     */
+    rowId: GridRowId;
+}
+declare const GridDetailPanel: (props: GridDetailPanelProps) => JSX.Element;
+export { GridDetailPanel };

package/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/hooks/features/detailPanel/gridDetailPanelInterface.d.ts

@@ -1,5 +1,9 @@
 import * as React from 'react';
 import { GridRowId } from '@mui/x-data-grid';
+declare type DetailPanelHeightCache = Record<GridRowId, {
+    autoHeight: boolean;
+    height: number;
+}>;
 /**
  * The master/detail API interface that is available in the grid [[apiRef]].
  */
@@ -19,10 +23,25 @@ export interface GridDetailPanelApi {
      * @param {GridRowId[]} ids The ids of the rows to open the detail panel.
      */
     setExpandedDetailPanels: (ids: GridRowId[]) => void;
+    /**
+     * Stores the panel height measurement and triggers the row height pre-processing.
+     * @param {GridRowId} id The id of the row.
+     * @param {number} height The new height.
+     * @ignore - do not document.
+     */
+    unstable_storeDetailPanelHeight: (id: GridRowId, height: number) => void;
+    /**
+     * Determines if the height of a detail panel is "auto".
+     * @param {GridRowId} id The id of the row.
+     * @return {boolean} `true` if the detail panel height is "auto".
+     * @ignore - do not document.
+     */
+    unstable_detailPanelHasAutoHeight: (id: GridRowId) => boolean;
 }
 export interface GridDetailPanelState {
     expandedRowIds: GridRowId[];
     contentCache: Record<GridRowId, React.ReactNode>;
-    heightCache: Record<GridRowId, number>;
+    heightCache: DetailPanelHeightCache;
 }
 export declare type GridDetailPanelInitialState = Pick<GridDetailPanelState, 'expandedRowIds'>;
+export {};

package/hooks/features/detailPanel/gridDetailPanelSelector.d.ts

@@ -1,5 +1,16 @@
 /// <reference types="react" />
+import { GridRowId } from '@mui/x-data-grid';
 import { GridStatePro } from '../../../models/gridStatePro';
-export declare const gridDetailPanelExpandedRowIdsSelector: (state: GridStatePro) => import("@mui/x-data-grid").GridRowId[];
-export declare const gridDetailPanelExpandedRowsContentCacheSelector: (state: GridStatePro) => Record<import("@mui/x-data-grid").GridRowId, import("react").ReactNode>;
-export declare const gridDetailPanelExpandedRowsHeightCacheSelector: (state: GridStatePro) => Record<import("@mui/x-data-grid").GridRowId, number>;
+export declare const gridDetailPanelExpandedRowIdsSelector: (state: GridStatePro) => GridRowId[];
+export declare const gridDetailPanelExpandedRowsContentCacheSelector: (state: GridStatePro) => Record<GridRowId, import("react").ReactNode>;
+export declare const gridDetailPanelRawHeightCacheSelector: (state: GridStatePro) => {
+    [x: string]: {
+        autoHeight: boolean;
+        height: number;
+    };
+    [x: number]: {
+        autoHeight: boolean;
+        height: number;
+    };
+};
+export declare const gridDetailPanelExpandedRowsHeightCacheSelector: import("@mui/x-data-grid").OutputSelector<GridStatePro, Record<GridRowId, number>>;

package/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/hooks/features/detailPanel/index.d.ts

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

package/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/hooks/features/detailPanel/useGridDetailPanel.js

@@ -3,18 +3,19 @@ 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) => {
   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
@@ -28,12 +29,19 @@ function cacheContentAndHeight(apiRef, getDetailPanelContent, getDetailPanelHeig
     return acc;
   }, {});
   const heightCache = rowIds.reduce((acc, id) => {
+    var _previousHeightCache$;
+
     if (contentCache[id] == null) {
       return acc;
     }
 
     const params = apiRef.current.getRowParams(id);
-    acc[id] = getDetailPanelHeight(params);
+    const height = getDetailPanelHeight(params);
+    const autoHeight = height === 'auto';
+    acc[id] = {
+      autoHeight,
+      height: autoHeight ? (_previousHeightCache$ = previousHeightCache[id]) == null ? void 0 : _previousHeightCache$.height : height
+    };
     return acc;
   }, {});
   return {
@@ -112,10 +120,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(() => {
@@ -130,7 +164,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();
@@ -145,7 +179,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;
@@ -161,7 +195,7 @@ export const useGridDetailPanel = (apiRef, props) => {
     }
 
     updateCachesIfNeeded();
-    const heightCache = gridDetailPanelExpandedRowsHeightCacheSelector(apiRef.current.state);
+    const 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/hooks/features/detailPanel/useGridDetailPanelCache.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import { GridApiPro } from '../../../models/gridApiPro';
+import { DataGridProProcessedProps } from '../../../models/dataGridProProps';
+export declare const useGridDetailPanelCache: (apiRef: React.MutableRefObject<GridApiPro>, props: Pick<DataGridProProcessedProps, 'getDetailPanelContent' | 'getDetailPanelHeight'>) => void;

package/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
+
+
+  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) => {
+    var _previousHeightCache$;
+
+    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$ = previousHeightCache[id]) == null ? void 0 : _previousHeightCache$.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/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/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/legacy/components/DataGridProVirtualScroller.js

@@ -6,7 +6,6 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _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';
@@ -14,6 +13,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 var filterColumns = function filterColumns(pinnedColumns, columns) {
@@ -81,31 +81,15 @@ var VirtualScrollerDetailPanels = styled('div', {
 })({
   position: 'relative'
 });
-var VirtualScrollerDetailPanel = styled(Box, {
-  name: 'MuiDataGrid',
-  slot: 'DetailPanel',
-  overridesResolver: function overridesResolver(props, styles) {
-    return styles.detailPanel;
-  }
-})(function (_ref) {
-  var theme = _ref.theme;
-  return {
-    zIndex: 2,
-    width: '100%',
-    position: 'absolute',
-    backgroundColor: theme.palette.background.default,
-    overflow: 'auto'
-  };
-});
 var VirtualScrollerPinnedColumns = styled('div', {
   name: 'MuiDataGrid',
   slot: 'PinnedColumns',
   overridesResolver: function overridesResolver(props, styles) {
     return [_defineProperty({}, "&.".concat(gridClasses['pinnedColumns--left']), styles['pinnedColumns--left']), _defineProperty({}, "&.".concat(gridClasses['pinnedColumns--right']), styles['pinnedColumns--right']), styles.pinnedColumns];
   }
-})(function (_ref4) {
-  var theme = _ref4.theme,
-      ownerState = _ref4.ownerState;
+})(function (_ref3) {
+  var theme = _ref3.theme,
+      ownerState = _ref3.ownerState;
   return _extends({
     position: 'sticky',
     overflow: 'hidden',
@@ -135,8 +119,8 @@ var DataGridProVirtualScroller = /*#__PURE__*/React.forwardRef(function DataGrid
   var detailPanelsHeights = useGridSelector(apiRef, gridDetailPanelExpandedRowsHeightCacheSelector);
   var leftColumns = React.useRef(null);
   var rightColumns = React.useRef(null);
-  var handleRenderZonePositioning = React.useCallback(function (_ref5) {
-    var top = _ref5.top;
+  var handleRenderZonePositioning = React.useCallback(function (_ref4) {
+    var top = _ref4.top;
 
     if (leftColumns.current) {
       leftColumns.current.style.transform = "translate3d(0px, ".concat(top, "px, 0px)");
@@ -227,15 +211,17 @@ var DataGridProVirtualScroller = /*#__PURE__*/React.forwardRef(function DataGrid
       var exists = rowIndex !== undefined;
 
       if ( /*#__PURE__*/React.isValidElement(content) && exists) {
-        var height = detailPanelsHeights[id];
+        var hasAutoHeight = apiRef.current.unstable_detailPanelHasAutoHeight(id);
+        var height = hasAutoHeight ? 'auto' : detailPanelsHeights[id];
         var sizes = apiRef.current.unstable_getRowInternalSizes(id);
         var spacingTop = (sizes == null ? void 0 : sizes.spacingTop) || 0;
         var top = rowsMeta.positions[rowIndex] + apiRef.current.unstable_getRowHeight(id) + spacingTop;
-        panels.push( /*#__PURE__*/_jsx(VirtualScrollerDetailPanel, {
+        panels.push( /*#__PURE__*/_jsx(GridDetailPanel, {
+          rowId: id,
           style: {
-            top: top,
-            height: height
+            top: top
           },
+          height: height,
           className: classes.detailPanel,
           children: content
         }, i));

package/legacy/components/GridDetailPanel.js

@@ -0,0 +1,72 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _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";
+var DetailPanel = styled(Box, {
+  name: 'MuiDataGrid',
+  slot: 'DetailPanel',
+  overridesResolver: function overridesResolver(props, styles) {
+    return styles.detailPanel;
+  }
+})(function (_ref) {
+  var theme = _ref.theme;
+  return {
+    zIndex: 2,
+    width: '100%',
+    position: 'absolute',
+    backgroundColor: theme.palette.background.default,
+    overflow: 'auto'
+  };
+});
+
+var GridDetailPanel = function GridDetailPanel(props) {
+  var rowId = props.rowId,
+      height = props.height,
+      _props$style = props.style,
+      styleProp = _props$style === void 0 ? {} : _props$style,
+      other = _objectWithoutProperties(props, _excluded);
+
+  var apiRef = useGridApiContext();
+  var ref = React.useRef();
+  React.useLayoutEffect(function () {
+    if (height === 'auto' && ref.current && typeof ResizeObserver === 'undefined') {
+      // Fallback for IE
+      apiRef.current.unstable_storeDetailPanelHeight(rowId, ref.current.clientHeight);
+    }
+  }, [apiRef, height, rowId]);
+  React.useLayoutEffect(function () {
+    var hasFixedHeight = height !== 'auto';
+
+    if (!ref.current || hasFixedHeight || typeof ResizeObserver === 'undefined') {
+      return undefined;
+    }
+
+    var resizeObserver = new ResizeObserver(function (entries) {
+      var _entries = _slicedToArray(entries, 1),
+          entry = _entries[0];
+
+      var 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 function () {
+      return resizeObserver.disconnect();
+    };
+  }, [apiRef, height, rowId]);
+
+  var style = _extends({}, styleProp, {
+    height: height
+  });
+
+  return /*#__PURE__*/_jsx(DetailPanel, _extends({
+    ref: ref,
+    style: style
+  }, other));
+};
+
+export { GridDetailPanel };