@mui/x-data-grid 5.14.0 → 5.15.0

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

@@ -166,10 +166,8 @@ export const useGridVirtualScroller = props => {
   React.useEffect(() => {
     setContainerWidth(rootRef.current.clientWidth);
   }, [rowsMeta.currentPageTotalHeight]);
-  const handleResize = React.useCallback(() => {
-    if (rootRef.current) {
-      setContainerWidth(rootRef.current.clientWidth);
-    }
+  const handleResize = React.useCallback(params => {
+    setContainerWidth(params.width);
   }, []);
   useGridApiEventHandler(apiRef, 'resize', handleResize);
   const updateRenderZonePosition = React.useCallback(nextRenderContext => {
@@ -285,10 +283,11 @@ export const useGridVirtualScroller = props => {
       minFirstColumn = renderZoneMinColumnIndex,
       maxLastColumn = renderZoneMaxColumnIndex,
       availableSpace = containerWidth,
-      ignoreAutoHeight
+      ignoreAutoHeight,
+      rowIndexOffset = 0
     } = params;
 
-    if (!currentPage.range || !nextRenderContext || availableSpace == null) {
+    if (!nextRenderContext || availableSpace == null) {
       return null;
     }
 
@@ -303,15 +302,31 @@ export const useGridVirtualScroller = props => {
     });
     const renderedRows = [];
 
-    for (let i = firstRowToRender; i < lastRowToRender; i += 1) {
-      const row = currentPage.rows[i];
-      renderedRows.push(row);
-      apiRef.current.unstable_calculateColSpan({
-        rowId: row.id,
-        minFirstColumn,
-        maxLastColumn,
-        columns: visibleColumns
+    if (params.rows) {
+      params.rows.forEach(row => {
+        renderedRows.push(row);
+        apiRef.current.unstable_calculateColSpan({
+          rowId: row.id,
+          minFirstColumn,
+          maxLastColumn,
+          columns: visibleColumns
+        });
       });
+    } else {
+      if (!currentPage.range) {
+        return null;
+      }
+
+      for (let i = firstRowToRender; i < lastRowToRender; i += 1) {
+        const row = currentPage.rows[i];
+        renderedRows.push(row);
+        apiRef.current.unstable_calculateColSpan({
+          rowId: row.id,
+          minFirstColumn,
+          maxLastColumn,
+          columns: visibleColumns
+        });
+      }
     }
 
     const [initialFirstColumnToRender, lastColumnToRender] = getRenderableIndexes({
@@ -361,7 +376,7 @@ export const useGridVirtualScroller = props => {
         firstColumnToRender: firstColumnToRender,
         lastColumnToRender: lastColumnToRender,
         selected: isSelected,
-        index: currentPage.range.firstRowIndex + firstRowToRender + i,
+        index: rowIndexOffset + (currentPage?.range?.firstRowIndex || 0) + firstRowToRender + i,
         containerWidth: availableSpace,
         isLastVisible: lastVisibleRowIndex
       }, typeof getRowProps === 'function' ? getRowProps(id, model) : {}, rootProps.componentsProps?.row), id));

package/modern/index.js

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

package/modern/internals/index.js

@@ -25,6 +25,9 @@ export { useGridRows, rowsStateInitializer } from '../hooks/features/rows/useGri
 export { useGridRowsPreProcessors } from '../hooks/features/rows/useGridRowsPreProcessors';
 export { useGridRowsMeta, rowsMetaStateInitializer } from '../hooks/features/rows/useGridRowsMeta';
 export { useGridParamsApi } from '../hooks/features/rows/useGridParamsApi';
+export { getRowIdFromRowModel } from '../hooks/features/rows/gridRowsUtils';
+export { gridAdditionalRowGroupsSelector, gridPinnedRowsSelector } from '../hooks/features/rows/gridRowsSelector';
+export { calculatePinnedRowsHeight } from '../hooks/features/rows/gridRowsUtils';
 export { useGridSelection, selectionStateInitializer } from '../hooks/features/selection/useGridSelection';
 export { useGridSelectionPreProcessors } from '../hooks/features/selection/useGridSelectionPreProcessors';
 export { useGridSorting, sortingStateInitializer } from '../hooks/features/sorting/useGridSorting';

package/modern/locales/arSD.js

@@ -21,7 +21,7 @@ const arSDGrid = {
   toolbarFiltersTooltipShow: 'اظهر المرشِحات',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} من المرشِحات النشطة` : `مرشِح نشط`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/bgBG.js

@@ -21,7 +21,7 @@ const bgBGGrid = {
   toolbarFiltersTooltipShow: 'Покажи Филтрите',
   toolbarFiltersTooltipActive: count => `${count} активни филтри`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/csCZ.js

@@ -31,7 +31,7 @@ const csCZGrid = {
     return `${count} ${pluralForm}`;
   },
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/daDK.js

@@ -21,7 +21,7 @@ const daDKGrid = {
   toolbarFiltersTooltipShow: 'Vis filtre',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} aktive filtre` : `${count} aktivt filter`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/deDE.js

@@ -21,7 +21,7 @@ const deDEGrid = {
   toolbarFiltersTooltipShow: 'Zeige Filter',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} aktive Filter` : `${count} aktiver Filter`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Suchen...',
+  toolbarQuickFilterPlaceholder: 'Suchen…',
   toolbarQuickFilterLabel: 'Suchen',
   toolbarQuickFilterDeleteIconLabel: 'Löschen',
   // Export selector toolbar button text

package/modern/locales/elGR.js

@@ -20,7 +20,7 @@ const elGRGrid = {
   toolbarFiltersTooltipShow: 'Εμφάνιση φίλτρων',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} ενεργά φίλτρα` : `${count} ενεργό φίλτρο`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/esES.js

@@ -21,7 +21,7 @@ const esESGrid = {
   toolbarFiltersTooltipShow: 'Mostrar filtros',
   toolbarFiltersTooltipActive: count => count > 1 ? `${count} filtros activos` : `${count} filtro activo`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/faIR.js

@@ -21,7 +21,7 @@ const faIRGrid = {
   toolbarFiltersTooltipShow: 'نمایش فیلترها',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} فیلترهای فعال` : `${count} فیلتر فعال`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/fiFI.js

@@ -21,7 +21,7 @@ const fiFIGrid = {
   toolbarFiltersTooltipShow: 'Näytä suodattimet',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} aktiivista suodatinta` : `${count} aktiivinen suodatin`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/frFR.js

@@ -21,7 +21,7 @@ const frFRGrid = {
   toolbarFiltersTooltipShow: 'Afficher les filtres',
   toolbarFiltersTooltipActive: count => count > 1 ? `${count} filtres actifs` : `${count} filtre actif`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Recherche...',
+  toolbarQuickFilterPlaceholder: 'Recherche…',
   toolbarQuickFilterLabel: 'Recherche',
   toolbarQuickFilterDeleteIconLabel: 'Supprimer',
   // Export selector toolbar button text

package/modern/locales/heIL.js

@@ -21,7 +21,7 @@ const heILGrid = {
   toolbarFiltersTooltipShow: 'הצג מסננים',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} מסננים פעילים` : `מסנן אחד פעיל`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'חיפוש...',
+  toolbarQuickFilterPlaceholder: 'חיפוש…',
   toolbarQuickFilterLabel: 'חיפוש',
   toolbarQuickFilterDeleteIconLabel: 'ניקוי',
   // Export selector toolbar button text

package/modern/locales/huHU.js

@@ -21,7 +21,7 @@ const huHUGrid = {
   toolbarFiltersTooltipShow: 'Szűrők megjelenítése',
   toolbarFiltersTooltipActive: count => `${count} aktív szűrő`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/itIT.js

@@ -21,7 +21,7 @@ const itITGrid = {
   toolbarFiltersTooltipShow: 'Mostra i filtri',
   toolbarFiltersTooltipActive: count => count > 1 ? `${count} filtri attivi` : `${count} filtro attivo`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/jaJP.js

@@ -21,7 +21,7 @@ const jaJPGrid = {
   toolbarFiltersTooltipShow: 'フィルター表示',
   toolbarFiltersTooltipActive: count => `${count}件のフィルターを適用中`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: '検索...',
+  toolbarQuickFilterPlaceholder: '検索…',
   toolbarQuickFilterLabel: '検索',
   toolbarQuickFilterDeleteIconLabel: 'クリア',
   // Export selector toolbar button text
@@ -32,7 +32,7 @@ const jaJPGrid = {
   toolbarExportExcel: 'Excelダウンロード',
   // Columns panel text
   columnsPanelTextFieldLabel: '列検索',
-  columnsPanelTextFieldPlaceholder: '検索クエリを入力...',
+  columnsPanelTextFieldPlaceholder: '検索クエリを入力…',
   columnsPanelDragIconLabel: '列並べ替え',
   columnsPanelShowAllButton: 'すべて表示',
   columnsPanelHideAllButton: 'すべて非表示',
@@ -46,7 +46,7 @@ const jaJPGrid = {
   filterPanelOperatorOr: 'Or',
   filterPanelColumns: '列',
   filterPanelInputLabel: '値',
-  filterPanelInputPlaceholder: '値を入力...',
+  filterPanelInputPlaceholder: '値を入力…',
   // Filter operators text
   filterOperatorContains: '...を含む',
   filterOperatorEquals: '...に等しい',

package/modern/locales/koKR.js

@@ -21,7 +21,7 @@ const koKRGrid = {
   toolbarFiltersTooltipShow: '필터 표시',
   toolbarFiltersTooltipActive: count => `${count}건의 필터를 적용중`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/nbNO.js

@@ -21,7 +21,7 @@ const nbNOGrid = {
   toolbarFiltersTooltipShow: 'Vis filter',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} aktive filter` : `${count} aktivt filter`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Søk...',
+  toolbarQuickFilterPlaceholder: 'Søk…',
   toolbarQuickFilterLabel: 'Søk',
   toolbarQuickFilterDeleteIconLabel: 'Slett',
   // Export selector toolbar button text

package/modern/locales/nlNL.js

@@ -21,7 +21,7 @@ const nlNLGrid = {
   toolbarFiltersTooltipShow: 'Toon filters',
   toolbarFiltersTooltipActive: count => count > 1 ? `${count} actieve filters` : `${count} filter actief`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Zoeken...',
+  toolbarQuickFilterPlaceholder: 'Zoeken…',
   toolbarQuickFilterLabel: 'Zoeken',
   toolbarQuickFilterDeleteIconLabel: 'Wissen',
   // Export selector toolbar button text

package/modern/locales/plPL.js

@@ -21,7 +21,7 @@ const plPLGrid = {
   toolbarFiltersTooltipShow: 'Pokaż filtry',
   toolbarFiltersTooltipActive: count => `Liczba aktywnych filtrów: ${count}`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/ptBR.js

@@ -21,7 +21,7 @@ const ptBRGrid = {
   toolbarFiltersTooltipShow: 'Exibir filtros',
   toolbarFiltersTooltipActive: count => `${count} ${count !== 1 ? 'filtros' : 'filtro'} ${count !== 1 ? 'ativos' : 'ativo'}`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Procurar...',
+  toolbarQuickFilterPlaceholder: 'Procurar…',
   toolbarQuickFilterLabel: 'Procurar',
   toolbarQuickFilterDeleteIconLabel: 'Limpar',
   // Export selector toolbar button text

package/modern/locales/roRO.js

@@ -21,7 +21,7 @@ const roROGrid = {
   toolbarFiltersTooltipShow: 'Afișează filtru',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} filtru activ` : `${count} filtru activ`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Căutare...',
+  toolbarQuickFilterPlaceholder: 'Căutare…',
   toolbarQuickFilterLabel: 'Căutare',
   toolbarQuickFilterDeleteIconLabel: 'Ștergere',
   // Export selector toolbar button text

package/modern/locales/ruRU.js

@@ -32,7 +32,7 @@ const ruRUGrid = {
     return `${count} ${pluralForm}`;
   },
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Поиск...',
+  toolbarQuickFilterPlaceholder: 'Поиск…',
   toolbarQuickFilterLabel: 'Поиск',
   toolbarQuickFilterDeleteIconLabel: 'Очистить',
   // Export selector toolbar button text

package/modern/locales/skSK.js

@@ -31,7 +31,7 @@ const skSKGrid = {
     return `${count} ${pluralForm}`;
   },
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Vyhľadať...',
+  toolbarQuickFilterPlaceholder: 'Vyhľadať…',
   toolbarQuickFilterLabel: 'Vyhľadať',
   toolbarQuickFilterDeleteIconLabel: 'Vymazať',
   // Export selector toolbar button text

package/modern/locales/svSE.js

@@ -21,7 +21,7 @@ const svSEGrid = {
   toolbarFiltersTooltipShow: 'Visa filter',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} aktiva filter` : `${count} aktivt filter`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Sök...',
+  toolbarQuickFilterPlaceholder: 'Sök…',
   toolbarQuickFilterLabel: 'Sök',
   toolbarQuickFilterDeleteIconLabel: 'Rensa',
   // Export selector toolbar button text

package/modern/locales/trTR.js

@@ -21,7 +21,7 @@ const trTRGrid = {
   toolbarFiltersTooltipShow: 'Filtreleri göster',
   toolbarFiltersTooltipActive: count => `${count} aktif filtre`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Ara...',
+  toolbarQuickFilterPlaceholder: 'Ara…',
   toolbarQuickFilterLabel: 'Ara',
   toolbarQuickFilterDeleteIconLabel: 'Temizle',
   // Export selector toolbar button text

package/modern/locales/ukUA.js

@@ -39,7 +39,7 @@ const ukUAGrid = {
     many: 'активних фільтрів'
   }),
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/viVN.js

@@ -21,7 +21,7 @@ const viVNGrid = {
   toolbarFiltersTooltipShow: 'Hiện',
   toolbarFiltersTooltipActive: count => count > 1 ? `${count} bộ lọc hoạt động` : `${count} bộ lọc hoạt động`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
+  // toolbarQuickFilterPlaceholder: 'Search…',
   // toolbarQuickFilterLabel: 'Search',
   // toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text

package/modern/locales/zhCN.js

@@ -21,15 +21,15 @@ const zhCNGrid = {
   toolbarFiltersTooltipShow: '显示筛选器',
   toolbarFiltersTooltipActive: count => `${count} 个筛选器`,
   // Quick filter toolbar field
-  // toolbarQuickFilterPlaceholder: 'Search...',
-  // toolbarQuickFilterLabel: 'Search',
-  // toolbarQuickFilterDeleteIconLabel: 'Clear',
+  toolbarQuickFilterPlaceholder: '搜索…',
+  toolbarQuickFilterLabel: '搜索',
+  toolbarQuickFilterDeleteIconLabel: '清除',
   // Export selector toolbar button text
   toolbarExport: '导出',
   toolbarExportLabel: '导出',
   toolbarExportCSV: '导出至CSV',
-  // toolbarExportPrint: 'Print',
-  // toolbarExportExcel: 'Download as Excel',
+  toolbarExportPrint: '打印',
+  toolbarExportExcel: '导出至Excel',
   // Columns panel text
   columnsPanelTextFieldLabel: '搜索列',
   columnsPanelTextFieldPlaceholder: '列名',
@@ -39,7 +39,7 @@ const zhCNGrid = {
   // Filter panel text
   filterPanelAddFilter: '添加筛选器',
   filterPanelDeleteIconLabel: '删除',
-  // filterPanelLinkOperator: 'Logic operator',
+  filterPanelLinkOperator: '逻辑操作器',
   filterPanelOperators: '操作器',
   // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: '与',
@@ -60,7 +60,7 @@ const zhCNGrid = {
   filterOperatorOnOrBefore: '正在前面',
   filterOperatorIsEmpty: '为空',
   filterOperatorIsNotEmpty: '不为空',
-  // filterOperatorIsAnyOf: 'is any of',
+  filterOperatorIsAnyOf: '属于',
   // Filter values text
   filterValueAny: '任何',
   filterValueTrue: '真',
@@ -85,39 +85,39 @@ const zhCNGrid = {
   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: '假' // Actions cell more text
-  // actionsCellMore: 'more',
+  booleanCellFalseLabel: '假',
+  // Actions cell more text
+  actionsCellMore: '更多',
   // Column pinning text
-  // pinToLeft: 'Pin to left',
-  // pinToRight: 'Pin to right',
-  // unpin: 'Unpin',
+  pinToLeft: '固定到左侧',
+  pinToRight: '固定到右侧',
+  unpin: '取消固定',
   // Tree Data
-  // treeDataGroupingHeaderName: 'Group',
-  // treeDataExpand: 'see children',
-  // treeDataCollapse: 'hide children',
+  treeDataGroupingHeaderName: '组',
+  treeDataExpand: '查看子项目',
+  treeDataCollapse: '隐藏子项目',
   // Grouping columns
-  // groupingColumnHeaderName: 'Group',
-  // groupColumn: name => `Group by ${name}`,
-  // unGroupColumn: name => `Stop grouping by ${name}`,
+  groupingColumnHeaderName: '组',
+  groupColumn: name => `用${name}分组`,
+  unGroupColumn: name => `不再用${name}分组`,
   // Master/detail
-  // detailPanelToggle: 'Detail panel toggle',
-  // expandDetailPanel: 'Expand',
-  // collapseDetailPanel: 'Collapse',
+  detailPanelToggle: '详细信息',
+  expandDetailPanel: '显示',
+  collapseDetailPanel: '折叠',
   // Row reordering text
-  // rowReorderingHeaderName: 'Row reordering',
+  rowReorderingHeaderName: '重新排列行',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
-
+  aggregationMenuItemHeader: '集合',
+  aggregationFunctionLabelSum: '总数',
+  aggregationFunctionLabelAvg: '平均',
+  aggregationFunctionLabelMin: '最小',
+  aggregationFunctionLabelMax: '最大',
+  aggregationFunctionLabelSize: '大小'
 };
 export const zhCN = getGridLocalization(zhCNGrid, zhCNCore);

package/modern/locales/zhTW.js

@@ -21,7 +21,7 @@ const zhTWGrid = {
   toolbarFiltersTooltipShow: '顯示篩選器',
   toolbarFiltersTooltipActive: count => `${count} 個篩選器`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: '搜尋...',
+  toolbarQuickFilterPlaceholder: '搜尋…',
   toolbarQuickFilterLabel: '搜尋',
   toolbarQuickFilterDeleteIconLabel: '清除',
   // Export selector toolbar button text

package/node/DataGrid/DataGrid.js

@@ -178,6 +178,12 @@ DataGridRaw.propTypes = {
    */
   disableExtendRowFullWidth: _propTypes.default.bool,
 
+  /**
+   * If `true`, modification to a cell will not be discarded if the mode is changed from "edit" to "view" while processing props.
+   * @default false
+   */
+  disableIgnoreModificationsIfProcessingProps: _propTypes.default.bool,
+
   /**
    * If `true`, the selection on click on a row or cell is disabled.
    * @default false

package/node/DataGrid/useDataGridProps.js

@@ -60,6 +60,7 @@ const DATA_GRID_PROPS_DEFAULT_VALUES = {
   disableMultipleColumnsSorting: false,
   disableSelectionOnClick: false,
   disableVirtualization: false,
+  disableIgnoreModificationsIfProcessingProps: false,
   editMode: _models.GridEditModes.Cell,
   filterMode: _models.GridFeatureModeConstant.client,
   headerHeight: 56,

package/node/colDef/gridStringColDef.js

@@ -26,7 +26,7 @@ const GRID_STRING_COL_DEF = {
   groupable: true,
   pinnable: true,
   // @ts-ignore
-  private_aggregable: true,
+  aggregable: true,
   editable: false,
   sortComparator: _gridSortingUtils.gridStringOrNumberComparator,
   type: 'string',

package/node/components/GridRow.js

@@ -147,7 +147,11 @@ function GridRow(props) {
       // doesn't care about pagination and considers the rows from the current page only, so the
       // first row always has index=0. We need to subtract the index of the first row to make it
       // compatible with the index used by the virtualization.
-      apiRef.current.unstable_setLastMeasuredRowIndex(index - currentPage.range.firstRowIndex);
+      const rowIndex = apiRef.current.getRowIndexRelativeToVisibleRows(rowId); // pinned rows are not part of the visible rows
+
+      if (rowIndex != null) {
+        apiRef.current.unstable_setLastMeasuredRowIndex(rowIndex);
+      }
     }
 
     const rootElement = ref.current;

package/node/components/base/GridOverlays.js

@@ -67,8 +67,8 @@ function GridOverlayWrapper(props) {
       position: 'absolute',
       top: headerHeight,
       bottom: height === 'auto' ? 0 : undefined,
-      zIndex: 3,
-      // should be above pinned columns and detail panel
+      zIndex: 4,
+      // should be above pinned columns, pinned rows and detail panel
       pointerEvents: 'none'
     }
   }, props));

package/node/components/columnSelection/GridCellCheckboxRenderer.js

@@ -108,6 +108,11 @@ const GridCellCheckboxForwardRef = /*#__PURE__*/React.forwardRef(function GridCe
 
   const isSelectable = apiRef.current.isRowSelectable(id);
   const label = apiRef.current.getLocaleText(isChecked ? 'checkboxSelectionUnselectRow' : 'checkboxSelectionSelectRow');
+
+  if (rowNode.isPinned) {
+    return null;
+  }
+
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.components.BaseCheckbox, (0, _extends2.default)({
     ref: handleRef,
     tabIndex: tabIndex,

package/node/components/containers/GridRoot.js

@@ -70,6 +70,7 @@ const GridRoot = /*#__PURE__*/React.forwardRef(function GridRoot(props, ref) {
   const densityValue = (0, _useGridSelector.useGridSelector)(apiRef, _densitySelector.gridDensityValueSelector);
   const rootContainerRef = React.useRef(null);
   const handleRef = (0, _utils.useForkRef)(rootContainerRef, ref);
+  const pinnedRowsCount = (0, _useGridSelector.useGridSelector)(apiRef, _gridRowsSelector.gridPinnedRowsCountSelector);
   const ownerState = {
     density: densityValue,
     classes: rootProps.classes,
@@ -97,7 +98,8 @@ const GridRoot = /*#__PURE__*/React.forwardRef(function GridRoot(props, ref) {
     className: (0, _clsx.default)(className, classes.root),
     role: "grid",
     "aria-colcount": visibleColumns.length,
-    "aria-rowcount": totalRowCount,
+    "aria-rowcount": totalRowCount + pinnedRowsCount + 1 // +1 for the header row
+    ,
     "aria-multiselectable": !rootProps.disableMultipleSelection,
     "aria-label": rootProps['aria-label'],
     "aria-labelledby": rootProps['aria-labelledby']

package/node/constants/gridClasses.js

@@ -12,5 +12,5 @@ function getDataGridUtilityClass(slot) {
   return (0, _material.generateUtilityClass)('MuiDataGrid', slot);
 }
 
-const gridClasses = (0, _material.generateUtilityClasses)('MuiDataGrid', ['actionsCell', 'aggregationColumnHeader', 'aggregationColumnHeader--alignLeft', 'aggregationColumnHeader--alignCenter', 'aggregationColumnHeader--alignRight', 'autoHeight', 'booleanCell', 'cell--editable', 'cell--editing', 'cell--textCenter', 'cell--textLeft', 'cell--textRight', 'cell--withRenderer', 'cell', 'cellContent', 'cellCheckbox', 'checkboxInput', 'columnHeader--alignCenter', 'columnHeader--alignLeft', 'columnHeader--alignRight', 'columnHeader--dragging', 'columnHeader--moving', 'columnHeader--numeric', 'columnHeader--sortable', 'columnHeader--sorted', 'columnHeader--filtered', 'columnHeader', 'columnHeaderCheckbox', 'columnHeaderDraggableContainer', 'columnHeaderDropZone', 'columnHeaderTitle', 'columnHeaderTitleContainer', 'columnHeaderTitleContainerContent', 'columnHeaders', 'columnHeadersInner', 'columnHeadersInner--scrollable', 'columnSeparator--resizable', 'columnSeparator--resizing', 'columnSeparator--sideLeft', 'columnSeparator--sideRight', 'columnSeparator', 'columnsPanel', 'columnsPanelRow', 'detailPanel', 'detailPanels', 'detailPanelToggleCell', 'detailPanelToggleCell--expanded', 'footerCell', 'panel', 'panelHeader', 'panelWrapper', 'panelContent', 'panelFooter', 'paper', 'editBooleanCell', 'editInputCell', 'filterForm', 'filterFormDeleteIcon', 'filterFormLinkOperatorInput', 'filterFormColumnInput', 'filterFormOperatorInput', 'filterFormValueInput', 'filterIcon', 'footerContainer', 'iconButtonContainer', 'iconSeparator', 'main', 'menu', 'menuIcon', 'menuIconButton', 'menuOpen', 'menuList', 'overlay', 'root', 'root--densityStandard', 'root--densityComfortable', 'root--densityCompact', 'row', 'row--editable', 'row--editing', 'row--lastVisible', 'row--dragging', 'row--dynamicHeight', 'rowReorderCellPlaceholder', 'rowCount', 'rowReorderCellContainer', 'rowReorderCell', 'rowReorderCell--draggable', 'scrollArea--left', 'scrollArea--right', 'scrollArea', 'selectedRowCount', 'sortIcon', 'toolbarContainer', 'toolbarFilterList', 'virtualScroller', 'virtualScrollerContent', 'virtualScrollerContent--overflowed', 'virtualScrollerRenderZone', 'pinnedColumns', 'pinnedColumns--left', 'pinnedColumns--right', 'pinnedColumnHeaders', 'pinnedColumnHeaders--left', 'pinnedColumnHeaders--right', 'withBorder', 'treeDataGroupingCell', 'treeDataGroupingCellToggle', 'groupingCriteriaCell', 'groupingCriteriaCellToggle']);
+const gridClasses = (0, _material.generateUtilityClasses)('MuiDataGrid', ['actionsCell', 'aggregationColumnHeader', 'aggregationColumnHeader--alignLeft', 'aggregationColumnHeader--alignCenter', 'aggregationColumnHeader--alignRight', 'autoHeight', 'booleanCell', 'cell--editable', 'cell--editing', 'cell--textCenter', 'cell--textLeft', 'cell--textRight', 'cell--withRenderer', 'cell', 'cellContent', 'cellCheckbox', 'checkboxInput', 'columnHeader--alignCenter', 'columnHeader--alignLeft', 'columnHeader--alignRight', 'columnHeader--dragging', 'columnHeader--moving', 'columnHeader--numeric', 'columnHeader--sortable', 'columnHeader--sorted', 'columnHeader--filtered', 'columnHeader', 'columnHeaderCheckbox', 'columnHeaderDraggableContainer', 'columnHeaderDropZone', 'columnHeaderTitle', 'columnHeaderTitleContainer', 'columnHeaderTitleContainerContent', 'columnHeaders', 'columnHeadersInner', 'columnHeadersInner--scrollable', 'columnSeparator--resizable', 'columnSeparator--resizing', 'columnSeparator--sideLeft', 'columnSeparator--sideRight', 'columnSeparator', 'columnsPanel', 'columnsPanelRow', 'detailPanel', 'detailPanels', 'detailPanelToggleCell', 'detailPanelToggleCell--expanded', 'footerCell', 'panel', 'panelHeader', 'panelWrapper', 'panelContent', 'panelFooter', 'paper', 'editBooleanCell', 'editInputCell', 'filterForm', 'filterFormDeleteIcon', 'filterFormLinkOperatorInput', 'filterFormColumnInput', 'filterFormOperatorInput', 'filterFormValueInput', 'filterIcon', 'footerContainer', 'iconButtonContainer', 'iconSeparator', 'main', 'menu', 'menuIcon', 'menuIconButton', 'menuOpen', 'menuList', 'overlay', 'root', 'root--densityStandard', 'root--densityComfortable', 'root--densityCompact', 'row', 'row--editable', 'row--editing', 'row--lastVisible', 'row--dragging', 'row--dynamicHeight', 'rowReorderCellPlaceholder', 'rowCount', 'rowReorderCellContainer', 'rowReorderCell', 'rowReorderCell--draggable', 'scrollArea--left', 'scrollArea--right', 'scrollArea', 'selectedRowCount', 'sortIcon', 'toolbarContainer', 'toolbarFilterList', 'virtualScroller', 'virtualScrollerContent', 'virtualScrollerContent--overflowed', 'virtualScrollerRenderZone', 'pinnedColumns', 'pinnedColumns--left', 'pinnedColumns--right', 'pinnedColumnHeaders', 'pinnedColumnHeaders--left', 'pinnedColumnHeaders--right', 'withBorder', 'treeDataGroupingCell', 'treeDataGroupingCellToggle', 'groupingCriteriaCell', 'groupingCriteriaCellToggle', 'pinnedRows', 'pinnedRows--top', 'pinnedRows--bottom', 'pinnedRowsRenderZone']);
 exports.gridClasses = gridClasses;

package/node/constants/localeTextConstants.js

@@ -25,7 +25,7 @@ const GRID_DEFAULT_LOCALE_TEXT = {
   toolbarFiltersTooltipShow: 'Show filters',
   toolbarFiltersTooltipActive: count => count !== 1 ? `${count} active filters` : `${count} active filter`,
   // Quick filter toolbar field
-  toolbarQuickFilterPlaceholder: 'Search...',
+  toolbarQuickFilterPlaceholder: 'Search…',
   toolbarQuickFilterLabel: 'Search',
   toolbarQuickFilterDeleteIconLabel: 'Clear',
   // Export selector toolbar button text