@mui/x-data-grid 6.0.0-alpha.13 → 6.0.0-alpha.14

package/legacy/colDef/gridSingleSelectOperators.js

@@ -1,20 +1,22 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import { GridFilterInputSingleSelect } from '../components/panel/filterPanel/GridFilterInputSingleSelect';
 import { GridFilterInputMultipleSingleSelect } from '../components/panel/filterPanel/GridFilterInputMultipleSingleSelect';
+import { isObject } from '../utils/utils';
 var parseObjectValue = function parseObjectValue(value) {
-  if (value == null || _typeof(value) !== 'object') {
+  if (value == null || !isObject(value)) {
     return value;
   }
   return value.value;
 };
 export var getGridSingleSelectQuickFilterFn = function getGridSingleSelectQuickFilterFn(value, column, apiRef) {
+  var _parseObjectValue;
   if (!value) {
     return null;
   }
   var valueOptions = column.valueOptions,
     valueFormatter = column.valueFormatter,
     field = column.field;
-  var potentialValues = [parseObjectValue(value).toString()];
+  var potentialValues = [(_parseObjectValue = parseObjectValue(value)) == null ? void 0 : _parseObjectValue.toString()];
   var iterableColumnValues = typeof valueOptions === 'function' ? valueOptions({
     field: field
   }) : valueOptions || [];
@@ -46,8 +48,9 @@ export var getGridSingleSelectQuickFilterFn = function getGridSingleSelectQuickF
     });
   }
   return function (_ref) {
+    var _parseObjectValue2;
     var columnValue = _ref.value;
-    return columnValue != null ? potentialValues.includes(parseObjectValue(columnValue).toString()) : false;
+    return columnValue != null ? potentialValues.includes((_parseObjectValue2 = parseObjectValue(columnValue)) == null ? void 0 : _parseObjectValue2.toString()) : false;
   };
 };
 export var getGridSingleSelectOperators = function getGridSingleSelectOperators() {

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

@@ -1,57 +1,22 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_useId as useId } from '@mui/utils';
-import MenuItem from '@mui/material/MenuItem';
 import { GridLoadIcon } from '../../icons';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
-import { getValueFromValueOptions } from './filterPanelUtils';
 import { jsx as _jsx } from "react/jsx-runtime";
-var warnedOnce = {};
-function warnDeprecatedTypeSupport(type) {
-  console.warn(["MUI: Using GridFilterInputValue with a \"".concat(type, "\" column is deprecated."), 'Use GridFilterInputSingleSelect instead.'].join('\n'));
-  warnedOnce[type] = true;
-}
-var renderSingleSelectOptions = function renderSingleSelectOptions(_ref, api, OptionComponent) {
-  var valueOptions = _ref.valueOptions,
-    valueFormatter = _ref.valueFormatter,
-    field = _ref.field;
-  var iterableColumnValues = typeof valueOptions === 'function' ? [''].concat(_toConsumableArray(valueOptions({
-    field: field
-  }))) : [''].concat(_toConsumableArray(valueOptions || []));
-  return iterableColumnValues.map(function (option) {
-    var isOptionTypeObject = _typeof(option) === 'object';
-    var key = isOptionTypeObject ? option.value : option;
-    var value = isOptionTypeObject ? option.value : option;
-    var formattedValue = valueFormatter && option !== '' ? valueFormatter({
-      value: option,
-      field: field,
-      api: api
-    }) : option;
-    var content = isOptionTypeObject ? option.label : formattedValue;
-    return /*#__PURE__*/_jsx(OptionComponent, {
-      value: value,
-      children: content
-    }, key);
-  });
-};
 export var SUBMIT_FILTER_STROKE_TIME = 500;
 function GridFilterInputValue(props) {
-  var _item$value, _rootProps$components, _baseSelectProps$nati, _rootProps$components2, _rootProps$components3;
+  var _item$value, _rootProps$components;
   var item = props.item,
     applyValue = props.applyValue,
     type = props.type,
     apiRef = props.apiRef,
     focusElementRef = props.focusElementRef,
     others = _objectWithoutProperties(props, _excluded);
-  if (process.env.NODE_ENV !== 'production' && ['date', 'datetime-local', 'singleSelect'].includes(type) && !warnedOnce[type]) {
-    warnDeprecatedTypeSupport(type);
-  }
   var filterTimeout = React.useRef();
   var _React$useState = React.useState((_item$value = item.value) != null ? _item$value : ''),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -63,36 +28,18 @@ function GridFilterInputValue(props) {
     setIsApplying = _React$useState4[1];
   var id = useId();
   var rootProps = useGridRootProps();
-  var baseSelectProps = ((_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.baseSelect) || {};
-  var isSelectNative = (_baseSelectProps$nati = baseSelectProps.native) != null ? _baseSelectProps$nati : true;
-  var singleSelectProps = type === 'singleSelect' ? {
-    select: true,
-    SelectProps: _extends({
-      native: isSelectNative
-    }, (_rootProps$components2 = rootProps.componentsProps) == null ? void 0 : _rootProps$components2.baseSelect),
-    children: renderSingleSelectOptions(apiRef.current.getColumn(item.field), apiRef.current, isSelectNative ? 'option' : MenuItem)
-  } : {};
   var onFilterChange = React.useCallback(function (event) {
     var value = event.target.value;
-    // NativeSelect casts the value to a string.
-    if (type === 'singleSelect') {
-      var column = apiRef.current.getColumn(item.field);
-      var columnValueOptions = typeof column.valueOptions === 'function' ? column.valueOptions({
-        field: column.field
-      }) : column.valueOptions;
-      value = getValueFromValueOptions(value, columnValueOptions);
-    }
     clearTimeout(filterTimeout.current);
     setFilterValueState(String(value));
     setIsApplying(true);
-    // TODO singleSelect doesn't debounce
     filterTimeout.current = setTimeout(function () {
       applyValue(_extends({}, item, {
         value: value
       }));
       setIsApplying(false);
     }, SUBMIT_FILTER_STROKE_TIME);
-  }, [apiRef, applyValue, item, type]);
+  }, [applyValue, item]);
   React.useEffect(function () {
     return function () {
       clearTimeout(filterTimeout.current);
@@ -119,7 +66,7 @@ function GridFilterInputValue(props) {
       shrink: true
     },
     inputRef: focusElementRef
-  }, singleSelectProps, others, (_rootProps$components3 = rootProps.componentsProps) == null ? void 0 : _rootProps$components3.baseTextField));
+  }, others, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.baseTextField));
 }
 process.env.NODE_ENV !== "production" ? GridFilterInputValue.propTypes = {
   // ----------------------------- Warning --------------------------------

package/legacy/hooks/features/clipboard/useGridClipboard.js

@@ -18,6 +18,19 @@ function writeToClipboardPolyfill(data) {
     document.body.removeChild(span);
   }
 }
+function hasNativeSelection(element) {
+  var _window$getSelection;
+  if (((_window$getSelection = window.getSelection()) == null ? void 0 : _window$getSelection.toString()) !== '') {
+    return true;
+  }
+  if (!element) {
+    return false;
+  }
+  if ((element.selectionEnd || 0) - (element.selectionStart || 0) > 0) {
+    return true;
+  }
+  return false;
+}
 
 /**
  * @requires useGridCsvExport (method)
@@ -42,7 +55,6 @@ export var useGridClipboard = function useGridClipboard(apiRef) {
     }
   }, [apiRef]);
   var handleKeydown = React.useCallback(function (event) {
-    var _window$getSelection;
     var isModifierKeyPressed = event.ctrlKey || event.metaKey || event.altKey;
     // event.key === 'c' is not enough as alt+c can lead to ©, ç, or other characters on macOS.
     // event.code === 'KeyC' is not enough as event.code assume a QWERTY keyboard layout which would
@@ -52,7 +64,7 @@ export var useGridClipboard = function useGridClipboard(apiRef) {
     }
 
     // Do nothing if there's a native selection
-    if (((_window$getSelection = window.getSelection()) == null ? void 0 : _window$getSelection.toString()) !== '') {
+    if (hasNativeSelection(event.target)) {
       return;
     }
     apiRef.current.unstable_copySelectedRowsToClipboard(event.altKey);

package/legacy/hooks/features/export/useGridPrintExport.js

@@ -98,6 +98,8 @@ export var useGridPrintExport = function useGridPrintExport(apiRef, props) {
     // Allow to overflow to not hide the border of the last row
     var gridMain = gridClone.querySelector(".".concat(gridClasses.main));
     gridMain.style.overflow = 'visible';
+    // See https://support.google.com/chrome/thread/191619088?hl=en&msgid=193009642
+    gridMain.style.contain = 'size';
     var columnHeaders = gridClone.querySelector(".".concat(gridClasses.columnHeaders));
     var columnHeadersInner = columnHeaders.querySelector(".".concat(gridClasses.columnHeadersInner));
     columnHeadersInner.style.width = '100%';

package/legacy/hooks/features/virtualization/useGridVirtualScroller.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["style"];
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { unstable_useForkRef as useForkRef } from '@mui/utils';
+import { unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils';
 import { useGridPrivateApiContext } from '../../utils/useGridPrivateApiContext';
 import { useGridRootProps } from '../../utils/useGridRootProps';
 import { useGridSelector } from '../../utils/useGridSelector';
@@ -157,7 +157,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       lastColumnIndex: lastColumnIndex
     };
   }, [disableVirtualization, getNearestIndexToRender, rowsMeta.positions.length, rootProps.autoHeight, rootProps.rowBuffer, currentPage.rows, columnPositions, visibleColumns.length, apiRef, containerDimensions]);
-  React.useEffect(function () {
+  useEnhancedEffect(function () {
     if (disableVirtualization) {
       renderZoneRef.current.style.transform = "translate3d(0px, 0px, 0px)";
     } else {
@@ -166,7 +166,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       rootRef.current.scrollTop = 0;
     }
   }, [disableVirtualization]);
-  React.useEffect(function () {
+  useEnhancedEffect(function () {
     setContainerDimensions({
       width: rootRef.current.clientWidth,
       height: rootRef.current.clientHeight
@@ -239,7 +239,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     });
     prevRenderContext.current = nextRenderContext;
   }, [apiRef, setRenderContext, prevRenderContext, currentPage.rows.length, rootProps.rowBuffer]);
-  React.useEffect(function () {
+  useEnhancedEffect(function () {
     if (containerDimensions.width == null) {
       return;
     }

package/legacy/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v6.0.0-alpha.13
+/** @license MUI X v6.0.0-alpha.14
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/legacy/models/gridEditRowModel.js

@@ -1,4 +1,3 @@
-// TODO v6: rename to GridEditingState
 var GridEditModes;
 (function (GridEditModes) {
   GridEditModes["Cell"] = "cell";

package/models/api/gridParamsApi.d.ts

@@ -24,7 +24,7 @@ export interface GridParamsApi {
      * @param {string} field The column field.
      * @returns {GridCellParams} The cell params.
      */
-    getCellParams: <V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNode = GridTreeNode>(id: GridRowId, field: string) => GridCellParams<V, R, F, N>;
+    getCellParams: <R extends GridValidRowModel = any, V = any, F = V, N extends GridTreeNode = GridTreeNode>(id: GridRowId, field: string) => GridCellParams<R, V, F, N>;
     /**
      * Gets the [[GridRowParams]] object that is passed as argument in events.
      * @param {GridRowId} id The id of the row.

package/models/colDef/gridColDef.d.ts

@@ -27,7 +27,7 @@ export type GridKeyValue = string | number | boolean;
 /**
  * Column Definition base interface.
  */
-export interface GridBaseColDef<R extends GridValidRowModel = any, V = any, F = V> {
+export interface GridBaseColDef<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> {
     /**
      * The column identifier. It's used to map with [[GridRowModel]] values.
      */
@@ -117,10 +117,10 @@ export interface GridBaseColDef<R extends GridValidRowModel = any, V = any, F =
     /**
      * Function that allows to get a specific data instead of field to render in the cell.
      * @template R, V
-     * @param {GridValueGetterParams<any, R>} params Object containing parameters for the getter.
+     * @param {GridValueGetterParams<R, any>} params Object containing parameters for the getter.
      * @returns {V} The cell value.
      */
-    valueGetter?: (params: GridValueGetterParams<any, R>) => V;
+    valueGetter?: (params: GridValueGetterParams<R, any>) => V;
     /**
      * Function that allows to customize how the entered value is stored in the row.
      * It only works with cell/row editing.
@@ -140,27 +140,27 @@ export interface GridBaseColDef<R extends GridValidRowModel = any, V = any, F =
      * Function that takes the user-entered value and converts it to a value used internally.
      * @template R, V, F
      * @param {F | undefined} value The user-entered value.
-     * @param {GridCellParams<V, R, F>} params The params when called before saving the value.
+     * @param {GridCellParams<R, V, F>} params The params when called before saving the value.
      * @returns {V} The converted value to use internally.
      */
-    valueParser?: (value: F | undefined, params?: GridCellParams<V, R, F>) => V;
+    valueParser?: (value: F | undefined, params?: GridCellParams<R, V, F>) => V;
     /**
      * Class name that will be added in cells for that column.
      */
-    cellClassName?: GridCellClassNamePropType;
+    cellClassName?: GridCellClassNamePropType<R, V>;
     /**
      * Allows to override the component rendered as cell for this column.
      * @template R, V, F
-     * @param {GridRenderCellParams<V, R, F>} params Object containing parameters for the renderer.
+     * @param {GridRenderCellParams<R, V, F>} params Object containing parameters for the renderer.
      * @returns {React.ReactNode} The element to be rendered.
      */
-    renderCell?: (params: GridRenderCellParams<V, R, F>) => React.ReactNode;
+    renderCell?: (params: GridRenderCellParams<R, V, F>) => React.ReactNode;
     /**
      * Allows to override the component rendered in edit cell mode for this column.
      * @param {GridRenderEditCellParams} params Object containing parameters for the renderer.
      * @returns {React.ReactNode} The element to be rendered.
      */
-    renderEditCell?: (params: GridRenderEditCellParams<V>) => React.ReactNode;
+    renderEditCell?: (params: GridRenderEditCellParams<R, V, F>) => React.ReactNode;
     /**
      * Callback fired when the edit props of the cell changes.
      * It allows to process the props that saved into the state.
@@ -174,11 +174,11 @@ export interface GridBaseColDef<R extends GridValidRowModel = any, V = any, F =
     headerClassName?: GridColumnHeaderClassNamePropType;
     /**
      * Allows to render a component in the column header cell.
-     * @template V, R, F
-     * @param {GridColumnHeaderParams<V, R, F>} params Object containing parameters for the renderer.
+     * @template R, V, F
+     * @param {GridColumnHeaderParams<R, V, F>} params Object containing parameters for the renderer.
      * @returns {React.ReactNode} The element to be rendered.
      */
-    renderHeader?: (params: GridColumnHeaderParams<V, R, F>) => React.ReactNode;
+    renderHeader?: (params: GridColumnHeaderParams<R, V, F>) => React.ReactNode;
     /**
      * Header cell element alignment.
      */
@@ -210,7 +210,7 @@ export interface GridBaseColDef<R extends GridValidRowModel = any, V = any, F =
      * @param {React.MutableRefObject<GridApiCommunity>} apiRef Deprecated: The API of the grid.
      * @returns {null | ((params: GridCellParams) => boolean)} The function to call to check if a row pass this filter value or not.
      */
-    getApplyQuickFilterFn?: (value: any, colDef: GridStateColDef, apiRef: React.MutableRefObject<GridApiCommunity>) => null | ((params: GridCellParams<V, R, F>) => boolean);
+    getApplyQuickFilterFn?: (value: any, colDef: GridStateColDef, apiRef: React.MutableRefObject<GridApiCommunity>) => null | ((params: GridCellParams<R, V, F>) => boolean);
     /**
      * If `true`, this column cannot be reordered.
      * @default false
@@ -225,7 +225,7 @@ export interface GridBaseColDef<R extends GridValidRowModel = any, V = any, F =
      * Number of columns a cell should span.
      * @default 1
      */
-    colSpan?: number | ((params: GridCellParams<V, R, F>) => number | undefined);
+    colSpan?: number | ((params: GridCellParams<R, V, F>) => number | undefined);
 }
 export interface GridActionsColDef<R extends GridValidRowModel = any, V = any, F = V> extends GridBaseColDef<R, V, F> {
     /**

package/models/events/gridEventLookup.d.ts

@@ -4,7 +4,6 @@ import { GridCellEditStartParams, GridCellEditStopParams } from '../params/gridE
 import { GridCellParams } from '../params/gridCellParams';
 import type { GridFilterModel } from '../gridFilterModel';
 import type { GridSortModel } from '../gridSortModel';
-import type { GridEditRowsModel } from '../gridEditRowModel';
 import type { GridRowSelectionModel } from '../gridRowSelectionModel';
 import type { ElementSize } from '../elementSize';
 import type { MuiBaseEvent } from '../muiEvent';
@@ -212,49 +211,49 @@ export interface GridCellEventLookup {
      * Fired when a cell is clicked.
      */
     cellClick: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.MouseEvent<HTMLElement>;
     };
     /**
      * Fired when a cell is double-clicked.
      */
     cellDoubleClick: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.MouseEvent<HTMLElement>;
     };
     /**
      * Fired when a `mousedown` event happens in a cell.
      */
     cellMouseDown: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.MouseEvent<HTMLElement>;
     };
     /**
      * Fired when a `mouseup` event happens in a cell.
      */
     cellMouseUp: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.MouseEvent<HTMLElement>;
     };
     /**
      * Fired when a `mouseover` event happens in a cell.
      */
     cellMouseOver: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.MouseEvent<HTMLElement>;
     };
     /**
      * Fired when a `keydown` event happens in a cell.
      */
     cellKeyDown: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.KeyboardEvent<HTMLElement>;
     };
     /**
      * Fired when a `keyup` event happens in a cell.
      */
     cellKeyUp: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.KeyboardEvent<HTMLElement>;
     };
     /**
@@ -262,7 +261,7 @@ export interface GridCellEventLookup {
      * @ignore - do not document.
      */
     cellDragEnter: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.DragEvent<HTMLElement>;
     };
     /**
@@ -271,7 +270,7 @@ export interface GridCellEventLookup {
      * @ignore - do not document.
      */
     cellDragOver: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: React.DragEvent<HTMLElement>;
     };
 }
@@ -300,12 +299,6 @@ export interface GridControlledStateEventLookup {
     sortModelChange: {
         params: GridSortModel;
     };
-    /**
-     * Fired when the row editing model changes.
-     */
-    editRowsModelChange: {
-        params: GridEditRowsModel;
-    };
     /**
      * Fired when the selection state of one or multiple rows changes.
      */
@@ -444,7 +437,7 @@ export interface GridEventLookup extends GridRowEventLookup, GridColumnHeaderEve
      * @ignore - do not document
      */
     cellModeChange: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
     };
     /**
      * Fired when the model that controls the cell modes changes.
@@ -497,13 +490,13 @@ export interface GridEventLookup extends GridRowEventLookup, GridColumnHeaderEve
      * Fired when a cell gains focus.
      */
     cellFocusIn: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
     };
     /**
      * Fired when a cell loses focus.
      */
     cellFocusOut: {
-        params: GridCellParams;
+        params: GridCellParams<any>;
         event: MuiBaseEvent;
     };
     /**

package/models/gridCellClass.d.ts

@@ -1,9 +1,10 @@
+import { GridValidRowModel } from './gridRows';
 import { GridCellParams } from './params/gridCellParams';
 /**
  * A function used to process cellClassName params.
  */
-export type GridCellClassFn = (params: GridCellParams) => string;
+export type GridCellClassFn<R extends GridValidRowModel = any, V = unknown> = (params: GridCellParams<R, V>) => string;
 /**
  * The union type representing the [[GridColDef]] cell class type.
  */
-export type GridCellClassNamePropType = string | GridCellClassFn;
+export type GridCellClassNamePropType<R extends GridValidRowModel = any, V = unknown> = string | GridCellClassFn<R, V>;

package/models/gridEditRowModel.d.ts

@@ -9,10 +9,9 @@ export interface GridEditCellProps<V = any> {
 export type GridEditRowProps = {
     [field: string]: GridEditCellProps;
 };
-export type GridEditRowsModel = {
+export type GridEditingState = {
     [rowId: string]: GridEditRowProps;
 };
-export type GridEditingState = GridEditRowsModel;
 export type GridEditMode = 'cell' | 'row';
 declare enum GridEditModes {
     Cell = "cell",

package/models/gridEditRowModel.js

@@ -1,4 +1,3 @@
-// TODO v6: rename to GridEditingState
 var GridEditModes;
 (function (GridEditModes) {
   GridEditModes["Cell"] = "cell";

package/models/gridFilterOperator.d.ts

@@ -26,7 +26,7 @@ export interface GridFilterOperator<R extends GridValidRowModel = any, V = any,
      * @param {GridColDef} column The column from which we want to filter the rows.
      * @returns {null | ((params: GridCellParams) => boolean)} The function to call to check if a row pass this filter item or not.
      */
-    getApplyFilterFn: (filterItem: GridFilterItem, column: GridColDef<R, V, F>) => null | ((params: GridCellParams<V, R, F>) => boolean);
+    getApplyFilterFn: (filterItem: GridFilterItem, column: GridColDef<R, V, F>) => null | ((params: GridCellParams<R, V, F>) => boolean);
     /**
      * The input component to render in the filter panel for this filter operator.
      */

package/models/gridStateCommunity.d.ts

@@ -1,6 +1,6 @@
 import type { GridColumnMenuState, GridColumnsInitialState, GridColumnsState, GridColumnsGroupingState, GridDensityState, GridFilterInitialState, GridFilterState, GridFocusState, GridPaginationInitialState, GridPaginationState, GridPreferencePanelInitialState, GridPreferencePanelState, GridRowsState, GridSortingInitialState, GridSortingState, GridTabIndexState } from '../hooks';
 import type { GridRowsMetaState } from '../hooks/features/rows/gridRowsMetaState';
-import type { GridEditRowsModel } from './gridEditRowModel';
+import type { GridEditingState } from './gridEditRowModel';
 import type { GridRowSelectionModel } from './gridRowSelectionModel';
 /**
  * The state of `DataGrid`.
@@ -8,7 +8,7 @@ import type { GridRowSelectionModel } from './gridRowSelectionModel';
 export interface GridStateCommunity {
     rows: GridRowsState;
     rowsMeta: GridRowsMetaState;
-    editRows: GridEditRowsModel;
+    editRows: GridEditingState;
     pagination: GridPaginationState;
     columns: GridColumnsState;
     columnGrouping: GridColumnsGroupingState;

package/models/params/gridCellParams.d.ts

@@ -7,7 +7,7 @@ import { GridApiCommunity } from '../api/gridApiCommunity';
 /**
  * Object passed as parameter in the column [[GridColDef]] cell renderer.
  */
-export interface GridCellParams<V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNode = GridTreeNode> {
+export interface GridCellParams<R extends GridValidRowModel = any, V = unknown, F = V, N extends GridTreeNode = GridTreeNode> {
     /**
      * The grid row id.
      */
@@ -60,7 +60,7 @@ export interface FocusElement {
 /**
  * GridCellParams containing api.
  */
-export interface GridRenderCellParams<V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends GridCellParams<V, R, F, N> {
+export interface GridRenderCellParams<R extends GridValidRowModel = any, V = any, F = V, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends GridCellParams<R, V, F, N> {
     /**
      * GridApi that let you manipulate the grid.
      */
@@ -75,7 +75,7 @@ export interface GridRenderCellParams<V = any, R extends GridValidRowModel = any
 /**
  * GridEditCellProps containing api.
  */
-export interface GridRenderEditCellParams<V = any, R extends GridValidRowModel = any, F = V, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends GridCellParams<V, R, F, N>, GridEditCellProps<V> {
+export interface GridRenderEditCellParams<R extends GridValidRowModel = any, V = any, F = V, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends GridCellParams<R, V, F, N>, GridEditCellProps<V> {
     /**
      * GridApi that let you manipulate the grid.
      */
@@ -84,7 +84,7 @@ export interface GridRenderEditCellParams<V = any, R extends GridValidRowModel =
 /**
  * Parameters passed to `colDef.valueGetter`.
  */
-export interface GridValueGetterParams<V = any, R extends GridValidRowModel = GridValidRowModel, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends Omit<GridCellParams<V, R, any, N>, 'formattedValue' | 'isEditable'> {
+export interface GridValueGetterParams<R extends GridValidRowModel = any, V = any, N extends GridTreeNodeWithRender = GridTreeNodeWithRender> extends Omit<GridCellParams<R, V, any, N>, 'formattedValue' | 'isEditable'> {
     /**
      * GridApi that let you manipulate the grid.
      */
@@ -92,7 +92,7 @@ export interface GridValueGetterParams<V = any, R extends GridValidRowModel = Gr
     /**
      * The default value for the cell that the `valueGetter` is overriding.
      */
-    value: GridCellParams<V, R, any>['value'];
+    value: GridCellParams<R, V, any>['value'];
 }
 /**
  * Object passed as parameter in the column [[GridColDef]] value setter callback.

package/models/params/gridColumnHeaderParams.d.ts

@@ -3,7 +3,7 @@ import { GridValidRowModel } from '../gridRows';
 /**
  * Object passed as parameter in the column [[GridColDef]] header renderer.
  */
-export interface GridColumnHeaderParams<V = any, R extends GridValidRowModel = GridValidRowModel, F = V> {
+export interface GridColumnHeaderParams<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> {
     /**
      * The column field of the column that triggered the event
      */

package/models/params/gridEditCellParams.d.ts

@@ -34,7 +34,7 @@ declare enum GridCellEditStartReasons {
 /**
  * Params passed to the `cellEditStart` event.
  */
-export interface GridCellEditStartParams<V = any, R extends GridValidRowModel = any, F = V> extends GridCellParams<V, R, F> {
+export interface GridCellEditStartParams<R extends GridValidRowModel = any, V = any, F = V> extends GridCellParams<R, V, F> {
     /**
      * The reason for this event to be triggered.
      */
@@ -54,7 +54,7 @@ declare enum GridCellEditStopReasons {
 /**
  * Params passed to the `cellEditStop event.
  */
-export interface GridCellEditStopParams<V = any, R extends GridValidRowModel = any, F = V> extends GridCellParams<V, R, F> {
+export interface GridCellEditStopParams<R extends GridValidRowModel = any, V = any, F = V> extends GridCellParams<R, V, F> {
     /**
      * The reason for this event to be triggered.
      */

package/models/props/DataGridProps.d.ts

@@ -3,7 +3,7 @@ import { SxProps } from '@mui/system';
 import { Theme } from '@mui/material/styles';
 import { CommonProps } from '@mui/material/OverridableComponent';
 import { GridDensity } from '../gridDensity';
-import { GridEditMode, GridEditRowsModel } from '../gridEditRowModel';
+import { GridEditMode } from '../gridEditRowModel';
 import { GridFeatureMode } from '../gridFeatureMode';
 import { Logger } from '../logger';
 import { GridSortDirection, GridSortModel } from '../gridSortModel';
@@ -582,16 +582,6 @@ export interface DataGridPropsWithoutDefaultValue<R extends GridValidRowModel =
      * @param {GridCallbackDetails} details Additional details for this callback.
      */
     onMenuClose?: GridEventListener<'menuClose'>;
-    /**
-     * Set the edit rows model of the grid.
-     */
-    editRowsModel?: GridEditRowsModel;
-    /**
-     * Callback fired when the `editRowsModel` changes.
-     * @param {GridEditRowsModel} editRowsModel With all properties from [[GridEditRowsModel]].
-     * @param {GridCallbackDetails} details Additional details for this callback.
-     */
-    onEditRowsModelChange?: (editRowsModel: GridEditRowsModel, details: GridCallbackDetails) => void;
     /**
      * Controls the modes of the cells.
      */

package/modern/DataGrid/DataGrid.js

@@ -155,10 +155,6 @@ DataGridRaw.propTypes = {
    * @default "cell"
    */
   editMode: PropTypes.oneOf(['cell', 'row']),
-  /**
-   * Set the edit rows model of the grid.
-   */
-  editRowsModel: PropTypes.object,
   /**
    * An error that will turn the grid into its error state and display the error component.
    */
@@ -407,12 +403,6 @@ DataGridRaw.propTypes = {
    * @param {GridCallbackDetails} details Additional details for this callback.
    */
   onColumnVisibilityModelChange: PropTypes.func,
-  /**
-   * Callback fired when the `editRowsModel` changes.
-   * @param {GridEditRowsModel} editRowsModel With all properties from [[GridEditRowsModel]].
-   * @param {GridCallbackDetails} details Additional details for this callback.
-   */
-  onEditRowsModelChange: PropTypes.func,
   /**
    * Callback fired when an exception is thrown in the grid.
    * @param {any} args The arguments passed to the `showError` call.