@mui/x-data-grid 6.0.0-beta.1 → 6.0.0-beta.2

package/CHANGELOG.md

@@ -3,6 +3,58 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 6.0.0-beta.2
+
+We'd like to offer a big thanks to the 11 contributors who made this release possible. Here are some highlights ✨:
+
+- 🚀 Support week day formats in the field components
+- 🌍 Add Hungarian (hu-HU) and Urdu (ur-PK) locales
+- 🌍 Improve French (fr-FR) and Italian (it-IT) locales
+- ✨ New codemods for migrating to v6
+- 📚 Documentation improvements
+- 🐞 Bug fixes
+
+### `@mui/x-data-grid@v6.0.0-beta.2` / `@mui/x-data-grid-pro@v6.0.0-beta.2` / `@mui/x-data-grid-premium@v6.0.0-beta.2`
+
+#### Changes
+
+- [DataGrid] Handle non-numeric values returned by `getRowHeight` prop (#7703) @cherniavskii
+- [DataGrid] Merge row styles with `componentsProps.row.style` (#7641) @marktoman
+- [l10n] Add Hungarian (hu-HU) locale (#7776) @noherczeg
+- [l10n] Add Urdu (ur-PK) locale (#6866) @MBilalShafi
+- [l10n] Improve French (fr-FR) locale (#7777) @Vivek-Prajapatii
+- [l10n] Improve Italian (it-IT) locale (#7761) @simonecervini
+
+### `@mui/x-date-pickers@v6.0.0-beta.2` / `@mui/x-date-pickers-pro@v6.0.0-beta.2`
+
+#### Changes
+
+- [fields] Support week day formats (#7392) @flaviendelangle
+- [pickers] Allow to initialize and control the `rangePosition` on all range components (#7764) @flaviendelangle
+- [pickers] Fix theme augmentation (#7800) @LukasTy
+- [pickers] Hide scrollbars in the date calendar container (#7766) @Vivek-Prajapatii
+- [pickers] Remove the dependency on `rifm` (#7785) @alexfauquette
+
+### `@mui/x-codemod@v6.0.0-beta.2`
+
+#### Changes
+
+- [codemod] Add pickers `rename-default-toolbar-title-localeText` codemod (#7752) @LukasTy
+- [codemod] Add pickers `rename-inputFormat-prop` codemod (#7736) @LukasTy
+
+### Docs
+
+- [docs] Fix a typo in data grid layout page (#7113) @sfbaker7
+- [docs] Fix require context path to avoid duplicate key creation (#7781) @LukasTy
+- [docs] Polish pickers migration docs (#7737) @LukasTy
+- [docs] Rename `next` translation docs and remove duplicates with `-next` (#7729) @LukasTy
+
+### Core
+
+- [core] Fix l10n data file (#7804) @flaviendelangle
+- [core] Fix Next.js warning (#7754) @oliviertassinari
+- [core] Remove unused demos (#7758) @flaviendelangle
+
 ## 6.0.0-beta.1
 
 _Jan 27, 2023_
@@ -1368,8 +1420,7 @@ We'd like to offer a big thanks to the 9 contributors who made this release poss
 - The toolbar related translation keys have been renamed to better fit their usage:
 
   ```diff
-   // Same on all other pickers
-   <DatePicker
+   <LocalizationProvider
      localeText={{
   -    datePickerDefaultToolbarTitle: 'Date Picker',
   +    datePickerToolbarTitle: 'Date Picker',
@@ -2022,7 +2073,33 @@ You can find more information about the new api, including how to set those tran
 - [test] Skip tests for column pinning and dynamic row height (#5997) @m4theushw
 - [website] Improve security header @oliviertassinari
 
-## v5.17.21
+## 5.17.22
+
+_Feb 2, 2023_
+
+We'd like to offer a big thanks to the 4 contributors who made this release possible. Here are some highlights ✨:
+
+- 🌍 Add Urdu (ur-PK) locale
+- 🌍 Improve French (fr-FR) and Italian (it-IT) locales
+- 🐞 Bugfixes
+
+### `@mui/x-data-grid@v5.17.22` / `@mui/x-data-grid-pro@v5.17.22` / `@mui/x-data-grid-premium@v5.17.22`
+
+#### Changes
+
+- [DataGrid] Fix an error when deleting pinned row using the buttons in the `actions` column (#7767) @cherniavskii
+- [DataGrid] Fix print preview regression in Chrome browser (#7405) @cherniavskii
+- [l10n] Add Urdu (ur-PK) locale (#7778) @MBilalShafi
+- [l10n] Improve French (fr-FR) locale (#7795) @Vivek-Prajapatii
+
+### `@mui/x-date-pickers@v5.0.17` / `@mui/x-date-pickers-pro@v5.0.17`
+
+#### Changes
+
+- [TimePicker] Add missing `themeAugmentation` entry (#7732) @LukasTy
+- [l10n] Improve Italian (it-IT) locale (#7761) @simonecervini
+
+## 5.17.21
 
 _Jan 27, 2023_
 

package/hooks/features/rows/useGridRowsMeta.js

@@ -10,12 +10,26 @@ import { gridPaginationSelector } from '../pagination/gridPaginationSelector';
 import { gridSortModelSelector } from '../sorting/gridSortingSelector';
 import { useGridRegisterPipeApplier } from '../../core/pipeProcessing';
 import { gridPinnedRowsSelector } from './gridRowsSelector';
+import { DATA_GRID_PROPS_DEFAULT_VALUES } from '../../../DataGrid/useDataGridProps';
 export const rowsMetaStateInitializer = state => _extends({}, state, {
   rowsMeta: {
     currentPageTotalHeight: 0,
     positions: []
   }
 });
+let warnedOnceInvalidRowHeight = false;
+const getValidRowHeight = (rowHeightProp, defaultRowHeight, warningMessage) => {
+  if (typeof rowHeightProp === 'number' && rowHeightProp > 0) {
+    return rowHeightProp;
+  }
+  if (process.env.NODE_ENV !== 'production' && !warnedOnceInvalidRowHeight && typeof rowHeightProp !== 'undefined' && rowHeightProp !== null) {
+    console.warn(warningMessage);
+    warnedOnceInvalidRowHeight = true;
+  }
+  return defaultRowHeight;
+};
+const rowHeightWarning = [`MUI: The \`rowHeight\` prop should be a number greater than 0.`, `The default value will be used instead.`].join('\n');
+const getRowHeightWarning = [`MUI: The \`getRowHeight\` prop should return a number greater than 0 or 'auto'.`, `The default value will be used instead.`].join('\n');
 
 /**
  * @requires useGridPageSize (method)
@@ -38,7 +52,8 @@ export const useGridRowsMeta = (apiRef, props) => {
   const sortModel = useGridSelector(apiRef, gridSortModelSelector);
   const currentPage = useGridVisibleRows(apiRef, props);
   const pinnedRows = useGridSelector(apiRef, gridPinnedRowsSelector);
-  const rowHeight = Math.floor(props.rowHeight * densityFactor);
+  const validRowHeight = getValidRowHeight(props.rowHeight, DATA_GRID_PROPS_DEFAULT_VALUES.rowHeight, rowHeightWarning);
+  const rowHeight = Math.floor(validRowHeight * densityFactor);
   const hydrateRowsMeta = React.useCallback(() => {
     var _pinnedRows$top, _pinnedRows$bottom;
     hasRowWithAutoHeight.current = false;
@@ -59,7 +74,7 @@ export const useGridRowsMeta = (apiRef, props) => {
         needsFirstMeasurement,
         sizes
       } = rowsHeightLookup.current[row.id];
-      let baseRowHeight = rowHeight;
+      let baseRowHeight = typeof rowHeight === 'number' && rowHeight > 0 ? rowHeight : 52;
       const existingBaseRowHeight = sizes.baseCenter;
       if (isResized) {
         // Do not recalculate resized row height and use the value from the lookup
@@ -82,8 +97,8 @@ export const useGridRowsMeta = (apiRef, props) => {
           hasRowWithAutoHeight.current = true;
           rowsHeightLookup.current[row.id].autoHeight = true;
         } else {
-          // Default back to base rowHeight if getRowHeight returns null or undefined.
-          baseRowHeight = rowHeightFromUser != null ? rowHeightFromUser : rowHeight;
+          // Default back to base rowHeight if getRowHeight returns invalid value.
+          baseRowHeight = getValidRowHeight(rowHeightFromUser, rowHeight, getRowHeightWarning);
           rowsHeightLookup.current[row.id].needsFirstMeasurement = false;
           rowsHeightLookup.current[row.id].autoHeight = false;
         }

package/hooks/features/virtualization/useGridVirtualScroller.js

@@ -1,6 +1,8 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["style"];
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["style"],
+  _excluded2 = ["style"],
+  _excluded3 = ["style"];
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils';
@@ -339,7 +341,7 @@ export const useGridVirtualScroller = props => {
     const renderedColumns = visibleColumns.slice(firstColumnToRender, lastColumnToRender);
     const rows = [];
     for (let i = 0; i < renderedRows.length; i += 1) {
-      var _currentPage$range5, _rootProps$components;
+      var _rootProps$components, _currentPage$range5;
       const {
         id,
         model
@@ -352,6 +354,16 @@ export const useGridVirtualScroller = props => {
       } else {
         isSelected = apiRef.current.isRowSelectable(id);
       }
+      const _ref = ((_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.row) || {},
+        {
+          style: rootRowStyle
+        } = _ref,
+        rootRowProps = _objectWithoutPropertiesLoose(_ref, _excluded);
+      const _ref2 = typeof getRowProps === 'function' && getRowProps(id, model) || {},
+        {
+          style: rowStyle
+        } = _ref2,
+        rowProps = _objectWithoutPropertiesLoose(_ref2, _excluded2);
       rows.push( /*#__PURE__*/_jsx(rootProps.components.Row, _extends({
         row: model,
         rowId: id,
@@ -371,7 +383,9 @@ export const useGridVirtualScroller = props => {
         containerWidth: availableSpace,
         isLastVisible: lastVisibleRowIndex,
         position: position
-      }, typeof getRowProps === 'function' ? getRowProps(id, model) : {}, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.row), id));
+      }, rowProps, rootRowProps, {
+        style: _extends({}, rowStyle, rootRowStyle)
+      }), id));
     }
     return rows;
   };
@@ -416,11 +430,11 @@ export const useGridVirtualScroller = props => {
     renderContext,
     updateRenderZonePosition,
     getRows,
-    getRootProps: (_ref = {}) => {
+    getRootProps: (_ref3 = {}) => {
       let {
           style = {}
-        } = _ref,
-        other = _objectWithoutPropertiesLoose(_ref, _excluded);
+        } = _ref3,
+        other = _objectWithoutPropertiesLoose(_ref3, _excluded3);
       return _extends({
         ref: handleRef,
         onScroll: handleScroll,

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.0.0-beta.1
+ * @mui/x-data-grid v6.0.0-beta.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/legacy/hooks/features/rows/useGridRowsMeta.js

@@ -11,6 +11,7 @@ import { gridPaginationSelector } from '../pagination/gridPaginationSelector';
 import { gridSortModelSelector } from '../sorting/gridSortingSelector';
 import { useGridRegisterPipeApplier } from '../../core/pipeProcessing';
 import { gridPinnedRowsSelector } from './gridRowsSelector';
+import { DATA_GRID_PROPS_DEFAULT_VALUES } from '../../../DataGrid/useDataGridProps';
 export var rowsMetaStateInitializer = function rowsMetaStateInitializer(state) {
   return _extends({}, state, {
     rowsMeta: {
@@ -19,6 +20,19 @@ export var rowsMetaStateInitializer = function rowsMetaStateInitializer(state) {
     }
   });
 };
+var warnedOnceInvalidRowHeight = false;
+var getValidRowHeight = function getValidRowHeight(rowHeightProp, defaultRowHeight, warningMessage) {
+  if (typeof rowHeightProp === 'number' && rowHeightProp > 0) {
+    return rowHeightProp;
+  }
+  if (process.env.NODE_ENV !== 'production' && !warnedOnceInvalidRowHeight && typeof rowHeightProp !== 'undefined' && rowHeightProp !== null) {
+    console.warn(warningMessage);
+    warnedOnceInvalidRowHeight = true;
+  }
+  return defaultRowHeight;
+};
+var rowHeightWarning = ["MUI: The `rowHeight` prop should be a number greater than 0.", "The default value will be used instead."].join('\n');
+var getRowHeightWarning = ["MUI: The `getRowHeight` prop should return a number greater than 0 or 'auto'.", "The default value will be used instead."].join('\n');
 
 /**
  * @requires useGridPageSize (method)
@@ -39,7 +53,8 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
   var sortModel = useGridSelector(apiRef, gridSortModelSelector);
   var currentPage = useGridVisibleRows(apiRef, props);
   var pinnedRows = useGridSelector(apiRef, gridPinnedRowsSelector);
-  var rowHeight = Math.floor(props.rowHeight * densityFactor);
+  var validRowHeight = getValidRowHeight(props.rowHeight, DATA_GRID_PROPS_DEFAULT_VALUES.rowHeight, rowHeightWarning);
+  var rowHeight = Math.floor(validRowHeight * densityFactor);
   var hydrateRowsMeta = React.useCallback(function () {
     var _pinnedRows$top, _pinnedRows$bottom;
     hasRowWithAutoHeight.current = false;
@@ -59,7 +74,7 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
         isResized = _rowsHeightLookup$cur.isResized,
         needsFirstMeasurement = _rowsHeightLookup$cur.needsFirstMeasurement,
         sizes = _rowsHeightLookup$cur.sizes;
-      var baseRowHeight = rowHeight;
+      var baseRowHeight = typeof rowHeight === 'number' && rowHeight > 0 ? rowHeight : 52;
       var existingBaseRowHeight = sizes.baseCenter;
       if (isResized) {
         // Do not recalculate resized row height and use the value from the lookup
@@ -82,8 +97,8 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
           hasRowWithAutoHeight.current = true;
           rowsHeightLookup.current[row.id].autoHeight = true;
         } else {
-          // Default back to base rowHeight if getRowHeight returns null or undefined.
-          baseRowHeight = rowHeightFromUser != null ? rowHeightFromUser : rowHeight;
+          // Default back to base rowHeight if getRowHeight returns invalid value.
+          baseRowHeight = getValidRowHeight(rowHeightFromUser, rowHeight, getRowHeightWarning);
           rowsHeightLookup.current[row.id].needsFirstMeasurement = false;
           rowsHeightLookup.current[row.id].autoHeight = false;
         }

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

@@ -1,7 +1,9 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["style"];
+var _excluded = ["style"],
+  _excluded2 = ["style"],
+  _excluded3 = ["style"];
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils';
@@ -365,7 +367,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     var renderedColumns = visibleColumns.slice(firstColumnToRender, lastColumnToRender);
     var rows = [];
     for (var i = 0; i < renderedRows.length; i += 1) {
-      var _currentPage$range5, _rootProps$components;
+      var _rootProps$components, _currentPage$range5;
       var _renderedRows$i = renderedRows[i],
         _id = _renderedRows$i.id,
         _model = _renderedRows$i.model;
@@ -377,6 +379,12 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       } else {
         isSelected = apiRef.current.isRowSelectable(_id);
       }
+      var _ref4 = ((_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.row) || {},
+        rootRowStyle = _ref4.style,
+        rootRowProps = _objectWithoutProperties(_ref4, _excluded);
+      var _ref5 = typeof getRowProps === 'function' && getRowProps(_id, _model) || {},
+        rowStyle = _ref5.style,
+        rowProps = _objectWithoutProperties(_ref5, _excluded2);
       rows.push( /*#__PURE__*/_jsx(rootProps.components.Row, _extends({
         row: _model,
         rowId: _id,
@@ -396,7 +404,9 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
         containerWidth: availableSpace,
         isLastVisible: lastVisibleRowIndex,
         position: position
-      }, typeof getRowProps === 'function' ? getRowProps(_id, _model) : {}, (_rootProps$components = rootProps.componentsProps) == null ? void 0 : _rootProps$components.row), _id));
+      }, rowProps, rootRowProps, {
+        style: _extends({}, rowStyle, rootRowStyle)
+      }), _id));
     }
     return rows;
   };
@@ -442,10 +452,10 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     updateRenderZonePosition: updateRenderZonePosition,
     getRows: getRows,
     getRootProps: function getRootProps() {
-      var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var _ref4$style = _ref4.style,
-        style = _ref4$style === void 0 ? {} : _ref4$style,
-        other = _objectWithoutProperties(_ref4, _excluded);
+      var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var _ref6$style = _ref6.style,
+        style = _ref6$style === void 0 ? {} : _ref6$style,
+        other = _objectWithoutProperties(_ref6, _excluded3);
       return _extends({
         ref: handleRef,
         onScroll: handleScroll,
@@ -455,9 +465,9 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       }, other);
     },
     getContentProps: function getContentProps() {
-      var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        _ref5$style = _ref5.style,
-        style = _ref5$style === void 0 ? {} : _ref5$style;
+      var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        _ref7$style = _ref7.style,
+        style = _ref7$style === void 0 ? {} : _ref7$style;
       return {
         style: _extends({}, style, contentSize)
       };

package/legacy/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.0.0-beta.1
+ * @mui/x-data-grid v6.0.0-beta.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/legacy/locales/frFR.js

@@ -60,7 +60,7 @@ var frFRGrid = {
   filterOperatorOnOrBefore: 'égal ou antérieur',
   filterOperatorIsEmpty: 'est vide',
   filterOperatorIsNotEmpty: "n'est pas vide",
-  filterOperatorIsAnyOf: 'fait parti de',
+  filterOperatorIsAnyOf: 'fait partie de',
   // Filter values text
   filterValueAny: 'tous',
   filterValueTrue: 'vrai',

package/legacy/locales/index.js

@@ -26,6 +26,7 @@ export * from './skSK';
 export * from './svSE';
 export * from './trTR';
 export * from './ukUA';
+export * from './urPK';
 export * from './viVN';
 export * from './zhCN';
 export * from './zhTW';

package/legacy/locales/urPK.js

@@ -0,0 +1,134 @@
+import { urPKCore } from './coreLocales';
+import { getGridLocalization } from '../utils/getGridLocalization';
+var urPKGrid = {
+  // Root
+  noRowsLabel: 'کوئی قطاریں نہیں',
+  noResultsOverlayLabel: 'کوئی نتائج نہیں',
+  // Density selector toolbar button text
+  toolbarDensity: 'کثافت',
+  toolbarDensityLabel: 'کثافت',
+  toolbarDensityCompact: 'تنگ',
+  toolbarDensityStandard: 'درمیانہ',
+  toolbarDensityComfortable: 'مناسب',
+  // Columns selector toolbar button text
+  toolbarColumns: 'کالمز',
+  toolbarColumnsLabel: 'کالمز کو منتخب کریں',
+  // Filters toolbar button text
+  toolbarFilters: 'فلٹرز',
+  toolbarFiltersLabel: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipHide: 'فلٹرز چھپائیں',
+  toolbarFiltersTooltipShow: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipActive: function toolbarFiltersTooltipActive(count) {
+    return count !== 1 ? "".concat(count, " \u0641\u0639\u0627\u0644 \u0641\u0644\u0679\u0631\u0632") : "".concat(count, " \u0641\u0644\u0679\u0631\u0632 \u0641\u0639\u0627\u0644");
+  },
+  // Quick filter toolbar field
+  toolbarQuickFilterPlaceholder: 'تلاش کریں۔۔۔',
+  toolbarQuickFilterLabel: 'تلاش کریں',
+  toolbarQuickFilterDeleteIconLabel: 'کلئیر کریں',
+  // Export selector toolbar button text
+  toolbarExport: 'ایکسپورٹ',
+  toolbarExportLabel: 'ایکسپورٹ',
+  toolbarExportCSV: 'CSV کے طور پر ڈاوٴنلوڈ کریں',
+  toolbarExportPrint: 'پرنٹ کریں',
+  toolbarExportExcel: 'ایکسل کے طور پر ڈاوٴنلوڈ کریں',
+  // Columns panel text
+  columnsPanelTextFieldLabel: 'کالم کو تلاش کریں',
+  columnsPanelTextFieldPlaceholder: 'کالم کا عنوان',
+  columnsPanelDragIconLabel: 'کالم کی ترتیب تبدیل کریں',
+  columnsPanelShowAllButton: 'سارے دکھائیں',
+  columnsPanelHideAllButton: 'سارے چھپائیں',
+  // Filter panel text
+  filterPanelAddFilter: 'نیا فلٹر',
+  filterPanelDeleteIconLabel: 'ختم کریں',
+  filterPanelLogicOperator: 'لاجک آپریٹر',
+  filterPanelOperator: 'آپریٹر',
+  filterPanelOperatorAnd: 'اور',
+  filterPanelOperatorOr: 'یا',
+  filterPanelColumns: 'کالمز',
+  filterPanelInputLabel: 'ویلیو',
+  filterPanelInputPlaceholder: 'ویلیو کو فلٹر کریں',
+  // Filter operators text
+  filterOperatorContains: 'شامل ہے',
+  filterOperatorEquals: 'برابر ہے',
+  filterOperatorStartsWith: 'شروع ہوتا ہے',
+  filterOperatorEndsWith: 'ختم ہوتا ہے',
+  filterOperatorIs: 'ہے',
+  filterOperatorNot: 'نہیں',
+  filterOperatorAfter: 'بعد میں ہے',
+  filterOperatorOnOrAfter: 'پر یا بعد میں ہے',
+  filterOperatorBefore: 'پہلے ہے',
+  filterOperatorOnOrBefore: 'پر یا پہلے ہے',
+  filterOperatorIsEmpty: 'خالی ہے',
+  filterOperatorIsNotEmpty: 'خالی نہیں ہے',
+  filterOperatorIsAnyOf: 'ان میں سے کوئی ہے',
+  // Filter values text
+  filterValueAny: 'کوئی بھی',
+  filterValueTrue: 'صحیح',
+  filterValueFalse: 'غلط',
+  // Column menu text
+  columnMenuLabel: 'مینیو',
+  columnMenuShowColumns: 'کالم دکھائیں',
+  columnMenuManageColumns: 'کالم مینج کریں',
+  columnMenuFilter: 'فلٹر',
+  columnMenuHideColumn: 'چھپائیں',
+  columnMenuUnsort: 'sort ختم کریں',
+  columnMenuSortAsc: 'ترتیب صعودی',
+  columnMenuSortDesc: 'ترتیب نزولی',
+  // Column header text
+  columnHeaderFiltersTooltipActive: function columnHeaderFiltersTooltipActive(count) {
+    return count !== 1 ? "".concat(count, " \u0641\u0639\u0627\u0644 \u0641\u0644\u0679\u0631\u0632") : "".concat(count, " \u0641\u0644\u0679\u0631\u0632 \u0641\u0639\u0627\u0644");
+  },
+  columnHeaderFiltersLabel: 'فلٹرز دکھائیں',
+  columnHeaderSortIconLabel: 'Sort',
+  // Rows selected footer text
+  footerRowSelected: function footerRowSelected(count) {
+    return count !== 1 ? "".concat(count.toLocaleString(), " \u0645\u0646\u062A\u062E\u0628 \u0642\u0637\u0627\u0631\u06CC\u06BA") : "".concat(count.toLocaleString(), " \u0645\u0646\u062A\u062E\u0628 \u0642\u0637\u0627\u0631");
+  },
+  // Total row amount footer text
+  footerTotalRows: 'کل قطاریں:',
+  // Total visible row amount footer text
+  footerTotalVisibleRows: function footerTotalVisibleRows(visibleCount, totalCount) {
+    return "".concat(totalCount.toLocaleString(), " \u0645\u06CC\u06BA \u0633\u06D2 ").concat(visibleCount.toLocaleString());
+  },
+  // Checkbox selection text
+  checkboxSelectionHeaderName: 'چیک باکس منتخب کریں',
+  checkboxSelectionSelectAllRows: 'تمام قطاریں منتخب کریں',
+  checkboxSelectionUnselectAllRows: 'تمام قطاریں نامنتخب کریں ',
+  checkboxSelectionSelectRow: 'قطار منتخب کریں',
+  checkboxSelectionUnselectRow: 'قطار نامنتخب کریں',
+  // Boolean cell text
+  booleanCellTrueLabel: 'ہاں',
+  booleanCellFalseLabel: 'نہیں',
+  // Actions cell more text
+  actionsCellMore: 'ذیادہ',
+  // Column pinning text
+  pinToLeft: 'بائیں جانب pin کریں',
+  pinToRight: 'دائیں جانب pin کریں',
+  unpin: 'pin ختم کریں',
+  // Tree Data
+  treeDataGroupingHeaderName: 'گروپ',
+  treeDataExpand: 'شاخیں دیکھیں',
+  treeDataCollapse: 'شاخیں چھپائیں',
+  // Grouping columns
+  groupingColumnHeaderName: 'گروپ',
+  groupColumn: function groupColumn(name) {
+    return "".concat(name, " \u0633\u06D2 \u06AF\u0631\u0648\u067E \u06A9\u0631\u06CC\u06BA");
+  },
+  unGroupColumn: function unGroupColumn(name) {
+    return "".concat(name, " \u0633\u06D2 \u06AF\u0631\u0648\u067E \u062E\u062A\u0645 \u06A9\u0631\u06CC\u06BA");
+  },
+  // Master/detail
+  detailPanelToggle: 'ڈیٹیل پینل کھولیں / بند کریں',
+  expandDetailPanel: 'پھیلائیں',
+  collapseDetailPanel: 'تنگ کریں',
+  // Row reordering text
+  rowReorderingHeaderName: 'قطاروں کی ترتیب تبدیل کریں',
+  // Aggregation
+  aggregationMenuItemHeader: 'Aggregation',
+  aggregationFunctionLabelSum: 'sum',
+  aggregationFunctionLabelAvg: 'avg',
+  aggregationFunctionLabelMin: 'min',
+  aggregationFunctionLabelMax: 'max',
+  aggregationFunctionLabelSize: 'size'
+};
+export var urPK = getGridLocalization(urPKGrid, urPKCore);

package/locales/frFR.js

@@ -58,7 +58,7 @@ const frFRGrid = {
   filterOperatorOnOrBefore: 'égal ou antérieur',
   filterOperatorIsEmpty: 'est vide',
   filterOperatorIsNotEmpty: "n'est pas vide",
-  filterOperatorIsAnyOf: 'fait parti de',
+  filterOperatorIsAnyOf: 'fait partie de',
   // Filter values text
   filterValueAny: 'tous',
   filterValueTrue: 'vrai',

package/locales/index.d.ts

@@ -25,6 +25,7 @@ export * from './skSK';
 export * from './svSE';
 export * from './trTR';
 export * from './ukUA';
+export * from './urPK';
 export * from './viVN';
 export * from './zhCN';
 export * from './zhTW';

package/locales/index.js

@@ -26,6 +26,7 @@ export * from './skSK';
 export * from './svSE';
 export * from './trTR';
 export * from './ukUA';
+export * from './urPK';
 export * from './viVN';
 export * from './zhCN';
 export * from './zhTW';

package/locales/urPK.d.ts

@@ -0,0 +1,2 @@
+import { Localization } from '../utils/getGridLocalization';
+export declare const urPK: Localization;

package/locales/urPK.js

@@ -0,0 +1,122 @@
+import { urPKCore } from './coreLocales';
+import { getGridLocalization } from '../utils/getGridLocalization';
+const urPKGrid = {
+  // Root
+  noRowsLabel: 'کوئی قطاریں نہیں',
+  noResultsOverlayLabel: 'کوئی نتائج نہیں',
+  // Density selector toolbar button text
+  toolbarDensity: 'کثافت',
+  toolbarDensityLabel: 'کثافت',
+  toolbarDensityCompact: 'تنگ',
+  toolbarDensityStandard: 'درمیانہ',
+  toolbarDensityComfortable: 'مناسب',
+  // Columns selector toolbar button text
+  toolbarColumns: 'کالمز',
+  toolbarColumnsLabel: 'کالمز کو منتخب کریں',
+  // Filters toolbar button text
+  toolbarFilters: 'فلٹرز',
+  toolbarFiltersLabel: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipHide: 'فلٹرز چھپائیں',
+  toolbarFiltersTooltipShow: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipActive: count => count !== 1 ? `${count} فعال فلٹرز` : `${count} فلٹرز فعال`,
+  // Quick filter toolbar field
+  toolbarQuickFilterPlaceholder: 'تلاش کریں۔۔۔',
+  toolbarQuickFilterLabel: 'تلاش کریں',
+  toolbarQuickFilterDeleteIconLabel: 'کلئیر کریں',
+  // Export selector toolbar button text
+  toolbarExport: 'ایکسپورٹ',
+  toolbarExportLabel: 'ایکسپورٹ',
+  toolbarExportCSV: 'CSV کے طور پر ڈاوٴنلوڈ کریں',
+  toolbarExportPrint: 'پرنٹ کریں',
+  toolbarExportExcel: 'ایکسل کے طور پر ڈاوٴنلوڈ کریں',
+  // Columns panel text
+  columnsPanelTextFieldLabel: 'کالم کو تلاش کریں',
+  columnsPanelTextFieldPlaceholder: 'کالم کا عنوان',
+  columnsPanelDragIconLabel: 'کالم کی ترتیب تبدیل کریں',
+  columnsPanelShowAllButton: 'سارے دکھائیں',
+  columnsPanelHideAllButton: 'سارے چھپائیں',
+  // Filter panel text
+  filterPanelAddFilter: 'نیا فلٹر',
+  filterPanelDeleteIconLabel: 'ختم کریں',
+  filterPanelLogicOperator: 'لاجک آپریٹر',
+  filterPanelOperator: 'آپریٹر',
+  filterPanelOperatorAnd: 'اور',
+  filterPanelOperatorOr: 'یا',
+  filterPanelColumns: 'کالمز',
+  filterPanelInputLabel: 'ویلیو',
+  filterPanelInputPlaceholder: 'ویلیو کو فلٹر کریں',
+  // Filter operators text
+  filterOperatorContains: 'شامل ہے',
+  filterOperatorEquals: 'برابر ہے',
+  filterOperatorStartsWith: 'شروع ہوتا ہے',
+  filterOperatorEndsWith: 'ختم ہوتا ہے',
+  filterOperatorIs: 'ہے',
+  filterOperatorNot: 'نہیں',
+  filterOperatorAfter: 'بعد میں ہے',
+  filterOperatorOnOrAfter: 'پر یا بعد میں ہے',
+  filterOperatorBefore: 'پہلے ہے',
+  filterOperatorOnOrBefore: 'پر یا پہلے ہے',
+  filterOperatorIsEmpty: 'خالی ہے',
+  filterOperatorIsNotEmpty: 'خالی نہیں ہے',
+  filterOperatorIsAnyOf: 'ان میں سے کوئی ہے',
+  // Filter values text
+  filterValueAny: 'کوئی بھی',
+  filterValueTrue: 'صحیح',
+  filterValueFalse: 'غلط',
+  // Column menu text
+  columnMenuLabel: 'مینیو',
+  columnMenuShowColumns: 'کالم دکھائیں',
+  columnMenuManageColumns: 'کالم مینج کریں',
+  columnMenuFilter: 'فلٹر',
+  columnMenuHideColumn: 'چھپائیں',
+  columnMenuUnsort: 'sort ختم کریں',
+  columnMenuSortAsc: 'ترتیب صعودی',
+  columnMenuSortDesc: 'ترتیب نزولی',
+  // Column header text
+  columnHeaderFiltersTooltipActive: count => count !== 1 ? `${count} فعال فلٹرز` : `${count} فلٹرز فعال`,
+  columnHeaderFiltersLabel: 'فلٹرز دکھائیں',
+  columnHeaderSortIconLabel: 'Sort',
+  // Rows selected footer text
+  footerRowSelected: count => count !== 1 ? `${count.toLocaleString()} منتخب قطاریں` : `${count.toLocaleString()} منتخب قطار`,
+  // Total row amount footer text
+  footerTotalRows: 'کل قطاریں:',
+  // Total visible row amount footer text
+  footerTotalVisibleRows: (visibleCount, totalCount) => `${totalCount.toLocaleString()} میں سے ${visibleCount.toLocaleString()}`,
+  // Checkbox selection text
+  checkboxSelectionHeaderName: 'چیک باکس منتخب کریں',
+  checkboxSelectionSelectAllRows: 'تمام قطاریں منتخب کریں',
+  checkboxSelectionUnselectAllRows: 'تمام قطاریں نامنتخب کریں ',
+  checkboxSelectionSelectRow: 'قطار منتخب کریں',
+  checkboxSelectionUnselectRow: 'قطار نامنتخب کریں',
+  // Boolean cell text
+  booleanCellTrueLabel: 'ہاں',
+  booleanCellFalseLabel: 'نہیں',
+  // Actions cell more text
+  actionsCellMore: 'ذیادہ',
+  // Column pinning text
+  pinToLeft: 'بائیں جانب pin کریں',
+  pinToRight: 'دائیں جانب pin کریں',
+  unpin: 'pin ختم کریں',
+  // Tree Data
+  treeDataGroupingHeaderName: 'گروپ',
+  treeDataExpand: 'شاخیں دیکھیں',
+  treeDataCollapse: 'شاخیں چھپائیں',
+  // Grouping columns
+  groupingColumnHeaderName: 'گروپ',
+  groupColumn: name => `${name} سے گروپ کریں`,
+  unGroupColumn: name => `${name} سے گروپ ختم کریں`,
+  // Master/detail
+  detailPanelToggle: 'ڈیٹیل پینل کھولیں / بند کریں',
+  expandDetailPanel: 'پھیلائیں',
+  collapseDetailPanel: 'تنگ کریں',
+  // Row reordering text
+  rowReorderingHeaderName: 'قطاروں کی ترتیب تبدیل کریں',
+  // Aggregation
+  aggregationMenuItemHeader: 'Aggregation',
+  aggregationFunctionLabelSum: 'sum',
+  aggregationFunctionLabelAvg: 'avg',
+  aggregationFunctionLabelMin: 'min',
+  aggregationFunctionLabelMax: 'max',
+  aggregationFunctionLabelSize: 'size'
+};
+export const urPK = getGridLocalization(urPKGrid, urPKCore);

package/modern/hooks/features/rows/useGridRowsMeta.js

@@ -10,12 +10,26 @@ import { gridPaginationSelector } from '../pagination/gridPaginationSelector';
 import { gridSortModelSelector } from '../sorting/gridSortingSelector';
 import { useGridRegisterPipeApplier } from '../../core/pipeProcessing';
 import { gridPinnedRowsSelector } from './gridRowsSelector';
+import { DATA_GRID_PROPS_DEFAULT_VALUES } from '../../../DataGrid/useDataGridProps';
 export const rowsMetaStateInitializer = state => _extends({}, state, {
   rowsMeta: {
     currentPageTotalHeight: 0,
     positions: []
   }
 });
+let warnedOnceInvalidRowHeight = false;
+const getValidRowHeight = (rowHeightProp, defaultRowHeight, warningMessage) => {
+  if (typeof rowHeightProp === 'number' && rowHeightProp > 0) {
+    return rowHeightProp;
+  }
+  if (process.env.NODE_ENV !== 'production' && !warnedOnceInvalidRowHeight && typeof rowHeightProp !== 'undefined' && rowHeightProp !== null) {
+    console.warn(warningMessage);
+    warnedOnceInvalidRowHeight = true;
+  }
+  return defaultRowHeight;
+};
+const rowHeightWarning = [`MUI: The \`rowHeight\` prop should be a number greater than 0.`, `The default value will be used instead.`].join('\n');
+const getRowHeightWarning = [`MUI: The \`getRowHeight\` prop should return a number greater than 0 or 'auto'.`, `The default value will be used instead.`].join('\n');
 
 /**
  * @requires useGridPageSize (method)
@@ -38,7 +52,8 @@ export const useGridRowsMeta = (apiRef, props) => {
   const sortModel = useGridSelector(apiRef, gridSortModelSelector);
   const currentPage = useGridVisibleRows(apiRef, props);
   const pinnedRows = useGridSelector(apiRef, gridPinnedRowsSelector);
-  const rowHeight = Math.floor(props.rowHeight * densityFactor);
+  const validRowHeight = getValidRowHeight(props.rowHeight, DATA_GRID_PROPS_DEFAULT_VALUES.rowHeight, rowHeightWarning);
+  const rowHeight = Math.floor(validRowHeight * densityFactor);
   const hydrateRowsMeta = React.useCallback(() => {
     hasRowWithAutoHeight.current = false;
     const calculateRowProcessedSizes = row => {
@@ -58,7 +73,7 @@ export const useGridRowsMeta = (apiRef, props) => {
         needsFirstMeasurement,
         sizes
       } = rowsHeightLookup.current[row.id];
-      let baseRowHeight = rowHeight;
+      let baseRowHeight = typeof rowHeight === 'number' && rowHeight > 0 ? rowHeight : 52;
       const existingBaseRowHeight = sizes.baseCenter;
       if (isResized) {
         // Do not recalculate resized row height and use the value from the lookup
@@ -81,8 +96,8 @@ export const useGridRowsMeta = (apiRef, props) => {
           hasRowWithAutoHeight.current = true;
           rowsHeightLookup.current[row.id].autoHeight = true;
         } else {
-          // Default back to base rowHeight if getRowHeight returns null or undefined.
-          baseRowHeight = rowHeightFromUser ?? rowHeight;
+          // Default back to base rowHeight if getRowHeight returns invalid value.
+          baseRowHeight = getValidRowHeight(rowHeightFromUser, rowHeight, getRowHeightWarning);
           rowsHeightLookup.current[row.id].needsFirstMeasurement = false;
           rowsHeightLookup.current[row.id].autoHeight = false;
         }

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

@@ -1,6 +1,8 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["style"];
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["style"],
+  _excluded2 = ["style"],
+  _excluded3 = ["style"];
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils';
@@ -349,6 +351,16 @@ export const useGridVirtualScroller = props => {
       } else {
         isSelected = apiRef.current.isRowSelectable(id);
       }
+      const _ref = rootProps.componentsProps?.row || {},
+        {
+          style: rootRowStyle
+        } = _ref,
+        rootRowProps = _objectWithoutPropertiesLoose(_ref, _excluded);
+      const _ref2 = typeof getRowProps === 'function' && getRowProps(id, model) || {},
+        {
+          style: rowStyle
+        } = _ref2,
+        rowProps = _objectWithoutPropertiesLoose(_ref2, _excluded2);
       rows.push( /*#__PURE__*/_jsx(rootProps.components.Row, _extends({
         row: model,
         rowId: id,
@@ -368,7 +380,9 @@ export const useGridVirtualScroller = props => {
         containerWidth: availableSpace,
         isLastVisible: lastVisibleRowIndex,
         position: position
-      }, typeof getRowProps === 'function' ? getRowProps(id, model) : {}, rootProps.componentsProps?.row), id));
+      }, rowProps, rootRowProps, {
+        style: _extends({}, rowStyle, rootRowStyle)
+      }), id));
     }
     return rows;
   };
@@ -413,11 +427,11 @@ export const useGridVirtualScroller = props => {
     renderContext,
     updateRenderZonePosition,
     getRows,
-    getRootProps: (_ref = {}) => {
+    getRootProps: (_ref3 = {}) => {
       let {
           style = {}
-        } = _ref,
-        other = _objectWithoutPropertiesLoose(_ref, _excluded);
+        } = _ref3,
+        other = _objectWithoutPropertiesLoose(_ref3, _excluded3);
       return _extends({
         ref: handleRef,
         onScroll: handleScroll,

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.0.0-beta.1
+ * @mui/x-data-grid v6.0.0-beta.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/locales/frFR.js

@@ -58,7 +58,7 @@ const frFRGrid = {
   filterOperatorOnOrBefore: 'égal ou antérieur',
   filterOperatorIsEmpty: 'est vide',
   filterOperatorIsNotEmpty: "n'est pas vide",
-  filterOperatorIsAnyOf: 'fait parti de',
+  filterOperatorIsAnyOf: 'fait partie de',
   // Filter values text
   filterValueAny: 'tous',
   filterValueTrue: 'vrai',

package/modern/locales/index.js

@@ -26,6 +26,7 @@ export * from './skSK';
 export * from './svSE';
 export * from './trTR';
 export * from './ukUA';
+export * from './urPK';
 export * from './viVN';
 export * from './zhCN';
 export * from './zhTW';

package/modern/locales/urPK.js

@@ -0,0 +1,122 @@
+import { urPKCore } from './coreLocales';
+import { getGridLocalization } from '../utils/getGridLocalization';
+const urPKGrid = {
+  // Root
+  noRowsLabel: 'کوئی قطاریں نہیں',
+  noResultsOverlayLabel: 'کوئی نتائج نہیں',
+  // Density selector toolbar button text
+  toolbarDensity: 'کثافت',
+  toolbarDensityLabel: 'کثافت',
+  toolbarDensityCompact: 'تنگ',
+  toolbarDensityStandard: 'درمیانہ',
+  toolbarDensityComfortable: 'مناسب',
+  // Columns selector toolbar button text
+  toolbarColumns: 'کالمز',
+  toolbarColumnsLabel: 'کالمز کو منتخب کریں',
+  // Filters toolbar button text
+  toolbarFilters: 'فلٹرز',
+  toolbarFiltersLabel: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipHide: 'فلٹرز چھپائیں',
+  toolbarFiltersTooltipShow: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipActive: count => count !== 1 ? `${count} فعال فلٹرز` : `${count} فلٹرز فعال`,
+  // Quick filter toolbar field
+  toolbarQuickFilterPlaceholder: 'تلاش کریں۔۔۔',
+  toolbarQuickFilterLabel: 'تلاش کریں',
+  toolbarQuickFilterDeleteIconLabel: 'کلئیر کریں',
+  // Export selector toolbar button text
+  toolbarExport: 'ایکسپورٹ',
+  toolbarExportLabel: 'ایکسپورٹ',
+  toolbarExportCSV: 'CSV کے طور پر ڈاوٴنلوڈ کریں',
+  toolbarExportPrint: 'پرنٹ کریں',
+  toolbarExportExcel: 'ایکسل کے طور پر ڈاوٴنلوڈ کریں',
+  // Columns panel text
+  columnsPanelTextFieldLabel: 'کالم کو تلاش کریں',
+  columnsPanelTextFieldPlaceholder: 'کالم کا عنوان',
+  columnsPanelDragIconLabel: 'کالم کی ترتیب تبدیل کریں',
+  columnsPanelShowAllButton: 'سارے دکھائیں',
+  columnsPanelHideAllButton: 'سارے چھپائیں',
+  // Filter panel text
+  filterPanelAddFilter: 'نیا فلٹر',
+  filterPanelDeleteIconLabel: 'ختم کریں',
+  filterPanelLogicOperator: 'لاجک آپریٹر',
+  filterPanelOperator: 'آپریٹر',
+  filterPanelOperatorAnd: 'اور',
+  filterPanelOperatorOr: 'یا',
+  filterPanelColumns: 'کالمز',
+  filterPanelInputLabel: 'ویلیو',
+  filterPanelInputPlaceholder: 'ویلیو کو فلٹر کریں',
+  // Filter operators text
+  filterOperatorContains: 'شامل ہے',
+  filterOperatorEquals: 'برابر ہے',
+  filterOperatorStartsWith: 'شروع ہوتا ہے',
+  filterOperatorEndsWith: 'ختم ہوتا ہے',
+  filterOperatorIs: 'ہے',
+  filterOperatorNot: 'نہیں',
+  filterOperatorAfter: 'بعد میں ہے',
+  filterOperatorOnOrAfter: 'پر یا بعد میں ہے',
+  filterOperatorBefore: 'پہلے ہے',
+  filterOperatorOnOrBefore: 'پر یا پہلے ہے',
+  filterOperatorIsEmpty: 'خالی ہے',
+  filterOperatorIsNotEmpty: 'خالی نہیں ہے',
+  filterOperatorIsAnyOf: 'ان میں سے کوئی ہے',
+  // Filter values text
+  filterValueAny: 'کوئی بھی',
+  filterValueTrue: 'صحیح',
+  filterValueFalse: 'غلط',
+  // Column menu text
+  columnMenuLabel: 'مینیو',
+  columnMenuShowColumns: 'کالم دکھائیں',
+  columnMenuManageColumns: 'کالم مینج کریں',
+  columnMenuFilter: 'فلٹر',
+  columnMenuHideColumn: 'چھپائیں',
+  columnMenuUnsort: 'sort ختم کریں',
+  columnMenuSortAsc: 'ترتیب صعودی',
+  columnMenuSortDesc: 'ترتیب نزولی',
+  // Column header text
+  columnHeaderFiltersTooltipActive: count => count !== 1 ? `${count} فعال فلٹرز` : `${count} فلٹرز فعال`,
+  columnHeaderFiltersLabel: 'فلٹرز دکھائیں',
+  columnHeaderSortIconLabel: 'Sort',
+  // Rows selected footer text
+  footerRowSelected: count => count !== 1 ? `${count.toLocaleString()} منتخب قطاریں` : `${count.toLocaleString()} منتخب قطار`,
+  // Total row amount footer text
+  footerTotalRows: 'کل قطاریں:',
+  // Total visible row amount footer text
+  footerTotalVisibleRows: (visibleCount, totalCount) => `${totalCount.toLocaleString()} میں سے ${visibleCount.toLocaleString()}`,
+  // Checkbox selection text
+  checkboxSelectionHeaderName: 'چیک باکس منتخب کریں',
+  checkboxSelectionSelectAllRows: 'تمام قطاریں منتخب کریں',
+  checkboxSelectionUnselectAllRows: 'تمام قطاریں نامنتخب کریں ',
+  checkboxSelectionSelectRow: 'قطار منتخب کریں',
+  checkboxSelectionUnselectRow: 'قطار نامنتخب کریں',
+  // Boolean cell text
+  booleanCellTrueLabel: 'ہاں',
+  booleanCellFalseLabel: 'نہیں',
+  // Actions cell more text
+  actionsCellMore: 'ذیادہ',
+  // Column pinning text
+  pinToLeft: 'بائیں جانب pin کریں',
+  pinToRight: 'دائیں جانب pin کریں',
+  unpin: 'pin ختم کریں',
+  // Tree Data
+  treeDataGroupingHeaderName: 'گروپ',
+  treeDataExpand: 'شاخیں دیکھیں',
+  treeDataCollapse: 'شاخیں چھپائیں',
+  // Grouping columns
+  groupingColumnHeaderName: 'گروپ',
+  groupColumn: name => `${name} سے گروپ کریں`,
+  unGroupColumn: name => `${name} سے گروپ ختم کریں`,
+  // Master/detail
+  detailPanelToggle: 'ڈیٹیل پینل کھولیں / بند کریں',
+  expandDetailPanel: 'پھیلائیں',
+  collapseDetailPanel: 'تنگ کریں',
+  // Row reordering text
+  rowReorderingHeaderName: 'قطاروں کی ترتیب تبدیل کریں',
+  // Aggregation
+  aggregationMenuItemHeader: 'Aggregation',
+  aggregationFunctionLabelSum: 'sum',
+  aggregationFunctionLabelAvg: 'avg',
+  aggregationFunctionLabelMin: 'min',
+  aggregationFunctionLabelMax: 'max',
+  aggregationFunctionLabelSize: 'size'
+};
+export const urPK = getGridLocalization(urPKGrid, urPKCore);

package/node/hooks/features/rows/useGridRowsMeta.js

@@ -17,6 +17,7 @@ var _gridPaginationSelector = require("../pagination/gridPaginationSelector");
 var _gridSortingSelector = require("../sorting/gridSortingSelector");
 var _pipeProcessing = require("../../core/pipeProcessing");
 var _gridRowsSelector = require("./gridRowsSelector");
+var _useDataGridProps = require("../../../DataGrid/useDataGridProps");
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const rowsMetaStateInitializer = state => (0, _extends2.default)({}, state, {
@@ -25,12 +26,25 @@ const rowsMetaStateInitializer = state => (0, _extends2.default)({}, state, {
     positions: []
   }
 });
+exports.rowsMetaStateInitializer = rowsMetaStateInitializer;
+let warnedOnceInvalidRowHeight = false;
+const getValidRowHeight = (rowHeightProp, defaultRowHeight, warningMessage) => {
+  if (typeof rowHeightProp === 'number' && rowHeightProp > 0) {
+    return rowHeightProp;
+  }
+  if (process.env.NODE_ENV !== 'production' && !warnedOnceInvalidRowHeight && typeof rowHeightProp !== 'undefined' && rowHeightProp !== null) {
+    console.warn(warningMessage);
+    warnedOnceInvalidRowHeight = true;
+  }
+  return defaultRowHeight;
+};
+const rowHeightWarning = [`MUI: The \`rowHeight\` prop should be a number greater than 0.`, `The default value will be used instead.`].join('\n');
+const getRowHeightWarning = [`MUI: The \`getRowHeight\` prop should return a number greater than 0 or 'auto'.`, `The default value will be used instead.`].join('\n');
 
 /**
  * @requires useGridPageSize (method)
  * @requires useGridPage (method)
  */
-exports.rowsMetaStateInitializer = rowsMetaStateInitializer;
 const useGridRowsMeta = (apiRef, props) => {
   const {
     getRowHeight: getRowHeightProp,
@@ -48,7 +62,8 @@ const useGridRowsMeta = (apiRef, props) => {
   const sortModel = (0, _useGridSelector.useGridSelector)(apiRef, _gridSortingSelector.gridSortModelSelector);
   const currentPage = (0, _useGridVisibleRows.useGridVisibleRows)(apiRef, props);
   const pinnedRows = (0, _useGridSelector.useGridSelector)(apiRef, _gridRowsSelector.gridPinnedRowsSelector);
-  const rowHeight = Math.floor(props.rowHeight * densityFactor);
+  const validRowHeight = getValidRowHeight(props.rowHeight, _useDataGridProps.DATA_GRID_PROPS_DEFAULT_VALUES.rowHeight, rowHeightWarning);
+  const rowHeight = Math.floor(validRowHeight * densityFactor);
   const hydrateRowsMeta = React.useCallback(() => {
     hasRowWithAutoHeight.current = false;
     const calculateRowProcessedSizes = row => {
@@ -68,7 +83,7 @@ const useGridRowsMeta = (apiRef, props) => {
         needsFirstMeasurement,
         sizes
       } = rowsHeightLookup.current[row.id];
-      let baseRowHeight = rowHeight;
+      let baseRowHeight = typeof rowHeight === 'number' && rowHeight > 0 ? rowHeight : 52;
       const existingBaseRowHeight = sizes.baseCenter;
       if (isResized) {
         // Do not recalculate resized row height and use the value from the lookup
@@ -91,8 +106,8 @@ const useGridRowsMeta = (apiRef, props) => {
           hasRowWithAutoHeight.current = true;
           rowsHeightLookup.current[row.id].autoHeight = true;
         } else {
-          // Default back to base rowHeight if getRowHeight returns null or undefined.
-          baseRowHeight = rowHeightFromUser ?? rowHeight;
+          // Default back to base rowHeight if getRowHeight returns invalid value.
+          baseRowHeight = getValidRowHeight(rowHeightFromUser, rowHeight, getRowHeightWarning);
           rowsHeightLookup.current[row.id].needsFirstMeasurement = false;
           rowsHeightLookup.current[row.id].autoHeight = false;
         }

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.binarySearch = binarySearch;
 exports.useGridVirtualScroller = exports.getRenderableIndexes = void 0;
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var ReactDOM = _interopRequireWildcard(require("react-dom"));
 var _utils = require("@mui/utils");
@@ -25,7 +25,9 @@ var _gridRowsMetaSelector = require("../rows/gridRowsMetaSelector");
 var _gridColumnsUtils = require("../columns/gridColumnsUtils");
 var _gridRowsUtils = require("../rows/gridRowsUtils");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["style"];
+const _excluded = ["style"],
+  _excluded2 = ["style"],
+  _excluded3 = ["style"];
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // Uses binary search to avoid looping through all possible positions
@@ -359,6 +361,16 @@ const useGridVirtualScroller = props => {
       } else {
         isSelected = apiRef.current.isRowSelectable(id);
       }
+      const _ref = rootProps.componentsProps?.row || {},
+        {
+          style: rootRowStyle
+        } = _ref,
+        rootRowProps = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
+      const _ref2 = typeof getRowProps === 'function' && getRowProps(id, model) || {},
+        {
+          style: rowStyle
+        } = _ref2,
+        rowProps = (0, _objectWithoutPropertiesLoose2.default)(_ref2, _excluded2);
       rows.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.Row, (0, _extends2.default)({
         row: model,
         rowId: id,
@@ -378,7 +390,9 @@ const useGridVirtualScroller = props => {
         containerWidth: availableSpace,
         isLastVisible: lastVisibleRowIndex,
         position: position
-      }, typeof getRowProps === 'function' ? getRowProps(id, model) : {}, rootProps.componentsProps?.row), id));
+      }, rowProps, rootRowProps, {
+        style: (0, _extends2.default)({}, rowStyle, rootRowStyle)
+      }), id));
     }
     return rows;
   };
@@ -423,11 +437,11 @@ const useGridVirtualScroller = props => {
     renderContext,
     updateRenderZonePosition,
     getRows,
-    getRootProps: (_ref = {}) => {
+    getRootProps: (_ref3 = {}) => {
       let {
           style = {}
-        } = _ref,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
+        } = _ref3,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_ref3, _excluded3);
       return (0, _extends2.default)({
         ref: handleRef,
         onScroll: handleScroll,

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.0.0-beta.1
+ * @mui/x-data-grid v6.0.0-beta.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/node/locales/frFR.js

@@ -64,7 +64,7 @@ const frFRGrid = {
   filterOperatorOnOrBefore: 'égal ou antérieur',
   filterOperatorIsEmpty: 'est vide',
   filterOperatorIsNotEmpty: "n'est pas vide",
-  filterOperatorIsAnyOf: 'fait parti de',
+  filterOperatorIsAnyOf: 'fait partie de',
   // Filter values text
   filterValueAny: 'tous',
   filterValueTrue: 'vrai',

package/node/locales/index.js

@@ -300,6 +300,17 @@ Object.keys(_ukUA).forEach(function (key) {
     }
   });
 });
+var _urPK = require("./urPK");
+Object.keys(_urPK).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _urPK[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _urPK[key];
+    }
+  });
+});
 var _viVN = require("./viVN");
 Object.keys(_viVN).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/node/locales/urPK.js

@@ -0,0 +1,129 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.urPK = void 0;
+var _coreLocales = require("./coreLocales");
+var _getGridLocalization = require("../utils/getGridLocalization");
+const urPKGrid = {
+  // Root
+  noRowsLabel: 'کوئی قطاریں نہیں',
+  noResultsOverlayLabel: 'کوئی نتائج نہیں',
+  // Density selector toolbar button text
+  toolbarDensity: 'کثافت',
+  toolbarDensityLabel: 'کثافت',
+  toolbarDensityCompact: 'تنگ',
+  toolbarDensityStandard: 'درمیانہ',
+  toolbarDensityComfortable: 'مناسب',
+  // Columns selector toolbar button text
+  toolbarColumns: 'کالمز',
+  toolbarColumnsLabel: 'کالمز کو منتخب کریں',
+  // Filters toolbar button text
+  toolbarFilters: 'فلٹرز',
+  toolbarFiltersLabel: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipHide: 'فلٹرز چھپائیں',
+  toolbarFiltersTooltipShow: 'فلٹرز دکھائیں',
+  toolbarFiltersTooltipActive: count => count !== 1 ? `${count} فعال فلٹرز` : `${count} فلٹرز فعال`,
+  // Quick filter toolbar field
+  toolbarQuickFilterPlaceholder: 'تلاش کریں۔۔۔',
+  toolbarQuickFilterLabel: 'تلاش کریں',
+  toolbarQuickFilterDeleteIconLabel: 'کلئیر کریں',
+  // Export selector toolbar button text
+  toolbarExport: 'ایکسپورٹ',
+  toolbarExportLabel: 'ایکسپورٹ',
+  toolbarExportCSV: 'CSV کے طور پر ڈاوٴنلوڈ کریں',
+  toolbarExportPrint: 'پرنٹ کریں',
+  toolbarExportExcel: 'ایکسل کے طور پر ڈاوٴنلوڈ کریں',
+  // Columns panel text
+  columnsPanelTextFieldLabel: 'کالم کو تلاش کریں',
+  columnsPanelTextFieldPlaceholder: 'کالم کا عنوان',
+  columnsPanelDragIconLabel: 'کالم کی ترتیب تبدیل کریں',
+  columnsPanelShowAllButton: 'سارے دکھائیں',
+  columnsPanelHideAllButton: 'سارے چھپائیں',
+  // Filter panel text
+  filterPanelAddFilter: 'نیا فلٹر',
+  filterPanelDeleteIconLabel: 'ختم کریں',
+  filterPanelLogicOperator: 'لاجک آپریٹر',
+  filterPanelOperator: 'آپریٹر',
+  filterPanelOperatorAnd: 'اور',
+  filterPanelOperatorOr: 'یا',
+  filterPanelColumns: 'کالمز',
+  filterPanelInputLabel: 'ویلیو',
+  filterPanelInputPlaceholder: 'ویلیو کو فلٹر کریں',
+  // Filter operators text
+  filterOperatorContains: 'شامل ہے',
+  filterOperatorEquals: 'برابر ہے',
+  filterOperatorStartsWith: 'شروع ہوتا ہے',
+  filterOperatorEndsWith: 'ختم ہوتا ہے',
+  filterOperatorIs: 'ہے',
+  filterOperatorNot: 'نہیں',
+  filterOperatorAfter: 'بعد میں ہے',
+  filterOperatorOnOrAfter: 'پر یا بعد میں ہے',
+  filterOperatorBefore: 'پہلے ہے',
+  filterOperatorOnOrBefore: 'پر یا پہلے ہے',
+  filterOperatorIsEmpty: 'خالی ہے',
+  filterOperatorIsNotEmpty: 'خالی نہیں ہے',
+  filterOperatorIsAnyOf: 'ان میں سے کوئی ہے',
+  // Filter values text
+  filterValueAny: 'کوئی بھی',
+  filterValueTrue: 'صحیح',
+  filterValueFalse: 'غلط',
+  // Column menu text
+  columnMenuLabel: 'مینیو',
+  columnMenuShowColumns: 'کالم دکھائیں',
+  columnMenuManageColumns: 'کالم مینج کریں',
+  columnMenuFilter: 'فلٹر',
+  columnMenuHideColumn: 'چھپائیں',
+  columnMenuUnsort: 'sort ختم کریں',
+  columnMenuSortAsc: 'ترتیب صعودی',
+  columnMenuSortDesc: 'ترتیب نزولی',
+  // Column header text
+  columnHeaderFiltersTooltipActive: count => count !== 1 ? `${count} فعال فلٹرز` : `${count} فلٹرز فعال`,
+  columnHeaderFiltersLabel: 'فلٹرز دکھائیں',
+  columnHeaderSortIconLabel: 'Sort',
+  // Rows selected footer text
+  footerRowSelected: count => count !== 1 ? `${count.toLocaleString()} منتخب قطاریں` : `${count.toLocaleString()} منتخب قطار`,
+  // Total row amount footer text
+  footerTotalRows: 'کل قطاریں:',
+  // Total visible row amount footer text
+  footerTotalVisibleRows: (visibleCount, totalCount) => `${totalCount.toLocaleString()} میں سے ${visibleCount.toLocaleString()}`,
+  // Checkbox selection text
+  checkboxSelectionHeaderName: 'چیک باکس منتخب کریں',
+  checkboxSelectionSelectAllRows: 'تمام قطاریں منتخب کریں',
+  checkboxSelectionUnselectAllRows: 'تمام قطاریں نامنتخب کریں ',
+  checkboxSelectionSelectRow: 'قطار منتخب کریں',
+  checkboxSelectionUnselectRow: 'قطار نامنتخب کریں',
+  // Boolean cell text
+  booleanCellTrueLabel: 'ہاں',
+  booleanCellFalseLabel: 'نہیں',
+  // Actions cell more text
+  actionsCellMore: 'ذیادہ',
+  // Column pinning text
+  pinToLeft: 'بائیں جانب pin کریں',
+  pinToRight: 'دائیں جانب pin کریں',
+  unpin: 'pin ختم کریں',
+  // Tree Data
+  treeDataGroupingHeaderName: 'گروپ',
+  treeDataExpand: 'شاخیں دیکھیں',
+  treeDataCollapse: 'شاخیں چھپائیں',
+  // Grouping columns
+  groupingColumnHeaderName: 'گروپ',
+  groupColumn: name => `${name} سے گروپ کریں`,
+  unGroupColumn: name => `${name} سے گروپ ختم کریں`,
+  // Master/detail
+  detailPanelToggle: 'ڈیٹیل پینل کھولیں / بند کریں',
+  expandDetailPanel: 'پھیلائیں',
+  collapseDetailPanel: 'تنگ کریں',
+  // Row reordering text
+  rowReorderingHeaderName: 'قطاروں کی ترتیب تبدیل کریں',
+  // Aggregation
+  aggregationMenuItemHeader: 'Aggregation',
+  aggregationFunctionLabelSum: 'sum',
+  aggregationFunctionLabelAvg: 'avg',
+  aggregationFunctionLabelMin: 'min',
+  aggregationFunctionLabelMax: 'max',
+  aggregationFunctionLabelSize: 'size'
+};
+const urPK = (0, _getGridLocalization.getGridLocalization)(urPKGrid, _coreLocales.urPKCore);
+exports.urPK = urPK;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.2",
   "description": "The community edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",