@mui/x-data-grid 7.0.0-alpha.5 → 7.0.0-alpha.6

package/legacy/components/panel/filterPanel/GridFilterInputSingleSelect.js

@@ -1,33 +1,31 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "getOptionLabel", "getOptionValue", "placeholder", "tabIndex", "label", "isFilterActive", "clearButton", "InputLabelProps"];
+var _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "placeholder", "tabIndex", "label", "isFilterActive", "clearButton", "InputLabelProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_useId as useId } from '@mui/utils';
 import { styled } from '@mui/material/styles';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
-import { getValueFromValueOptions, isSingleSelectColDef } from './filterPanelUtils';
+import { getValueFromValueOptions, getValueOptions, isSingleSelectColDef } from './filterPanelUtils';
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var renderSingleSelectOptions = function renderSingleSelectOptions(_ref) {
-  var _ref$column = _ref.column,
-    valueOptions = _ref$column.valueOptions,
-    field = _ref$column.field,
+  var column = _ref.column,
     OptionComponent = _ref.OptionComponent,
     getOptionLabel = _ref.getOptionLabel,
     getOptionValue = _ref.getOptionValue,
     isSelectNative = _ref.isSelectNative,
     baseSelectOptionProps = _ref.baseSelectOptionProps;
-  var iterableColumnValues = typeof valueOptions === 'function' ? [''].concat(_toConsumableArray(valueOptions({
-    field: field
-  }))) : [''].concat(_toConsumableArray(valueOptions || []));
+  var iterableColumnValues = [''].concat(_toConsumableArray(getValueOptions(column) || []));
   return iterableColumnValues.map(function (option) {
     var value = getOptionValue(option);
     var label = getOptionLabel(option);
+    if (label === '') {
+      label = ' '; // To force the height of the empty option
+    }
     return /*#__PURE__*/_createElement(OptionComponent, _extends({}, baseSelectOptionProps, {
       native: isSelectNative,
       key: value,
@@ -49,8 +47,6 @@ function GridFilterInputSingleSelect(props) {
     type = props.type,
     apiRef = props.apiRef,
     focusElementRef = props.focusElementRef,
-    getOptionLabelProp = props.getOptionLabel,
-    getOptionValueProp = props.getOptionValue,
     placeholder = props.placeholder,
     tabIndex = props.tabIndex,
     labelProp = props.label,
@@ -58,14 +54,11 @@ function GridFilterInputSingleSelect(props) {
     clearButton = props.clearButton,
     InputLabelProps = props.InputLabelProps,
     others = _objectWithoutProperties(props, _excluded);
-  var _React$useState = React.useState((_item$value = item.value) != null ? _item$value : ''),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    filterValueState = _React$useState2[0],
-    setFilterValueState = _React$useState2[1];
+  var filterValue = (_item$value = item.value) != null ? _item$value : '';
   var id = useId();
   var labelId = useId();
   var rootProps = useGridRootProps();
-  var isSelectNative = (_rootProps$slotProps$ = (_rootProps$slotProps = rootProps.slotProps) == null || (_rootProps$slotProps = _rootProps$slotProps.baseSelect) == null ? void 0 : _rootProps$slotProps.native) != null ? _rootProps$slotProps$ : true;
+  var isSelectNative = (_rootProps$slotProps$ = (_rootProps$slotProps = rootProps.slotProps) == null || (_rootProps$slotProps = _rootProps$slotProps.baseSelect) == null ? void 0 : _rootProps$slotProps.native) != null ? _rootProps$slotProps$ : false;
   var resolvedColumn = null;
   if (item.field) {
     var column = apiRef.current.getColumn(item.field);
@@ -73,53 +66,27 @@ function GridFilterInputSingleSelect(props) {
       resolvedColumn = column;
     }
   }
-  var getOptionValue = getOptionValueProp || ((_resolvedColumn = resolvedColumn) == null ? void 0 : _resolvedColumn.getOptionValue);
-  var getOptionLabel = getOptionLabelProp || ((_resolvedColumn2 = resolvedColumn) == null ? void 0 : _resolvedColumn2.getOptionLabel);
+  var getOptionValue = (_resolvedColumn = resolvedColumn) == null ? void 0 : _resolvedColumn.getOptionValue;
+  var getOptionLabel = (_resolvedColumn2 = resolvedColumn) == null ? void 0 : _resolvedColumn2.getOptionLabel;
   var currentValueOptions = React.useMemo(function () {
-    if (!resolvedColumn) {
-      return undefined;
-    }
-    return typeof resolvedColumn.valueOptions === 'function' ? resolvedColumn.valueOptions({
-      field: resolvedColumn.field
-    }) : resolvedColumn.valueOptions;
+    return getValueOptions(resolvedColumn);
   }, [resolvedColumn]);
   var onFilterChange = React.useCallback(function (event) {
     var value = event.target.value;
 
     // NativeSelect casts the value to a string.
     value = getValueFromValueOptions(value, currentValueOptions, getOptionValue);
-    setFilterValueState(String(value));
     applyValue(_extends({}, item, {
       value: value
     }));
   }, [currentValueOptions, getOptionValue, applyValue, item]);
-  React.useEffect(function () {
-    var _itemValue;
-    var itemValue;
-    if (currentValueOptions !== undefined) {
-      // sanitize if valueOptions are provided
-      itemValue = getValueFromValueOptions(item.value, currentValueOptions, getOptionValue);
-      if (itemValue !== item.value) {
-        applyValue(_extends({}, item, {
-          value: itemValue
-        }));
-        return;
-      }
-    } else {
-      itemValue = item.value;
-    }
-    itemValue = (_itemValue = itemValue) != null ? _itemValue : '';
-    setFilterValueState(String(itemValue));
-  }, [item, currentValueOptions, applyValue, getOptionValue]);
-  if (!isSingleSelectColDef(resolvedColumn)) {
-    return null;
-  }
   if (!isSingleSelectColDef(resolvedColumn)) {
     return null;
   }
   var label = labelProp != null ? labelProp : apiRef.current.getLocaleText('filterPanelInputLabel');
   return /*#__PURE__*/_jsxs(SingleSelectOperatorContainer, {
     children: [/*#__PURE__*/_jsxs(rootProps.slots.baseFormControl, {
+      fullWidth: true,
       children: [/*#__PURE__*/_jsx(rootProps.slots.baseInputLabel, _extends({}, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseInputLabel, {
         id: labelId,
         htmlFor: id,
@@ -130,7 +97,7 @@ function GridFilterInputSingleSelect(props) {
         id: id,
         label: label,
         labelId: labelId,
-        value: filterValueState,
+        value: filterValue,
         onChange: onFilterChange,
         variant: "standard",
         type: type || 'text',
@@ -164,18 +131,6 @@ process.env.NODE_ENV !== "production" ? GridFilterInputSingleSelect.propTypes =
   applyValue: PropTypes.func.isRequired,
   clearButton: PropTypes.node,
   focusElementRef: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.func, PropTypes.object]),
-  /**
-   * Used to determine the label displayed for a given value option.
-   * @param {ValueOptions} value The current value option.
-   * @returns {string} The text to be displayed.
-   */
-  getOptionLabel: PropTypes.func,
-  /**
-   * Used to determine the value used for a value option.
-   * @param {ValueOptions} value The current value option.
-   * @returns {string} The value to be used.
-   */
-  getOptionValue: PropTypes.func,
   /**
    * It is `true` if the filter either has a value or an operator with no value
    * required is selected (e.g. `isEmpty`)

package/legacy/components/panel/filterPanel/filterPanelUtils.js

@@ -1,7 +1,15 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
+import _extends from "@babel/runtime/helpers/esm/extends";
 export function isSingleSelectColDef(colDef) {
   return (colDef == null ? void 0 : colDef.type) === 'singleSelect';
 }
+export function getValueOptions(column, additionalParams) {
+  if (!column) {
+    return undefined;
+  }
+  return typeof column.valueOptions === 'function' ? column.valueOptions(_extends({
+    field: column.field
+  }, additionalParams)) : column.valueOptions;
+}
 export function getValueFromValueOptions(value, valueOptions, getOptionValue) {
   if (valueOptions === undefined) {
     return undefined;
@@ -11,8 +19,4 @@ export function getValueFromValueOptions(value, valueOptions, getOptionValue) {
     return String(optionValue) === String(value);
   });
   return getOptionValue(result);
-}
-export var getLabelFromValueOption = function getLabelFromValueOption(valueOption) {
-  var label = _typeof(valueOption) === 'object' ? valueOption.label : valueOption;
-  return label != null ? String(label) : '';
-};
+}

package/legacy/hooks/features/rowSelection/useGridRowSelection.js

@@ -16,6 +16,7 @@ import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from '../../../constants/gridDetailPanelToggleField';
 import { gridClasses } from '../../../constants/gridClasses';
 import { isEventTargetInPortal } from '../../../utils/domUtils';
+import { isMultipleRowSelectionEnabled } from './utils';
 var getSelectionModelPropValue = function getSelectionModelPropValue(selectionModelProp, prevSelectionModel) {
   if (selectionModelProp == null) {
     return selectionModelProp;
@@ -62,10 +63,9 @@ export var useGridRowSelection = function useGridRowSelection(apiRef, props) {
     changeEvent: 'rowSelectionChange'
   });
   var checkboxSelection = props.checkboxSelection,
-    disableMultipleRowSelection = props.disableMultipleRowSelection,
     disableRowSelectionOnClick = props.disableRowSelectionOnClick,
     propIsRowSelectable = props.isRowSelectable;
-  var canHaveMultipleSelection = !disableMultipleRowSelection || checkboxSelection;
+  var canHaveMultipleSelection = isMultipleRowSelectionEnabled(props);
   var visibleRows = useGridVisibleRows(apiRef, props);
   var expandMouseRowRangeSelection = React.useCallback(function (id) {
     var _lastRowToggled$curre;
@@ -100,7 +100,7 @@ export var useGridRowSelection = function useGridRowSelection(apiRef, props) {
    * API METHODS
    */
   var setRowSelectionModel = React.useCallback(function (model) {
-    if (props.signature === GridSignature.DataGrid && !props.checkboxSelection && Array.isArray(model) && model.length > 1) {
+    if (props.signature === GridSignature.DataGrid && !canHaveMultipleSelection && Array.isArray(model) && model.length > 1) {
       throw new Error(['MUI: `rowSelectionModel` can only contain 1 item in DataGrid.', 'You need to upgrade to DataGridPro or DataGridPremium component to unlock multiple selection.'].join('\n'));
     }
     var currentModel = gridRowSelectionStateSelector(apiRef.current.state);
@@ -113,7 +113,7 @@ export var useGridRowSelection = function useGridRowSelection(apiRef, props) {
       });
       apiRef.current.forceUpdate();
     }
-  }, [apiRef, logger, props.rowSelection, props.signature, props.checkboxSelection]);
+  }, [apiRef, logger, props.rowSelection, props.signature, canHaveMultipleSelection]);
   var isRowSelected = React.useCallback(function (id) {
     return gridRowSelectionStateSelector(apiRef.current.state).includes(id);
   }, [apiRef]);
@@ -281,12 +281,12 @@ export var useGridRowSelection = function useGridRowSelection(apiRef, props) {
     if (rowNode.type === 'pinnedRow') {
       return;
     }
-    if (event.shiftKey && (canHaveMultipleSelection || checkboxSelection)) {
+    if (event.shiftKey && canHaveMultipleSelection) {
       expandMouseRowRangeSelection(params.id);
     } else {
       handleSingleRowSelection(params.id, event);
     }
-  }, [disableRowSelectionOnClick, canHaveMultipleSelection, checkboxSelection, apiRef, expandMouseRowRangeSelection, handleSingleRowSelection]);
+  }, [disableRowSelectionOnClick, canHaveMultipleSelection, apiRef, expandMouseRowRangeSelection, handleSingleRowSelection]);
   var preventSelectionOnShift = React.useCallback(function (params, event) {
     if (canHaveMultipleSelection && event.shiftKey) {
       var _window$getSelection;
@@ -294,12 +294,12 @@ export var useGridRowSelection = function useGridRowSelection(apiRef, props) {
     }
   }, [canHaveMultipleSelection]);
   var handleRowSelectionCheckboxChange = React.useCallback(function (params, event) {
-    if (event.nativeEvent.shiftKey) {
+    if (canHaveMultipleSelection && event.nativeEvent.shiftKey) {
       expandMouseRowRangeSelection(params.id);
     } else {
-      apiRef.current.selectRow(params.id, params.value);
+      apiRef.current.selectRow(params.id, params.value, !canHaveMultipleSelection);
     }
-  }, [apiRef, expandMouseRowRangeSelection]);
+  }, [apiRef, expandMouseRowRangeSelection, canHaveMultipleSelection]);
   var handleHeaderSelectionCheckboxChange = React.useCallback(function (params) {
     var shouldLimitSelectionToCurrentPage = props.checkboxSelectionVisibleOnly && props.pagination;
     var rowsToBeSelected = shouldLimitSelectionToCurrentPage ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridExpandedSortedRowIdsSelector(apiRef);

package/legacy/hooks/features/rowSelection/utils.js

@@ -0,0 +1,8 @@
+import { GridSignature } from '../../utils/useGridApiEventHandler';
+export function isMultipleRowSelectionEnabled(props) {
+  if (props.signature === GridSignature.DataGrid) {
+    // DataGrid Community has multiple row selection enabled only if checkbox selection is enabled.
+    return props.checkboxSelection && props.disableMultipleRowSelection !== true;
+  }
+  return !props.disableMultipleRowSelection;
+}

package/legacy/hooks/utils/useGridAriaAttributes.js

@@ -4,6 +4,7 @@ import { useGridRootProps } from './useGridRootProps';
 import { gridColumnGroupsHeaderMaxDepthSelector } from '../features/columnGrouping/gridColumnGroupsSelector';
 import { gridPinnedRowsCountSelector, gridRowCountSelector } from '../features/rows/gridRowsSelector';
 import { useGridPrivateApiContext } from './useGridPrivateApiContext';
+import { isMultipleRowSelectionEnabled } from '../features/rowSelection/utils';
 export var useGridAriaAttributes = function useGridAriaAttributes() {
   var _rootProps$experiment;
   var apiRef = useGridPrivateApiContext();
@@ -20,6 +21,6 @@ export var useGridAriaAttributes = function useGridAriaAttributes() {
     role: role,
     'aria-colcount': visibleColumns.length,
     'aria-rowcount': headerGroupingMaxDepth + 1 + pinnedRowsCount + totalRowCount,
-    'aria-multiselectable': !rootProps.disableMultipleRowSelection
+    'aria-multiselectable': isMultipleRowSelectionEnabled(rootProps)
   };
 };

package/legacy/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v7.0.0-alpha.5
+ * @mui/x-data-grid v7.0.0-alpha.6
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/models/props/DataGridProps.d.ts

@@ -56,7 +56,7 @@ export interface DataGridProcessedProps<R extends GridValidRowModel = any> exten
  * The props of the `DataGrid` component after the pre-processing phase that the user should not be able to override.
  * Those are usually used in feature-hook for which the pro-plan has more advanced features (eg: multi-sorting, multi-filtering, ...).
  */
-export type DataGridForcedPropsKey = 'checkboxSelectionVisibleOnly' | 'disableMultipleColumnsFiltering' | 'disableMultipleColumnsSorting' | 'disableMultipleRowSelection' | 'disableColumnReorder' | 'disableColumnResize' | 'keepColumnPositionIfDraggedOutside' | 'throttleRowsMs' | 'hideFooterRowCount' | 'pagination' | 'signature';
+export type DataGridForcedPropsKey = 'checkboxSelectionVisibleOnly' | 'disableMultipleColumnsFiltering' | 'disableMultipleColumnsSorting' | 'disableColumnReorder' | 'disableColumnResize' | 'keepColumnPositionIfDraggedOutside' | 'throttleRowsMs' | 'hideFooterRowCount' | 'pagination' | 'signature';
 /**
  * The `DataGrid` options with a default value that must be merged with the value given through props.
  */
@@ -73,7 +73,7 @@ export interface DataGridPropsWithComplexDefaultValueBeforeProcessing {
      */
     slots?: Partial<GridSlotsComponent>;
     /**
-     * Set the locale text of the grid.
+     * Set the locale text of the Data Grid.
      * You can find all the translation keys supported in [the source](https://github.com/mui/mui-x/blob/HEAD/packages/grid/x-data-grid/src/constants/localeTextConstants.ts) in the GitHub repository.
      */
     localeText?: Partial<GridLocaleText>;
@@ -86,7 +86,7 @@ export interface DataGridPropsWithComplexDefaultValueBeforeProcessing {
  */
 export interface DataGridPropsWithDefaultValues {
     /**
-     * If `true`, the grid height is dynamic and follow the number of rows in the grid.
+     * If `true`, the Data Grid height is dynamic and follow the number of rows in the Data Grid.
      * @default false
      */
     autoHeight: boolean;
@@ -96,7 +96,7 @@ export interface DataGridPropsWithDefaultValues {
      */
     autoPageSize: boolean;
     /**
-     * If `true`, the grid get a first column with a checkbox that allows to select rows.
+     * If `true`, the Data Grid will display an extra column with checkboxes for selecting rows.
      * @default false
      */
     checkboxSelection: boolean;
@@ -132,7 +132,7 @@ export interface DataGridPropsWithDefaultValues {
      */
     columnThreshold: number;
     /**
-     * Set the density of the grid.
+     * Set the density of the Data Grid.
      * @default "standard"
      */
     density: GridDensity;
@@ -168,8 +168,9 @@ export interface DataGridPropsWithDefaultValues {
      */
     disableMultipleColumnsFiltering: boolean;
     /**
-     * If `true`, multiple selection using the Ctrl or CMD key is disabled.
-     * @default false
+     * If `true`, multiple selection using the Ctrl/CMD or Shift key is disabled.
+     * The MIT DataGrid will ignore this prop, unless `checkboxSelection` is enabled.
+     * @default false (`!props.checkboxSelection` for MIT Data Grid)
      */
     disableMultipleRowSelection: boolean;
     /**
@@ -204,7 +205,7 @@ export interface DataGridPropsWithDefaultValues {
      */
     filterDebounceMs: number;
     /**
-     * Sets the height in pixel of the column headers in the grid.
+     * Sets the height in pixel of the column headers in the Data Grid.
      * @default 56
      */
     columnHeaderHeight: number;
@@ -265,7 +266,7 @@ export interface DataGridPropsWithDefaultValues {
      */
     paginationMode: GridFeatureMode;
     /**
-     * Sets the height in pixel of a row in the grid.
+     * Sets the height in pixel of a row in the Data Grid.
      * @default 52
      */
     rowHeight: number;
@@ -305,7 +306,7 @@ export interface DataGridPropsWithDefaultValues {
      */
     sortingMode: GridFeatureMode;
     /**
-     * If positive, the Grid will throttle updates coming from `apiRef.current.updateRows` and `apiRef.current.setRows`.
+     * If positive, the Data Grid will throttle updates coming from `apiRef.current.updateRows` and `apiRef.current.setRows`.
      * It can be useful if you have a high update rate but do not want to do heavy work like filtering / sorting or rendering on each  individual update.
      * @default 0
      */
@@ -321,13 +322,13 @@ export interface DataGridPropsWithDefaultValues {
      */
     disableColumnResize: boolean;
     /**
-     * If `true`, moving the mouse pointer outside the grid before releasing the mouse button
+     * If `true`, moving the mouse pointer outside the Data Grid before releasing the mouse button
      * in a column re-order action will not cause the column to jump back to its original position.
      * @default false
      */
     keepColumnPositionIfDraggedOutside: boolean;
     /**
-     * If `true`, the grid will not use `valueFormatter` when exporting to CSV or copying to clipboard.
+     * If `true`, the Data Grid will not use `valueFormatter` when exporting to CSV or copying to clipboard.
      * If an object is provided, you can choose to ignore the `valueFormatter` for CSV export or clipboard export.
      * @default false
      */
@@ -353,17 +354,17 @@ export interface DataGridPropsWithDefaultValues {
  */
 export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel = any> extends CommonProps {
     /**
-     * The ref object that allows grid manipulation. Can be instantiated with `useGridApiRef()`.
+     * The ref object that allows Data Grid manipulation. Can be instantiated with `useGridApiRef()`.
      */
     apiRef?: React.MutableRefObject<GridApiCommunity>;
     /**
-     * Forwarded props for the grid root element.
+     * Forwarded props for the Data Grid root element.
      * @ignore - do not document.
      */
     forwardedProps?: Record<string, unknown>;
     /**
      * Signal to the underlying logic what version of the public component API
-     * of the data grid is exposed [[GridSignature]].
+     * of the Data Grid is exposed [[GridSignature]].
      * @ignore - do not document.
      */
     signature?: string;
@@ -377,7 +378,7 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      */
     rowCount?: number;
     /**
-     * Override the height/width of the grid inner scrollbar.
+     * Override the height/width of the Data Grid inner scrollbar.
      */
     scrollbarSize?: number;
     /**
@@ -546,14 +547,14 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      */
     onRowDoubleClick?: GridEventListener<'rowDoubleClick'>;
     /**
-     * Callback fired when the grid is resized.
+     * Callback fired when the Data Grid is resized.
      * @param {ElementSize} containerSize With all properties from [[ElementSize]].
      * @param {MuiEvent<{}>} event The event object.
      * @param {GridCallbackDetails} details Additional details for this callback.
      */
     onResize?: GridEventListener<'debouncedResize'>;
     /**
-     * Callback fired when the state of the grid is updated.
+     * Callback fired when the state of the Data Grid is updated.
      * @param {GridState} state The new state.
      * @param {MuiEvent<{}>} event The event object.
      * @param {GridCallbackDetails} details Additional details for this callback.
@@ -619,7 +620,7 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      */
     onRowModesModelChange?: (rowModesModel: GridRowModesModel, details: GridCallbackDetails) => void;
     /**
-     * Set the filter model of the grid.
+     * Set the filter model of the Data Grid.
      */
     filterModel?: GridFilterModel;
     /**
@@ -629,7 +630,7 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      */
     onFilterModelChange?: (model: GridFilterModel, details: GridCallbackDetails<'filter'>) => void;
     /**
-     * Sets the row selection model of the grid.
+     * Sets the row selection model of the Data Grid.
      */
     rowSelectionModel?: GridInputRowSelectionModel;
     /**
@@ -639,8 +640,8 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      */
     onRowSelectionModelChange?: (rowSelectionModel: GridRowSelectionModel, details: GridCallbackDetails) => void;
     /**
-     * Set the column visibility model of the grid.
-     * If defined, the grid will ignore the `hide` property in [[GridColDef]].
+     * Set the column visibility model of the Data Grid.
+     * If defined, the Data Grid will ignore the `hide` property in [[GridColDef]].
      */
     columnVisibilityModel?: GridColumnVisibilityModel;
     /**
@@ -650,7 +651,7 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      */
     onColumnVisibilityModelChange?: (model: GridColumnVisibilityModel, details: GridCallbackDetails) => void;
     /**
-     * Set the sort model of the grid.
+     * Set the sort model of the Data Grid.
      */
     sortModel?: GridSortModel;
     /**
@@ -660,11 +661,11 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      */
     onSortModelChange?: (model: GridSortModel, details: GridCallbackDetails) => void;
     /**
-     * The label of the grid.
+     * The label of the Data Grid.
      */
     'aria-label'?: string;
     /**
-     * The id of the element containing a label for the grid.
+     * The id of the element containing a label for the Data Grid.
      */
     'aria-labelledby'?: string;
     /**

package/modern/DataGrid/DataGrid.js

@@ -41,21 +41,21 @@ DataGridRaw.propTypes = {
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
   /**
-   * The ref object that allows grid manipulation. Can be instantiated with `useGridApiRef()`.
+   * The ref object that allows Data Grid manipulation. Can be instantiated with `useGridApiRef()`.
    */
   apiRef: PropTypes.shape({
     current: PropTypes.object.isRequired
   }),
   /**
-   * The label of the grid.
+   * The label of the Data Grid.
    */
   'aria-label': PropTypes.string,
   /**
-   * The id of the element containing a label for the grid.
+   * The id of the element containing a label for the Data Grid.
    */
   'aria-labelledby': PropTypes.string,
   /**
-   * If `true`, the grid height is dynamic and follow the number of rows in the grid.
+   * If `true`, the Data Grid height is dynamic and follow the number of rows in the Data Grid.
    * @default false
    */
   autoHeight: PropTypes.bool,
@@ -69,7 +69,7 @@ DataGridRaw.propTypes = {
    */
   cellModesModel: PropTypes.object,
   /**
-   * If `true`, the grid get a first column with a checkbox that allows to select rows.
+   * If `true`, the Data Grid will display an extra column with checkboxes for selecting rows.
    * @default false
    */
   checkboxSelection: PropTypes.bool,
@@ -89,7 +89,7 @@ DataGridRaw.propTypes = {
   columnBuffer: PropTypes.number,
   columnGroupingModel: PropTypes.arrayOf(PropTypes.object),
   /**
-   * Sets the height in pixel of the column headers in the grid.
+   * Sets the height in pixel of the column headers in the Data Grid.
    * @default 56
    */
   columnHeaderHeight: PropTypes.number,
@@ -109,12 +109,12 @@ DataGridRaw.propTypes = {
    */
   columnThreshold: PropTypes.number,
   /**
-   * Set the column visibility model of the grid.
-   * If defined, the grid will ignore the `hide` property in [[GridColDef]].
+   * Set the column visibility model of the Data Grid.
+   * If defined, the Data Grid will ignore the `hide` property in [[GridColDef]].
    */
   columnVisibilityModel: PropTypes.object,
   /**
-   * Set the density of the grid.
+   * Set the density of the Data Grid.
    * @default "standard"
    */
   density: PropTypes.oneOf(['comfortable', 'compact', 'standard']),
@@ -144,6 +144,12 @@ DataGridRaw.propTypes = {
    * @ignore - do not document
    */
   disableEval: PropTypes.bool,
+  /**
+   * If `true`, multiple selection using the Ctrl/CMD or Shift key is disabled.
+   * The MIT DataGrid will ignore this prop, unless `checkboxSelection` is enabled.
+   * @default false (`!props.checkboxSelection` for MIT Data Grid)
+   */
+  disableMultipleRowSelection: PropTypes.bool,
   /**
    * If `true`, the selection on click on a row or cell is disabled.
    * @default false
@@ -180,7 +186,7 @@ DataGridRaw.propTypes = {
    */
   filterMode: PropTypes.oneOf(['client', 'server']),
   /**
-   * Set the filter model of the grid.
+   * Set the filter model of the Data Grid.
    */
   filterModel: PropTypes.shape({
     items: PropTypes.arrayOf(PropTypes.shape({
@@ -195,7 +201,7 @@ DataGridRaw.propTypes = {
     quickFilterValues: PropTypes.array
   }),
   /**
-   * Forwarded props for the grid root element.
+   * Forwarded props for the Data Grid root element.
    * @ignore - do not document.
    */
   forwardedProps: PropTypes.object,
@@ -263,7 +269,7 @@ DataGridRaw.propTypes = {
    */
   ignoreDiacritics: PropTypes.bool,
   /**
-   * If `true`, the grid will not use `valueFormatter` when exporting to CSV or copying to clipboard.
+   * If `true`, the Data Grid will not use `valueFormatter` when exporting to CSV or copying to clipboard.
    * If an object is provided, you can choose to ignore the `valueFormatter` for CSV export or clipboard export.
    * @default false
    */
@@ -301,7 +307,7 @@ DataGridRaw.propTypes = {
    */
   loading: PropTypes.bool,
   /**
-   * Set the locale text of the grid.
+   * Set the locale text of the Data Grid.
    * You can find all the translation keys supported in [the source](https://github.com/mui/mui-x/blob/HEAD/packages/grid/x-data-grid/src/constants/localeTextConstants.ts) in the GitHub repository.
    */
   localeText: PropTypes.object,
@@ -469,7 +475,7 @@ DataGridRaw.propTypes = {
    */
   onProcessRowUpdateError: PropTypes.func,
   /**
-   * Callback fired when the grid is resized.
+   * Callback fired when the Data Grid is resized.
    * @param {ElementSize} containerSize With all properties from [[ElementSize]].
    * @param {MuiEvent<{}>} event The event object.
    * @param {GridCallbackDetails} details Additional details for this callback.
@@ -527,7 +533,7 @@ DataGridRaw.propTypes = {
    */
   onSortModelChange: PropTypes.func,
   /**
-   * Callback fired when the state of the grid is updated.
+   * Callback fired when the state of the Data Grid is updated.
    * @param {GridState} state The new state.
    * @param {MuiEvent<{}>} event The event object.
    * @param {GridCallbackDetails} details Additional details for this callback.
@@ -581,7 +587,7 @@ DataGridRaw.propTypes = {
    */
   rowCount: PropTypes.number,
   /**
-   * Sets the height in pixel of a row in the grid.
+   * Sets the height in pixel of a row in the Data Grid.
    * @default 52
    */
   rowHeight: PropTypes.number,
@@ -606,7 +612,7 @@ DataGridRaw.propTypes = {
    */
   rowSelection: PropTypes.bool,
   /**
-   * Sets the row selection model of the grid.
+   * Sets the row selection model of the Data Grid.
    */
   rowSelectionModel: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired), PropTypes.number, PropTypes.string]),
   /**
@@ -620,7 +626,7 @@ DataGridRaw.propTypes = {
    */
   rowThreshold: PropTypes.number,
   /**
-   * Override the height/width of the grid inner scrollbar.
+   * Override the height/width of the Data Grid inner scrollbar.
    */
   scrollbarSize: PropTypes.number,
   /**
@@ -654,7 +660,7 @@ DataGridRaw.propTypes = {
    */
   sortingOrder: PropTypes.arrayOf(PropTypes.oneOf(['asc', 'desc'])),
   /**
-   * Set the sort model of the grid.
+   * Set the sort model of the Data Grid.
    */
   sortModel: PropTypes.arrayOf(PropTypes.shape({
     field: PropTypes.string.isRequired,

package/modern/DataGrid/useDataGridProps.js

@@ -8,7 +8,6 @@ import { computeSlots, useProps } from '../internals/utils';
 const DATA_GRID_FORCED_PROPS = {
   disableMultipleColumnsFiltering: true,
   disableMultipleColumnsSorting: true,
-  disableMultipleRowSelection: true,
   throttleRowsMs: undefined,
   hideFooterRowCount: false,
   pagination: true,