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

package/components/panel/filterPanel/filterPanelUtils.d.ts

@@ -1,4 +1,5 @@
-import type { GridColDef, GridSingleSelectColDef, ValueOptions } from '../../../models/colDef/gridColDef';
+import type { GridColDef, GridSingleSelectColDef } from '../../../models/colDef/gridColDef';
+import type { GridValueOptionsParams } from '../../../models/params/gridValueOptionsParams';
 export declare function isSingleSelectColDef(colDef: GridColDef | null): colDef is GridSingleSelectColDef;
+export declare function getValueOptions(column: GridSingleSelectColDef, additionalParams?: Omit<GridValueOptionsParams, 'field'>): import("../../../models/colDef/gridColDef").ValueOptions[] | undefined;
 export declare function getValueFromValueOptions(value: string, valueOptions: any[] | undefined, getOptionValue: NonNullable<GridSingleSelectColDef['getOptionValue']>): any;
-export declare const getLabelFromValueOption: (valueOption: ValueOptions) => string;

package/components/panel/filterPanel/filterPanelUtils.js

@@ -1,6 +1,15 @@
+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;
@@ -10,8 +19,4 @@ export function getValueFromValueOptions(value, valueOptions, getOptionValue) {
     return String(optionValue) === String(value);
   });
   return getOptionValue(result);
-}
-export const getLabelFromValueOption = valueOption => {
-  const label = typeof valueOption === 'object' ? valueOption.label : valueOption;
-  return label != null ? String(label) : '';
-};
+}

package/hooks/features/filter/gridFilterUtils.js

@@ -4,15 +4,17 @@ import { getDefaultGridFilterModel } from './gridFilterState';
 import { buildWarning } from '../../../utils/warning';
 import { getPublicApiRef } from '../../../utils/getPublicApiRef';
 import { gridColumnFieldsSelector, gridColumnLookupSelector, gridVisibleColumnFieldsSelector } from '../columns';
-
-// Fixes https://github.com/mui/mui-x/issues/10056
-const globalScope = typeof window === 'undefined' ? globalThis : window;
-const evalCode = globalScope[atob('ZXZhbA==')];
 let hasEval;
-try {
-  hasEval = evalCode('true');
-} catch (_) {
-  hasEval = false;
+function getHasEval() {
+  if (hasEval !== undefined) {
+    return hasEval;
+  }
+  try {
+    hasEval = new Function('return true')();
+  } catch (_) {
+    hasEval = false;
+  }
+  return hasEval;
 }
 /**
  * Adds default values to the optional fields of a filter items.
@@ -140,7 +142,7 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
   if (appliers.length === 0) {
     return null;
   }
-  if (!hasEval || disableEval) {
+  if (disableEval || !getHasEval()) {
     // This is the original logic, which is used if `eval()` is not supported (aka prevented by CSP).
     return (row, shouldApplyFilter) => {
       const resultPerItemId = {};
@@ -154,25 +156,20 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
     };
   }
 
-  // We generate a new function with `eval()` to avoid expensive patterns for JS engines
+  // We generate a new function with `new Function()` to avoid expensive patterns for JS engines
   // such as a dynamic object assignment, e.g. `{ [dynamicKey]: value }`.
-  const filterItemTemplate = `(function filterItem$$(getRowId, appliers, row, shouldApplyFilter) {
-      ${appliers.map((applier, i) => `const shouldApply${i} = !shouldApplyFilter || shouldApplyFilter(${JSON.stringify(applier.item.field)});`).join('\n')}
+  const filterItemCore = new Function('appliers', 'row', 'shouldApplyFilter', `"use strict";
+${appliers.map((applier, i) => `const shouldApply${i} = !shouldApplyFilter || shouldApplyFilter(${JSON.stringify(applier.item.field)});`).join('\n')}
 
-      const result$$ = {
-      ${appliers.map((applier, i) => `${JSON.stringify(String(applier.item.id))}:
-          !shouldApply${i} ?
-            false :
-            appliers[${i}].fn(row),
-      `).join('\n')}};
+const result$$ = {
+${appliers.map((applier, i) => `  ${JSON.stringify(String(applier.item.id))}: !shouldApply${i} ? false : appliers[${i}].fn(row),`).join('\n')}
+};
 
-      return result$$;
-    })`;
-  const filterItemCore = evalCode(filterItemTemplate.replaceAll('$$', String(filterItemsApplierId)));
-  const filterItem = (row, shouldApplyItem) => {
-    return filterItemCore(apiRef.current.getRowId, appliers, row, shouldApplyItem);
-  };
+return result$$;`.replaceAll('$$', String(filterItemsApplierId)));
   filterItemsApplierId += 1;
+
+  // Assign to the arrow function a name to help debugging
+  const filterItem = (row, shouldApplyItem) => filterItemCore(appliers, row, shouldApplyItem);
   return filterItem;
 };
 export const shouldQuickFilterExcludeHiddenColumns = filterModel => {

package/hooks/features/rowSelection/useGridRowSelection.js

@@ -15,6 +15,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';
 const getSelectionModelPropValue = (selectionModelProp, prevSelectionModel) => {
   if (selectionModelProp == null) {
     return selectionModelProp;
@@ -60,11 +61,10 @@ export const useGridRowSelection = (apiRef, props) => {
   });
   const {
     checkboxSelection,
-    disableMultipleRowSelection,
     disableRowSelectionOnClick,
     isRowSelectable: propIsRowSelectable
   } = props;
-  const canHaveMultipleSelection = !disableMultipleRowSelection || checkboxSelection;
+  const canHaveMultipleSelection = isMultipleRowSelectionEnabled(props);
   const visibleRows = useGridVisibleRows(apiRef, props);
   const expandMouseRowRangeSelection = React.useCallback(id => {
     var _lastRowToggled$curre;
@@ -95,7 +95,7 @@ export const useGridRowSelection = (apiRef, props) => {
    * API METHODS
    */
   const setRowSelectionModel = React.useCallback(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'));
     }
     const currentModel = gridRowSelectionStateSelector(apiRef.current.state);
@@ -106,7 +106,7 @@ export const useGridRowSelection = (apiRef, props) => {
       }));
       apiRef.current.forceUpdate();
     }
-  }, [apiRef, logger, props.rowSelection, props.signature, props.checkboxSelection]);
+  }, [apiRef, logger, props.rowSelection, props.signature, canHaveMultipleSelection]);
   const isRowSelected = React.useCallback(id => gridRowSelectionStateSelector(apiRef.current.state).includes(id), [apiRef]);
   const isRowSelectable = React.useCallback(id => {
     if (propIsRowSelectable && !propIsRowSelectable(apiRef.current.getRowParams(id))) {
@@ -258,12 +258,12 @@ export const 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]);
   const preventSelectionOnShift = React.useCallback((params, event) => {
     if (canHaveMultipleSelection && event.shiftKey) {
       var _window$getSelection;
@@ -271,12 +271,12 @@ export const useGridRowSelection = (apiRef, props) => {
     }
   }, [canHaveMultipleSelection]);
   const handleRowSelectionCheckboxChange = React.useCallback((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]);
   const handleHeaderSelectionCheckboxChange = React.useCallback(params => {
     const shouldLimitSelectionToCurrentPage = props.checkboxSelectionVisibleOnly && props.pagination;
     const rowsToBeSelected = shouldLimitSelectionToCurrentPage ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef) : gridExpandedSortedRowIdsSelector(apiRef);

package/hooks/features/rowSelection/utils.d.ts

@@ -0,0 +1,2 @@
+import type { DataGridProcessedProps } from '../../../models/props/DataGridProps';
+export declare function isMultipleRowSelectionEnabled(props: Pick<DataGridProcessedProps, 'signature' | 'disableMultipleRowSelection' | 'checkboxSelection'>): boolean;

package/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/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 const useGridAriaAttributes = () => {
   var _rootProps$experiment;
   const apiRef = useGridPrivateApiContext();
@@ -20,6 +21,6 @@ export const useGridAriaAttributes = () => {
     role,
     'aria-colcount': visibleColumns.length,
     'aria-rowcount': headerGroupingMaxDepth + 1 + pinnedRowsCount + totalRowCount,
-    'aria-multiselectable': !rootProps.disableMultipleRowSelection
+    'aria-multiselectable': isMultipleRowSelectionEnabled(rootProps)
   };
 };

package/index.js

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

package/legacy/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,
@@ -63,13 +63,18 @@ DataGridRaw.propTypes = {
    * 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
    */
-  autoPageSize: PropTypes.bool,
+  autoPageSize: chainPropTypes(PropTypes.bool, function (props) {
+    if (props.autoHeight && props.autoPageSize) {
+      return new Error(['MUI: `<DataGrid autoPageSize={true} autoHeight={true} />` are not valid props.', 'You can not use both the `autoPageSize` and `autoHeight` props at the same time because `autoHeight` scales the height of the Data Grid according to the `pageSize`.', '', 'Please remove one of these two props.'].join('\n'));
+    }
+    return null;
+  }),
   /**
    * Controls the modes of the cells.
    */
   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 +94,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,
@@ -111,12 +116,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']),
@@ -143,9 +148,14 @@ DataGridRaw.propTypes = {
   /**
    * If `true`, `eval()` is not used for performance optimization.
    * @default false
-   * @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
@@ -182,7 +192,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({
@@ -197,7 +207,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,
@@ -265,7 +275,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
    */
@@ -303,7 +313,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,
@@ -471,7 +481,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.
@@ -529,7 +539,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.
@@ -583,7 +593,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,
@@ -608,7 +618,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]),
   /**
@@ -622,7 +632,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,
   /**
@@ -656,7 +666,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/legacy/DataGrid/useDataGridProps.js

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

package/legacy/colDef/gridDateOperators.js

@@ -1,19 +1,15 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { GridFilterInputDate } from '../components/panel/filterPanel/GridFilterInputDate';
-var dateRegex = /(\d+)-(\d+)-(\d+)/;
-var dateTimeRegex = /(\d+)-(\d+)-(\d+)T(\d+):(\d+)/;
 function buildApplyFilterFn(filterItem, compareFn, showTime, keepHours) {
   if (!filterItem.value) {
     return null;
   }
-  var _slice$map = filterItem.value.match(showTime ? dateTimeRegex : dateRegex).slice(1).map(Number),
-    _slice$map2 = _slicedToArray(_slice$map, 5),
-    year = _slice$map2[0],
-    month = _slice$map2[1],
-    day = _slice$map2[2],
-    hour = _slice$map2[3],
-    minute = _slice$map2[4];
-  var time = new Date(year, month - 1, day, hour || 0, minute || 0).getTime();
+  var date = new Date(filterItem.value);
+  if (showTime) {
+    date.setSeconds(0, 0);
+  } else {
+    date.setHours(0, 0, 0, 0);
+  }
+  var time = date.getTime();
   return function (value) {
     if (!value) {
       return false;
@@ -24,8 +20,12 @@ function buildApplyFilterFn(filterItem, compareFn, showTime, keepHours) {
 
     // Make a copy of the date to not reset the hours in the original object
     var dateCopy = new Date(value);
-    var timeToCompare = dateCopy.setHours(showTime ? value.getHours() : 0, showTime ? value.getMinutes() : 0, 0, 0);
-    return compareFn(timeToCompare, time);
+    if (showTime) {
+      dateCopy.setSeconds(0, 0);
+    } else {
+      dateCopy.setHours(0, 0, 0, 0);
+    }
+    return compareFn(dateCopy.getTime(), time);
   };
 }
 export var getGridDateOperators = function getGridDateOperators(showTime) {

package/legacy/colDef/gridSingleSelectColDef.js

@@ -3,7 +3,7 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 import { GRID_STRING_COL_DEF } from './gridStringColDef';
 import { renderEditSingleSelectCell } from '../components/cell/GridEditSingleSelectCell';
 import { getGridSingleSelectOperators } from './gridSingleSelectOperators';
-import { isSingleSelectColDef } from '../components/panel/filterPanel/filterPanelUtils';
+import { getValueOptions, isSingleSelectColDef } from '../components/panel/filterPanel/filterPanelUtils';
 import { isObject } from '../utils/utils';
 var isArrayOfObjects = function isArrayOfObjects(options) {
   return _typeof(options[0]) === 'object';
@@ -27,16 +27,10 @@ export var GRID_SINGLE_SELECT_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
     if (!isSingleSelectColDef(colDef)) {
       return '';
     }
-    var valueOptions;
-    if (typeof colDef.valueOptions === 'function') {
-      valueOptions = colDef.valueOptions({
-        id: id,
-        row: id ? api.getRow(id) : null,
-        field: field
-      });
-    } else {
-      valueOptions = colDef.valueOptions;
-    }
+    var valueOptions = getValueOptions(colDef, {
+      id: id,
+      row: id ? api.getRow(id) : null
+    });
     if (value == null) {
       return '';
     }
@@ -56,10 +50,7 @@ export var GRID_SINGLE_SELECT_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
   // @ts-ignore
   pastedValueParser: function pastedValueParser(value, params) {
     var colDef = params.colDef;
-    var colDefValueOptions = colDef.valueOptions;
-    var valueOptions = typeof colDefValueOptions === 'function' ? colDefValueOptions({
-      field: colDef.field
-    }) : colDefValueOptions || [];
+    var valueOptions = getValueOptions(colDef) || [];
     var getOptionValue = colDef.getOptionValue;
     var valueOption = valueOptions.find(function (option) {
       if (getOptionValue(option) === value) {

package/legacy/components/cell/GridEditSingleSelectCell.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["id", "value", "formattedValue", "api", "field", "row", "rowNode", "colDef", "cellMode", "isEditable", "tabIndex", "className", "hasFocus", "isValidating", "isProcessingProps", "error", "onValueChange", "initialOpen", "getOptionLabel", "getOptionValue"],
+var _excluded = ["id", "value", "formattedValue", "api", "field", "row", "rowNode", "colDef", "cellMode", "isEditable", "tabIndex", "className", "hasFocus", "isValidating", "isProcessingProps", "error", "onValueChange", "initialOpen"],
   _excluded2 = ["MenuProps"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as React from 'react';
@@ -12,7 +12,7 @@ import { GridCellEditStopReasons } from '../../models/params/gridEditCellParams'
 import { isEscapeKey } from '../../utils/keyboardUtils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridEditModes } from '../../models/gridEditRowModel';
-import { getValueFromValueOptions, isSingleSelectColDef } from '../panel/filterPanel/filterPanelUtils';
+import { getValueFromValueOptions, getValueOptions, isSingleSelectColDef } from '../panel/filterPanel/filterPanelUtils';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -41,8 +41,6 @@ function GridEditSingleSelectCell(props) {
     onValueChange = props.onValueChange,
     _props$initialOpen = props.initialOpen,
     initialOpen = _props$initialOpen === void 0 ? rootProps.editMode === GridEditModes.Cell : _props$initialOpen,
-    getOptionLabelProp = props.getOptionLabel,
-    getOptionValueProp = props.getOptionValue,
     other = _objectWithoutProperties(props, _excluded);
   var apiRef = useGridApiContext();
   var ref = React.useRef();
@@ -65,21 +63,15 @@ function GridEditSingleSelectCell(props) {
   if (!isSingleSelectColDef(colDef)) {
     return null;
   }
-  var valueOptions;
-  if (typeof (colDef == null ? void 0 : colDef.valueOptions) === 'function') {
-    valueOptions = colDef == null ? void 0 : colDef.valueOptions({
-      id: id,
-      row: row,
-      field: field
-    });
-  } else {
-    valueOptions = colDef == null ? void 0 : colDef.valueOptions;
-  }
+  var valueOptions = getValueOptions(colDef, {
+    id: id,
+    row: row
+  });
   if (!valueOptions) {
     return null;
   }
-  var getOptionValue = getOptionValueProp || colDef.getOptionValue;
-  var getOptionLabel = getOptionLabelProp || colDef.getOptionLabel;
+  var getOptionValue = colDef.getOptionValue;
+  var getOptionLabel = colDef.getOptionLabel;
   var handleChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
       var target, formattedTargetValue;
@@ -190,18 +182,6 @@ process.env.NODE_ENV !== "production" ? GridEditSingleSelectCell.propTypes = {
    * The cell value formatted with the column valueFormatter.
    */
   formattedValue: PropTypes.any,
-  /**
-   * 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,
   /**
    * If true, the cell is the active element.
    */

package/legacy/components/columnSelection/GridHeaderCheckbox.js

@@ -5,6 +5,7 @@ var _excluded = ["field", "colDef"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_composeClasses as composeClasses } from '@mui/utils';
+import { isMultipleRowSelectionEnabled } from '../../hooks/features/rowSelection/utils';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridTabIndexColumnHeaderSelector } from '../../hooks/features/focus/gridFocusStateSelector';
 import { gridRowSelectionStateSelector } from '../../hooks/features/rowSelection/gridRowSelectionSelector';
@@ -112,7 +113,8 @@ var GridHeaderCheckbox = /*#__PURE__*/React.forwardRef(function GridHeaderCheckb
       'aria-label': label
     },
     tabIndex: tabIndex,
-    onKeyDown: handleKeyDown
+    onKeyDown: handleKeyDown,
+    disabled: !isMultipleRowSelectionEnabled(rootProps)
   }, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseCheckbox, other));
 });
 process.env.NODE_ENV !== "production" ? GridHeaderCheckbox.propTypes = {