another round

docs/pages/x/api/data-grid/data-grid-premium.json

@@ -17,7 +17,7 @@
     "aria-label": { "type": { "name": "string" } },
     "aria-labelledby": { "type": { "name": "string" } },
     "autoHeight": {
-      "type": { "name": "custom", "description": "bool" },
+      "type": { "name": "bool" },
       "default": "false",
       "deprecated": true,
       "deprecationInfo": "Use flex parent container instead: <a href=\"https://mui.com/r/x-grid-deprecate-auto-height\">https://mui.com/r/x-grid-deprecate-auto-height</a>."

docs/pages/x/api/data-grid/data-grid-pro.json

@@ -8,7 +8,7 @@
     "aria-label": { "type": { "name": "string" } },
     "aria-labelledby": { "type": { "name": "string" } },
     "autoHeight": {
-      "type": { "name": "custom", "description": "bool" },
+      "type": { "name": "bool" },
       "default": "false",
       "deprecated": true,
       "deprecationInfo": "Use flex parent container instead: <a href=\"https://mui.com/r/x-grid-deprecate-auto-height\">https://mui.com/r/x-grid-deprecate-auto-height</a>."

docs/pages/x/api/data-grid/data-grid.json

@@ -8,7 +8,7 @@
     "aria-label": { "type": { "name": "string" } },
     "aria-labelledby": { "type": { "name": "string" } },
     "autoHeight": {
-      "type": { "name": "custom", "description": "bool" },
+      "type": { "name": "bool" },
       "default": "false",
       "deprecated": true,
       "deprecationInfo": "Use flex parent container instead: <a href=\"https://mui.com/r/x-grid-deprecate-auto-height\">https://mui.com/r/x-grid-deprecate-auto-height</a>."

docs/translations/api-docs/data-grid/data-grid-premium/data-grid-premium.json

@@ -14,8 +14,7 @@
       "description": "The id of the element containing a label for the Data Grid."
     },
     "autoHeight": {
-      "description": "If <code>true</code>, the Data Grid height is dynamic and follows the number of rows in the Data Grid.",
-      "deprecated": "<em>Deprecated</em>. Use flex parent container instead: <a href=\"https://mui.com/r/x-grid-deprecate-auto-height\">https://mui.com/r/x-grid-deprecate-auto-height</a>.<br><br>"
+      "description": "If <code>true</code>, the Data Grid height is dynamic and follows the number of rows in the Data Grid."
     },
     "autoPageSize": {
       "description": "If <code>true</code>, the pageSize is calculated according to the container size and the max number of rows to avoid rendering a vertical scroll bar."

docs/translations/api-docs/data-grid/data-grid-pro/data-grid-pro.json

@@ -9,8 +9,7 @@
       "description": "The id of the element containing a label for the Data Grid."
     },
     "autoHeight": {
-      "description": "If <code>true</code>, the Data Grid height is dynamic and follows the number of rows in the Data Grid.",
-      "deprecated": "<em>Deprecated</em>. Use flex parent container instead: <a href=\"https://mui.com/r/x-grid-deprecate-auto-height\">https://mui.com/r/x-grid-deprecate-auto-height</a>.<br><br>"
+      "description": "If <code>true</code>, the Data Grid height is dynamic and follows the number of rows in the Data Grid."
     },
     "autoPageSize": {
       "description": "If <code>true</code>, the pageSize is calculated according to the container size and the max number of rows to avoid rendering a vertical scroll bar."

docs/translations/api-docs/data-grid/data-grid/data-grid.json

@@ -9,8 +9,7 @@
       "description": "The id of the element containing a label for the Data Grid."
     },
     "autoHeight": {
-      "description": "If <code>true</code>, the Data Grid height is dynamic and follows the number of rows in the Data Grid.",
-      "deprecated": "<em>Deprecated</em>. Use flex parent container instead: <a href=\"https://mui.com/r/x-grid-deprecate-auto-height\">https://mui.com/r/x-grid-deprecate-auto-height</a>.<br><br>"
+      "description": "If <code>true</code>, the Data Grid height is dynamic and follows the number of rows in the Data Grid."
     },
     "autoPageSize": {
       "description": "If <code>true</code>, the pageSize is calculated according to the container size and the max number of rows to avoid rendering a vertical scroll bar."

packages/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx

@@ -2,7 +2,6 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useLicenseVerifier, Watermark } from '@mui/x-license';
-import deprecatedPropType from '@mui/utils/deprecatedPropType';
 import {
   GridBody,
   GridFooterPlaceholder,
@@ -118,10 +117,7 @@ DataGridPremiumRaw.propTypes = {
    *   <DataGrid />
    * </div>
    */
-  autoHeight: deprecatedPropType(
-    PropTypes.bool,
-    'Use flex parent container instead: https://mui.com/r/x-grid-deprecate-auto-height.',
-  ),
+  autoHeight: PropTypes.bool,
   /**
    * If `true`, the pageSize is calculated according to the container size and the max number of rows to avoid rendering a vertical scroll bar.
    * @default false

packages/x-data-grid-premium/src/tests/exportExcel.DataGridPremium.test.tsx

@@ -14,8 +14,6 @@ import { expect } from 'chai';
 import Excel from 'exceljs';
 import { spyApi } from 'test/utils/helperFn';
 
-const isJSDOM = /jsdom/.test(window.navigator.userAgent);
-
 describe('<DataGridPremium /> - Export Excel', () => {
   const { render } = createRenderer();
 

packages/x-data-grid-premium/src/tests/rowGrouping.DataGridPremium.test.tsx

@@ -34,8 +34,6 @@ import {
 } from '@mui/x-data-grid-premium';
 import { spy } from 'sinon';
 
-const isJSDOM = /jsdom/.test(window.navigator.userAgent);
-
 interface BaselineProps extends DataGridPremiumProps {
   rows: GridRowsProp;
 }

packages/x-data-grid-premium/src/tests/statePersistence.DataGridPremium.test.tsx

@@ -12,8 +12,6 @@ import { createRenderer, act } from '@mui/internal-test-utils';
 import { expect } from 'chai';
 import { getColumnValues } from 'test/utils/helperFn';
 
-const isJSDOM = /jsdom/.test(window.navigator.userAgent);
-
 const rows: GridRowsProp = [
   { id: 0, category: 'Cat A' },
   { id: 1, category: 'Cat A' },

packages/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx

@@ -12,7 +12,6 @@ import {
 } from '@mui/x-data-grid';
 import { validateProps } from '@mui/x-data-grid/internals';
 import { forwardRef } from '@mui/x-internals/forwardRef';
-import deprecatedPropType from '@mui/utils/deprecatedPropType';
 import { useDataGridProComponent } from './useDataGridProComponent';
 import { DataGridProProps } from '../models/dataGridProProps';
 import { useDataGridProProps } from './useDataGridProProps';
@@ -105,10 +104,7 @@ DataGridProRaw.propTypes = {
    *   <DataGrid />
    * </div>
    */
-  autoHeight: deprecatedPropType(
-    PropTypes.bool,
-    'Use flex parent container instead: https://mui.com/r/x-grid-deprecate-auto-height.',
-  ),
+  autoHeight: PropTypes.bool,
   /**
    * If `true`, the pageSize is calculated according to the container size and the max number of rows to avoid rendering a vertical scroll bar.
    * @default false

packages/x-data-grid-pro/src/tests/detailPanel.DataGridPro.test.tsx

@@ -389,6 +389,7 @@ describe('<DataGridPro /> - Detail panel', () => {
     const getDetailPanelHeight = spy(() => 100);
     const { setProps } = render(
       <TestCase
+        autoHeight
         columns={[{ field: 'brand' }]}
         rows={[
           { id: 0, brand: 'Nike' },

packages/x-data-grid-pro/src/tests/filtering.DataGridPro.test.tsx

@@ -24,10 +24,10 @@ import * as React from 'react';
 import { spy } from 'sinon';
 import { getColumnHeaderCell, getColumnValues, getSelectInput, grid } from 'test/utils/helperFn';
 
-const isJSDOM = /jsdom/.test(window.navigator.userAgent);
-
 const SUBMIT_FILTER_STROKE_TIME = DATA_GRID_PRO_PROPS_DEFAULT_VALUES.filterDebounceMs;
 
+const isJSDOM = /jsdom/.test(window.navigator.userAgent);
+
 describe('<DataGridPro /> - Filter', () => {
   const { clock, render } = createRenderer({ clock: 'fake' });
 

packages/x-data-grid-pro/src/tests/layout.DataGridPro.test.tsx

@@ -148,6 +148,7 @@ describe('<DataGridPro /> - Layout', () => {
       <div style={{ width: 300, height: 300 }}>
         <DataGridPro
           {...baselineProps}
+          autoHeight
           headerFilters
           columnHeaderHeight={20}
           headerFilterHeight={32}

packages/x-data-grid-pro/src/tests/statePersistence.DataGridPro.test.tsx

@@ -18,8 +18,6 @@ import {
   getColumnValues,
 } from 'test/utils/helperFn';
 
-const isJSDOM = /jsdom/.test(window.navigator.userAgent);
-
 const rows: GridRowsProp = [
   { id: 0, category: 'Cat A' },
   { id: 1, category: 'Cat A' },

packages/x-data-grid-pro/src/tests/treeData.DataGridPro.test.tsx

@@ -22,8 +22,6 @@ import {
   GridPaginationModel,
 } from '@mui/x-data-grid-pro';
 
-const isJSDOM = /jsdom/.test(window.navigator.userAgent);
-
 const rowsWithoutGap: GridRowsProp = [
   { name: 'A' },
   { name: 'A.A' },

packages/x-data-grid/src/DataGrid/DataGrid.tsx

@@ -2,7 +2,6 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { forwardRef } from '@mui/x-internals/forwardRef';
-import deprecatedPropType from '@mui/utils/deprecatedPropType';
 import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot } from '../components';
 import { useGridAriaAttributes } from '../hooks/utils/useGridAriaAttributes';
 import { useGridRowAriaAttributes } from '../hooks/features/rows/useGridRowAriaAttributes';
@@ -115,10 +114,7 @@ DataGridRaw.propTypes = {
    *   <DataGrid />
    * </div>
    */
-  autoHeight: deprecatedPropType(
-    PropTypes.bool,
-    'Use flex parent container instead: https://mui.com/r/x-grid-deprecate-auto-height.',
-  ),
+  autoHeight: PropTypes.bool,
   /**
    * If `true`, the pageSize is calculated according to the container size and the max number of rows to avoid rendering a vertical scroll bar.
    * @default false

packages/x-data-grid/src/tests/filterPanel.DataGrid.test.tsx

@@ -46,8 +46,6 @@ function CustomInputValue(props: GridFilterInputValueProps) {
   );
 }
 
-const isJSDOM = /jsdom/.test(window.navigator.userAgent);
-
 describe('<DataGrid /> - Filter panel', () => {
   const { render, clock } = createRenderer({ clock: 'fake' });
 

packages/x-data-grid/src/tests/keyboard.DataGrid.test.tsx

@@ -50,6 +50,7 @@ describe('<DataGrid /> - Keyboard', () => {
     return (
       <div style={{ width: 300, height: HEIGHT }}>
         <DataGrid
+          autoHeight={isJSDOM}
           rows={data.rows}
           columns={transformColSizes(data.columns)}
           initialState={{ pagination: { paginationModel: { pageSize: PAGE_SIZE } } }}

packages/x-data-grid/src/tests/rows.DataGrid.test.tsx

@@ -1101,7 +1101,7 @@ describe('<DataGrid /> - Rows', () => {
 
     it('should throw a console error if autoPageSize is used with autoHeight', () => {
       expect(() => {
-        render(<TestCase autoPageSize />);
+        render(<TestCase autoPageSize autoHeight />);
       }).toErrorDev(
         [
           'MUI X: `<DataGrid autoPageSize={true} autoHeight={true} />` are not valid props.',