@mui/x-data-grid 6.9.0 → 6.9.2

package/legacy/colDef/gridBooleanOperators.js

@@ -1,17 +1,17 @@
 import { GridFilterInputBoolean } from '../components/panel/filterPanel/GridFilterInputBoolean';
+import { convertLegacyOperators } from './utils';
 export var getGridBooleanOperators = function getGridBooleanOperators() {
-  return [{
+  return convertLegacyOperators([{
     value: 'is',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!filterItem.value) {
         return null;
       }
       var valueAsBoolean = filterItem.value === 'true';
-      return function (_ref) {
-        var value = _ref.value;
+      return function (value) {
         return Boolean(value) === valueAsBoolean;
       };
     },
     InputComponent: GridFilterInputBoolean
-  }];
+  }]);
 };

package/legacy/colDef/gridCheckboxSelectionColDef.js

@@ -19,6 +19,7 @@ export var GRID_CHECKBOX_SELECTION_COL_DEF = _extends({}, GRID_BOOLEAN_COL_DEF,
   disableReorder: true,
   disableExport: true,
   getApplyQuickFilterFn: undefined,
+  getApplyQuickFilterFnV7: undefined,
   valueGetter: function valueGetter(params) {
     var selectionLookup = selectedIdsLookupSelector(params.api.state, params.api.instanceId);
     return selectionLookup[params.id] !== undefined;

package/legacy/colDef/gridDateColDef.js

@@ -49,6 +49,7 @@ export var GRID_DATE_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
   filterOperators: getGridDateOperators(),
   renderEditCell: renderEditDateCell,
   getApplyQuickFilterFn: undefined,
+  getApplyQuickFilterFnV7: undefined,
   // @ts-ignore
   pastedValueParser: function pastedValueParser(value) {
     return new Date(value);
@@ -61,6 +62,7 @@ export var GRID_DATETIME_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
   filterOperators: getGridDateOperators(true),
   renderEditCell: renderEditDateCell,
   getApplyQuickFilterFn: undefined,
+  getApplyQuickFilterFnV7: undefined,
   // @ts-ignore
   pastedValueParser: function pastedValueParser(value) {
     return new Date(value);

package/legacy/colDef/gridDateOperators.js

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { GridFilterInputDate } from '../components/panel/filterPanel/GridFilterInputDate';
+import { convertLegacyOperators } from './utils';
 var dateRegex = /(\d+)-(\d+)-(\d+)/;
 var dateTimeRegex = /(\d+)-(\d+)-(\d+)T(\d+):(\d+)/;
 function buildApplyFilterFn(filterItem, compareFn, showTime, keepHours) {
@@ -14,8 +15,7 @@ function buildApplyFilterFn(filterItem, compareFn, showTime, keepHours) {
     hour = _slice$map2[3],
     minute = _slice$map2[4];
   var time = new Date(year, month - 1, day, hour || 0, minute || 0).getTime();
-  return function (_ref) {
-    var value = _ref.value;
+  return function (value) {
     if (!value) {
       return false;
     }
@@ -30,9 +30,9 @@ function buildApplyFilterFn(filterItem, compareFn, showTime, keepHours) {
   };
 }
 export var getGridDateOperators = function getGridDateOperators(showTime) {
-  return [{
+  return convertLegacyOperators([{
     value: 'is',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       return buildApplyFilterFn(filterItem, function (value1, value2) {
         return value1 === value2;
       }, showTime);
@@ -43,7 +43,7 @@ export var getGridDateOperators = function getGridDateOperators(showTime) {
     }
   }, {
     value: 'not',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       return buildApplyFilterFn(filterItem, function (value1, value2) {
         return value1 !== value2;
       }, showTime);
@@ -54,7 +54,7 @@ export var getGridDateOperators = function getGridDateOperators(showTime) {
     }
   }, {
     value: 'after',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       return buildApplyFilterFn(filterItem, function (value1, value2) {
         return value1 > value2;
       }, showTime);
@@ -65,7 +65,7 @@ export var getGridDateOperators = function getGridDateOperators(showTime) {
     }
   }, {
     value: 'onOrAfter',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       return buildApplyFilterFn(filterItem, function (value1, value2) {
         return value1 >= value2;
       }, showTime);
@@ -76,7 +76,7 @@ export var getGridDateOperators = function getGridDateOperators(showTime) {
     }
   }, {
     value: 'before',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       return buildApplyFilterFn(filterItem, function (value1, value2) {
         return value1 < value2;
       }, showTime, !showTime);
@@ -87,7 +87,7 @@ export var getGridDateOperators = function getGridDateOperators(showTime) {
     }
   }, {
     value: 'onOrBefore',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       return buildApplyFilterFn(filterItem, function (value1, value2) {
         return value1 <= value2;
       }, showTime);
@@ -98,21 +98,19 @@ export var getGridDateOperators = function getGridDateOperators(showTime) {
     }
   }, {
     value: 'isEmpty',
-    getApplyFilterFn: function getApplyFilterFn() {
-      return function (_ref2) {
-        var value = _ref2.value;
+    getApplyFilterFnV7: function getApplyFilterFnV7() {
+      return function (value) {
         return value == null;
       };
     },
     requiresFilterValue: false
   }, {
     value: 'isNotEmpty',
-    getApplyFilterFn: function getApplyFilterFn() {
-      return function (_ref3) {
-        var value = _ref3.value;
+    getApplyFilterFnV7: function getApplyFilterFnV7() {
+      return function (value) {
         return value != null;
       };
     },
     requiresFilterValue: false
-  }];
+  }]);
 };

package/legacy/colDef/gridNumericColDef.js

@@ -3,6 +3,7 @@ import { gridNumberComparator } from '../hooks/features/sorting/gridSortingUtils
 import { isNumber } from '../utils/utils';
 import { getGridNumericOperators, getGridNumericQuickFilterFn } from './gridNumericOperators';
 import { GRID_STRING_COL_DEF } from './gridStringColDef';
+import { convertQuickFilterV7ToLegacy } from './utils';
 export var GRID_NUMERIC_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
   type: 'number',
   align: 'right',
@@ -16,5 +17,6 @@ export var GRID_NUMERIC_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
     return isNumber(value) ? value.toLocaleString() : value || '';
   },
   filterOperators: getGridNumericOperators(),
-  getApplyQuickFilterFn: getGridNumericQuickFilterFn
+  getApplyQuickFilterFn: convertQuickFilterV7ToLegacy(getGridNumericQuickFilterFn),
+  getApplyQuickFilterFnV7: getGridNumericQuickFilterFn
 });

package/legacy/colDef/gridNumericOperators.js

@@ -1,29 +1,28 @@
 import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilterInputValue';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
+import { convertLegacyOperators, tagInternalFilter } from './utils';
 var parseNumericValue = function parseNumericValue(value) {
   if (value == null) {
     return null;
   }
   return Number(value);
 };
-export var getGridNumericQuickFilterFn = function getGridNumericQuickFilterFn(value) {
+export var getGridNumericQuickFilterFn = tagInternalFilter(function (value) {
   if (value == null || Number.isNaN(value) || value === '') {
     return null;
   }
-  return function (_ref) {
-    var columnValue = _ref.value;
+  return function (columnValue) {
     return parseNumericValue(columnValue) === parseNumericValue(value);
   };
-};
+});
 export var getGridNumericOperators = function getGridNumericOperators() {
-  return [{
+  return convertLegacyOperators([{
     value: '=',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || Number.isNaN(filterItem.value)) {
         return null;
       }
-      return function (_ref2) {
-        var value = _ref2.value;
+      return function (value) {
         return parseNumericValue(value) === filterItem.value;
       };
     },
@@ -33,12 +32,11 @@ export var getGridNumericOperators = function getGridNumericOperators() {
     }
   }, {
     value: '!=',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || Number.isNaN(filterItem.value)) {
         return null;
       }
-      return function (_ref3) {
-        var value = _ref3.value;
+      return function (value) {
         return parseNumericValue(value) !== filterItem.value;
       };
     },
@@ -48,12 +46,11 @@ export var getGridNumericOperators = function getGridNumericOperators() {
     }
   }, {
     value: '>',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || Number.isNaN(filterItem.value)) {
         return null;
       }
-      return function (_ref4) {
-        var value = _ref4.value;
+      return function (value) {
         if (value == null) {
           return false;
         }
@@ -66,12 +63,11 @@ export var getGridNumericOperators = function getGridNumericOperators() {
     }
   }, {
     value: '>=',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || Number.isNaN(filterItem.value)) {
         return null;
       }
-      return function (_ref5) {
-        var value = _ref5.value;
+      return function (value) {
         if (value == null) {
           return false;
         }
@@ -84,12 +80,11 @@ export var getGridNumericOperators = function getGridNumericOperators() {
     }
   }, {
     value: '<',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || Number.isNaN(filterItem.value)) {
         return null;
       }
-      return function (_ref6) {
-        var value = _ref6.value;
+      return function (value) {
         if (value == null) {
           return false;
         }
@@ -102,12 +97,11 @@ export var getGridNumericOperators = function getGridNumericOperators() {
     }
   }, {
     value: '<=',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || Number.isNaN(filterItem.value)) {
         return null;
       }
-      return function (_ref7) {
-        var value = _ref7.value;
+      return function (value) {
         if (value == null) {
           return false;
         }
@@ -120,30 +114,27 @@ export var getGridNumericOperators = function getGridNumericOperators() {
     }
   }, {
     value: 'isEmpty',
-    getApplyFilterFn: function getApplyFilterFn() {
-      return function (_ref8) {
-        var value = _ref8.value;
+    getApplyFilterFnV7: function getApplyFilterFnV7() {
+      return function (value) {
         return value == null;
       };
     },
     requiresFilterValue: false
   }, {
     value: 'isNotEmpty',
-    getApplyFilterFn: function getApplyFilterFn() {
-      return function (_ref9) {
-        var value = _ref9.value;
+    getApplyFilterFnV7: function getApplyFilterFnV7() {
+      return function (value) {
         return value != null;
       };
     },
     requiresFilterValue: false
   }, {
     value: 'isAnyOf',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
         return null;
       }
-      return function (_ref10) {
-        var value = _ref10.value;
+      return function (value) {
         return value != null && filterItem.value.includes(Number(value));
       };
     },
@@ -151,5 +142,5 @@ export var getGridNumericOperators = function getGridNumericOperators() {
     InputComponentProps: {
       type: 'number'
     }
-  }];
+  }]);
 };

package/legacy/colDef/gridSingleSelectOperators.js

@@ -1,6 +1,7 @@
 import { GridFilterInputSingleSelect } from '../components/panel/filterPanel/GridFilterInputSingleSelect';
 import { GridFilterInputMultipleSingleSelect } from '../components/panel/filterPanel/GridFilterInputMultipleSingleSelect';
 import { isObject } from '../utils/utils';
+import { convertLegacyOperators } from './utils';
 var parseObjectValue = function parseObjectValue(value) {
   if (value == null || !isObject(value)) {
     return value;
@@ -8,42 +9,39 @@ var parseObjectValue = function parseObjectValue(value) {
   return value.value;
 };
 export var getGridSingleSelectOperators = function getGridSingleSelectOperators() {
-  return [{
+  return convertLegacyOperators([{
     value: 'is',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || filterItem.value === '') {
         return null;
       }
-      return function (_ref) {
-        var value = _ref.value;
+      return function (value) {
         return parseObjectValue(value) === parseObjectValue(filterItem.value);
       };
     },
     InputComponent: GridFilterInputSingleSelect
   }, {
     value: 'not',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (filterItem.value == null || filterItem.value === '') {
         return null;
       }
-      return function (_ref2) {
-        var value = _ref2.value;
+      return function (value) {
         return parseObjectValue(value) !== parseObjectValue(filterItem.value);
       };
     },
     InputComponent: GridFilterInputSingleSelect
   }, {
     value: 'isAnyOf',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
         return null;
       }
       var filterItemValues = filterItem.value.map(parseObjectValue);
-      return function (_ref3) {
-        var value = _ref3.value;
+      return function (value) {
         return filterItemValues.includes(parseObjectValue(value));
       };
     },
     InputComponent: GridFilterInputMultipleSingleSelect
-  }];
+  }]);
 };

package/legacy/colDef/gridStringColDef.js

@@ -1,6 +1,7 @@
 import { renderEditInputCell } from '../components/cell/GridEditInputCell';
 import { gridStringOrNumberComparator } from '../hooks/features/sorting/gridSortingUtils';
 import { getGridStringOperators, getGridStringQuickFilterFn } from './gridStringOperators';
+import { convertQuickFilterV7ToLegacy } from './utils';
 
 /**
  * TODO: Move pro and premium properties outside of this Community file
@@ -23,5 +24,6 @@ export var GRID_STRING_COL_DEF = {
   align: 'left',
   filterOperators: getGridStringOperators(),
   renderEditCell: renderEditInputCell,
-  getApplyQuickFilterFn: getGridStringQuickFilterFn
+  getApplyQuickFilterFn: convertQuickFilterV7ToLegacy(getGridStringQuickFilterFn),
+  getApplyQuickFilterFnV7: getGridStringQuickFilterFn
 };

package/legacy/colDef/gridStringOperators.js

@@ -1,35 +1,35 @@
 import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilterInputValue';
 import { escapeRegExp } from '../utils/utils';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
-export var getGridStringQuickFilterFn = function getGridStringQuickFilterFn(value) {
+import { convertLegacyOperators, tagInternalFilter } from './utils';
+export var getGridStringQuickFilterFn = tagInternalFilter(function (value) {
   if (!value) {
     return null;
   }
   var filterRegex = new RegExp(escapeRegExp(value), 'i');
-  return function (_ref) {
-    var columnValue = _ref.formattedValue;
+  return function (_, row, column, apiRef) {
+    var columnValue = apiRef.current.getRowFormattedValue(row, column);
     return columnValue != null ? filterRegex.test(columnValue.toString()) : false;
   };
-};
+});
 export var getGridStringOperators = function getGridStringOperators() {
   var disableTrim = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  return [{
+  return convertLegacyOperators([{
     value: 'contains',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!filterItem.value) {
         return null;
       }
       var filterItemValue = disableTrim ? filterItem.value : filterItem.value.trim();
       var filterRegex = new RegExp(escapeRegExp(filterItemValue), 'i');
-      return function (_ref2) {
-        var value = _ref2.value;
-        return value != null ? filterRegex.test(value.toString()) : false;
+      return function (value) {
+        return value != null ? filterRegex.test(String(value)) : false;
       };
     },
     InputComponent: GridFilterInputValue
   }, {
     value: 'equals',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!filterItem.value) {
         return null;
       }
@@ -38,61 +38,56 @@ export var getGridStringOperators = function getGridStringOperators() {
         sensitivity: 'base',
         usage: 'search'
       });
-      return function (_ref3) {
-        var value = _ref3.value;
+      return function (value) {
         return value != null ? collator.compare(filterItemValue, value.toString()) === 0 : false;
       };
     },
     InputComponent: GridFilterInputValue
   }, {
     value: 'startsWith',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!filterItem.value) {
         return null;
       }
       var filterItemValue = disableTrim ? filterItem.value : filterItem.value.trim();
       var filterRegex = new RegExp("^".concat(escapeRegExp(filterItemValue), ".*$"), 'i');
-      return function (_ref4) {
-        var value = _ref4.value;
+      return function (value) {
         return value != null ? filterRegex.test(value.toString()) : false;
       };
     },
     InputComponent: GridFilterInputValue
   }, {
     value: 'endsWith',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!filterItem.value) {
         return null;
       }
       var filterItemValue = disableTrim ? filterItem.value : filterItem.value.trim();
       var filterRegex = new RegExp(".*".concat(escapeRegExp(filterItemValue), "$"), 'i');
-      return function (_ref5) {
-        var value = _ref5.value;
+      return function (value) {
         return value != null ? filterRegex.test(value.toString()) : false;
       };
     },
     InputComponent: GridFilterInputValue
   }, {
     value: 'isEmpty',
-    getApplyFilterFn: function getApplyFilterFn() {
-      return function (_ref6) {
-        var value = _ref6.value;
+    getApplyFilterFnV7: function getApplyFilterFnV7() {
+      return function (value) {
         return value === '' || value == null;
       };
     },
     requiresFilterValue: false
   }, {
     value: 'isNotEmpty',
-    getApplyFilterFn: function getApplyFilterFn() {
-      return function (_ref7) {
-        var value = _ref7.value;
+    getApplyFilterFnV7: function getApplyFilterFnV7() {
+      return function (value) {
         return value !== '' && value != null;
       };
     },
     requiresFilterValue: false
   }, {
     value: 'isAnyOf',
-    getApplyFilterFn: function getApplyFilterFn(filterItem) {
+    getApplyFilterFnV7: function getApplyFilterFnV7(filterItem) {
       if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
         return null;
       }
@@ -103,13 +98,12 @@ export var getGridStringOperators = function getGridStringOperators() {
         sensitivity: 'base',
         usage: 'search'
       });
-      return function (_ref8) {
-        var value = _ref8.value;
+      return function (value) {
         return value != null ? filterItemValue.some(function (filterValue) {
           return collator.compare(filterValue, value.toString() || '') === 0;
         }) : false;
       };
     },
     InputComponent: GridFilterInputMultipleValue
-  }];
+  }]);
 };

package/legacy/colDef/utils.js

@@ -0,0 +1,51 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+/**
+ * A global API ref, for v7-to-legacy converter
+ */
+export var GLOBAL_API_REF = {
+  current: null
+};
+
+/**
+ * A tagger to determine if the filter is internal or custom user-supplied.
+ * To be a valid internal filter, the V7 function *must* be defined/redefined at
+ * the same time as the legacy one.
+ * https://github.com/mui/mui-x/pull/9254#discussion_r1231095551
+ */
+export function tagInternalFilter(fn) {
+  fn.isInternal = true;
+  return fn;
+}
+export function isInternalFilter(fn) {
+  return fn !== undefined && fn.isInternal === true;
+}
+export function convertFilterV7ToLegacy(fn) {
+  return tagInternalFilter(function (filterItem, column) {
+    var filterFn = fn(filterItem, column);
+    if (!filterFn) {
+      return filterFn;
+    }
+    return function (cellParams) {
+      return filterFn(cellParams.value, cellParams.row, column, GLOBAL_API_REF.current);
+    };
+  });
+}
+export function convertLegacyOperators(ops) {
+  return ops.map(function (op) {
+    return _extends({}, op, {
+      getApplyFilterFn: convertFilterV7ToLegacy(op.getApplyFilterFnV7),
+      getApplyFilterFnV7: tagInternalFilter(op.getApplyFilterFnV7)
+    });
+  });
+}
+export function convertQuickFilterV7ToLegacy(fn) {
+  return tagInternalFilter(function (filterItem, column, apiRef) {
+    var filterFn = fn(filterItem, column, apiRef);
+    if (!filterFn) {
+      return filterFn;
+    }
+    return function (cellParams) {
+      return filterFn(cellParams.value, cellParams.row, column, apiRef);
+    };
+  });
+}

package/legacy/components/GridPagination.js

@@ -23,7 +23,6 @@ var GridPaginationRoot = styled(TablePagination)(function (_ref) {
   })), _ref2;
 });
 export var GridPagination = /*#__PURE__*/React.forwardRef(function GridPagination(props, ref) {
-  var _rootProps$pageSizeOp;
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
   var paginationModel = useGridSelector(apiRef, gridPaginationModelSelector);
@@ -42,22 +41,36 @@ export var GridPagination = /*#__PURE__*/React.forwardRef(function GridPaginatio
   var handlePageChange = React.useCallback(function (_, page) {
     apiRef.current.setPage(page);
   }, [apiRef]);
+  var isPageSizeIncludedInPageSizeOptions = function isPageSizeIncludedInPageSizeOptions(pageSize) {
+    for (var i = 0; i < rootProps.pageSizeOptions.length; i += 1) {
+      var option = rootProps.pageSizeOptions[i];
+      if (typeof option === 'number') {
+        if (option === pageSize) {
+          return true;
+        }
+      } else if (option.value === pageSize) {
+        return true;
+      }
+    }
+    return false;
+  };
   if (process.env.NODE_ENV !== 'production') {
     var _rootProps$pagination, _rootProps$pagination2;
     // eslint-disable-next-line react-hooks/rules-of-hooks
     var warnedOnceMissingInPageSizeOptions = React.useRef(false);
     var pageSize = (_rootProps$pagination = (_rootProps$pagination2 = rootProps.paginationModel) == null ? void 0 : _rootProps$pagination2.pageSize) != null ? _rootProps$pagination : paginationModel.pageSize;
-    if (!warnedOnceMissingInPageSizeOptions.current && !rootProps.autoPageSize && !rootProps.pageSizeOptions.includes(pageSize)) {
+    if (!warnedOnceMissingInPageSizeOptions.current && !rootProps.autoPageSize && !isPageSizeIncludedInPageSizeOptions(pageSize)) {
       console.warn(["MUI: The page size `".concat(paginationModel.pageSize, "` is not preset in the `pageSizeOptions`"), "Add it to show the pagination select."].join('\n'));
       warnedOnceMissingInPageSizeOptions.current = true;
     }
   }
+  var pageSizeOptions = isPageSizeIncludedInPageSizeOptions(paginationModel.pageSize) ? rootProps.pageSizeOptions : [];
   return /*#__PURE__*/_jsx(GridPaginationRoot, _extends({
     ref: ref,
     component: "div",
     count: rowCount,
     page: paginationModel.page <= lastPage ? paginationModel.page : lastPage,
-    rowsPerPageOptions: (_rootProps$pageSizeOp = rootProps.pageSizeOptions) != null && _rootProps$pageSizeOp.includes(paginationModel.pageSize) ? rootProps.pageSizeOptions : [],
+    rowsPerPageOptions: pageSizeOptions,
     rowsPerPage: paginationModel.pageSize,
     onPageChange: handlePageChange,
     onRowsPerPageChange: handlePageSizeChange

package/legacy/components/cell/GridCell.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["changeReason", "unstable_updateValueOnRender"],
-  _excluded2 = ["align", "children", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
+  _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
   _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
   _excluded4 = ["changeReason", "unstable_updateValueOnRender"];
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
@@ -153,6 +153,7 @@ var GridCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _rootProps$experiment;
   var align = props.align,
     childrenProp = props.children,
+    editCellState = props.editCellState,
     colIndex = props.colIndex,
     column = props.column,
     cellMode = props.cellMode,

package/legacy/components/cell/GridEditDateCell.js

@@ -151,7 +151,7 @@ function GridEditDateCell(props) {
   var meta = apiRef.current.unstable_getEditCellMeta(id, field);
   var handleInputRef = function handleInputRef(el) {
     inputRef.current = el;
-    if (meta.unstable_updateValueOnRender && !hasUpdatedEditValueOnMount.current) {
+    if (meta != null && meta.unstable_updateValueOnRender && !hasUpdatedEditValueOnMount.current) {
       var inputValue = inputRef.current.value;
       var parsedDate = parseValueToDate(inputValue);
       setValueState({