@mui/x-data-grid 6.0.0-alpha.2 → 6.0.0-alpha.3

package/legacy/components/cell/GridEditInputCell.js

@@ -13,7 +13,6 @@ import InputBase from '@mui/material/InputBase';
 import { getDataGridUtilityClass } from '../../constants/gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridLoadIcon } from '../icons/index';
-import { SUBMIT_FILTER_STROKE_TIME } from '../panel/filterPanel/GridFilterInputValue';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { jsx as _jsx } from "react/jsx-runtime";
 
@@ -42,8 +41,6 @@ var GridEditInputCellRoot = styled(InputBase, {
   });
 });
 var GridEditInputCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _rootProps$experiment, _rootProps$experiment3;
-
   var rootProps = useGridRootProps();
 
   var id = props.id,
@@ -61,7 +58,7 @@ var GridEditInputCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
       getValue = props.getValue,
       isValidating = props.isValidating,
       _props$debounceMs = props.debounceMs,
-      debounceMs = _props$debounceMs === void 0 ? (_rootProps$experiment = rootProps.experimentalFeatures) != null && _rootProps$experiment.newEditingApi ? 200 : SUBMIT_FILTER_STROKE_TIME : _props$debounceMs,
+      debounceMs = _props$debounceMs === void 0 ? 200 : _props$debounceMs,
       isProcessingProps = props.isProcessingProps,
       onValueChange = props.onValueChange,
       other = _objectWithoutProperties(props, _excluded);
@@ -80,8 +77,6 @@ var GridEditInputCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var classes = useUtilityClasses(ownerState);
   var handleChange = React.useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
-      var _rootProps$experiment2;
-
       var newValue, column, parsedValue;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -101,7 +96,7 @@ var GridEditInputCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
               column = apiRef.current.getColumn(field);
               parsedValue = newValue;
 
-              if (column.valueParser && (_rootProps$experiment2 = rootProps.experimentalFeatures) != null && _rootProps$experiment2.newEditingApi) {
+              if (column.valueParser) {
                 parsedValue = column.valueParser(newValue, apiRef.current.getCellParams(id, field));
               }
 
@@ -125,7 +120,7 @@ var GridEditInputCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [apiRef, debounceMs, field, id, onValueChange, (_rootProps$experiment3 = rootProps.experimentalFeatures) == null ? void 0 : _rootProps$experiment3.newEditingApi]);
+  }(), [apiRef, debounceMs, field, id, onValueChange]);
   var meta = apiRef.current.unstable_getEditCellMeta ? apiRef.current.unstable_getEditCellMeta(id, field) : {};
   React.useEffect(function () {
     if (meta.changeReason !== 'debouncedSetEditCellValue') {

package/legacy/components/cell/GridEditSingleSelectCell.js

@@ -101,9 +101,7 @@ function GridEditSingleSelectCell(props) {
 
   var handleChange = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
-      var _rootProps$experiment;
-
-      var target, formattedTargetValue, isValid, canCommit, params;
+      var target, formattedTargetValue;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -130,44 +128,6 @@ function GridEditSingleSelectCell(props) {
               }, event);
 
             case 8:
-              isValid = _context.sent;
-
-              if (!((_rootProps$experiment = rootProps.experimentalFeatures) != null && _rootProps$experiment.newEditingApi)) {
-                _context.next = 11;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 11:
-              if (!(rootProps.editMode === GridEditModes.Row || isValid === false)) {
-                _context.next = 13;
-                break;
-              }
-
-              return _context.abrupt("return");
-
-            case 13:
-              _context.next = 15;
-              return Promise.resolve(apiRef.current.commitCellChange({
-                id: id,
-                field: field
-              }, event));
-
-            case 15:
-              canCommit = _context.sent;
-
-              if (canCommit) {
-                apiRef.current.setCellMode(id, field, 'view');
-
-                if (event.key) {
-                  // TODO v6: remove once we stop ignoring events fired from portals
-                  params = apiRef.current.getCellParams(id, field);
-                  apiRef.current.publishEvent('cellNavigationKeyDown', params, event);
-                }
-              }
-
-            case 17:
             case "end":
               return _context.stop();
           }
@@ -187,17 +147,11 @@ function GridEditSingleSelectCell(props) {
     }
 
     if (reason === 'backdropClick' || isEscapeKey(event.key)) {
-      var _rootProps$experiment2;
-
-      if ((_rootProps$experiment2 = rootProps.experimentalFeatures) != null && _rootProps$experiment2.newEditingApi) {
-        apiRef.current.stopCellEditMode({
-          id: id,
-          field: field,
-          ignoreModifications: true
-        });
-      } else {
-        apiRef.current.setCellMode(id, field, 'view');
-      }
+      apiRef.current.stopCellEditMode({
+        id: id,
+        field: field,
+        ignoreModifications: true
+      });
     }
   };
 

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

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["item", "hasMultipleFilters", "deleteFilter", "applyFilterChanges", "multiFilterOperator", "showMultiFilterOperators", "disableMultiFilterOperator", "applyMultiFilterOperatorChanges", "focusElementRef", "linkOperators", "columnsSort", "deleteIconProps", "linkOperatorInputProps", "operatorInputProps", "columnInputProps", "valueInputProps", "children"],
+var _excluded = ["item", "hasMultipleFilters", "deleteFilter", "applyFilterChanges", "multiFilterOperator", "showMultiFilterOperators", "disableMultiFilterOperator", "applyMultiFilterOperatorChanges", "focusElementRef", "linkOperators", "columnsSort", "filterColumns", "deleteIconProps", "linkOperatorInputProps", "operatorInputProps", "columnInputProps", "valueInputProps", "children"],
     _excluded2 = ["InputComponentProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
@@ -13,6 +13,7 @@ import { capitalize, unstable_useId as useId } from '@mui/material/utils';
 import { styled } from '@mui/material/styles';
 import clsx from 'clsx';
 import { gridFilterableColumnDefinitionsSelector } from '../../../hooks/features/columns/gridColumnsSelector';
+import { gridFilterModelSelector } from '../../../hooks/features/filter/gridFilterSelector';
 import { useGridSelector } from '../../../hooks/utils/useGridSelector';
 import { GridLinkOperator } from '../../../models/gridFilterItem';
 import { useGridApiContext } from '../../../hooks/utils/useGridApiContext';
@@ -134,6 +135,7 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
       _props$linkOperators = props.linkOperators,
       linkOperators = _props$linkOperators === void 0 ? [GridLinkOperator.And, GridLinkOperator.Or] : _props$linkOperators,
       columnsSort = props.columnsSort,
+      filterColumns = props.filterColumns,
       _props$deleteIconProp = props.deleteIconProps,
       deleteIconProps = _props$deleteIconProp === void 0 ? {} : _props$deleteIconProp,
       _props$linkOperatorIn = props.linkOperatorInputProps,
@@ -149,6 +151,7 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
 
   var apiRef = useGridApiContext();
   var filterableColumns = useGridSelector(apiRef, gridFilterableColumnDefinitionsSelector);
+  var filterModel = useGridSelector(apiRef, gridFilterModelSelector);
   var columnSelectId = useId();
   var columnSelectLabelId = useId();
   var operatorSelectId = useId();
@@ -169,22 +172,36 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
   var InputComponentProps = valueInputProps.InputComponentProps,
       valueInputPropsOther = _objectWithoutProperties(valueInputProps, _excluded2);
 
-  var sortedFilterableColumns = React.useMemo(function () {
+  var filteredColumns = React.useMemo(function () {
+    if (filterColumns === undefined || typeof filterColumns !== 'function') {
+      return filterableColumns;
+    }
+
+    var filteredFields = filterColumns({
+      field: item.columnField,
+      columns: filterableColumns,
+      currentFilters: (filterModel == null ? void 0 : filterModel.items) || []
+    });
+    return filterableColumns.filter(function (column) {
+      return filteredFields.includes(column.field);
+    });
+  }, [filterColumns, filterModel == null ? void 0 : filterModel.items, filterableColumns, item.columnField]);
+  var sortedFilteredColumns = React.useMemo(function () {
     switch (columnsSort) {
       case 'asc':
-        return filterableColumns.sort(function (a, b) {
+        return filteredColumns.sort(function (a, b) {
           return collator.compare(getColumnLabel(a), getColumnLabel(b));
         });
 
       case 'desc':
-        return filterableColumns.sort(function (a, b) {
+        return filteredColumns.sort(function (a, b) {
           return -collator.compare(getColumnLabel(a), getColumnLabel(b));
         });
 
       default:
-        return filterableColumns;
+        return filteredColumns;
     }
-  }, [filterableColumns, columnsSort]);
+  }, [filteredColumns, columnsSort]);
   var currentColumn = item.columnField ? apiRef.current.getColumn(item.columnField) : null;
   var currentOperator = React.useMemo(function () {
     var _currentColumn$filter;
@@ -323,7 +340,7 @@ var GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(props
         onChange: changeColumn,
         native: isBaseSelectNative
       }, (_rootProps$components4 = rootProps.componentsProps) == null ? void 0 : _rootProps$components4.baseSelect, {
-        children: sortedFilterableColumns.map(function (col) {
+        children: sortedFilteredColumns.map(function (col) {
           return /*#__PURE__*/_jsx(OptionComponent, {
             value: col.field,
             children: getColumnLabel(col)
@@ -421,6 +438,13 @@ process.env.NODE_ENV !== "production" ? GridFilterForm.propTypes = {
    */
   disableMultiFilterOperator: PropTypes.bool,
 
+  /**
+   * Allows to filter the columns displayed in the filter form.
+   * @param {FilterColumnsArgs} args The columns of the grid and name of field.
+   * @returns {GridColDef['field'][]} The filtered fields array.
+   */
+  filterColumns: PropTypes.func,
+
   /**
    * A ref allowing to set imperative focus.
    * It can be passed to the el

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["linkOperators", "columnsSort", "filterFormProps", "children"];
+var _excluded = ["linkOperators", "columnsSort", "filterFormProps", "getColumnForNewFilter", "children"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { GridLinkOperator } from '../../../models/gridFilterItem';
@@ -17,6 +17,15 @@ import { gridFilterModelSelector } from '../../../hooks/features/filter/gridFilt
 import { gridFilterableColumnDefinitionsSelector } from '../../../hooks/features/columns/gridColumnsSelector';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+
+var getGridFilter = function getGridFilter(col) {
+  return {
+    columnField: col.field,
+    operatorValue: col.filterOperators[0].value,
+    id: Math.round(Math.random() * 1e5)
+  };
+};
+
 var GridFilterPanel = /*#__PURE__*/React.forwardRef(function GridFilterPanel(props, ref) {
   var _rootProps$components;
 
@@ -30,6 +39,7 @@ var GridFilterPanel = /*#__PURE__*/React.forwardRef(function GridFilterPanel(pro
       linkOperators = _props$linkOperators === void 0 ? [GridLinkOperator.And, GridLinkOperator.Or] : _props$linkOperators,
       columnsSort = props.columnsSort,
       filterFormProps = props.filterFormProps,
+      getColumnForNewFilter = props.getColumnForNewFilter,
       children = props.children,
       other = _objectWithoutProperties(props, _excluded);
 
@@ -39,41 +49,73 @@ var GridFilterPanel = /*#__PURE__*/React.forwardRef(function GridFilterPanel(pro
   var applyFilterLinkOperator = React.useCallback(function (operator) {
     apiRef.current.setFilterLinkOperator(operator);
   }, [apiRef]);
-  var getDefaultItem = React.useCallback(function () {
-    var firstColumnWithOperator = filterableColumns.find(function (colDef) {
-      var _colDef$filterOperato;
+  var getDefaultFilter = React.useCallback(function () {
+    var nextColumnWithOperator;
+
+    if (getColumnForNewFilter && typeof getColumnForNewFilter === 'function') {
+      // To allow override the column for default (first) filter
+      var nextColumnFieldName = getColumnForNewFilter({
+        currentFilters: (filterModel == null ? void 0 : filterModel.items) || [],
+        columns: filterableColumns
+      });
+      nextColumnWithOperator = filterableColumns.find(function (_ref) {
+        var field = _ref.field;
+        return field === nextColumnFieldName;
+      });
+    } else {
+      nextColumnWithOperator = filterableColumns.find(function (colDef) {
+        var _colDef$filterOperato;
+
+        return (_colDef$filterOperato = colDef.filterOperators) == null ? void 0 : _colDef$filterOperato.length;
+      });
+    }
+
+    if (!nextColumnWithOperator) {
+      return null;
+    }
 
-      return (_colDef$filterOperato = colDef.filterOperators) == null ? void 0 : _colDef$filterOperato.length;
+    return getGridFilter(nextColumnWithOperator);
+  }, [filterModel == null ? void 0 : filterModel.items, filterableColumns, getColumnForNewFilter]);
+  var getNewFilter = React.useCallback(function () {
+    if (getColumnForNewFilter === undefined || typeof getColumnForNewFilter !== 'function') {
+      return getDefaultFilter();
+    }
+
+    var currentFilters = filterModel.items.length ? filterModel.items : [getDefaultFilter()].filter(Boolean); // If no items are there in filterModel, we have to pass defaultFilter
+
+    var nextColumnFieldName = getColumnForNewFilter({
+      currentFilters: currentFilters,
+      columns: filterableColumns
+    });
+    var nextColumnWithOperator = filterableColumns.find(function (_ref2) {
+      var field = _ref2.field;
+      return field === nextColumnFieldName;
     });
 
-    if (!firstColumnWithOperator) {
+    if (!nextColumnWithOperator) {
       return null;
     }
 
-    return {
-      columnField: firstColumnWithOperator.field,
-      operatorValue: firstColumnWithOperator.filterOperators[0].value,
-      id: Math.round(Math.random() * 1e5)
-    };
-  }, [filterableColumns]);
+    return getGridFilter(nextColumnWithOperator);
+  }, [filterModel.items, filterableColumns, getColumnForNewFilter, getDefaultFilter]);
   var items = React.useMemo(function () {
     if (filterModel.items.length) {
       return filterModel.items;
     }
 
-    var defaultItem = getDefaultItem();
-    return defaultItem ? [defaultItem] : [];
-  }, [filterModel.items, getDefaultItem]);
+    var defaultFilter = getDefaultFilter();
+    return defaultFilter ? [defaultFilter] : [];
+  }, [filterModel.items, getDefaultFilter]);
   var hasMultipleFilters = items.length > 1;
 
   var addNewFilter = function addNewFilter() {
-    var defaultItem = getDefaultItem();
+    var newFilter = getNewFilter();
 
-    if (!defaultItem) {
+    if (!newFilter) {
       return;
     }
 
-    apiRef.current.upsertFilterItems([].concat(_toConsumableArray(items), [defaultItem]));
+    apiRef.current.upsertFilterItems([].concat(_toConsumableArray(items), [newFilter]));
   };
 
   var deleteFilter = React.useCallback(function (item) {
@@ -152,6 +194,13 @@ process.env.NODE_ENV !== "production" ? GridFilterPanel.propTypes = {
     valueInputProps: PropTypes.any
   }),
 
+  /**
+   * Function that returns the next filter item to be picked as default filter.
+   * @param {GetColumnForNewFilterArgs} args Currently configured filters and columns.
+   * @returns {GridColDef['field']} The field to be used for the next filter.
+   */
+  getColumnForNewFilter: PropTypes.func,
+
   /**
    * Sets the available logic operators.
    * @default [GridLinkOperator.And, GridLinkOperator.Or]

package/legacy/hooks/features/editing/index.js

@@ -0,0 +1 @@
+export * from './gridEditingSelectors';

package/legacy/hooks/features/{editRows/useGridCellEditing.new.js → editing/useGridCellEditing.js}

@@ -12,7 +12,7 @@ import { unstable_useEventCallback as useEventCallback } from '@mui/utils';
 import { useGridApiEventHandler, useGridApiOptionHandler, GridSignature } from '../../utils/useGridApiEventHandler';
 import { GridEditModes, GridCellModes } from '../../../models/gridEditRowModel';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
-import { gridEditRowsStateSelector } from './gridEditRowsSelector';
+import { gridEditRowsStateSelector } from './gridEditingSelectors';
 import { isPrintableKey } from '../../../utils/keyboardUtils';
 import { buildWarning } from '../../../utils/warning';
 import { gridRowsDataRowIdToIdLookupSelector } from '../rows/gridRowsSelector';
@@ -129,7 +129,8 @@ export var useGridCellEditing = function useGridCellEditing(apiRef, props) {
 
       if (_reason) {
         var _newParams = _extends({}, params, {
-          reason: _reason
+          reason: _reason,
+          key: event.key
         });
 
         apiRef.current.publishEvent('cellEditStart', _newParams, event);
@@ -139,13 +140,20 @@ export var useGridCellEditing = function useGridCellEditing(apiRef, props) {
   var handleCellEditStart = React.useCallback(function (params) {
     var id = params.id,
         field = params.field,
-        reason = params.reason;
+        reason = params.reason,
+        key = params.key;
     var startCellEditModeParams = {
       id: id,
       field: field
     };
 
-    if (reason === GridCellEditStartReasons.deleteKeyDown || reason === GridCellEditStartReasons.printableKeyDown) {
+    if (reason === GridCellEditStartReasons.printableKeyDown) {
+      if (React.version.startsWith('18')) {
+        startCellEditModeParams.initialValue = key; // In React 17, cleaning the input is enough
+      } else {
+        startCellEditModeParams.deleteValue = true;
+      }
+    } else if (reason === GridCellEditStartReasons.deleteKeyDown) {
       startCellEditModeParams.deleteValue = true;
     }
 
@@ -268,9 +276,16 @@ export var useGridCellEditing = function useGridCellEditing(apiRef, props) {
   var updateStateToStartCellEditMode = useEventCallback(function (params) {
     var id = params.id,
         field = params.field,
-        deleteValue = params.deleteValue;
+        deleteValue = params.deleteValue,
+        initialValue = params.initialValue;
+    var newValue = apiRef.current.getCellValue(id, field);
+
+    if (deleteValue || initialValue) {
+      newValue = deleteValue ? '' : initialValue;
+    }
+
     var newProps = {
-      value: deleteValue ? '' : apiRef.current.getCellValue(id, field),
+      value: newValue,
       error: false,
       isProcessingProps: false
     };

package/legacy/hooks/features/{editRows/useGridEditing.new.js → editing/useGridEditing.js}

@@ -4,10 +4,10 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as React from 'react';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
-import { useGridCellEditing } from './useGridCellEditing.new';
+import { useGridCellEditing } from './useGridCellEditing';
 import { GridCellModes, GridEditModes } from '../../../models/gridEditRowModel';
-import { useGridRowEditing } from './useGridRowEditing.new';
-import { gridEditRowsStateSelector } from './gridEditRowsSelector';
+import { useGridRowEditing } from './useGridRowEditing';
+import { gridEditRowsStateSelector } from './gridEditingSelectors';
 import { isAutoGeneratedRow } from '../rows/gridRowsUtils';
 export var editingStateInitializer = function editingStateInitializer(state) {
   return _extends({}, state, {

package/legacy/hooks/features/{editRows/useGridRowEditing.new.js → editing/useGridRowEditing.js}

@@ -10,7 +10,7 @@ import { unstable_useEventCallback as useEventCallback } from '@mui/utils';
 import { useGridApiEventHandler, useGridApiOptionHandler, GridSignature } from '../../utils/useGridApiEventHandler';
 import { GridEditModes, GridRowModes } from '../../../models/gridEditRowModel';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
-import { gridEditRowsStateSelector } from './gridEditRowsSelector';
+import { gridEditRowsStateSelector } from './gridEditingSelectors';
 import { isPrintableKey } from '../../../utils/keyboardUtils';
 import { gridColumnFieldsSelector } from '../columns/gridColumnsSelector';
 import { buildWarning } from '../../../utils/warning';
@@ -189,6 +189,7 @@ export var useGridRowEditing = function useGridRowEditing(apiRef, props) {
 
         var _newParams = _extends({}, _rowParams, {
           field: params.field,
+          key: event.key,
           reason: _reason
         });
 
@@ -199,13 +200,20 @@ export var useGridRowEditing = function useGridRowEditing(apiRef, props) {
   var handleRowEditStart = React.useCallback(function (params) {
     var id = params.id,
         field = params.field,
-        reason = params.reason;
+        reason = params.reason,
+        key = params.key;
     var startRowEditModeParams = {
       id: id,
       fieldToFocus: field
     };
 
-    if (reason === GridRowEditStartReasons.deleteKeyDown || reason === GridRowEditStartReasons.printableKeyDown) {
+    if (reason === GridRowEditStartReasons.printableKeyDown) {
+      if (React.version.startsWith('18')) {
+        startRowEditModeParams.initialValue = key; // In React 17, cleaning the input is enough
+      } else {
+        startRowEditModeParams.deleteValue = !!field;
+      }
+    } else if (reason === GridRowEditStartReasons.deleteKeyDown) {
       startRowEditModeParams.deleteValue = !!field;
     }
 
@@ -338,7 +346,8 @@ export var useGridRowEditing = function useGridRowEditing(apiRef, props) {
   var updateStateToStartRowEditMode = useEventCallback(function (params) {
     var id = params.id,
         fieldToFocus = params.fieldToFocus,
-        deleteValue = params.deleteValue;
+        deleteValue = params.deleteValue,
+        initialValue = params.initialValue;
     var columnFields = gridColumnFieldsSelector(apiRef);
     var newProps = columnFields.reduce(function (acc, field) {
       var cellParams = apiRef.current.getCellParams(id, field);
@@ -347,9 +356,14 @@ export var useGridRowEditing = function useGridRowEditing(apiRef, props) {
         return acc;
       }
 
-      var shouldDeleteValue = deleteValue && fieldToFocus === field;
+      var newValue = apiRef.current.getCellValue(id, field);
+
+      if (fieldToFocus === field && (deleteValue || initialValue)) {
+        newValue = deleteValue ? '' : initialValue;
+      }
+
       acc[field] = {
-        value: shouldDeleteValue ? '' : apiRef.current.getCellValue(id, field),
+        value: newValue,
         error: false,
         isProcessingProps: false
       };

package/legacy/hooks/features/index.js

@@ -3,7 +3,7 @@ export * from './columnMenu';
 export * from './columns';
 export * from './columnGrouping';
 export * from './density';
-export * from './editRows';
+export * from './editing';
 export * from './filter';
 export * from './focus';
 export * from './pagination';

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

@@ -10,7 +10,7 @@ import { useGridRootProps } from '../../utils/useGridRootProps';
 import { useGridSelector } from '../../utils/useGridSelector';
 import { gridVisibleColumnDefinitionsSelector, gridColumnsTotalWidthSelector, gridColumnPositionsSelector } from '../columns/gridColumnsSelector';
 import { gridFocusCellSelector, gridTabIndexCellSelector } from '../focus/gridFocusStateSelector';
-import { gridEditRowsStateSelector } from '../editRows/gridEditRowsSelector';
+import { gridEditRowsStateSelector } from '../editing/gridEditingSelectors';
 import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { clamp } from '../../../utils/utils';

package/legacy/index.js

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

package/legacy/internals/index.js

@@ -22,8 +22,7 @@ export { useGridFocus, focusStateInitializer } from '../hooks/features/focus/use
 export { useGridKeyboardNavigation } from '../hooks/features/keyboardNavigation/useGridKeyboardNavigation';
 export { useGridPagination, paginationStateInitializer } from '../hooks/features/pagination/useGridPagination';
 export { useGridPreferencesPanel, preferencePanelStateInitializer } from '../hooks/features/preferencesPanel/useGridPreferencesPanel';
-export { useGridEditing as useGridEditing_new, editingStateInitializer as editingStateInitializer_new } from '../hooks/features/editRows/useGridEditing.new';
-export { useGridEditing as useGridEditing_old, editingStateInitializer as editingStateInitializer_old } from '../hooks/features/editRows/useGridEditing.old';
+export { useGridEditing, editingStateInitializer } from '../hooks/features/editing/useGridEditing';
 export { useGridRows, rowsStateInitializer } from '../hooks/features/rows/useGridRows';
 export { useGridRowsPreProcessors } from '../hooks/features/rows/useGridRowsPreProcessors';
 export { getTreeNodeDescendants, buildRootGroup } from '../hooks/features/rows/gridRowsUtils';

package/legacy/models/params/gridEditCellParams.js

@@ -1,10 +1,6 @@
-// TODO v6 - remove
-
 /**
  * Params passed to `apiRef.current.setEditCellValue`.
  */
-// TODO v6 - remove
-// TODO v6 - remove
 var GridCellEditStartReasons;
 /**
  * Params passed to the `cellEditStart` event.

package/models/api/gridApiCommon.d.ts

@@ -27,9 +27,6 @@ import type { GridDimensionsApi } from '../../hooks/features/dimensions';
 import type { GridPaginationApi } from '../../hooks/features/pagination';
 import type { GridStatePersistenceApi } from '../../hooks/features/statePersistence';
 import { GridColumnGroupingApi } from './gridColumnGroupingApi';
-declare type GridStateApiUntyped = {
-    [key in keyof (GridStateApi<any> & GridStatePersistenceApi<any>)]: any;
-};
-export interface GridApiCommon extends GridCoreApi, GridLoggerApi, GridPipeProcessingApi, GridStrategyProcessingApi, GridDensityApi, GridDimensionsApi, GridRowApi, GridRowsMetaApi, GridEditingApi, GridParamsApi, GridColumnApi, GridSelectionApi, GridSortApi, GridPaginationApi, GridCsvExportApi, GridFocusApi, GridFilterApi, GridColumnMenuApi, GridPreferencesPanelApi, GridPrintExportApi, GridDisableVirtualizationApi, GridVirtualScrollerApi, GridLocaleTextApi, GridClipboardApi, GridScrollApi, GridColumnSpanningApi, GridStateApiUntyped, GridColumnGroupingApi {
+import type { GridInitialStateCommunity, GridStateCommunity } from '../gridStateCommunity';
+export interface GridApiCommon<GridState extends GridStateCommunity = any, GridInitialState extends GridInitialStateCommunity = any> extends GridCoreApi, GridLoggerApi, GridPipeProcessingApi, GridStrategyProcessingApi, GridDensityApi, GridDimensionsApi, GridRowApi, GridRowsMetaApi, GridEditingApi, GridParamsApi, GridColumnApi, GridSelectionApi, GridSortApi, GridPaginationApi, GridCsvExportApi, GridFocusApi, GridFilterApi, GridColumnMenuApi, GridPreferencesPanelApi, GridPrintExportApi, GridDisableVirtualizationApi, GridVirtualScrollerApi, GridLocaleTextApi, GridClipboardApi, GridScrollApi, GridColumnSpanningApi, GridStateApi<GridState>, GridStatePersistenceApi<GridInitialState>, GridColumnGroupingApi {
 }
-export {};

package/models/api/gridApiCommunity.d.ts

@@ -1,13 +1,7 @@
-import type { GridStateApi } from './gridStateApi';
 import type { GridInitialStateCommunity, GridStateCommunity } from '../gridStateCommunity';
 import type { GridApiCommon } from './gridApiCommon';
-import type { GridStatePersistenceApi } from '../../hooks/features/statePersistence';
-declare type GridStateApiUntyped = {
-    [key in keyof (GridStateApi<any> & GridStatePersistenceApi<any>)]: any;
-};
 /**
  * The api of `DataGrid`.
  */
-export interface GridApiCommunity extends Omit<GridApiCommon, keyof GridStateApiUntyped>, GridStateApi<GridStateCommunity>, GridStatePersistenceApi<GridInitialStateCommunity> {
+export interface GridApiCommunity extends GridApiCommon<GridStateCommunity, GridInitialStateCommunity> {
 }
-export {};