@mui/x-data-grid-generator 5.15.1 → 5.16.0

package/CHANGELOG.md

@@ -3,6 +3,148 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 5.16.0
+
+_Aug 25, 2022_
+
+We'd like to offer a big thanks to the 11 contributors who made this release possible. Here are some highlights ✨:
+
+- 🎁 Introduce column grouping for data grid (#5133) @alexfauquette
+
+  You can now group columns using the `columnGroupingModel` prop. This lets you to display more structured data.
+
+  <img src="https://user-images.githubusercontent.com/45398769/186178366-4fba66b2-bf90-4c7a-9d83-940a7fc78704.png" width="800" />
+
+  To enable this feature, add `experimentalFeatures={{ columnGrouping: true }}`.
+  The grouping header can be fully customized.
+  See the [documentation](https://mui.com/x/react-data-grid/column-groups/) to explore everything it has to offer.
+
+- 🐞 Bugfixes
+- 🌏 New locales for pickers thanks to @tesseractjh and @drastus
+
+### `@mui/x-data-grid@v5.16.0` / `@mui/x-data-grid-pro@v5.16.0` / `@mui/x-data-grid-premium@v5.16.0`
+
+#### Changes
+
+- [DataGrid] Implement column grouping (#5133) @alexfauquette
+- [DataGrid] Handle `disableVirtualization` prop change (#5889) @cherniavskii
+- [DataGrid] Improve `GridRowModel` typing (#5734) @cherniavskii
+- [DataGrid] Update deprecation note for `GridColDef` `hide` property (#5886) @cherniavskii
+
+### `@mui/x-date-pickers@v5.0.0-beta.7` / `@mui/x-date-pickers-pro@v5.0.0-beta.7`
+
+#### Changes
+
+- [DatePicker] Fix to pass down `className` prop provided on DatePicker to `renderInput` (#5471) @CruseCtrl
+- [DatePicker] Improve `a11y` support (#5809) @LukasTy
+- [pickers] Add `PaperContent` component slot (#5801) @LukasTy
+- [pickers] Add a breaking change section in the migration guide (#5805) @alexfauquette
+- [pickers] Add new translations to `localeText` (#5143) @alexfauquette
+- [pickers] Document components slots (#4657) @flaviendelangle
+- [pickers] Add new unstable field components (#5504) @flaviendelangle
+- [pickers] Fallback to default `minDate` / `maxDate` when `null` value is passed (#5397) @flaviendelangle
+- [l10n] Add Korean (ko-KR) locale (#5854) @tesseractjh
+- [l10n] Add Polish (pl-PL) locale (#5833) @drastus
+
+### Docs
+
+- [docs] Fix typo in `migration from lab` (#5277) @chuckwired
+- [docs] Use `dayjs` instead of `date-fns` in doc examples (#5481) @flaviendelangle
+
+### Core
+
+- [core] Clarify the scope of the license key used for tests and documentation (#5824) @oliviertassinari
+- [core] Fix Typescript error on field hooks (#5892) @flaviendelangle
+- [core] Memoize `columns` in `useDemoData` hook (#5848) @cherniavskii
+- [core] Remove Firefox from the BrowserStack list (#5874) @DanailH
+- [core] Small changes to the release script (#5840) @m4theushw
+
+## 5.15.3
+
+_Aug 18, 2022_
+
+We'd like to offer a big thanks to the 9 contributors who made this release possible. Here are some highlights ✨:
+
+- 📚 Documentation improvements
+- 🐞 Bugfixes
+
+### `@mui/x-data-grid@v5.15.3` / `@mui/x-data-grid-pro@v5.15.3` / `@mui/x-data-grid-premium@v5.15.3`
+
+#### Changes
+
+- [DataGrid] Fix <kbd>Enter</kbd> causing Select to re-open when commiting value (#5756) @m4theushw
+- [DataGrid] Fix `GridOverlays` bypassing pointer events (#5674) @philjones88
+
+### `@mui/x-date-pickers@v5.0.0-beta.6` / `@mui/x-date-picker-pro@v5.0.0-beta.6`
+
+#### Changes
+
+- [DatePicker] Support click on day outside of current month (#5768) @alexfauquette
+- [pickers] Extend `PickersActionBarProps` with `DialogActionProps` (#5798) @LukasTy
+
+### Docs
+
+- [docs] Fix API anchor link scroll top (#5795) @oliviertassinari
+- [docs] Fix contradiction in the free trial clause (#5732) @oliviertassinari
+- [docs] Fix default value of the DataGrid `logLevel` prop to false (#5784) @HwangTaehyun
+- [docs] Fix typo on the row height page (#5772) @flaviendelangle
+- [docs] Improve "upgrading plans" documentation. (#5683) @joserodolfofreitas
+- [docs] Link the license docs before pricing (#5726) @oliviertassinari
+- [docs] Update packages README files (#5835) @cherniavskii
+- [docs] Use `InputBase` for pickers inputs (#5597) @cherniavskii
+
+### Core
+
+- [core] Upgrade monorepo (#5771, #5797) @cherniavskii
+- [core] Various TS improvements (#5556) @flaviendelangle
+- [license] Give more context in the missing license (#5731) @oliviertassinari
+- [license] Only log an error type once (#5730) @oliviertassinari
+- [test] Increase timeout to take print screenshot (#5799) @m4theushw
+
+## 5.15.2
+
+_Aug 11, 2022_
+
+We'd like to offer a big thanks to the 7 contributors who made this release possible. Here are some highlights ✨:
+
+- ✨ Improve quick filtering with row grouping (#5701) @alexfauquette
+- 📚 Documentation improvements
+- 🐞 Bugfixes
+
+### `@mui/x-data-grid@v5.15.2` / `@mui/x-data-grid-pro@v5.15.2` / `@mui/x-data-grid-premium@v5.15.2`
+
+#### Changes
+
+- [DataGrid] Catch errors if rows freezing is not supported (#5711) @cherniavskii
+- [DataGrid] Preserve cell mode when entering edit mode while commiting (#5686) @m4theushw
+- [DataGridPremium] Let quick filter search in row grouping children (#5701) @alexfauquette
+
+### `@mui/x-date-pickers@v5.0.0-beta.5` / `@mui/x-date-picker-pro@5.0.0-beta.5`
+
+#### Changes
+
+- [pickers] Add `react-dom` to peerDependencies (#5752) @cherniavskii
+- [TimePicker] Set clock focus outline to `none` (#5758) @LukasTy
+- [pickers] Fix theme augmentation with TypeScript (#5596) @alexfauquette
+- [pickers] Reset input value when locale is modified (#5310) @alexfauquette
+- [pickers] Support `disableHighlightToday` on `MonthPicker` and `YearPicker` (#5562) @flaviendelangle
+- [pickers] Fallback to desktop mode when `matchMedia` is unavailable (#5684) @LukasTy
+- [pickers] Trigger `onChange` when clearing or accepting `Invalid date` (#5740) @LukasTy
+
+### Docs
+
+- [docs] Add RFC GH issue template (#5739) @bytasv
+- [docs] Add description to the `GridExportStateParams` page (#5654) @oliviertassinari
+- [docs] Improve the Events page (#5413) @flaviendelangle
+- [docs] Use new editing API in the introduction demos (#5728) @oliviertassinari
+
+### Core
+
+- [core] Remove duplicated `FUNDING.yml` file (#5656) @oliviertassinari
+- [core] Remove outdated Next.js options (#5727) @oliviertassinari
+- [core] Update tooling to run with React 18 (#4155) @m4theushw
+- [test] Fix failing dynamic row height tests on Edge (#5707) @m4theushw
+
 ## 5.15.1
 
 _Aug 4, 2022_

package/README.md

@@ -1,3 +1,3 @@
-# `@mui/x-data-grid-pro-data-gen`
+# `@mui/x-data-grid-generator`
 
 Use this package to generate some data and build demos for the grid!

package/hooks/useDemoData.js

@@ -113,7 +113,7 @@ export const useDemoData = options => {
   const [rowLength, setRowLength] = React.useState(options.rowLength);
   const [index, setIndex] = React.useState(0);
   const [loading, setLoading] = React.useState(true);
-  const getColumns = React.useCallback(() => {
+  const columns = React.useMemo(() => {
     return getColumnsFromOptions({
       dataSet: options.dataSet,
       editable: options.editable,
@@ -122,7 +122,6 @@ export const useDemoData = options => {
     });
   }, [options.dataSet, options.editable, options.maxColumns, options.visibleFields]);
   const [data, setData] = React.useState(() => {
-    const columns = getColumns();
     return addTreeDataOptionsToDemoData({
       columns,
       rows: [],
@@ -149,10 +148,10 @@ export const useDemoData = options => {
       let newData;
 
       if (rowLength > 1000) {
-        newData = await getRealGridData(1000, getColumns());
+        newData = await getRealGridData(1000, columns);
         newData = await extrapolateSeed(rowLength, newData);
       } else {
-        newData = await getRealGridData(rowLength, getColumns());
+        newData = await getRealGridData(rowLength, columns);
       }
 
       if (!active) {
@@ -177,7 +176,7 @@ export const useDemoData = options => {
     return () => {
       active = false;
     };
-  }, [rowLength, options.dataSet, options.maxColumns, (_options$treeData5 = options.treeData) == null ? void 0 : _options$treeData5.maxDepth, (_options$treeData6 = options.treeData) == null ? void 0 : _options$treeData6.groupingField, (_options$treeData7 = options.treeData) == null ? void 0 : _options$treeData7.averageChildren, index, getColumns]);
+  }, [rowLength, options.dataSet, options.maxColumns, (_options$treeData5 = options.treeData) == null ? void 0 : _options$treeData5.maxDepth, (_options$treeData6 = options.treeData) == null ? void 0 : _options$treeData6.groupingField, (_options$treeData7 = options.treeData) == null ? void 0 : _options$treeData7.averageChildren, index, columns]);
   return {
     data,
     loading,

package/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.15.1
+/** @license MUI v5.16.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/legacy/hooks/useDemoData.js

@@ -166,7 +166,7 @@ export var useDemoData = function useDemoData(options) {
       loading = _React$useState6[0],
       setLoading = _React$useState6[1];
 
-  var getColumns = React.useCallback(function () {
+  var columns = React.useMemo(function () {
     return getColumnsFromOptions({
       dataSet: options.dataSet,
       editable: options.editable,
@@ -176,7 +176,6 @@ export var useDemoData = function useDemoData(options) {
   }, [options.dataSet, options.editable, options.maxColumns, options.visibleFields]);
 
   var _React$useState7 = React.useState(function () {
-    var columns = getColumns();
     return addTreeDataOptionsToDemoData({
       columns: columns,
       rows: [],
@@ -216,7 +215,7 @@ export var useDemoData = function useDemoData(options) {
               }
 
               _context.next = 4;
-              return getRealGridData(1000, getColumns());
+              return getRealGridData(1000, columns);
 
             case 4:
               newData = _context.sent;
@@ -230,7 +229,7 @@ export var useDemoData = function useDemoData(options) {
 
             case 10:
               _context.next = 12;
-              return getRealGridData(rowLength, getColumns());
+              return getRealGridData(rowLength, columns);
 
             case 12:
               newData = _context.sent;
@@ -269,7 +268,7 @@ export var useDemoData = function useDemoData(options) {
     return function () {
       active = false;
     };
-  }, [rowLength, options.dataSet, options.maxColumns, (_options$treeData5 = options.treeData) == null ? void 0 : _options$treeData5.maxDepth, (_options$treeData6 = options.treeData) == null ? void 0 : _options$treeData6.groupingField, (_options$treeData7 = options.treeData) == null ? void 0 : _options$treeData7.averageChildren, index, getColumns]);
+  }, [rowLength, options.dataSet, options.maxColumns, (_options$treeData5 = options.treeData) == null ? void 0 : _options$treeData5.maxDepth, (_options$treeData6 = options.treeData) == null ? void 0 : _options$treeData6.groupingField, (_options$treeData7 = options.treeData) == null ? void 0 : _options$treeData7.averageChildren, index, columns]);
   return {
     data: data,
     loading: loading,

package/legacy/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.15.1
+/** @license MUI v5.16.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/legacy/renderer/renderEditStatus.js

@@ -1,6 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as React from 'react';
-import { useGridApiContext } from '@mui/x-data-grid-premium';
+import { useGridApiContext, useGridRootProps, GridEditModes } from '@mui/x-data-grid-premium';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
@@ -17,30 +19,54 @@ function EditStatus(props) {
   var id = props.id,
       value = props.value,
       field = props.field;
+  var rootProps = useGridRootProps();
   var apiRef = useGridApiContext();
 
-  var handleChange = function handleChange(event) {
-    apiRef.current.setEditCellValue({
-      id: id,
-      field: field,
-      value: event.target.value
-    }, event);
-    apiRef.current.commitCellChange({
-      id: id,
-      field: field
-    });
-    apiRef.current.setCellMode(id, field, 'view');
+  var handleChange = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
+      var isValid;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return apiRef.current.setEditCellValue({
+                id: id,
+                field: field,
+                value: event.target.value
+              });
 
-    if (event.key) {
-      // TODO v6: remove once we stop ignoring events fired from portals
-      var params = apiRef.current.getCellParams(id, field);
-      apiRef.current.publishEvent('cellNavigationKeyDown', params, event);
-    }
-  };
+            case 2:
+              isValid = _context.sent;
+
+              if (isValid && rootProps.editMode === GridEditModes.Cell) {
+                apiRef.current.stopCellEditMode({
+                  id: id,
+                  field: field,
+                  cellToFocusAfter: 'below'
+                });
+              }
+
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleChange(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   var handleClose = function handleClose(event, reason) {
     if (reason === 'backdropClick') {
-      apiRef.current.setCellMode(id, field, 'view');
+      apiRef.current.stopCellEditMode({
+        id: id,
+        field: field,
+        ignoreModifications: true
+      });
     }
   };
 

package/modern/hooks/useDemoData.js

@@ -105,7 +105,7 @@ export const useDemoData = options => {
   const [rowLength, setRowLength] = React.useState(options.rowLength);
   const [index, setIndex] = React.useState(0);
   const [loading, setLoading] = React.useState(true);
-  const getColumns = React.useCallback(() => {
+  const columns = React.useMemo(() => {
     return getColumnsFromOptions({
       dataSet: options.dataSet,
       editable: options.editable,
@@ -114,7 +114,6 @@ export const useDemoData = options => {
     });
   }, [options.dataSet, options.editable, options.maxColumns, options.visibleFields]);
   const [data, setData] = React.useState(() => {
-    const columns = getColumns();
     return addTreeDataOptionsToDemoData({
       columns,
       rows: [],
@@ -139,10 +138,10 @@ export const useDemoData = options => {
       let newData;
 
       if (rowLength > 1000) {
-        newData = await getRealGridData(1000, getColumns());
+        newData = await getRealGridData(1000, columns);
         newData = await extrapolateSeed(rowLength, newData);
       } else {
-        newData = await getRealGridData(rowLength, getColumns());
+        newData = await getRealGridData(rowLength, columns);
       }
 
       if (!active) {
@@ -167,7 +166,7 @@ export const useDemoData = options => {
     return () => {
       active = false;
     };
-  }, [rowLength, options.dataSet, options.maxColumns, options.treeData?.maxDepth, options.treeData?.groupingField, options.treeData?.averageChildren, index, getColumns]);
+  }, [rowLength, options.dataSet, options.maxColumns, options.treeData?.maxDepth, options.treeData?.groupingField, options.treeData?.averageChildren, index, columns]);
   return {
     data,
     loading,

package/modern/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.15.1
+/** @license MUI v5.16.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/modern/renderer/renderEditStatus.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { useGridApiContext } from '@mui/x-data-grid-premium';
+import { useGridApiContext, useGridRootProps, GridEditModes } from '@mui/x-data-grid-premium';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
@@ -19,30 +19,32 @@ function EditStatus(props) {
     value,
     field
   } = props;
+  const rootProps = useGridRootProps();
   const apiRef = useGridApiContext();
 
-  const handleChange = event => {
-    apiRef.current.setEditCellValue({
+  const handleChange = async event => {
+    const isValid = await apiRef.current.setEditCellValue({
       id,
       field,
       value: event.target.value
-    }, event);
-    apiRef.current.commitCellChange({
-      id,
-      field
     });
-    apiRef.current.setCellMode(id, field, 'view');
 
-    if (event.key) {
-      // TODO v6: remove once we stop ignoring events fired from portals
-      const params = apiRef.current.getCellParams(id, field);
-      apiRef.current.publishEvent('cellNavigationKeyDown', params, event);
+    if (isValid && rootProps.editMode === GridEditModes.Cell) {
+      apiRef.current.stopCellEditMode({
+        id,
+        field,
+        cellToFocusAfter: 'below'
+      });
     }
   };
 
   const handleClose = (event, reason) => {
     if (reason === 'backdropClick') {
-      apiRef.current.setCellMode(id, field, 'view');
+      apiRef.current.stopCellEditMode({
+        id,
+        field,
+        ignoreModifications: true
+      });
     }
   };
 

package/node/hooks/useDemoData.js

@@ -140,7 +140,7 @@ const useDemoData = options => {
   const [rowLength, setRowLength] = React.useState(options.rowLength);
   const [index, setIndex] = React.useState(0);
   const [loading, setLoading] = React.useState(true);
-  const getColumns = React.useCallback(() => {
+  const columns = React.useMemo(() => {
     return getColumnsFromOptions({
       dataSet: options.dataSet,
       editable: options.editable,
@@ -149,7 +149,6 @@ const useDemoData = options => {
     });
   }, [options.dataSet, options.editable, options.maxColumns, options.visibleFields]);
   const [data, setData] = React.useState(() => {
-    const columns = getColumns();
     return (0, _treeDataGenerator.addTreeDataOptionsToDemoData)({
       columns,
       rows: [],
@@ -176,10 +175,10 @@ const useDemoData = options => {
       let newData;
 
       if (rowLength > 1000) {
-        newData = await (0, _realDataService.getRealGridData)(1000, getColumns());
+        newData = await (0, _realDataService.getRealGridData)(1000, columns);
         newData = await extrapolateSeed(rowLength, newData);
       } else {
-        newData = await (0, _realDataService.getRealGridData)(rowLength, getColumns());
+        newData = await (0, _realDataService.getRealGridData)(rowLength, columns);
       }
 
       if (!active) {
@@ -204,7 +203,7 @@ const useDemoData = options => {
     return () => {
       active = false;
     };
-  }, [rowLength, options.dataSet, options.maxColumns, (_options$treeData5 = options.treeData) == null ? void 0 : _options$treeData5.maxDepth, (_options$treeData6 = options.treeData) == null ? void 0 : _options$treeData6.groupingField, (_options$treeData7 = options.treeData) == null ? void 0 : _options$treeData7.averageChildren, index, getColumns]);
+  }, [rowLength, options.dataSet, options.maxColumns, (_options$treeData5 = options.treeData) == null ? void 0 : _options$treeData5.maxDepth, (_options$treeData6 = options.treeData) == null ? void 0 : _options$treeData6.groupingField, (_options$treeData7 = options.treeData) == null ? void 0 : _options$treeData7.averageChildren, index, columns]);
   return {
     data,
     loading,

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.15.1
+/** @license MUI v5.16.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/renderer/renderEditStatus.js

@@ -43,30 +43,32 @@ function EditStatus(props) {
     value,
     field
   } = props;
+  const rootProps = (0, _xDataGridPremium.useGridRootProps)();
   const apiRef = (0, _xDataGridPremium.useGridApiContext)();
 
-  const handleChange = event => {
-    apiRef.current.setEditCellValue({
+  const handleChange = async event => {
+    const isValid = await apiRef.current.setEditCellValue({
       id,
       field,
       value: event.target.value
-    }, event);
-    apiRef.current.commitCellChange({
-      id,
-      field
     });
-    apiRef.current.setCellMode(id, field, 'view');
 
-    if (event.key) {
-      // TODO v6: remove once we stop ignoring events fired from portals
-      const params = apiRef.current.getCellParams(id, field);
-      apiRef.current.publishEvent('cellNavigationKeyDown', params, event);
+    if (isValid && rootProps.editMode === _xDataGridPremium.GridEditModes.Cell) {
+      apiRef.current.stopCellEditMode({
+        id,
+        field,
+        cellToFocusAfter: 'below'
+      });
     }
   };
 
   const handleClose = (event, reason) => {
     if (reason === 'backdropClick') {
-      apiRef.current.setCellMode(id, field, 'view');
+      apiRef.current.stopCellEditMode({
+        id,
+        field,
+        ignoreModifications: true
+      });
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-generator",
-  "version": "5.15.1",
+  "version": "5.16.0",
   "description": "Generate fake data for demo purposes only.",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -19,12 +19,12 @@
     "directory": "packages/grid/x-data-grid-generator"
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.6",
-    "@mui/base": "^5.0.0-alpha.80",
-    "@mui/x-data-grid-premium": "5.15.1",
+    "@babel/runtime": "^7.18.9",
+    "@mui/base": "^5.0.0-alpha.94",
+    "@mui/x-data-grid-premium": "5.16.0",
     "chance": "^1.1.8",
     "clsx": "^1.2.1",
-    "lru-cache": "^7.13.1"
+    "lru-cache": "^7.14.0"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5.4.1",

package/renderer/renderEditStatus.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { useGridApiContext } from '@mui/x-data-grid-premium';
+import { useGridApiContext, useGridRootProps, GridEditModes } from '@mui/x-data-grid-premium';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
@@ -19,30 +19,32 @@ function EditStatus(props) {
     value,
     field
   } = props;
+  const rootProps = useGridRootProps();
   const apiRef = useGridApiContext();
 
-  const handleChange = event => {
-    apiRef.current.setEditCellValue({
+  const handleChange = async event => {
+    const isValid = await apiRef.current.setEditCellValue({
       id,
       field,
       value: event.target.value
-    }, event);
-    apiRef.current.commitCellChange({
-      id,
-      field
     });
-    apiRef.current.setCellMode(id, field, 'view');
 
-    if (event.key) {
-      // TODO v6: remove once we stop ignoring events fired from portals
-      const params = apiRef.current.getCellParams(id, field);
-      apiRef.current.publishEvent('cellNavigationKeyDown', params, event);
+    if (isValid && rootProps.editMode === GridEditModes.Cell) {
+      apiRef.current.stopCellEditMode({
+        id,
+        field,
+        cellToFocusAfter: 'below'
+      });
     }
   };
 
   const handleClose = (event, reason) => {
     if (reason === 'backdropClick') {
-      apiRef.current.setCellMode(id, field, 'view');
+      apiRef.current.stopCellEditMode({
+        id,
+        field,
+        ignoreModifications: true
+      });
     }
   };