@mui/x-data-grid 5.12.2 → 5.13.1

package/node/components/cell/GridEditBooleanCell.js

@@ -26,6 +26,8 @@ var _gridClasses = require("../../constants/gridClasses");
 
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 
+var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["id", "value", "formattedValue", "api", "field", "row", "rowNode", "colDef", "cellMode", "isEditable", "tabIndex", "className", "getValue", "hasFocus", "isValidating", "isProcessingProps", "error", "onValueChange"];
@@ -50,13 +52,13 @@ function GridEditBooleanCell(props) {
   const {
     id: idProp,
     value,
-    api,
     field,
     className,
     hasFocus,
     onValueChange
   } = props,
         other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+  const apiRef = (0, _useGridApiContext.useGridApiContext)();
   const inputRef = React.useRef(null);
   const id = (0, _utils.unstable_useId)();
   const [valueState, setValueState] = React.useState(value);
@@ -73,12 +75,12 @@ function GridEditBooleanCell(props) {
     }
 
     setValueState(newValue);
-    await api.setEditCellValue({
+    await apiRef.current.setEditCellValue({
       id: idProp,
       field,
       value: newValue
     }, event);
-  }, [api, field, idProp, onValueChange]);
+  }, [apiRef, field, idProp, onValueChange]);
   React.useEffect(() => {
     setValueState(value);
   }, [value]);

package/node/components/cell/GridEditDateCell.js

@@ -26,6 +26,8 @@ var _gridClasses = require("../../constants/gridClasses");
 
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 
+var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["id", "value", "formattedValue", "api", "field", "row", "rowNode", "colDef", "cellMode", "isEditable", "tabIndex", "hasFocus", "getValue", "inputProps", "isValidating", "isProcessingProps", "onValueChange"];
@@ -48,7 +50,6 @@ function GridEditDateCell(props) {
   const {
     id,
     value: valueProp,
-    api,
     field,
     colDef,
     hasFocus,
@@ -57,6 +58,7 @@ function GridEditDateCell(props) {
   } = props,
         other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const isDateTime = colDef.type === 'dateTime';
+  const apiRef = (0, _useGridApiContext.useGridApiContext)();
   const inputRef = React.useRef();
   const valueTransformed = React.useMemo(() => {
     let parsedDate;
@@ -116,12 +118,12 @@ function GridEditDateCell(props) {
       parsed: newParsedDate,
       formatted: newFormattedDate
     });
-    api.setEditCellValue({
+    apiRef.current.setEditCellValue({
       id,
       field,
       value: newParsedDate
     }, event);
-  }, [api, field, id, onValueChange]);
+  }, [apiRef, field, id, onValueChange]);
   React.useEffect(() => {
     setValueState(state => {
       var _valueTransformed$par, _state$parsed;

package/node/components/cell/GridEditInputCell.js

@@ -32,6 +32,8 @@ var _index = require("../icons/index");
 
 var _GridFilterInputValue = require("../panel/filterPanel/GridFilterInputValue");
 
+var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["id", "value", "formattedValue", "api", "field", "row", "rowNode", "colDef", "cellMode", "isEditable", "tabIndex", "hasFocus", "getValue", "isValidating", "debounceMs", "isProcessingProps", "onValueChange"];
@@ -71,7 +73,6 @@ function GridEditInputCell(props) {
   const {
     id,
     value,
-    api,
     field,
     colDef,
     hasFocus,
@@ -80,6 +81,7 @@ function GridEditInputCell(props) {
     onValueChange
   } = props,
         other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+  const apiRef = (0, _useGridApiContext.useGridApiContext)();
   const inputRef = React.useRef();
   const [valueState, setValueState] = React.useState(value);
   const ownerState = {
@@ -94,13 +96,13 @@ function GridEditInputCell(props) {
     }
 
     setValueState(newValue);
-    api.setEditCellValue({
+    apiRef.current.setEditCellValue({
       id,
       field,
       value: newValue,
       debounceMs
     }, event);
-  }, [api, debounceMs, field, id, onValueChange]);
+  }, [apiRef, debounceMs, field, id, onValueChange]);
   React.useEffect(() => {
     setValueState(value);
   }, [value]);

package/node/components/cell/GridEditSingleSelectCell.js

@@ -28,6 +28,8 @@ var _gridEditRowModel = require("../../models/gridEditRowModel");
 
 var _filterPanelUtils = require("../panel/filterPanel/filterPanelUtils");
 
+var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 const _excluded = ["id", "value", "formattedValue", "api", "field", "row", "rowNode", "colDef", "cellMode", "isEditable", "tabIndex", "className", "getValue", "hasFocus", "isValidating", "isProcessingProps", "error", "onValueChange"];
@@ -62,6 +64,7 @@ function GridEditSingleSelectCell(props) {
     onValueChange
   } = props,
         other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+  const apiRef = (0, _useGridApiContext.useGridApiContext)();
   const ref = React.useRef();
   const inputRef = React.useRef();
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
@@ -110,7 +113,7 @@ function GridEditSingleSelectCell(props) {
       await onValueChange(event, formattedTargetValue);
     }
 
-    const isValid = await api.setEditCellValue({
+    const isValid = await apiRef.current.setEditCellValue({
       id,
       field,
       value: formattedTargetValue
@@ -125,18 +128,18 @@ function GridEditSingleSelectCell(props) {
       return;
     }
 
-    const canCommit = await Promise.resolve(api.commitCellChange({
+    const canCommit = await Promise.resolve(apiRef.current.commitCellChange({
       id,
       field
     }, event));
 
     if (canCommit) {
-      api.setCellMode(id, field, 'view');
+      apiRef.current.setCellMode(id, field, 'view');
 
       if (event.key) {
         // TODO v6: remove once we stop ignoring events fired from portals
-        const params = api.getCellParams(id, field);
-        api.publishEvent('cellNavigationKeyDown', params, event);
+        const params = apiRef.current.getCellParams(id, field);
+        apiRef.current.publishEvent('cellNavigationKeyDown', params, event);
       }
     }
   };
@@ -151,13 +154,13 @@ function GridEditSingleSelectCell(props) {
       var _rootProps$experiment2;
 
       if ((_rootProps$experiment2 = rootProps.experimentalFeatures) != null && _rootProps$experiment2.newEditingApi) {
-        api.stopCellEditMode({
+        apiRef.current.stopCellEditMode({
           id,
           field,
           ignoreModifications: true
         });
       } else {
-        api.setCellMode(id, field, 'view');
+        apiRef.current.setCellMode(id, field, 'view');
       }
     }
   };

package/node/components/panel/GridColumnsPanel.js

@@ -112,7 +112,7 @@ function GridColumnsPanel(props) {
         return apiRef.current.setColumnVisibilityModel({});
       }
 
-      return apiRef.current.setColumnVisibilityModel(Object.fromEntries(columns.map(col => [col.field, false])));
+      return apiRef.current.setColumnVisibilityModel(Object.fromEntries(columns.filter(col => col.hideable !== false).map(col => [col.field, false])));
     } // TODO v6: Remove
 
 

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

@@ -45,7 +45,8 @@ var _gridClasses = require("../../../constants/gridClasses");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["item", "hasMultipleFilters", "deleteFilter", "applyFilterChanges", "multiFilterOperator", "showMultiFilterOperators", "disableMultiFilterOperator", "applyMultiFilterOperatorChanges", "focusElementRef", "linkOperators", "columnsSort", "deleteIconProps", "linkOperatorInputProps", "operatorInputProps", "columnInputProps", "valueInputProps", "children"];
+const _excluded = ["item", "hasMultipleFilters", "deleteFilter", "applyFilterChanges", "multiFilterOperator", "showMultiFilterOperators", "disableMultiFilterOperator", "applyMultiFilterOperatorChanges", "focusElementRef", "linkOperators", "columnsSort", "deleteIconProps", "linkOperatorInputProps", "operatorInputProps", "columnInputProps", "valueInputProps", "children"],
+      _excluded2 = ["InputComponentProps"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -175,6 +176,10 @@ const GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(pro
   const baseSelectProps = ((_rootProps$components2 = rootProps.componentsProps) == null ? void 0 : _rootProps$components2.baseSelect) || {};
   const isBaseSelectNative = (_baseSelectProps$nati = baseSelectProps.native) != null ? _baseSelectProps$nati : true;
   const OptionComponent = isBaseSelectNative ? 'option' : _MenuItem.default;
+  const {
+    InputComponentProps
+  } = valueInputProps,
+        valueInputPropsOther = (0, _objectWithoutPropertiesLoose2.default)(valueInputProps, _excluded2);
   const sortedFilterableColumns = React.useMemo(() => {
     switch (columnsSort) {
       case 'asc':
@@ -345,14 +350,14 @@ const GridFilterForm = /*#__PURE__*/React.forwardRef(function GridFilterForm(pro
     })), /*#__PURE__*/(0, _jsxRuntime.jsx)(FilterFormValueInput, (0, _extends2.default)({
       variant: "standard",
       as: rootProps.components.BaseFormControl
-    }, baseFormControlProps, valueInputProps, {
-      className: (0, _clsx.default)(classes.valueInput, baseFormControlProps.className, valueInputProps.className),
+    }, baseFormControlProps, valueInputPropsOther, {
+      className: (0, _clsx.default)(classes.valueInput, baseFormControlProps.className, valueInputPropsOther.className),
       children: currentOperator != null && currentOperator.InputComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(currentOperator.InputComponent, (0, _extends2.default)({
         apiRef: apiRef,
         item: item,
         applyValue: applyFilterChanges,
         focusElementRef: valueRef
-      }, currentOperator.InputComponentProps)) : null
+      }, currentOperator.InputComponentProps, InputComponentProps)) : null
     }))]
   }));
 });

package/node/components/panel/filterPanel/GridFilterInputBoolean.js

@@ -54,8 +54,8 @@ function GridFilterInputBoolean(props) {
     label: apiRef.current.getLocaleText('filterPanelInputLabel'),
     value: filterValueState,
     onChange: onFilterChange,
-    variant: "standard",
     select: true,
+    variant: "standard",
     SelectProps: (0, _extends2.default)({
       native: isSelectNative,
       displayEmpty: true

package/node/components/panel/filterPanel/GridFilterInputDate.js

@@ -79,8 +79,8 @@ function GridFilterInputDate(props) {
     placeholder: apiRef.current.getLocaleText('filterPanelInputPlaceholder'),
     value: filterValueState,
     onChange: onFilterChange,
-    type: type || 'text',
     variant: "standard",
+    type: type || 'text',
     InputLabelProps: {
       shrink: true
     },
@@ -100,7 +100,9 @@ process.env.NODE_ENV !== "production" ? GridFilterInputDate.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
-  apiRef: _propTypes.default.any.isRequired,
+  apiRef: _propTypes.default.shape({
+    current: _propTypes.default.object.isRequired
+  }).isRequired,
   applyValue: _propTypes.default.func.isRequired,
   focusElementRef: _propTypes.default
   /* @typescript-to-proptypes-ignore */

package/node/components/panel/filterPanel/GridFilterInputMultipleSingleSelect.js

@@ -19,15 +19,15 @@ var _Autocomplete = _interopRequireWildcard(require("@mui/material/Autocomplete"
 
 var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
 
-var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
-
 var _utils = require("@mui/material/utils");
 
 var _filterPanelUtils = require("./filterPanelUtils");
 
+var _useGridRootProps = require("../../../hooks/utils/useGridRootProps");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef"];
+const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "color", "error", "helperText", "size", "variant"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -42,15 +42,36 @@ function GridFilterInputMultipleSingleSelect(props) {
     item,
     applyValue,
     apiRef,
-    focusElementRef
+    focusElementRef,
+    color,
+    error,
+    helperText,
+    size,
+    variant = 'standard'
   } = props,
         other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+  const TextFieldProps = {
+    color,
+    error,
+    helperText,
+    size,
+    variant
+  };
   const id = (0, _utils.unstable_useId)();
+  const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const resolvedColumn = item.columnField ? apiRef.current.getColumn(item.columnField) : null;
   const resolvedValueOptions = React.useMemo(() => {
-    return typeof (resolvedColumn == null ? void 0 : resolvedColumn.valueOptions) === 'function' ? resolvedColumn.valueOptions({
-      field: resolvedColumn.field
-    }) : resolvedColumn == null ? void 0 : resolvedColumn.valueOptions;
+    if (!(resolvedColumn != null && resolvedColumn.valueOptions)) {
+      return [];
+    }
+
+    if (typeof resolvedColumn.valueOptions === 'function') {
+      return resolvedColumn.valueOptions({
+        field: resolvedColumn.field
+      });
+    }
+
+    return resolvedColumn.valueOptions;
   }, [resolvedColumn]);
   const resolvedFormattedValueOptions = React.useMemo(() => {
     return resolvedValueOptions == null ? void 0 : resolvedValueOptions.map(_filterPanelUtils.getValueFromOption);
@@ -81,7 +102,7 @@ function GridFilterInputMultipleSingleSelect(props) {
 
     if (resolvedValueOptions !== undefined) {
       const itemValueIndexes = item.value.map(element => {
-        // get the index matching between values and valueoptions
+        // get the index matching between values and valueOptions
         const formattedElement = (0, _filterPanelUtils.getValueFromOption)(element);
         const index = (resolvedFormattedValueOptions == null ? void 0 : resolvedFormattedValueOptions.findIndex(formatedOption => formatedOption === formattedElement)) || 0;
         return index;
@@ -107,8 +128,7 @@ function GridFilterInputMultipleSingleSelect(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Autocomplete.default, (0, _extends2.default)({
     multiple: true,
     limitTags: 1,
-    options: resolvedValueOptions // TODO: avoid `any`?
-    ,
+    options: resolvedValueOptions,
     isOptionEqualToValue: isOptionEqualToValue,
     filterOptions: filter,
     id: id,
@@ -121,16 +141,19 @@ function GridFilterInputMultipleSingleSelect(props) {
     }, getTagProps({
       index
     })))),
-    renderInput: params => /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, (0, _extends2.default)({}, params, {
-      label: apiRef.current.getLocaleText('filterPanelInputLabel'),
-      placeholder: apiRef.current.getLocaleText('filterPanelInputPlaceholder'),
-      InputLabelProps: (0, _extends2.default)({}, params.InputLabelProps, {
-        shrink: true
-      }),
-      inputRef: focusElementRef,
-      type: 'singleSelect',
-      variant: "standard"
-    }))
+    renderInput: params => {
+      var _rootProps$components;
+
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.BaseTextField, (0, _extends2.default)({}, params, {
+        label: apiRef.current.getLocaleText('filterPanelInputLabel'),
+        placeholder: apiRef.current.getLocaleText('filterPanelInputPlaceholder'),
+        InputLabelProps: (0, _extends2.default)({}, params.InputLabelProps, {
+          shrink: true
+        }),
+        inputRef: focusElementRef,
+        type: "singleSelect"
+      }, TextFieldProps, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.baseTextField));
+    }
   }, other));
 }
 

package/node/components/panel/filterPanel/GridFilterInputMultipleValue.js

@@ -19,13 +19,13 @@ var _Autocomplete = _interopRequireDefault(require("@mui/material/Autocomplete")
 
 var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
 
-var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
-
 var _utils = require("@mui/material/utils");
 
+var _useGridRootProps = require("../../../hooks/utils/useGridRootProps");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef"];
+const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "color", "error", "helperText", "size", "variant"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -37,11 +37,24 @@ function GridFilterInputMultipleValue(props) {
     applyValue,
     type,
     apiRef,
-    focusElementRef
+    focusElementRef,
+    color,
+    error,
+    helperText,
+    size,
+    variant
   } = props,
         other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+  const TextFieldProps = {
+    color,
+    error,
+    helperText,
+    size,
+    variant
+  };
   const [filterValueState, setFilterValueState] = React.useState(item.value || []);
   const id = (0, _utils.unstable_useId)();
+  const rootProps = (0, _useGridRootProps.useGridRootProps)();
   React.useEffect(() => {
     var _item$value;
 
@@ -75,16 +88,19 @@ function GridFilterInputMultipleValue(props) {
     }, getTagProps({
       index
     })))),
-    renderInput: params => /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, (0, _extends2.default)({}, params, {
-      label: apiRef.current.getLocaleText('filterPanelInputLabel'),
-      placeholder: apiRef.current.getLocaleText('filterPanelInputPlaceholder'),
-      InputLabelProps: (0, _extends2.default)({}, params.InputLabelProps, {
-        shrink: true
-      }),
-      inputRef: focusElementRef,
-      type: type || 'text',
-      variant: "standard"
-    }))
+    renderInput: params => {
+      var _rootProps$components;
+
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.BaseTextField, (0, _extends2.default)({}, params, {
+        label: apiRef.current.getLocaleText('filterPanelInputLabel'),
+        placeholder: apiRef.current.getLocaleText('filterPanelInputPlaceholder'),
+        InputLabelProps: (0, _extends2.default)({}, params.InputLabelProps, {
+          shrink: true
+        }),
+        inputRef: focusElementRef,
+        type: type || 'text'
+      }, TextFieldProps, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.baseTextField));
+    }
   }, other));
 }
 
@@ -93,7 +109,9 @@ process.env.NODE_ENV !== "production" ? GridFilterInputMultipleValue.propTypes =
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
-  apiRef: _propTypes.default.any.isRequired,
+  apiRef: _propTypes.default.shape({
+    current: _propTypes.default.object.isRequired
+  }).isRequired,
   applyValue: _propTypes.default.func.isRequired,
   focusElementRef: _propTypes.default
   /* @typescript-to-proptypes-ignore */

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

@@ -74,6 +74,10 @@ function GridFilterInputSingleSelect(props) {
   const isSelectNative = (_baseSelectProps$nati = baseSelectProps.native) != null ? _baseSelectProps$nati : true;
   const currentColumn = item.columnField ? apiRef.current.getColumn(item.columnField) : null;
   const currentValueOptions = React.useMemo(() => {
+    if (currentColumn === null) {
+      return undefined;
+    }
+
     return typeof currentColumn.valueOptions === 'function' ? currentColumn.valueOptions({
       field: currentColumn.field
     }) : currentColumn.valueOptions;
@@ -115,8 +119,8 @@ function GridFilterInputSingleSelect(props) {
     placeholder: apiRef.current.getLocaleText('filterPanelInputPlaceholder'),
     value: filterValueState,
     onChange: onFilterChange,
-    type: type || 'text',
     variant: "standard",
+    type: type || 'text',
     InputLabelProps: {
       shrink: true
     },
@@ -135,7 +139,9 @@ process.env.NODE_ENV !== "production" ? GridFilterInputSingleSelect.propTypes =
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
-  apiRef: _propTypes.default.any.isRequired,
+  apiRef: _propTypes.default.shape({
+    current: _propTypes.default.object.isRequired
+  }).isRequired,
   applyValue: _propTypes.default.func.isRequired,
   focusElementRef: _propTypes.default
   /* @typescript-to-proptypes-ignore */

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

@@ -141,8 +141,8 @@ function GridFilterInputValue(props) {
     placeholder: apiRef.current.getLocaleText('filterPanelInputPlaceholder'),
     value: filterValueState,
     onChange: onFilterChange,
-    type: type || 'text',
     variant: "standard",
+    type: type || 'text',
     InputProps: InputProps,
     InputLabelProps: {
       shrink: true
@@ -156,7 +156,9 @@ process.env.NODE_ENV !== "production" ? GridFilterInputValue.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
-  apiRef: _propTypes.default.any.isRequired,
+  apiRef: _propTypes.default.shape({
+    current: _propTypes.default.object.isRequired
+  }).isRequired,
   applyValue: _propTypes.default.func.isRequired,
   focusElementRef: _propTypes.default
   /* @typescript-to-proptypes-ignore */

package/node/hooks/features/dimensions/useGridDimensions.js

@@ -92,21 +92,34 @@ function useGridDimensions(apiRef, props) {
       rootElement.removeChild(scrollDiv);
     }
 
-    const viewportOuterSize = {
-      width: rootDimensionsRef.current.width,
-      height: props.autoHeight ? rowsMeta.currentPageTotalHeight : rootDimensionsRef.current.height - headerHeight
-    };
-    const {
-      hasScrollX,
-      hasScrollY
-    } = hasScroll({
-      content: {
-        width: Math.round(columnsTotalWidth),
-        height: rowsMeta.currentPageTotalHeight
-      },
-      container: viewportOuterSize,
-      scrollBarSize
-    });
+    let viewportOuterSize;
+    let hasScrollX;
+    let hasScrollY;
+
+    if (props.autoHeight) {
+      hasScrollY = false;
+      hasScrollX = Math.round(columnsTotalWidth) > rootDimensionsRef.current.width;
+      viewportOuterSize = {
+        width: rootDimensionsRef.current.width,
+        height: rowsMeta.currentPageTotalHeight + (hasScrollX ? scrollBarSize : 0)
+      };
+    } else {
+      viewportOuterSize = {
+        width: rootDimensionsRef.current.width,
+        height: rootDimensionsRef.current.height - headerHeight
+      };
+      const scrollInformation = hasScroll({
+        content: {
+          width: Math.round(columnsTotalWidth),
+          height: rowsMeta.currentPageTotalHeight
+        },
+        container: viewportOuterSize,
+        scrollBarSize
+      });
+      hasScrollY = scrollInformation.hasScrollY;
+      hasScrollX = scrollInformation.hasScrollX;
+    }
+
     const viewportInnerSize = {
       width: viewportOuterSize.width - (hasScrollY ? scrollBarSize : 0),
       height: viewportOuterSize.height - (hasScrollX ? scrollBarSize : 0)

package/node/hooks/features/editRows/useGridCellEditing.new.js

@@ -95,6 +95,12 @@ const useGridCellEditing = (apiRef, props) => {
   }, [apiRef]);
   const handleCellKeyDown = React.useCallback((params, event) => {
     if (params.cellMode === _gridEditRowModel.GridCellModes.Edit) {
+      // Wait until IME is settled for Asian languages like Japanese and Chinese
+      // TODO: `event.which` is depricated but this is a temporary workaround
+      if (event.which === 229) {
+        return;
+      }
+
       let reason;
 
       if (event.key === 'Escape') {
@@ -116,7 +122,7 @@ const useGridCellEditing = (apiRef, props) => {
       let reason;
 
       if ((0, _keyboardUtils.isPrintableKey)(event.key)) {
-        if (event.shiftKey || event.ctrlKey || event.metaKey || event.altKey) {
+        if (event.ctrlKey && event.key !== 'v' || event.metaKey && event.key !== 'v' || event.altKey) {
           return;
         }
 

package/node/hooks/features/editRows/useGridCellEditing.old.js

@@ -199,6 +199,12 @@ const useCellEditing = (apiRef, props) => {
   };
   (0, _useGridApiMethod.useGridApiMethod)(apiRef, cellEditingApi, 'EditRowApi');
   const handleCellKeyDown = React.useCallback(async (params, event) => {
+    // Wait until IME is settled for Asian languages like Japanese and Chinese
+    // TODO: `event.which` is depricated but this is a temporary workaround
+    if (event.which === 229) {
+      return;
+    }
+
     const {
       id,
       field,

package/node/hooks/features/editRows/useGridRowEditing.new.js

@@ -134,6 +134,12 @@ const useGridRowEditing = (apiRef, props) => {
   }, []);
   const handleCellKeyDown = React.useCallback((params, event) => {
     if (params.cellMode === _gridEditRowModel.GridRowModes.Edit) {
+      // Wait until IME is settled for Asian languages like Japanese and Chinese
+      // TODO: `event.which` is depricated but this is a temporary workaround
+      if (event.which === 229) {
+        return;
+      }
+
       let reason;
 
       if (event.key === 'Escape') {
@@ -170,7 +176,7 @@ const useGridRowEditing = (apiRef, props) => {
       let reason;
 
       if ((0, _keyboardUtils.isPrintableKey)(event.key)) {
-        if (event.shiftKey || event.ctrlKey || event.metaKey || event.altKey) {
+        if (event.ctrlKey && event.key !== 'v' || event.metaKey && event.key !== 'v' || event.altKey) {
           return;
         }
 

package/node/hooks/features/editRows/useGridRowEditing.old.js

@@ -199,6 +199,12 @@ const useGridRowEditing = (apiRef, props) => {
   };
   (0, _useGridApiMethod.useGridApiMethod)(apiRef, rowEditingApi, 'EditRowApi');
   const handleCellKeyDown = React.useCallback(async (params, event) => {
+    // Wait until IME is settled for Asian languages like Japanese and Chinese
+    // TODO: `event.which` is depricated but this is a temporary workaround
+    if (event.which === 229) {
+      return;
+    }
+
     const {
       cellMode,
       isEditable