@mui/x-data-grid 5.17.14 → 5.17.17

package/CHANGELOG.md

@@ -3,6 +3,83 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 5.17.17
+
+_Dec 23, 2022_
+
+We'd like to offer a big thanks to the 4 contributors who made this release possible. Here are some highlights ✨:
+
+- 🌍 Improve Russian (ru-RU) and Korean (ko-KR) locales
+- 🐞 Bugfixes
+
+### `@mui/x-data-grid@5.17.17` / `@mui/x-data-grid-pro@5.17.17` / `@mui/x-data-grid-premium@5.17.17`
+
+#### Changes
+
+- [DataGrid] Update Russian (ru-RU) locale (#7291) @VeceluXa
+- [DataGridPro] Use row ID as `key` of the detail panels (#7311) @m4theushw
+- [DataGridPremium] Fix `exceljs` import with parcel (#7285) @alexfauquette
+
+### `@mui/x-date-pickers@5.0.12` / `@mui/x-date-pickers-pro@5.0.12`
+
+#### Changes
+
+- [pickers] Improve Korean (ko-KR) locale (#7283) @hanbin9775
+
+## 5.17.16
+
+_Dec 16, 2022_
+
+We'd like to offer a big thanks to the 4 contributors who made this release possible. Here are some highlights ✨:
+
+- 🐞 Bugfixes
+
+### `@mui/x-data-grid@v5.17.16` / `@mui/x-data-grid-pro@v5.17.16` / `@mui/x-data-grid-premium@v5.17.16`
+
+#### Changes
+
+- [DataGrid] Display sort column menu items as per `sortingOrder` prop (#7125) @hanbin9775
+- [DataGrid] Fix flickering on mount (#7155) @cherniavskii
+- [DataGridPremium] Use separate cache for aggregation columns pre-processor (#7174) @m4theushw
+
+### `@mui/x-date-pickers@v5.0.11` / `@mui/x-date-pickers-pro@v5.0.11`
+
+#### Changes
+
+- [DateTimePicker] Update export pattern (#7172) @kealjones-wk
+
+### Docs
+
+- [docs] Document aggregation selectors (#7151) @cherniavskii
+
+## 5.17.15
+
+_Dec 8, 2022_
+
+We'd like to offer a big thanks to the 4 contributors who made this release possible. Here are some highlights ✨:
+
+- ✨ Fix lazy-loading not working in `DataGridPremium` (#7130) @m4theushw
+- 🐞 Bugfixes
+
+### `@mui/x-data-grid@v5.17.15` / `@mui/x-data-grid-pro@v5.17.15` / `@mui/x-data-grid-premium@v5.17.15`
+
+#### Changes
+
+- [DataGridPremium] Add support for lazy-loading (#7130) @m4theushw
+- [DataGridPremium] Pass `groupId` to the aggregation function (#7143) @m4theushw
+
+### `@mui/x-date-pickers@v5.0.10` / `@mui/x-date-pickers-pro@v5.0.10`
+
+#### Changes
+
+- [pickers] Initialize date without time when selecting year or month (#7136) @LukasTy
+
+### Docs
+
+- [docs] Fix the nested import on the api pages (#7134) @flaviendelangle
+- [docs] Keep track of the localization completion (#7099) @alexfauquette
+- [docs] Update localization doc to use existing locale (#7104) @LukasTy
+
 ## 5.17.14
 
 _Dec 1, 2022_

package/components/menu/columnMenu/SortGridMenuItems.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { GridFilterItemProps } from './GridFilterItemProps';
-declare const SortGridMenuItems: {
-    (props: GridFilterItemProps): JSX.Element | null;
-    propTypes: any;
-};
+declare function SortGridMenuItems(props: GridFilterItemProps): JSX.Element | null;
+declare namespace SortGridMenuItems {
+    var propTypes: any;
+}
 export { SortGridMenuItems };

package/components/menu/columnMenu/SortGridMenuItems.js

@@ -4,16 +4,21 @@ import MenuItem from '@mui/material/MenuItem';
 import { useGridSelector } from '../../../hooks/utils/useGridSelector';
 import { gridSortModelSelector } from '../../../hooks/features/sorting/gridSortingSelector';
 import { useGridApiContext } from '../../../hooks/utils/useGridApiContext';
+import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 
-const SortGridMenuItems = props => {
+function SortGridMenuItems(props) {
+  var _column$sortingOrder;
+
   const {
     column,
     onClick
   } = props;
   const apiRef = useGridApiContext();
   const sortModel = useGridSelector(apiRef, gridSortModelSelector);
+  const rootProps = useGridRootProps();
+  const sortingOrder = (_column$sortingOrder = column.sortingOrder) != null ? _column$sortingOrder : rootProps.sortingOrder;
   const sortDirection = React.useMemo(() => {
     if (!column) {
       return null;
@@ -33,23 +38,23 @@ const SortGridMenuItems = props => {
   }
 
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [/*#__PURE__*/_jsx(MenuItem, {
+    children: [sortingOrder.includes(null) ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       disabled: sortDirection == null,
       children: apiRef.current.getLocaleText('columnMenuUnsort')
-    }), /*#__PURE__*/_jsx(MenuItem, {
+    }) : null, sortingOrder.includes('asc') ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       "data-value": "asc",
       disabled: sortDirection === 'asc',
       children: apiRef.current.getLocaleText('columnMenuSortAsc')
-    }), /*#__PURE__*/_jsx(MenuItem, {
+    }) : null, sortingOrder.includes('desc') ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       "data-value": "desc",
       disabled: sortDirection === 'desc',
       children: apiRef.current.getLocaleText('columnMenuSortDesc')
-    })]
+    }) : null]
   });
-};
+}
 
 process.env.NODE_ENV !== "production" ? SortGridMenuItems.propTypes = {
   // ----------------------------- Warning --------------------------------

package/hooks/features/virtualization/useGridVirtualScroller.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 const _excluded = ["style"];
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { useForkRef } from '@mui/material/utils';
+import { useForkRef, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/material/utils';
 import { useGridApiContext } from '../../utils/useGridApiContext';
 import { useGridRootProps } from '../../utils/useGridRootProps';
 import { useGridSelector } from '../../utils/useGridSelector';
@@ -158,7 +158,7 @@ export const useGridVirtualScroller = props => {
       lastColumnIndex
     };
   }, [disableVirtualization, getNearestIndexToRender, rowsMeta.positions.length, rootProps.autoHeight, rootProps.rowBuffer, currentPage.rows, columnPositions, visibleColumns.length, apiRef, containerWidth]);
-  React.useEffect(() => {
+  useEnhancedEffect(() => {
     if (disableVirtualization) {
       renderZoneRef.current.style.transform = `translate3d(0px, 0px, 0px)`;
     } else {
@@ -167,7 +167,7 @@ export const useGridVirtualScroller = props => {
       rootRef.current.scrollTop = 0;
     }
   }, [disableVirtualization]);
-  React.useEffect(() => {
+  useEnhancedEffect(() => {
     setContainerWidth(rootRef.current.clientWidth);
   }, [rowsMeta.currentPageTotalHeight]);
   const handleResize = React.useCallback(params => {
@@ -228,7 +228,7 @@ export const useGridVirtualScroller = props => {
     });
     prevRenderContext.current = nextRenderContext;
   }, [apiRef, setRenderContext, prevRenderContext, currentPage.rows.length, rootProps.rowBuffer]);
-  React.useEffect(() => {
+  useEnhancedEffect(() => {
     if (containerWidth == null) {
       return;
     }

package/index.js

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

package/legacy/components/menu/columnMenu/SortGridMenuItems.js

@@ -4,14 +4,19 @@ import MenuItem from '@mui/material/MenuItem';
 import { useGridSelector } from '../../../hooks/utils/useGridSelector';
 import { gridSortModelSelector } from '../../../hooks/features/sorting/gridSortingSelector';
 import { useGridApiContext } from '../../../hooks/utils/useGridApiContext';
+import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 
-var SortGridMenuItems = function SortGridMenuItems(props) {
+function SortGridMenuItems(props) {
+  var _column$sortingOrder;
+
   var column = props.column,
       onClick = props.onClick;
   var apiRef = useGridApiContext();
   var sortModel = useGridSelector(apiRef, gridSortModelSelector);
+  var rootProps = useGridRootProps();
+  var sortingOrder = (_column$sortingOrder = column.sortingOrder) != null ? _column$sortingOrder : rootProps.sortingOrder;
   var sortDirection = React.useMemo(function () {
     if (!column) {
       return null;
@@ -33,23 +38,23 @@ var SortGridMenuItems = function SortGridMenuItems(props) {
   }
 
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [/*#__PURE__*/_jsx(MenuItem, {
+    children: [sortingOrder.includes(null) ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       disabled: sortDirection == null,
       children: apiRef.current.getLocaleText('columnMenuUnsort')
-    }), /*#__PURE__*/_jsx(MenuItem, {
+    }) : null, sortingOrder.includes('asc') ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       "data-value": "asc",
       disabled: sortDirection === 'asc',
       children: apiRef.current.getLocaleText('columnMenuSortAsc')
-    }), /*#__PURE__*/_jsx(MenuItem, {
+    }) : null, sortingOrder.includes('desc') ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       "data-value": "desc",
       disabled: sortDirection === 'desc',
       children: apiRef.current.getLocaleText('columnMenuSortDesc')
-    })]
+    }) : null]
   });
-};
+}
 
 process.env.NODE_ENV !== "production" ? SortGridMenuItems.propTypes = {
   // ----------------------------- Warning --------------------------------

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

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["style"];
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { useForkRef } from '@mui/material/utils';
+import { useForkRef, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/material/utils';
 import { useGridApiContext } from '../../utils/useGridApiContext';
 import { useGridRootProps } from '../../utils/useGridRootProps';
 import { useGridSelector } from '../../utils/useGridSelector';
@@ -174,7 +174,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       lastColumnIndex: lastColumnIndex
     };
   }, [disableVirtualization, getNearestIndexToRender, rowsMeta.positions.length, rootProps.autoHeight, rootProps.rowBuffer, currentPage.rows, columnPositions, visibleColumns.length, apiRef, containerWidth]);
-  React.useEffect(function () {
+  useEnhancedEffect(function () {
     if (disableVirtualization) {
       renderZoneRef.current.style.transform = "translate3d(0px, 0px, 0px)";
     } else {
@@ -183,7 +183,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
       rootRef.current.scrollTop = 0;
     }
   }, [disableVirtualization]);
-  React.useEffect(function () {
+  useEnhancedEffect(function () {
     setContainerWidth(rootRef.current.clientWidth);
   }, [rowsMeta.currentPageTotalHeight]);
   var handleResize = React.useCallback(function (params) {
@@ -256,7 +256,7 @@ export var useGridVirtualScroller = function useGridVirtualScroller(props) {
     });
     prevRenderContext.current = nextRenderContext;
   }, [apiRef, setRenderContext, prevRenderContext, currentPage.rows.length, rootProps.rowBuffer]);
-  React.useEffect(function () {
+  useEnhancedEffect(function () {
     if (containerWidth == null) {
       return;
     }

package/legacy/index.js

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

package/legacy/locales/ruRU.js

@@ -50,7 +50,7 @@ var ruRUGrid = {
   // Filter panel text
   filterPanelAddFilter: 'Добавить фильтр',
   filterPanelDeleteIconLabel: 'Удалить',
-  // filterPanelLinkOperator: 'Logic operator',
+  filterPanelLinkOperator: 'Логические операторы',
   filterPanelOperators: 'Операторы',
   // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'И',
@@ -120,10 +120,10 @@ var ruRUGrid = {
   },
   // Checkbox selection text
   checkboxSelectionHeaderName: 'Выбор флажка',
-  // checkboxSelectionSelectAllRows: 'Select all rows',
-  // checkboxSelectionUnselectAllRows: 'Unselect all rows',
-  // checkboxSelectionSelectRow: 'Select row',
-  // checkboxSelectionUnselectRow: 'Unselect row',
+  checkboxSelectionSelectAllRows: 'Выбрать все строки',
+  checkboxSelectionUnselectAllRows: 'Отменить выбор всех строк',
+  checkboxSelectionSelectRow: 'Выбрать строку',
+  checkboxSelectionUnselectRow: 'Отменить выбор строки',
   // Boolean cell text
   booleanCellTrueLabel: 'истина',
   booleanCellFalseLabel: 'ложь',
@@ -146,17 +146,17 @@ var ruRUGrid = {
     return "\u0420\u0430\u0437\u0433\u0440\u0443\u043F\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E ".concat(name);
   },
   // Master/detail
-  // detailPanelToggle: 'Detail panel toggle',
+  detailPanelToggle: 'Детали',
   expandDetailPanel: 'Развернуть',
-  collapseDetailPanel: 'Свернуть' // Row reordering text
-  // rowReorderingHeaderName: 'Row reordering',
+  collapseDetailPanel: 'Свернуть',
+  // Row reordering text
+  rowReorderingHeaderName: 'Изменение порядка строк',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
-
+  aggregationMenuItemHeader: 'Объединение данных',
+  aggregationFunctionLabelSum: 'сумм',
+  aggregationFunctionLabelAvg: 'срзнач',
+  aggregationFunctionLabelMin: 'мин',
+  aggregationFunctionLabelMax: 'макс',
+  aggregationFunctionLabelSize: 'счет'
 };
 export var ruRU = getGridLocalization(ruRUGrid, ruRUCore);

package/locales/ruRU.js

@@ -50,7 +50,7 @@ const ruRUGrid = {
   // Filter panel text
   filterPanelAddFilter: 'Добавить фильтр',
   filterPanelDeleteIconLabel: 'Удалить',
-  // filterPanelLinkOperator: 'Logic operator',
+  filterPanelLinkOperator: 'Логические операторы',
   filterPanelOperators: 'Операторы',
   // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'И',
@@ -118,10 +118,10 @@ const ruRUGrid = {
   footerTotalVisibleRows: (visibleCount, totalCount) => `${visibleCount.toLocaleString()} из ${totalCount.toLocaleString()}`,
   // Checkbox selection text
   checkboxSelectionHeaderName: 'Выбор флажка',
-  // checkboxSelectionSelectAllRows: 'Select all rows',
-  // checkboxSelectionUnselectAllRows: 'Unselect all rows',
-  // checkboxSelectionSelectRow: 'Select row',
-  // checkboxSelectionUnselectRow: 'Unselect row',
+  checkboxSelectionSelectAllRows: 'Выбрать все строки',
+  checkboxSelectionUnselectAllRows: 'Отменить выбор всех строк',
+  checkboxSelectionSelectRow: 'Выбрать строку',
+  checkboxSelectionUnselectRow: 'Отменить выбор строки',
   // Boolean cell text
   booleanCellTrueLabel: 'истина',
   booleanCellFalseLabel: 'ложь',
@@ -140,17 +140,17 @@ const ruRUGrid = {
   groupColumn: name => `Сгруппировать по ${name}`,
   unGroupColumn: name => `Разгруппировать по ${name}`,
   // Master/detail
-  // detailPanelToggle: 'Detail panel toggle',
+  detailPanelToggle: 'Детали',
   expandDetailPanel: 'Развернуть',
-  collapseDetailPanel: 'Свернуть' // Row reordering text
-  // rowReorderingHeaderName: 'Row reordering',
+  collapseDetailPanel: 'Свернуть',
+  // Row reordering text
+  rowReorderingHeaderName: 'Изменение порядка строк',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
-
+  aggregationMenuItemHeader: 'Объединение данных',
+  aggregationFunctionLabelSum: 'сумм',
+  aggregationFunctionLabelAvg: 'срзнач',
+  aggregationFunctionLabelMin: 'мин',
+  aggregationFunctionLabelMax: 'макс',
+  aggregationFunctionLabelSize: 'счет'
 };
 export const ruRU = getGridLocalization(ruRUGrid, ruRUCore);

package/modern/components/menu/columnMenu/SortGridMenuItems.js

@@ -4,16 +4,19 @@ import MenuItem from '@mui/material/MenuItem';
 import { useGridSelector } from '../../../hooks/utils/useGridSelector';
 import { gridSortModelSelector } from '../../../hooks/features/sorting/gridSortingSelector';
 import { useGridApiContext } from '../../../hooks/utils/useGridApiContext';
+import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 
-const SortGridMenuItems = props => {
+function SortGridMenuItems(props) {
   const {
     column,
     onClick
   } = props;
   const apiRef = useGridApiContext();
   const sortModel = useGridSelector(apiRef, gridSortModelSelector);
+  const rootProps = useGridRootProps();
+  const sortingOrder = column.sortingOrder ?? rootProps.sortingOrder;
   const sortDirection = React.useMemo(() => {
     if (!column) {
       return null;
@@ -33,23 +36,23 @@ const SortGridMenuItems = props => {
   }
 
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [/*#__PURE__*/_jsx(MenuItem, {
+    children: [sortingOrder.includes(null) ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       disabled: sortDirection == null,
       children: apiRef.current.getLocaleText('columnMenuUnsort')
-    }), /*#__PURE__*/_jsx(MenuItem, {
+    }) : null, sortingOrder.includes('asc') ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       "data-value": "asc",
       disabled: sortDirection === 'asc',
       children: apiRef.current.getLocaleText('columnMenuSortAsc')
-    }), /*#__PURE__*/_jsx(MenuItem, {
+    }) : null, sortingOrder.includes('desc') ? /*#__PURE__*/_jsx(MenuItem, {
       onClick: onSortMenuItemClick,
       "data-value": "desc",
       disabled: sortDirection === 'desc',
       children: apiRef.current.getLocaleText('columnMenuSortDesc')
-    })]
+    }) : null]
   });
-};
+}
 
 process.env.NODE_ENV !== "production" ? SortGridMenuItems.propTypes = {
   // ----------------------------- Warning --------------------------------

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

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 const _excluded = ["style"];
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { useForkRef } from '@mui/material/utils';
+import { useForkRef, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/material/utils';
 import { useGridApiContext } from '../../utils/useGridApiContext';
 import { useGridRootProps } from '../../utils/useGridRootProps';
 import { useGridSelector } from '../../utils/useGridSelector';
@@ -154,7 +154,7 @@ export const useGridVirtualScroller = props => {
       lastColumnIndex
     };
   }, [disableVirtualization, getNearestIndexToRender, rowsMeta.positions.length, rootProps.autoHeight, rootProps.rowBuffer, currentPage.rows, columnPositions, visibleColumns.length, apiRef, containerWidth]);
-  React.useEffect(() => {
+  useEnhancedEffect(() => {
     if (disableVirtualization) {
       renderZoneRef.current.style.transform = `translate3d(0px, 0px, 0px)`;
     } else {
@@ -163,7 +163,7 @@ export const useGridVirtualScroller = props => {
       rootRef.current.scrollTop = 0;
     }
   }, [disableVirtualization]);
-  React.useEffect(() => {
+  useEnhancedEffect(() => {
     setContainerWidth(rootRef.current.clientWidth);
   }, [rowsMeta.currentPageTotalHeight]);
   const handleResize = React.useCallback(params => {
@@ -224,7 +224,7 @@ export const useGridVirtualScroller = props => {
     });
     prevRenderContext.current = nextRenderContext;
   }, [apiRef, setRenderContext, prevRenderContext, currentPage.rows.length, rootProps.rowBuffer]);
-  React.useEffect(() => {
+  useEnhancedEffect(() => {
     if (containerWidth == null) {
       return;
     }

package/modern/index.js

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

package/modern/locales/ruRU.js

@@ -50,7 +50,7 @@ const ruRUGrid = {
   // Filter panel text
   filterPanelAddFilter: 'Добавить фильтр',
   filterPanelDeleteIconLabel: 'Удалить',
-  // filterPanelLinkOperator: 'Logic operator',
+  filterPanelLinkOperator: 'Логические операторы',
   filterPanelOperators: 'Операторы',
   // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'И',
@@ -118,10 +118,10 @@ const ruRUGrid = {
   footerTotalVisibleRows: (visibleCount, totalCount) => `${visibleCount.toLocaleString()} из ${totalCount.toLocaleString()}`,
   // Checkbox selection text
   checkboxSelectionHeaderName: 'Выбор флажка',
-  // checkboxSelectionSelectAllRows: 'Select all rows',
-  // checkboxSelectionUnselectAllRows: 'Unselect all rows',
-  // checkboxSelectionSelectRow: 'Select row',
-  // checkboxSelectionUnselectRow: 'Unselect row',
+  checkboxSelectionSelectAllRows: 'Выбрать все строки',
+  checkboxSelectionUnselectAllRows: 'Отменить выбор всех строк',
+  checkboxSelectionSelectRow: 'Выбрать строку',
+  checkboxSelectionUnselectRow: 'Отменить выбор строки',
   // Boolean cell text
   booleanCellTrueLabel: 'истина',
   booleanCellFalseLabel: 'ложь',
@@ -140,17 +140,17 @@ const ruRUGrid = {
   groupColumn: name => `Сгруппировать по ${name}`,
   unGroupColumn: name => `Разгруппировать по ${name}`,
   // Master/detail
-  // detailPanelToggle: 'Detail panel toggle',
+  detailPanelToggle: 'Детали',
   expandDetailPanel: 'Развернуть',
-  collapseDetailPanel: 'Свернуть' // Row reordering text
-  // rowReorderingHeaderName: 'Row reordering',
+  collapseDetailPanel: 'Свернуть',
+  // Row reordering text
+  rowReorderingHeaderName: 'Изменение порядка строк',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
-
+  aggregationMenuItemHeader: 'Объединение данных',
+  aggregationFunctionLabelSum: 'сумм',
+  aggregationFunctionLabelAvg: 'срзнач',
+  aggregationFunctionLabelMin: 'мин',
+  aggregationFunctionLabelMax: 'макс',
+  aggregationFunctionLabelSize: 'счет'
 };
 export const ruRU = getGridLocalization(ruRUGrid, ruRUCore);

package/node/components/menu/columnMenu/SortGridMenuItems.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SortGridMenuItems = void 0;
+exports.SortGridMenuItems = SortGridMenuItems;
 
 var React = _interopRequireWildcard(require("react"));
 
@@ -19,19 +19,25 @@ var _gridSortingSelector = require("../../../hooks/features/sorting/gridSortingS
 
 var _useGridApiContext = require("../../../hooks/utils/useGridApiContext");
 
+var _useGridRootProps = require("../../../hooks/utils/useGridRootProps");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 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 SortGridMenuItems = props => {
+function SortGridMenuItems(props) {
+  var _column$sortingOrder;
+
   const {
     column,
     onClick
   } = props;
   const apiRef = (0, _useGridApiContext.useGridApiContext)();
   const sortModel = (0, _useGridSelector.useGridSelector)(apiRef, _gridSortingSelector.gridSortModelSelector);
+  const rootProps = (0, _useGridRootProps.useGridRootProps)();
+  const sortingOrder = (_column$sortingOrder = column.sortingOrder) != null ? _column$sortingOrder : rootProps.sortingOrder;
   const sortDirection = React.useMemo(() => {
     if (!column) {
       return null;
@@ -51,25 +57,24 @@ const SortGridMenuItems = props => {
   }
 
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
+    children: [sortingOrder.includes(null) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
       onClick: onSortMenuItemClick,
       disabled: sortDirection == null,
       children: apiRef.current.getLocaleText('columnMenuUnsort')
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
+    }) : null, sortingOrder.includes('asc') ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
       onClick: onSortMenuItemClick,
       "data-value": "asc",
       disabled: sortDirection === 'asc',
       children: apiRef.current.getLocaleText('columnMenuSortAsc')
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
+    }) : null, sortingOrder.includes('desc') ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
       onClick: onSortMenuItemClick,
       "data-value": "desc",
       disabled: sortDirection === 'desc',
       children: apiRef.current.getLocaleText('columnMenuSortDesc')
-    })]
+    }) : null]
   });
-};
+}
 
-exports.SortGridMenuItems = SortGridMenuItems;
 process.env.NODE_ENV !== "production" ? SortGridMenuItems.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |

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

@@ -195,7 +195,7 @@ const useGridVirtualScroller = props => {
       lastColumnIndex
     };
   }, [disableVirtualization, getNearestIndexToRender, rowsMeta.positions.length, rootProps.autoHeight, rootProps.rowBuffer, currentPage.rows, columnPositions, visibleColumns.length, apiRef, containerWidth]);
-  React.useEffect(() => {
+  (0, _utils.unstable_useEnhancedEffect)(() => {
     if (disableVirtualization) {
       renderZoneRef.current.style.transform = `translate3d(0px, 0px, 0px)`;
     } else {
@@ -204,7 +204,7 @@ const useGridVirtualScroller = props => {
       rootRef.current.scrollTop = 0;
     }
   }, [disableVirtualization]);
-  React.useEffect(() => {
+  (0, _utils.unstable_useEnhancedEffect)(() => {
     setContainerWidth(rootRef.current.clientWidth);
   }, [rowsMeta.currentPageTotalHeight]);
   const handleResize = React.useCallback(params => {
@@ -265,7 +265,7 @@ const useGridVirtualScroller = props => {
     });
     prevRenderContext.current = nextRenderContext;
   }, [apiRef, setRenderContext, prevRenderContext, currentPage.rows.length, rootProps.rowBuffer]);
-  React.useEffect(() => {
+  (0, _utils.unstable_useEnhancedEffect)(() => {
     if (containerWidth == null) {
       return;
     }

package/node/index.js

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

package/node/locales/ruRU.js

@@ -59,7 +59,7 @@ const ruRUGrid = {
   // Filter panel text
   filterPanelAddFilter: 'Добавить фильтр',
   filterPanelDeleteIconLabel: 'Удалить',
-  // filterPanelLinkOperator: 'Logic operator',
+  filterPanelLinkOperator: 'Логические операторы',
   filterPanelOperators: 'Операторы',
   // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'И',
@@ -127,10 +127,10 @@ const ruRUGrid = {
   footerTotalVisibleRows: (visibleCount, totalCount) => `${visibleCount.toLocaleString()} из ${totalCount.toLocaleString()}`,
   // Checkbox selection text
   checkboxSelectionHeaderName: 'Выбор флажка',
-  // checkboxSelectionSelectAllRows: 'Select all rows',
-  // checkboxSelectionUnselectAllRows: 'Unselect all rows',
-  // checkboxSelectionSelectRow: 'Select row',
-  // checkboxSelectionUnselectRow: 'Unselect row',
+  checkboxSelectionSelectAllRows: 'Выбрать все строки',
+  checkboxSelectionUnselectAllRows: 'Отменить выбор всех строк',
+  checkboxSelectionSelectRow: 'Выбрать строку',
+  checkboxSelectionUnselectRow: 'Отменить выбор строки',
   // Boolean cell text
   booleanCellTrueLabel: 'истина',
   booleanCellFalseLabel: 'ложь',
@@ -149,18 +149,18 @@ const ruRUGrid = {
   groupColumn: name => `Сгруппировать по ${name}`,
   unGroupColumn: name => `Разгруппировать по ${name}`,
   // Master/detail
-  // detailPanelToggle: 'Detail panel toggle',
+  detailPanelToggle: 'Детали',
   expandDetailPanel: 'Развернуть',
-  collapseDetailPanel: 'Свернуть' // Row reordering text
-  // rowReorderingHeaderName: 'Row reordering',
+  collapseDetailPanel: 'Свернуть',
+  // Row reordering text
+  rowReorderingHeaderName: 'Изменение порядка строк',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
-
+  aggregationMenuItemHeader: 'Объединение данных',
+  aggregationFunctionLabelSum: 'сумм',
+  aggregationFunctionLabelAvg: 'срзнач',
+  aggregationFunctionLabelMin: 'мин',
+  aggregationFunctionLabelMax: 'макс',
+  aggregationFunctionLabelSize: 'счет'
 };
 const ruRU = (0, _getGridLocalization.getGridLocalization)(ruRUGrid, _locale.ruRU);
 exports.ruRU = ruRU;

package/package.json

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