@mui/x-data-grid 7.29.1 → 7.29.3

package/modern/components/containers/GridRootStyles.js

@@ -12,16 +12,6 @@ function getBorderColor(theme) {
   }
   return darken(alpha(theme.palette.divider, 1), 0.68);
 }
-const columnHeaderStyles = {
-  [`& .${c.iconButtonContainer}`]: {
-    visibility: 'visible',
-    width: 'auto'
-  },
-  [`& .${c.menuIcon}`]: {
-    width: 'auto',
-    visibility: 'visible'
-  }
-};
 const columnSeparatorTargetSize = 10;
 const columnSeparatorOffset = -5;
 const focusOutlineWidth = 1;
@@ -439,7 +429,7 @@ export const GridRootStyles = styled('div', {
       visibility: 'visible',
       width: 'auto'
     },
-    [`& .${c.columnHeader}:not(.${c['columnHeader--sorted']}) .${c.sortIcon}`]: {
+    [`& .${c.columnHeader}:not(.${c['columnHeader--sorted']}) .${c.sortButton}`]: {
       opacity: 0,
       transition: t.transitions.create(['opacity'], {
         duration: t.transitions.duration.shorter
@@ -507,13 +497,25 @@ export const GridRootStyles = styled('div', {
       width: 'var(--DataGrid-rowWidth)'
     },
     '@media (hover: hover)': {
-      [`& .${c.columnHeader}:hover`]: columnHeaderStyles,
-      [`& .${c.columnHeader}:not(.${c['columnHeader--sorted']}):hover .${c.sortIcon}`]: {
+      [`& .${c.columnHeader}:hover`]: {
+        [`& .${c.menuIcon}`]: {
+          width: 'auto',
+          visibility: 'visible'
+        },
+        [`& .${c.iconButtonContainer}`]: {
+          visibility: 'visible',
+          width: 'auto'
+        }
+      },
+      [`& .${c.columnHeader}:not(.${c['columnHeader--sorted']}):hover .${c.sortButton}`]: {
         opacity: 0.5
       }
     },
     '@media (hover: none)': {
-      [`& .${c.columnHeader}`]: columnHeaderStyles,
+      [`& .${c.columnHeader} .${c.menuIcon}`]: {
+        width: 'auto',
+        visibility: 'visible'
+      },
       [`& .${c.columnHeader}:focus,
         & .${c['columnHeader--siblingFocused']}`]: {
         [`.${c['columnSeparator--resizable']}`]: {

package/modern/constants/gridClasses.js

@@ -2,4 +2,4 @@ import { unstable_generateUtilityClasses as generateUtilityClasses, unstable_gen
 export function getDataGridUtilityClass(slot) {
   return generateUtilityClass('MuiDataGrid', slot);
 }
-export const gridClasses = generateUtilityClasses('MuiDataGrid', ['actionsCell', 'aggregationColumnHeader', 'aggregationColumnHeader--alignLeft', 'aggregationColumnHeader--alignCenter', 'aggregationColumnHeader--alignRight', 'aggregationColumnHeaderLabel', 'autoHeight', 'autosizing', 'booleanCell', 'cell--editable', 'cell--editing', 'cell--flex', 'cell--textCenter', 'cell--textLeft', 'cell--textRight', 'cell--rangeTop', 'cell--rangeBottom', 'cell--rangeLeft', 'cell--rangeRight', 'cell--pinnedLeft', 'cell--pinnedRight', 'cell--selectionMode', 'cell', 'cellCheckbox', 'cellEmpty', 'cellSkeleton', 'cellOffsetLeft', 'checkboxInput', 'columnHeader', 'columnHeader--alignCenter', 'columnHeader--alignLeft', 'columnHeader--alignRight', 'columnHeader--dragging', 'columnHeader--moving', 'columnHeader--numeric', 'columnHeader--sortable', 'columnHeader--sorted', 'columnHeader--filtered', 'columnHeader--pinnedLeft', 'columnHeader--pinnedRight', 'columnHeader--last', 'columnHeader--lastUnpinned', 'columnHeader--siblingFocused', 'columnHeaderCheckbox', 'columnHeaderDraggableContainer', 'columnHeaderTitle', 'columnHeaderTitleContainer', 'columnHeaderTitleContainerContent', 'columnHeader--filledGroup', 'columnHeader--emptyGroup', 'columnHeaders', 'columnSeparator--resizable', 'columnSeparator--resizing', 'columnSeparator--sideLeft', 'columnSeparator--sideRight', 'columnSeparator', 'columnsManagement', 'columnsManagementRow', 'columnsManagementHeader', 'columnsManagementSearchInput', 'columnsManagementFooter', 'container--top', 'container--bottom', 'detailPanel', 'detailPanels', 'detailPanelToggleCell', 'detailPanelToggleCell--expanded', 'footerCell', 'panel', 'panelHeader', 'panelWrapper', 'panelContent', 'panelFooter', 'paper', 'editBooleanCell', 'editInputCell', 'filler', 'filler--borderBottom', 'filler--pinnedLeft', 'filler--pinnedRight', 'filterForm', 'filterFormDeleteIcon', 'filterFormLogicOperatorInput', 'filterFormColumnInput', 'filterFormOperatorInput', 'filterFormValueInput', 'filterIcon', 'footerContainer', 'headerFilterRow', 'iconButtonContainer', 'iconSeparator', 'main', 'main--hasPinnedRight', 'main--hasSkeletonLoadingOverlay', 'menu', 'menuIcon', 'menuIconButton', 'menuOpen', 'menuList', 'overlay', 'overlayWrapper', 'overlayWrapperInner', 'root', 'root--densityStandard', 'root--densityComfortable', 'root--densityCompact', 'root--disableUserSelection', 'root--noToolbar', 'row', 'row--editable', 'row--editing', 'row--firstVisible', 'row--lastVisible', 'row--dragging', 'row--dynamicHeight', 'row--detailPanelExpanded', 'row--borderBottom', 'rowReorderCellPlaceholder', 'rowCount', 'rowReorderCellContainer', 'rowReorderCell', 'rowReorderCell--draggable', 'rowSkeleton', 'scrollArea--left', 'scrollArea--right', 'scrollArea', 'scrollbar', 'scrollbar--vertical', 'scrollbar--horizontal', 'scrollbarFiller', 'scrollbarFiller--header', 'scrollbarFiller--borderTop', 'scrollbarFiller--borderBottom', 'scrollbarFiller--pinnedRight', 'selectedRowCount', 'sortIcon', 'toolbarContainer', 'toolbarFilterList', 'virtualScroller', 'virtualScroller--hasScrollX', 'virtualScrollerContent', 'virtualScrollerContent--overflowed', 'virtualScrollerRenderZone', 'pinnedColumns', 'withVerticalBorder', 'withBorderColor', 'cell--withRightBorder', 'cell--withLeftBorder', 'columnHeader--withRightBorder', 'columnHeader--withLeftBorder', 'treeDataGroupingCell', 'treeDataGroupingCellToggle', 'treeDataGroupingCellLoadingContainer', 'groupingCriteriaCell', 'groupingCriteriaCellToggle', 'groupingCriteriaCellLoadingContainer', 'pinnedRows', 'pinnedRows--top', 'pinnedRows--bottom', 'pinnedRowsRenderZone']);
+export const gridClasses = generateUtilityClasses('MuiDataGrid', ['actionsCell', 'aggregationColumnHeader', 'aggregationColumnHeader--alignLeft', 'aggregationColumnHeader--alignCenter', 'aggregationColumnHeader--alignRight', 'aggregationColumnHeaderLabel', 'autoHeight', 'autosizing', 'booleanCell', 'cell--editable', 'cell--editing', 'cell--flex', 'cell--textCenter', 'cell--textLeft', 'cell--textRight', 'cell--rangeTop', 'cell--rangeBottom', 'cell--rangeLeft', 'cell--rangeRight', 'cell--pinnedLeft', 'cell--pinnedRight', 'cell--selectionMode', 'cell', 'cellCheckbox', 'cellEmpty', 'cellSkeleton', 'cellOffsetLeft', 'checkboxInput', 'columnHeader', 'columnHeader--alignCenter', 'columnHeader--alignLeft', 'columnHeader--alignRight', 'columnHeader--dragging', 'columnHeader--moving', 'columnHeader--numeric', 'columnHeader--sortable', 'columnHeader--sorted', 'columnHeader--filtered', 'columnHeader--pinnedLeft', 'columnHeader--pinnedRight', 'columnHeader--last', 'columnHeader--lastUnpinned', 'columnHeader--siblingFocused', 'columnHeaderCheckbox', 'columnHeaderDraggableContainer', 'columnHeaderTitle', 'columnHeaderTitleContainer', 'columnHeaderTitleContainerContent', 'columnHeader--filledGroup', 'columnHeader--emptyGroup', 'columnHeaders', 'columnSeparator--resizable', 'columnSeparator--resizing', 'columnSeparator--sideLeft', 'columnSeparator--sideRight', 'columnSeparator', 'columnsManagement', 'columnsManagementRow', 'columnsManagementHeader', 'columnsManagementSearchInput', 'columnsManagementFooter', 'container--top', 'container--bottom', 'detailPanel', 'detailPanels', 'detailPanelToggleCell', 'detailPanelToggleCell--expanded', 'footerCell', 'panel', 'panelHeader', 'panelWrapper', 'panelContent', 'panelFooter', 'paper', 'editBooleanCell', 'editInputCell', 'filler', 'filler--borderBottom', 'filler--pinnedLeft', 'filler--pinnedRight', 'filterForm', 'filterFormDeleteIcon', 'filterFormLogicOperatorInput', 'filterFormColumnInput', 'filterFormOperatorInput', 'filterFormValueInput', 'filterIcon', 'footerContainer', 'headerFilterRow', 'iconButtonContainer', 'iconSeparator', 'main', 'main--hasPinnedRight', 'main--hasSkeletonLoadingOverlay', 'menu', 'menuIcon', 'menuIconButton', 'menuOpen', 'menuList', 'overlay', 'overlayWrapper', 'overlayWrapperInner', 'root', 'root--densityStandard', 'root--densityComfortable', 'root--densityCompact', 'root--disableUserSelection', 'root--noToolbar', 'row', 'row--editable', 'row--editing', 'row--firstVisible', 'row--lastVisible', 'row--dragging', 'row--dynamicHeight', 'row--detailPanelExpanded', 'row--borderBottom', 'rowReorderCellPlaceholder', 'rowCount', 'rowReorderCellContainer', 'rowReorderCell', 'rowReorderCell--draggable', 'rowSkeleton', 'scrollArea--left', 'scrollArea--right', 'scrollArea', 'scrollbar', 'scrollbar--vertical', 'scrollbar--horizontal', 'scrollbarFiller', 'scrollbarFiller--header', 'scrollbarFiller--borderTop', 'scrollbarFiller--borderBottom', 'scrollbarFiller--pinnedRight', 'selectedRowCount', 'sortButton', 'sortIcon', 'toolbarContainer', 'toolbarFilterList', 'virtualScroller', 'virtualScroller--hasScrollX', 'virtualScrollerContent', 'virtualScrollerContent--overflowed', 'virtualScrollerRenderZone', 'pinnedColumns', 'withVerticalBorder', 'withBorderColor', 'cell--withRightBorder', 'cell--withLeftBorder', 'columnHeader--withRightBorder', 'columnHeader--withLeftBorder', 'treeDataGroupingCell', 'treeDataGroupingCellToggle', 'treeDataGroupingCellLoadingContainer', 'groupingCriteriaCell', 'groupingCriteriaCellToggle', 'groupingCriteriaCellLoadingContainer', 'pinnedRows', 'pinnedRows--top', 'pinnedRows--bottom', 'pinnedRowsRenderZone']);

package/modern/hooks/features/editing/useGridRowEditing.js

@@ -11,7 +11,7 @@ import { GridEditModes, GridRowModes } from "../../../models/gridEditRowModel.js
 import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
 import { gridEditRowsStateSelector, gridRowIsEditingSelector } from "./gridEditingSelectors.js";
 import { isPrintableKey, isPasteShortcut } from "../../../utils/keyboardUtils.js";
-import { gridColumnFieldsSelector, gridVisibleColumnFieldsSelector } from "../columns/gridColumnsSelector.js";
+import { gridColumnDefinitionsSelector, gridVisibleColumnFieldsSelector } from "../columns/gridColumnsSelector.js";
 import { gridRowsLookupSelector } from "../rows/gridRowsSelector.js";
 import { deepClone } from "../../../utils/utils.js";
 import { GridRowEditStopReasons, GridRowEditStartReasons } from "../../../models/params/gridRowParams.js";
@@ -313,8 +313,9 @@ export const useGridRowEditing = (apiRef, props) => {
       initialValue
     } = params;
     const row = apiRef.current.getRow(id);
-    const columnFields = gridColumnFieldsSelector(apiRef);
-    const newProps = columnFields.reduce((acc, field) => {
+    const columns = gridColumnDefinitionsSelector(apiRef);
+    const newProps = columns.reduce((acc, col) => {
+      const field = col.field;
       const cellParams = apiRef.current.getCellParams(id, field);
       if (!cellParams.isEditable) {
         return acc;
@@ -331,7 +332,7 @@ export const useGridRowEditing = (apiRef, props) => {
       acc[field] = {
         value: newValue,
         error: false,
-        isProcessingProps: !!column.preProcessEditCellProps && deleteValue
+        isProcessingProps: column.editable && !!column.preProcessEditCellProps && deleteValue
       };
       return acc;
     }, {});
@@ -340,8 +341,8 @@ export const useGridRowEditing = (apiRef, props) => {
     if (fieldToFocus) {
       apiRef.current.setCellFocus(id, fieldToFocus);
     }
-    columnFields.filter(field => !!apiRef.current.getColumn(field).preProcessEditCellProps && deleteValue).forEach(field => {
-      const column = apiRef.current.getColumn(field);
+    columns.filter(column => column.editable && !!column.preProcessEditCellProps && deleteValue).forEach(column => {
+      const field = column.field;
       const value = apiRef.current.getCellValue(id, field);
       const newValue = deleteValue ? getDefaultCellValue(column) : initialValue ?? value;
       Promise.resolve(column.preProcessEditCellProps({

package/modern/hooks/features/rowSelection/utils.js

@@ -97,7 +97,7 @@ const getFilteredRowNodeSiblings = (tree, filteredRows, id) => {
 export const findRowsToSelect = (apiRef, tree, selectedRow, autoSelectDescendants, autoSelectParents, addRow, selectedIds = new Set(gridRowSelectionStateSelector(apiRef.current.state))) => {
   const filteredRows = gridFilteredRowsLookupSelector(apiRef);
   const selectedDescendants = new Set([]);
-  if (!autoSelectDescendants && !autoSelectParents) {
+  if (!autoSelectDescendants && !autoSelectParents || filteredRows[selectedRow] === false) {
     return;
   }
   if (autoSelectDescendants) {

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v7.29.1
+ * @mui/x-data-grid v7.29.3
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/locales/hyAM.js

@@ -0,0 +1,178 @@
+import { hyAM as hyAMCore } from '@mui/material/locale';
+import { getGridLocalization } from "../utils/getGridLocalization.js";
+const hyAMGrid = {
+  // 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 => {
+    let pluralForm = 'ակտիվ զտիչ';
+    if (count === 1) {
+      pluralForm = 'ակտիվ զտիչ';
+    } else {
+      pluralForm = 'ակտիվ զտիչներ';
+    }
+    return `${count} ${pluralForm}`;
+  },
+  // Quick filter toolbar field
+  toolbarQuickFilterPlaceholder: 'Որոնել…',
+  toolbarQuickFilterLabel: 'Որոնել',
+  toolbarQuickFilterDeleteIconLabel: 'Մաքրել',
+  // Export selector toolbar button text
+  toolbarExport: 'Արտահանում',
+  toolbarExportLabel: 'Արտահանում',
+  toolbarExportCSV: 'Ներբեռնել CSV-ով',
+  toolbarExportPrint: 'Տպել',
+  toolbarExportExcel: 'Ներբեռնել Excel-ով',
+  // Columns management text
+  columnsManagementSearchTitle: 'Որոնել',
+  columnsManagementNoColumns: 'Սյունակներ չկան',
+  columnsManagementShowHideAllText: 'Ցուցադրել/Թաքցնել բոլորը',
+  columnsManagementReset: 'Վերակայել',
+  columnsManagementDeleteIconLabel: 'Հեռացնել',
+  // Filter panel text
+  filterPanelAddFilter: 'Ավելացնել զտիչ',
+  filterPanelRemoveAll: 'Հեռացնել բոլորը',
+  filterPanelDeleteIconLabel: 'Հեռացնել',
+  filterPanelLogicOperator: 'Տրամաբանական օպերատոր',
+  filterPanelOperator: 'Օպերատոր',
+  filterPanelOperatorAnd: 'Եվ',
+  filterPanelOperatorOr: 'Կամ',
+  filterPanelColumns: 'Սյունակներ',
+  filterPanelInputLabel: 'Արժեք',
+  filterPanelInputPlaceholder: 'Զտիչի արժեք',
+  // Filter operators text
+  filterOperatorContains: 'պարունակում է',
+  filterOperatorDoesNotContain: 'չի պարունակում',
+  filterOperatorEquals: 'հավասար է',
+  filterOperatorDoesNotEqual: 'հավասար չէ',
+  filterOperatorStartsWith: 'սկսվում է',
+  filterOperatorEndsWith: 'վերջանում է',
+  filterOperatorIs: 'է',
+  filterOperatorNot: 'չէ',
+  filterOperatorAfter: 'հետո է',
+  filterOperatorOnOrAfter: 'այդ օրը կամ հետո է',
+  filterOperatorBefore: 'մինչ է',
+  filterOperatorOnOrBefore: 'այդ օրը կամ առաջ է',
+  filterOperatorIsEmpty: 'դատարկ է',
+  filterOperatorIsNotEmpty: 'դատարկ չէ',
+  filterOperatorIsAnyOf: 'որևէ մեկը',
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
+  // Header filter operators text
+  headerFilterOperatorContains: 'Պարունակում է',
+  headerFilterOperatorDoesNotContain: 'Չի պարունակում',
+  headerFilterOperatorEquals: 'Հավասար է',
+  headerFilterOperatorDoesNotEqual: 'Հավասար չէ',
+  headerFilterOperatorStartsWith: 'Սկսվում է',
+  headerFilterOperatorEndsWith: 'Վերջանում է',
+  headerFilterOperatorIs: 'Է',
+  headerFilterOperatorNot: 'Չէ',
+  headerFilterOperatorAfter: 'Հետո է',
+  headerFilterOperatorOnOrAfter: 'Այդ օրը կամ հետո է',
+  headerFilterOperatorBefore: 'Մինչ է',
+  headerFilterOperatorOnOrBefore: 'Այդ օրը կամ առաջ է',
+  headerFilterOperatorIsEmpty: 'Դատարկ է',
+  headerFilterOperatorIsNotEmpty: 'Դատարկ չէ',
+  headerFilterOperatorIsAnyOf: 'Որևէ մեկը',
+  'headerFilterOperator=': 'Հավասար է',
+  'headerFilterOperator!=': 'Հավասար չէ',
+  'headerFilterOperator>': 'Ավելի մեծ է',
+  'headerFilterOperator>=': 'Ավելի մեծ կամ հավասար է',
+  'headerFilterOperator<': 'Ավելի փոքր է',
+  'headerFilterOperator<=': 'Ավելի փոքր կամ հավասար է',
+  // Filter values text
+  filterValueAny: 'ցանկացած',
+  filterValueTrue: 'այո',
+  filterValueFalse: 'ոչ',
+  // Column menu text
+  columnMenuLabel: 'Մենյու',
+  columnMenuAriaLabel: columnName => `${columnName} սյունակի մենյու`,
+  columnMenuShowColumns: 'Ցուցադրել սյունակները',
+  columnMenuManageColumns: 'Կառավարել սյունակները',
+  columnMenuFilter: 'Զտիչ',
+  columnMenuHideColumn: 'Թաքցնել',
+  columnMenuUnsort: 'Մաքրել դասավորումը',
+  columnMenuSortAsc: 'Աճման կարգով դասավորել',
+  columnMenuSortDesc: 'Նվազման կարգով դասավորել',
+  // Column header text
+  columnHeaderFiltersTooltipActive: count => {
+    let pluralForm = 'ակտիվ զտիչներ';
+    if (count === 1) {
+      pluralForm = 'ակտիվ զտիչ';
+    }
+    return `${count} ${pluralForm}`;
+  },
+  columnHeaderFiltersLabel: 'Ցուցադրել զտիչները',
+  columnHeaderSortIconLabel: 'Դասավորել',
+  // Rows selected footer text
+  footerRowSelected: count => {
+    let pluralForm = 'ընտրված տող';
+    if (count === 1) {
+      pluralForm = 'ընտրված տող';
+    } else {
+      pluralForm = 'ընտրված տողեր';
+    }
+    return `${count} ${pluralForm}`;
+  },
+  // Total row amount footer text
+  footerTotalRows: 'Ընդամենը տողեր:',
+  // Total visible row amount footer text
+  footerTotalVisibleRows: (visibleCount, totalCount) => {
+    return `${visibleCount.toLocaleString()} / ${totalCount.toLocaleString()}`;
+  },
+  // Checkbox selection text
+  checkboxSelectionHeaderName: 'Տողի ընտրություն',
+  checkboxSelectionSelectAllRows: 'Ընտրել բոլոր տողերը',
+  checkboxSelectionUnselectAllRows: 'Չընտրել բոլոր տողերը',
+  checkboxSelectionSelectRow: 'Ընտրել տողը',
+  checkboxSelectionUnselectRow: 'Չընտրել տողը',
+  // Boolean cell text
+  booleanCellTrueLabel: 'այո',
+  booleanCellFalseLabel: 'ոչ',
+  // Actions cell more text
+  actionsCellMore: 'ավելին',
+  // Column pinning text
+  pinToLeft: 'Կցել ձախ',
+  pinToRight: 'Կցել աջ',
+  unpin: 'Անջատել',
+  // 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: 'Ագրեգացում',
+  aggregationFunctionLabelSum: 'գումար',
+  aggregationFunctionLabelAvg: 'միջին',
+  aggregationFunctionLabelMin: 'մինիմում',
+  aggregationFunctionLabelMax: 'մաքսիմում',
+  aggregationFunctionLabelSize: 'քանակ'
+};
+export const hyAM = getGridLocalization(hyAMGrid, hyAMCore);

package/modern/locales/index.js

@@ -14,6 +14,7 @@ export * from "./fiFI.js";
 export * from "./frFR.js";
 export * from "./heIL.js";
 export * from "./huHU.js";
+export * from "./hyAM.js";
 export * from "./itIT.js";
 export * from "./jaJP.js";
 export * from "./koKR.js";

package/node/DataGrid/useDataGridProps.js

@@ -9,6 +9,7 @@ exports.useDataGridProps = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _styles = require("@mui/material/styles");
+var _system = require("@mui/system");
 var _constants = require("../constants");
 var _defaultGridSlotsComponents = require("../constants/defaultGridSlotsComponents");
 var _utils = require("../internals/utils");
@@ -27,12 +28,12 @@ const DATA_GRID_FORCED_PROPS = {
 };
 const defaultSlots = _defaultGridSlotsComponents.DATA_GRID_DEFAULT_SLOTS_COMPONENTS;
 const useDataGridProps = inProps => {
-  const themedProps = (0, _utils.useProps)(
-  // eslint-disable-next-line material-ui/mui-name-matches-component-name
-  (0, _styles.useThemeProps)({
+  const theme = (0, _styles.useTheme)();
+  const themedProps = (0, _utils.useProps)(React.useMemo(() => (0, _system.getThemeProps)({
     props: inProps,
+    theme,
     name: 'MuiDataGrid'
-  }));
+  }), [theme, inProps]));
   const localeText = React.useMemo(() => (0, _extends2.default)({}, _constants.GRID_DEFAULT_LOCALE_TEXT, themedProps.localeText), [themedProps.localeText]);
   const slots = React.useMemo(() => (0, _utils.computeSlots)({
     defaultSlots,

package/node/components/columnHeaders/GridColumnHeaderSortIcon.js

@@ -11,17 +11,19 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
+var _clsx = _interopRequireDefault(require("clsx"));
 var _useGridApiContext = require("../../hooks/utils/useGridApiContext");
 var _gridClasses = require("../../constants/gridClasses");
 var _useGridRootProps = require("../../hooks/utils/useGridRootProps");
 var _GridIconButtonContainer = require("./GridIconButtonContainer");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["direction", "index", "sortingOrder", "disabled"];
+const _excluded = ["direction", "index", "sortingOrder", "disabled", "className"];
 const useUtilityClasses = ownerState => {
   const {
     classes
   } = ownerState;
   const slots = {
+    root: ['sortButton'],
     icon: ['sortIcon']
   };
   return (0, _composeClasses.default)(slots, _gridClasses.getDataGridUtilityClass, classes);
@@ -47,7 +49,8 @@ function GridColumnHeaderSortIconRaw(props) {
       direction,
       index,
       sortingOrder,
-      disabled
+      disabled,
+      className
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const apiRef = (0, _useGridApiContext.useGridApiContext)();
@@ -65,7 +68,8 @@ function GridColumnHeaderSortIconRaw(props) {
     "aria-label": apiRef.current.getLocaleText('columnHeaderSortIconLabel'),
     title: apiRef.current.getLocaleText('columnHeaderSortIconLabel'),
     size: "small",
-    disabled: disabled
+    disabled: disabled,
+    className: (0, _clsx.default)(classes.root, className)
   }, rootProps.slotProps?.baseIconButton, other, {
     children: iconElement
   }));
@@ -84,6 +88,7 @@ process.env.NODE_ENV !== "production" ? GridColumnHeaderSortIconRaw.propTypes =
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
+  className: _propTypes.default.string,
   direction: _propTypes.default.oneOf(['asc', 'desc']),
   disabled: _propTypes.default.bool,
   field: _propTypes.default.string.isRequired,

package/node/components/containers/GridRootStyles.js

@@ -19,16 +19,6 @@ function getBorderColor(theme) {
   }
   return (0, _styles.darken)((0, _styles.alpha)(theme.palette.divider, 1), 0.68);
 }
-const columnHeaderStyles = {
-  [`& .${_gridClasses.gridClasses.iconButtonContainer}`]: {
-    visibility: 'visible',
-    width: 'auto'
-  },
-  [`& .${_gridClasses.gridClasses.menuIcon}`]: {
-    width: 'auto',
-    visibility: 'visible'
-  }
-};
 const columnSeparatorTargetSize = 10;
 const columnSeparatorOffset = -5;
 const focusOutlineWidth = 1;
@@ -446,7 +436,7 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
       visibility: 'visible',
       width: 'auto'
     },
-    [`& .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}) .${_gridClasses.gridClasses.sortIcon}`]: {
+    [`& .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}) .${_gridClasses.gridClasses.sortButton}`]: {
       opacity: 0,
       transition: t.transitions.create(['opacity'], {
         duration: t.transitions.duration.shorter
@@ -514,13 +504,25 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
       width: 'var(--DataGrid-rowWidth)'
     },
     '@media (hover: hover)': {
-      [`& .${_gridClasses.gridClasses.columnHeader}:hover`]: columnHeaderStyles,
-      [`& .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}):hover .${_gridClasses.gridClasses.sortIcon}`]: {
+      [`& .${_gridClasses.gridClasses.columnHeader}:hover`]: {
+        [`& .${_gridClasses.gridClasses.menuIcon}`]: {
+          width: 'auto',
+          visibility: 'visible'
+        },
+        [`& .${_gridClasses.gridClasses.iconButtonContainer}`]: {
+          visibility: 'visible',
+          width: 'auto'
+        }
+      },
+      [`& .${_gridClasses.gridClasses.columnHeader}:not(.${_gridClasses.gridClasses['columnHeader--sorted']}):hover .${_gridClasses.gridClasses.sortButton}`]: {
         opacity: 0.5
       }
     },
     '@media (hover: none)': {
-      [`& .${_gridClasses.gridClasses.columnHeader}`]: columnHeaderStyles,
+      [`& .${_gridClasses.gridClasses.columnHeader} .${_gridClasses.gridClasses.menuIcon}`]: {
+        width: 'auto',
+        visibility: 'visible'
+      },
       [`& .${_gridClasses.gridClasses.columnHeader}:focus,
         & .${_gridClasses.gridClasses['columnHeader--siblingFocused']}`]: {
         [`.${_gridClasses.gridClasses['columnSeparator--resizable']}`]: {

package/node/constants/gridClasses.js

@@ -9,4 +9,4 @@ var _utils = require("@mui/utils");
 function getDataGridUtilityClass(slot) {
   return (0, _utils.unstable_generateUtilityClass)('MuiDataGrid', slot);
 }
-const gridClasses = exports.gridClasses = (0, _utils.unstable_generateUtilityClasses)('MuiDataGrid', ['actionsCell', 'aggregationColumnHeader', 'aggregationColumnHeader--alignLeft', 'aggregationColumnHeader--alignCenter', 'aggregationColumnHeader--alignRight', 'aggregationColumnHeaderLabel', 'autoHeight', 'autosizing', 'booleanCell', 'cell--editable', 'cell--editing', 'cell--flex', 'cell--textCenter', 'cell--textLeft', 'cell--textRight', 'cell--rangeTop', 'cell--rangeBottom', 'cell--rangeLeft', 'cell--rangeRight', 'cell--pinnedLeft', 'cell--pinnedRight', 'cell--selectionMode', 'cell', 'cellCheckbox', 'cellEmpty', 'cellSkeleton', 'cellOffsetLeft', 'checkboxInput', 'columnHeader', 'columnHeader--alignCenter', 'columnHeader--alignLeft', 'columnHeader--alignRight', 'columnHeader--dragging', 'columnHeader--moving', 'columnHeader--numeric', 'columnHeader--sortable', 'columnHeader--sorted', 'columnHeader--filtered', 'columnHeader--pinnedLeft', 'columnHeader--pinnedRight', 'columnHeader--last', 'columnHeader--lastUnpinned', 'columnHeader--siblingFocused', 'columnHeaderCheckbox', 'columnHeaderDraggableContainer', 'columnHeaderTitle', 'columnHeaderTitleContainer', 'columnHeaderTitleContainerContent', 'columnHeader--filledGroup', 'columnHeader--emptyGroup', 'columnHeaders', 'columnSeparator--resizable', 'columnSeparator--resizing', 'columnSeparator--sideLeft', 'columnSeparator--sideRight', 'columnSeparator', 'columnsManagement', 'columnsManagementRow', 'columnsManagementHeader', 'columnsManagementSearchInput', 'columnsManagementFooter', 'container--top', 'container--bottom', 'detailPanel', 'detailPanels', 'detailPanelToggleCell', 'detailPanelToggleCell--expanded', 'footerCell', 'panel', 'panelHeader', 'panelWrapper', 'panelContent', 'panelFooter', 'paper', 'editBooleanCell', 'editInputCell', 'filler', 'filler--borderBottom', 'filler--pinnedLeft', 'filler--pinnedRight', 'filterForm', 'filterFormDeleteIcon', 'filterFormLogicOperatorInput', 'filterFormColumnInput', 'filterFormOperatorInput', 'filterFormValueInput', 'filterIcon', 'footerContainer', 'headerFilterRow', 'iconButtonContainer', 'iconSeparator', 'main', 'main--hasPinnedRight', 'main--hasSkeletonLoadingOverlay', 'menu', 'menuIcon', 'menuIconButton', 'menuOpen', 'menuList', 'overlay', 'overlayWrapper', 'overlayWrapperInner', 'root', 'root--densityStandard', 'root--densityComfortable', 'root--densityCompact', 'root--disableUserSelection', 'root--noToolbar', 'row', 'row--editable', 'row--editing', 'row--firstVisible', 'row--lastVisible', 'row--dragging', 'row--dynamicHeight', 'row--detailPanelExpanded', 'row--borderBottom', 'rowReorderCellPlaceholder', 'rowCount', 'rowReorderCellContainer', 'rowReorderCell', 'rowReorderCell--draggable', 'rowSkeleton', 'scrollArea--left', 'scrollArea--right', 'scrollArea', 'scrollbar', 'scrollbar--vertical', 'scrollbar--horizontal', 'scrollbarFiller', 'scrollbarFiller--header', 'scrollbarFiller--borderTop', 'scrollbarFiller--borderBottom', 'scrollbarFiller--pinnedRight', 'selectedRowCount', 'sortIcon', 'toolbarContainer', 'toolbarFilterList', 'virtualScroller', 'virtualScroller--hasScrollX', 'virtualScrollerContent', 'virtualScrollerContent--overflowed', 'virtualScrollerRenderZone', 'pinnedColumns', 'withVerticalBorder', 'withBorderColor', 'cell--withRightBorder', 'cell--withLeftBorder', 'columnHeader--withRightBorder', 'columnHeader--withLeftBorder', 'treeDataGroupingCell', 'treeDataGroupingCellToggle', 'treeDataGroupingCellLoadingContainer', 'groupingCriteriaCell', 'groupingCriteriaCellToggle', 'groupingCriteriaCellLoadingContainer', 'pinnedRows', 'pinnedRows--top', 'pinnedRows--bottom', 'pinnedRowsRenderZone']);
+const gridClasses = exports.gridClasses = (0, _utils.unstable_generateUtilityClasses)('MuiDataGrid', ['actionsCell', 'aggregationColumnHeader', 'aggregationColumnHeader--alignLeft', 'aggregationColumnHeader--alignCenter', 'aggregationColumnHeader--alignRight', 'aggregationColumnHeaderLabel', 'autoHeight', 'autosizing', 'booleanCell', 'cell--editable', 'cell--editing', 'cell--flex', 'cell--textCenter', 'cell--textLeft', 'cell--textRight', 'cell--rangeTop', 'cell--rangeBottom', 'cell--rangeLeft', 'cell--rangeRight', 'cell--pinnedLeft', 'cell--pinnedRight', 'cell--selectionMode', 'cell', 'cellCheckbox', 'cellEmpty', 'cellSkeleton', 'cellOffsetLeft', 'checkboxInput', 'columnHeader', 'columnHeader--alignCenter', 'columnHeader--alignLeft', 'columnHeader--alignRight', 'columnHeader--dragging', 'columnHeader--moving', 'columnHeader--numeric', 'columnHeader--sortable', 'columnHeader--sorted', 'columnHeader--filtered', 'columnHeader--pinnedLeft', 'columnHeader--pinnedRight', 'columnHeader--last', 'columnHeader--lastUnpinned', 'columnHeader--siblingFocused', 'columnHeaderCheckbox', 'columnHeaderDraggableContainer', 'columnHeaderTitle', 'columnHeaderTitleContainer', 'columnHeaderTitleContainerContent', 'columnHeader--filledGroup', 'columnHeader--emptyGroup', 'columnHeaders', 'columnSeparator--resizable', 'columnSeparator--resizing', 'columnSeparator--sideLeft', 'columnSeparator--sideRight', 'columnSeparator', 'columnsManagement', 'columnsManagementRow', 'columnsManagementHeader', 'columnsManagementSearchInput', 'columnsManagementFooter', 'container--top', 'container--bottom', 'detailPanel', 'detailPanels', 'detailPanelToggleCell', 'detailPanelToggleCell--expanded', 'footerCell', 'panel', 'panelHeader', 'panelWrapper', 'panelContent', 'panelFooter', 'paper', 'editBooleanCell', 'editInputCell', 'filler', 'filler--borderBottom', 'filler--pinnedLeft', 'filler--pinnedRight', 'filterForm', 'filterFormDeleteIcon', 'filterFormLogicOperatorInput', 'filterFormColumnInput', 'filterFormOperatorInput', 'filterFormValueInput', 'filterIcon', 'footerContainer', 'headerFilterRow', 'iconButtonContainer', 'iconSeparator', 'main', 'main--hasPinnedRight', 'main--hasSkeletonLoadingOverlay', 'menu', 'menuIcon', 'menuIconButton', 'menuOpen', 'menuList', 'overlay', 'overlayWrapper', 'overlayWrapperInner', 'root', 'root--densityStandard', 'root--densityComfortable', 'root--densityCompact', 'root--disableUserSelection', 'root--noToolbar', 'row', 'row--editable', 'row--editing', 'row--firstVisible', 'row--lastVisible', 'row--dragging', 'row--dynamicHeight', 'row--detailPanelExpanded', 'row--borderBottom', 'rowReorderCellPlaceholder', 'rowCount', 'rowReorderCellContainer', 'rowReorderCell', 'rowReorderCell--draggable', 'rowSkeleton', 'scrollArea--left', 'scrollArea--right', 'scrollArea', 'scrollbar', 'scrollbar--vertical', 'scrollbar--horizontal', 'scrollbarFiller', 'scrollbarFiller--header', 'scrollbarFiller--borderTop', 'scrollbarFiller--borderBottom', 'scrollbarFiller--pinnedRight', 'selectedRowCount', 'sortButton', 'sortIcon', 'toolbarContainer', 'toolbarFilterList', 'virtualScroller', 'virtualScroller--hasScrollX', 'virtualScrollerContent', 'virtualScrollerContent--overflowed', 'virtualScrollerRenderZone', 'pinnedColumns', 'withVerticalBorder', 'withBorderColor', 'cell--withRightBorder', 'cell--withLeftBorder', 'columnHeader--withRightBorder', 'columnHeader--withLeftBorder', 'treeDataGroupingCell', 'treeDataGroupingCellToggle', 'treeDataGroupingCellLoadingContainer', 'groupingCriteriaCell', 'groupingCriteriaCellToggle', 'groupingCriteriaCellLoadingContainer', 'pinnedRows', 'pinnedRows--top', 'pinnedRows--bottom', 'pinnedRowsRenderZone']);

package/node/hooks/features/editing/useGridRowEditing.js

@@ -321,8 +321,9 @@ const useGridRowEditing = (apiRef, props) => {
       initialValue
     } = params;
     const row = apiRef.current.getRow(id);
-    const columnFields = (0, _gridColumnsSelector.gridColumnFieldsSelector)(apiRef);
-    const newProps = columnFields.reduce((acc, field) => {
+    const columns = (0, _gridColumnsSelector.gridColumnDefinitionsSelector)(apiRef);
+    const newProps = columns.reduce((acc, col) => {
+      const field = col.field;
       const cellParams = apiRef.current.getCellParams(id, field);
       if (!cellParams.isEditable) {
         return acc;
@@ -339,7 +340,7 @@ const useGridRowEditing = (apiRef, props) => {
       acc[field] = {
         value: newValue,
         error: false,
-        isProcessingProps: !!column.preProcessEditCellProps && deleteValue
+        isProcessingProps: column.editable && !!column.preProcessEditCellProps && deleteValue
       };
       return acc;
     }, {});
@@ -348,8 +349,8 @@ const useGridRowEditing = (apiRef, props) => {
     if (fieldToFocus) {
       apiRef.current.setCellFocus(id, fieldToFocus);
     }
-    columnFields.filter(field => !!apiRef.current.getColumn(field).preProcessEditCellProps && deleteValue).forEach(field => {
-      const column = apiRef.current.getColumn(field);
+    columns.filter(column => column.editable && !!column.preProcessEditCellProps && deleteValue).forEach(column => {
+      const field = column.field;
       const value = apiRef.current.getCellValue(id, field);
       const newValue = deleteValue ? (0, _utils3.getDefaultCellValue)(column) : initialValue ?? value;
       Promise.resolve(column.preProcessEditCellProps({

package/node/hooks/features/rowSelection/utils.js

@@ -105,7 +105,7 @@ const getFilteredRowNodeSiblings = (tree, filteredRows, id) => {
 const findRowsToSelect = (apiRef, tree, selectedRow, autoSelectDescendants, autoSelectParents, addRow, selectedIds = new Set((0, _gridRowSelectionSelector.gridRowSelectionStateSelector)(apiRef.current.state))) => {
   const filteredRows = (0, _gridFilterSelector.gridFilteredRowsLookupSelector)(apiRef);
   const selectedDescendants = new Set([]);
-  if (!autoSelectDescendants && !autoSelectParents) {
+  if (!autoSelectDescendants && !autoSelectParents || filteredRows[selectedRow] === false) {
     return;
   }
   if (autoSelectDescendants) {

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v7.29.1
+ * @mui/x-data-grid v7.29.3
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the