@mui/x-data-grid 7.0.0-alpha.2 → 7.0.0-alpha.4

package/modern/hooks/features/filter/gridFilterUtils.js

@@ -174,6 +174,9 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
   filterItemsApplierId += 1;
   return filterItem;
 };
+export const shouldQuickFilterExcludeHiddenColumns = filterModel => {
+  return filterModel.quickFilterExcludeHiddenColumns ?? true;
+};
 
 /**
  * Generates a method to easily check if a row is matching the current quick filter.
@@ -186,8 +189,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   if (quickFilterValues.length === 0) {
     return null;
   }
-  const quickFilterExcludeHiddenColumns = filterModel.quickFilterExcludeHiddenColumns ?? false;
-  const columnFields = quickFilterExcludeHiddenColumns ? gridVisibleColumnFieldsSelector(apiRef) : gridColumnFieldsSelector(apiRef);
+  const columnFields = shouldQuickFilterExcludeHiddenColumns(filterModel) ? gridVisibleColumnFieldsSelector(apiRef) : gridColumnFieldsSelector(apiRef);
   const appliersPerField = [];
   const {
     ignoreDiacritics

package/modern/hooks/features/filter/useGridFilter.js

@@ -14,7 +14,7 @@ import { useFirstRender } from '../../utils/useFirstRender';
 import { gridRowsLookupSelector } from '../rows';
 import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
 import { GRID_DEFAULT_STRATEGY, useGridRegisterStrategyProcessor } from '../../core/strategyProcessing';
-import { buildAggregatedFilterApplier, sanitizeFilterModel, mergeStateWithFilterModel, cleanFilterItem, passFilterLogic } from './gridFilterUtils';
+import { buildAggregatedFilterApplier, sanitizeFilterModel, mergeStateWithFilterModel, cleanFilterItem, passFilterLogic, shouldQuickFilterExcludeHiddenColumns } from './gridFilterUtils';
 import { isDeepEqual } from '../../../utils/utils';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const filterStateInitializer = (state, props, apiRef) => {
@@ -339,7 +339,7 @@ export const useGridFilter = (apiRef, props) => {
   useGridApiEventHandler(apiRef, 'rowExpansionChange', updateVisibleRowsLookupState);
   useGridApiEventHandler(apiRef, 'columnVisibilityModelChange', () => {
     const filterModel = gridFilterModelSelector(apiRef);
-    if (filterModel.quickFilterValues && filterModel.quickFilterExcludeHiddenColumns) {
+    if (filterModel.quickFilterValues && shouldQuickFilterExcludeHiddenColumns(filterModel)) {
       // re-apply filters because the quick filter results may have changed
       apiRef.current.unstable_applyFilters();
     }

package/modern/hooks/features/focus/gridFocusStateSelector.js

@@ -2,18 +2,14 @@ import { createSelector } from '../../../utils/createSelector';
 export const gridFocusStateSelector = state => state.focus;
 export const gridFocusCellSelector = createSelector(gridFocusStateSelector, focusState => focusState.cell);
 export const gridFocusColumnHeaderSelector = createSelector(gridFocusStateSelector, focusState => focusState.columnHeader);
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const unstable_gridFocusColumnHeaderFilterSelector = createSelector(gridFocusStateSelector, focusState => focusState.columnHeaderFilter);
+export const gridFocusColumnHeaderFilterSelector = createSelector(gridFocusStateSelector, focusState => focusState.columnHeaderFilter);
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const unstable_gridFocusColumnGroupHeaderSelector = createSelector(gridFocusStateSelector, focusState => focusState.columnGroupHeader);
 export const gridTabIndexStateSelector = state => state.tabIndex;
 export const gridTabIndexCellSelector = createSelector(gridTabIndexStateSelector, state => state.cell);
 export const gridTabIndexColumnHeaderSelector = createSelector(gridTabIndexStateSelector, state => state.columnHeader);
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const unstable_gridTabIndexColumnHeaderFilterSelector = createSelector(gridTabIndexStateSelector, state => state.columnHeaderFilter);
+export const gridTabIndexColumnHeaderFilterSelector = createSelector(gridTabIndexStateSelector, state => state.columnHeaderFilter);
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const unstable_gridTabIndexColumnGroupHeaderSelector = createSelector(gridTabIndexStateSelector, state => state.columnGroupHeader);

package/modern/hooks/features/headerFiltering/gridHeaderFilteringSelectors.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 import { createSelector } from '../../../utils/createSelector';
-export const unstable_gridHeaderFilteringStateSelector = state => state.headerFiltering;
-export const unstable_gridHeaderFilteringEditFieldSelector = createSelector(unstable_gridHeaderFilteringStateSelector, headerFilteringState => headerFilteringState.editing);
-export const unstable_gridHeaderFilteringMenuSelector = createSelector(unstable_gridHeaderFilteringStateSelector, headerFilteringState => headerFilteringState.menuOpen);
+export const gridHeaderFilteringStateSelector = state => state.headerFiltering;
+export const gridHeaderFilteringEditFieldSelector = createSelector(gridHeaderFilteringStateSelector, headerFilteringState => headerFilteringState.editing);
+export const gridHeaderFilteringMenuSelector = createSelector(gridHeaderFilteringStateSelector, headerFilteringState => headerFilteringState.menuOpen);

package/modern/hooks/features/keyboardNavigation/useGridKeyboardNavigation.js

@@ -13,8 +13,9 @@ import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from '../../../constants/gridDetailPan
 import { gridPinnedRowsSelector } from '../rows/gridRowsSelector';
 import { unstable_gridFocusColumnGroupHeaderSelector } from '../focus';
 import { gridColumnGroupsHeaderMaxDepthSelector } from '../columnGrouping/gridColumnGroupsSelector';
-import { unstable_gridHeaderFilteringEditFieldSelector, unstable_gridHeaderFilteringMenuSelector } from '../headerFiltering/gridHeaderFilteringSelectors';
+import { gridHeaderFilteringEditFieldSelector, gridHeaderFilteringMenuSelector } from '../headerFiltering/gridHeaderFilteringSelectors';
 import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
+import { isEventTargetInPortal } from '../../../utils/domUtils';
 function enrichPageRowsWithPinnedRows(apiRef, rows) {
   const pinnedRows = gridPinnedRowsSelector(apiRef) || {};
   return [...(pinnedRows.top || []), ...rows, ...(pinnedRows.bottom || [])];
@@ -70,7 +71,7 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
   const currentPageRows = React.useMemo(() => enrichPageRowsWithPinnedRows(apiRef, initialCurrentPageRows), [apiRef, initialCurrentPageRows]);
   const headerFilteringEnabled =
   // @ts-expect-error // TODO move relevant code to the `DataGridPro`
-  props.signature !== 'DataGrid' && props.unstable_headerFilters;
+  props.signature !== 'DataGrid' && props.headerFilters;
 
   /**
    * @param {number} colIndex Index of the column to focus
@@ -236,8 +237,8 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
     if (!dimensions) {
       return;
     }
-    const isEditing = unstable_gridHeaderFilteringEditFieldSelector(apiRef) === params.field;
-    const isHeaderMenuOpen = unstable_gridHeaderFilteringMenuSelector(apiRef) === params.field;
+    const isEditing = gridHeaderFilteringEditFieldSelector(apiRef) === params.field;
+    const isHeaderMenuOpen = gridHeaderFilteringMenuSelector(apiRef) === params.field;
     if (isEditing || isHeaderMenuOpen || !isNavigationKey(event.key)) {
       return;
     }
@@ -413,7 +414,7 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
   }, [apiRef, currentPageRows.length, goToHeader, goToGroupHeader, goToCell, getRowIdFromIndex]);
   const handleCellKeyDown = React.useCallback((params, event) => {
     // Ignore portal
-    if (!event.currentTarget.contains(event.target)) {
+    if (isEventTargetInPortal(event)) {
       return;
     }
 
@@ -505,7 +506,9 @@ export const useGridKeyboardNavigation = (apiRef, props) => {
             break;
           }
           const colDef = params.colDef;
-          if (colDef && colDef.type === 'treeDataGroup') {
+          if (colDef &&
+          // `GRID_TREE_DATA_GROUPING_FIELD` from the Pro package
+          colDef.field === '__tree_data_group__') {
             break;
           }
           if (!event.shiftKey && rowIndexBefore < lastRowIndexInPage) {

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

@@ -14,6 +14,7 @@ import { isKeyboardEvent, isNavigationKey } from '../../../utils/keyboardUtils';
 import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD } from '../../../constants/gridDetailPanelToggleField';
 import { gridClasses } from '../../../constants/gridClasses';
+import { isEventTargetInPortal } from '../../../utils/domUtils';
 const getSelectionModelPropValue = (selectionModelProp, prevSelectionModel) => {
   if (selectionModelProp == null) {
     return selectionModelProp;
@@ -283,7 +284,7 @@ export const useGridRowSelection = (apiRef, props) => {
 
     // Ignore portal
     // Do not apply shortcuts if the focus is not on the cell root component
-    if (!event.currentTarget.contains(event.target)) {
+    if (isEventTargetInPortal(event)) {
       return;
     }
     if (isNavigationKey(event.key) && event.shiftKey) {

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

@@ -67,7 +67,6 @@ export const useGridRowsMeta = (apiRef, props) => {
           needsFirstMeasurement: true // Assume all rows will need to be measured by default
         };
       }
-
       const {
         isResized,
         needsFirstMeasurement,

package/modern/hooks/features/sorting/useGridSorting.js

@@ -112,7 +112,8 @@ export const useGridSorting = (apiRef, props) => {
       apiRef.current.applySorting();
     }
   }, [apiRef, logger, props.disableMultipleColumnsSorting]);
-  const sortColumn = React.useCallback((column, direction, allowMultipleSorting) => {
+  const sortColumn = React.useCallback((field, direction, allowMultipleSorting) => {
+    const column = apiRef.current.getColumn(field);
     if (!column.sortable) {
       return;
     }
@@ -193,17 +194,17 @@ export const useGridSorting = (apiRef, props) => {
    * EVENTS
    */
   const handleColumnHeaderClick = React.useCallback(({
-    colDef
+    field
   }, event) => {
     const allowMultipleSorting = event.shiftKey || event.metaKey || event.ctrlKey;
-    sortColumn(colDef, undefined, allowMultipleSorting);
+    sortColumn(field, undefined, allowMultipleSorting);
   }, [sortColumn]);
   const handleColumnHeaderKeyDown = React.useCallback(({
-    colDef
+    field
   }, event) => {
     // Ctrl + Enter opens the column menu
     if (isEnterKey(event.key) && !event.ctrlKey && !event.metaKey) {
-      sortColumn(colDef, undefined, event.shiftKey);
+      sortColumn(field, undefined, event.shiftKey);
     }
   }, [sortColumn]);
   const handleColumnsChange = React.useCallback(() => {

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

@@ -550,7 +550,6 @@ export const useGridVirtualScroller = props => {
     if (rootProps.autoHeight && currentPage.rows.length === 0) {
       size.height = getMinimalContentHeight(apiRef, rootProps.rowHeight); // Give room to show the overlay when there no rows.
     }
-
     return size;
   }, [apiRef, rootRef, columnsTotalWidth, rowsMeta.currentPageTotalHeight, needsHorizontalScrollbar, rootProps.autoHeight, rootProps.rowHeight, currentPage.rows.length]);
   React.useEffect(() => {

package/modern/index.js

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

package/modern/internals/index.js

@@ -11,7 +11,7 @@ export { useGridInitialization } from '../hooks/core/useGridInitialization';
 export { unwrapPrivateAPI } from '../hooks/core/useGridApiInitialization';
 export { useGridClipboard } from '../hooks/features/clipboard/useGridClipboard';
 export { useGridColumnHeaders } from '../hooks/features/columnHeaders/useGridColumnHeaders';
-export { unstable_gridHeaderFilteringEditFieldSelector, unstable_gridHeaderFilteringMenuSelector } from '../hooks/features/headerFiltering/gridHeaderFilteringSelectors';
+export { gridHeaderFilteringEditFieldSelector, gridHeaderFilteringMenuSelector } from '../hooks/features/headerFiltering/gridHeaderFilteringSelectors';
 export { useGridColumnMenu, columnMenuStateInitializer } from '../hooks/features/columnMenu/useGridColumnMenu';
 export { useGridColumns, columnsStateInitializer } from '../hooks/features/columns/useGridColumns';
 export { getTotalHeaderHeight } from '../hooks/features/columns/gridColumnsUtils';
@@ -54,7 +54,7 @@ export { useGridInitializeState } from '../hooks/utils/useGridInitializeState';
 export { getColumnsToExport, defaultGetRowsToExport } from '../hooks/features/export/utils';
 export * from '../utils/createControllablePromise';
 export { createSelector, createSelectorMemoized, unstable_resetCreateSelectorCache } from '../utils/createSelector';
-export { findParentElementFromClassName, getActiveElement } from '../utils/domUtils';
+export { findParentElementFromClassName, getActiveElement, isEventTargetInPortal } from '../utils/domUtils';
 export { isNavigationKey } from '../utils/keyboardUtils';
 export { clamp, isDeepEqual, isNumber, isFunction, isObject } from '../utils/utils';
 export { buildWarning } from '../utils/warning';

package/modern/locales/bgBG.js

@@ -60,34 +60,32 @@ const bgBGGrid = {
   filterOperatorIsEmpty: 'е празен',
   filterOperatorIsNotEmpty: 'не е празен',
   filterOperatorIsAnyOf: 'е някой от',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: 'Съдържа',
+  headerFilterOperatorEquals: 'Равнo',
+  headerFilterOperatorStartsWith: 'Започва с',
+  headerFilterOperatorEndsWith: 'Завършва с',
+  headerFilterOperatorIs: 'Равно е на',
+  headerFilterOperatorNot: 'Не се равнява на',
+  headerFilterOperatorAfter: 'След',
+  headerFilterOperatorOnOrAfter: 'След (включително)',
+  headerFilterOperatorBefore: 'Преди',
+  headerFilterOperatorOnOrBefore: 'Преди (включително)',
+  headerFilterOperatorIsEmpty: 'Празен',
+  headerFilterOperatorIsNotEmpty: 'Не е празен',
+  headerFilterOperatorIsAnyOf: 'Всичко от',
+  'headerFilterOperator=': 'Равно',
+  'headerFilterOperator!=': 'Различно',
+  'headerFilterOperator>': 'По-голямо от',
+  'headerFilterOperator>=': 'По-голямо или равно на',
+  'headerFilterOperator<': 'По-малко от',
+  'headerFilterOperator<=': 'По-малко или равно на',
   // Filter values text
   filterValueAny: 'всякакви',
   filterValueTrue: 'вярно',
@@ -135,19 +133,17 @@ const bgBGGrid = {
   groupColumn: name => `Групирай по ${name}`,
   unGroupColumn: name => `Спри групиране по ${name}`,
   // Master/detail
-  // detailPanelToggle: 'Detail panel toggle',
+  detailPanelToggle: 'Превключване на панела с детайли',
   expandDetailPanel: 'Разгъване',
   collapseDetailPanel: 'Свиване',
   // Row reordering text
-  rowReorderingHeaderName: 'Подредба на редове'
-
+  rowReorderingHeaderName: 'Подредба на редове',
   // Aggregation
-  // aggregationMenuItemHeader: 'Aggregation',
-  // aggregationFunctionLabelSum: 'sum',
-  // aggregationFunctionLabelAvg: 'avg',
-  // aggregationFunctionLabelMin: 'min',
-  // aggregationFunctionLabelMax: 'max',
-  // aggregationFunctionLabelSize: 'size',
+  aggregationMenuItemHeader: 'Агрегиране',
+  aggregationFunctionLabelSum: 'сума',
+  aggregationFunctionLabelAvg: 'срст',
+  aggregationFunctionLabelMin: 'мин',
+  aggregationFunctionLabelMax: 'макс',
+  aggregationFunctionLabelSize: 'размер'
 };
-
 export const bgBG = getGridLocalization(bgBGGrid, bgBGCore);

package/modern/locales/coreLocales.js

@@ -3,6 +3,7 @@
 // This allows not to bump the minimal version of `@mui/material` in peerDependencies which results
 // in broader compatibility between the packages.
 // See https://github.com/mui/mui-x/pull/7646#issuecomment-1404605556 for additional context.
+
 export const beBYCore = {
   components: {
     MuiTablePagination: {

package/modern/locales/daDK.js

@@ -47,47 +47,45 @@ const daDKGrid = {
   filterPanelInputLabel: 'Værdi',
   filterPanelInputPlaceholder: 'Filter værdi',
   // Filter operators text
-  filterOperatorContains: 'Indeholder',
-  filterOperatorEquals: 'Lig med',
-  filterOperatorStartsWith: 'Begynder med',
-  filterOperatorEndsWith: 'Ender med',
-  filterOperatorIs: 'Er lig med',
-  filterOperatorNot: 'Er ikke lig med',
-  filterOperatorAfter: 'Efter',
-  filterOperatorOnOrAfter: 'På eller efter',
-  filterOperatorBefore: 'Før',
-  filterOperatorOnOrBefore: 'På eller før',
-  filterOperatorIsEmpty: 'Indeholder ikke data',
-  filterOperatorIsNotEmpty: 'Indeholder data',
+  filterOperatorContains: 'indeholder',
+  filterOperatorEquals: 'lig med',
+  filterOperatorStartsWith: 'begynder med',
+  filterOperatorEndsWith: 'ender med',
+  filterOperatorIs: 'er lig med',
+  filterOperatorNot: 'er ikke lig med',
+  filterOperatorAfter: 'efter',
+  filterOperatorOnOrAfter: 'på eller efter',
+  filterOperatorBefore: 'før',
+  filterOperatorOnOrBefore: 'på eller før',
+  filterOperatorIsEmpty: 'indeholder ikke data',
+  filterOperatorIsNotEmpty: 'indeholder data',
   filterOperatorIsAnyOf: 'indeholder en af',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: 'Indeholder',
+  headerFilterOperatorEquals: 'Lig med',
+  headerFilterOperatorStartsWith: 'Begynder med',
+  headerFilterOperatorEndsWith: 'Ender med',
+  headerFilterOperatorIs: 'Er lig med',
+  headerFilterOperatorNot: 'Er ikke lig med',
+  headerFilterOperatorAfter: 'Efter',
+  headerFilterOperatorOnOrAfter: 'På eller efter',
+  headerFilterOperatorBefore: 'Før',
+  headerFilterOperatorOnOrBefore: 'På eller før',
+  headerFilterOperatorIsEmpty: 'Indeholder ikke data',
+  headerFilterOperatorIsNotEmpty: 'Indeholder data',
+  headerFilterOperatorIsAnyOf: 'Indeholder en af',
+  'headerFilterOperator=': 'Lig med',
+  'headerFilterOperator!=': 'Ikke lig med',
+  'headerFilterOperator>': 'Større end',
+  'headerFilterOperator>=': 'Større end eller lig med',
+  'headerFilterOperator<': 'Mindre end',
+  'headerFilterOperator<=': 'Mindre end eller lig med',
   // Filter values text
   filterValueAny: 'hvilken som helst',
   filterValueTrue: 'positiv',

package/modern/locales/plPL.js

@@ -149,5 +149,4 @@ const plPLGrid = {
   // aggregationFunctionLabelMax: 'max',
   // aggregationFunctionLabelSize: 'size',
 };
-
 export const plPL = getGridLocalization(plPLGrid, plPLCore);

package/modern/models/params/gridEditCellParams.js

@@ -6,6 +6,7 @@ var GridCellEditStartReasons = /*#__PURE__*/function (GridCellEditStartReasons)
   GridCellEditStartReasons["cellDoubleClick"] = "cellDoubleClick";
   GridCellEditStartReasons["printableKeyDown"] = "printableKeyDown";
   GridCellEditStartReasons["deleteKeyDown"] = "deleteKeyDown";
+  GridCellEditStartReasons["pasteKeyDown"] = "pasteKeyDown";
   return GridCellEditStartReasons;
 }(GridCellEditStartReasons || {});
 /**

package/modern/utils/domUtils.js

@@ -37,4 +37,13 @@ export const getActiveElement = (root = document) => {
     return getActiveElement(activeEl.shadowRoot);
   }
   return activeEl;
-};
+};
+export function isEventTargetInPortal(event) {
+  if (
+  // The target is not an element when triggered by a Select inside the cell
+  // See https://github.com/mui/material-ui/issues/10534
+  event.target.nodeType === 1 && !event.currentTarget.contains(event.target)) {
+    return true;
+  }
+  return false;
+}

package/modern/utils/utils.js

@@ -163,7 +163,6 @@ function mulberry32(a) {
     /* eslint-enable */
   };
 }
-
 export function randomNumberBetween(seed, min, max) {
   const random = mulberry32(seed);
   return () => min + (max - min) * random();

package/node/DataGrid/DataGrid.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SUBMIT_FILTER_STROKE_TIME = exports.SUBMIT_FILTER_DATE_STROKE_TIME = exports.DataGrid = void 0;
+exports.DataGrid = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -43,18 +43,6 @@ const DataGridRaw = /*#__PURE__*/React.forwardRef(function DataGrid(inProps, ref
  * - [DataGrid API](https://mui.com/x/api/data-grid/data-grid/)
  */
 const DataGrid = exports.DataGrid = /*#__PURE__*/React.memo(DataGridRaw);
-
-/**
- * Remove at v7
- * @deprecated
- */
-const SUBMIT_FILTER_STROKE_TIME = exports.SUBMIT_FILTER_STROKE_TIME = _useDataGridProps.DATA_GRID_PROPS_DEFAULT_VALUES.filterDebounceMs;
-
-/**
- * Remove at v7
- * @deprecated
- */
-const SUBMIT_FILTER_DATE_STROKE_TIME = exports.SUBMIT_FILTER_DATE_STROKE_TIME = _useDataGridProps.DATA_GRID_PROPS_DEFAULT_VALUES.filterDebounceMs;
 DataGridRaw.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
@@ -282,6 +270,15 @@ DataGridRaw.propTypes = {
    * @default false
    */
   ignoreDiacritics: _propTypes.default.bool,
+  /**
+   * If `true`, the grid will not use `valueFormatter` when exporting to CSV or copying to clipboard.
+   * If an object is provided, you can choose to ignore the `valueFormatter` for CSV export or clipboard export.
+   * @default false
+   */
+  ignoreValueFormatterDuringExport: _propTypes.default.oneOfType([_propTypes.default.shape({
+    clipboardExport: _propTypes.default.bool,
+    csvExport: _propTypes.default.bool
+  }), _propTypes.default.bool]),
   /**
    * The initial state of the DataGrid.
    * The data in it will be set in the state on initialization but will not be controlled.
@@ -674,14 +671,5 @@ DataGridRaw.propTypes = {
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */
-  sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
-  /**
-   * If `true`, the grid will not use `valueFormatter` when exporting to CSV or copying to clipboard.
-   * If an object is provided, you can choose to ignore the `valueFormatter` for CSV export or clipboard export.
-   * @default false
-   */
-  unstable_ignoreValueFormatterDuringExport: _propTypes.default.oneOfType([_propTypes.default.shape({
-    clipboardExport: _propTypes.default.bool,
-    csvExport: _propTypes.default.bool
-  }), _propTypes.default.bool])
+  sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object])
 };

package/node/DataGrid/useDataGridProps.js

@@ -77,7 +77,7 @@ const DATA_GRID_PROPS_DEFAULT_VALUES = exports.DATA_GRID_PROPS_DEFAULT_VALUES =
   disableColumnResize: false,
   keepNonExistentRowsSelected: false,
   keepColumnPositionIfDraggedOutside: false,
-  unstable_ignoreValueFormatterDuringExport: false,
+  ignoreValueFormatterDuringExport: false,
   clipboardCopyCellDelimiter: '\t',
   rowPositionsDebounceMs: 166
 };

package/node/colDef/gridCheckboxSelectionColDef.js

@@ -16,8 +16,8 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const GRID_CHECKBOX_SELECTION_FIELD = exports.GRID_CHECKBOX_SELECTION_FIELD = '__check__';
 const GRID_CHECKBOX_SELECTION_COL_DEF = exports.GRID_CHECKBOX_SELECTION_COL_DEF = (0, _extends2.default)({}, _gridBooleanColDef.GRID_BOOLEAN_COL_DEF, {
+  type: 'custom',
   field: GRID_CHECKBOX_SELECTION_FIELD,
-  type: 'checkboxSelection',
   width: 50,
   resizable: false,
   sortable: false,

package/node/colDef/gridDefaultColumnTypes.js

@@ -10,7 +10,7 @@ var _gridDateColDef = require("./gridDateColDef");
 var _gridBooleanColDef = require("./gridBooleanColDef");
 var _gridSingleSelectColDef = require("./gridSingleSelectColDef");
 var _gridActionsColDef = require("./gridActionsColDef");
-const DEFAULT_GRID_COL_TYPE_KEY = exports.DEFAULT_GRID_COL_TYPE_KEY = '__default__';
+const DEFAULT_GRID_COL_TYPE_KEY = exports.DEFAULT_GRID_COL_TYPE_KEY = 'string';
 const getGridDefaultColumnTypes = () => {
   const nativeColumnTypes = {
     string: _gridStringColDef.GRID_STRING_COL_DEF,
@@ -20,7 +20,7 @@ const getGridDefaultColumnTypes = () => {
     boolean: _gridBooleanColDef.GRID_BOOLEAN_COL_DEF,
     singleSelect: _gridSingleSelectColDef.GRID_SINGLE_SELECT_COL_DEF,
     [_gridActionsColDef.GRID_ACTIONS_COLUMN_TYPE]: _gridActionsColDef.GRID_ACTIONS_COL_DEF,
-    [DEFAULT_GRID_COL_TYPE_KEY]: _gridStringColDef.GRID_STRING_COL_DEF
+    custom: _gridStringColDef.GRID_STRING_COL_DEF
   };
   return nativeColumnTypes;
 };

package/node/components/GridHeader.js

@@ -8,12 +8,13 @@ exports.GridHeader = GridHeader;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _useGridRootProps = require("../hooks/utils/useGridRootProps");
+var _GridPreferencesPanel = require("./panel/GridPreferencesPanel");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function GridHeader() {
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.preferencesPanel, (0, _extends2.default)({}, rootProps.slotProps?.preferencesPanel)), rootProps.slots.toolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.toolbar, (0, _extends2.default)({}, rootProps.slotProps?.toolbar))]
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_GridPreferencesPanel.GridPreferencesPanel, {}), rootProps.slots.toolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.toolbar, (0, _extends2.default)({}, rootProps.slotProps?.toolbar))]
   });
 }

package/node/components/GridRow.js

@@ -61,7 +61,6 @@ function EmptyCell({
     style: style
   }); // TODO change to .MuiDataGrid-emptyCell or .MuiDataGrid-rowFiller
 }
-
 const GridRow = /*#__PURE__*/React.forwardRef(function GridRow(props, refProp) {
   const {
       selected,
@@ -145,9 +144,7 @@ const GridRow = /*#__PURE__*/React.forwardRef(function GridRow(props, refProp) {
   }, [apiRef, currentPage.range, index, rowHeight, rowId, position]);
   const publish = React.useCallback((eventName, propHandler) => event => {
     // Ignore portal
-    // The target is not an element when triggered by a Select inside the cell
-    // See https://github.com/mui/material-ui/issues/10534
-    if (event.target.nodeType === 1 && !event.currentTarget.contains(event.target)) {
+    if ((0, _domUtils.isEventTargetInPortal)(event)) {
       return;
     }
 
@@ -203,7 +200,13 @@ const GridRow = /*#__PURE__*/React.forwardRef(function GridRow(props, refProp) {
   const CellComponent = slots.cell === _GridCell.GridCellV7 ? _GridCell.GridCellV7 : _GridCell.GridCellWrapper;
   const rowReordering = rootProps.rowReordering;
   const getCell = (column, cellProps) => {
-    const disableDragEvents = disableColumnReorder && column.disableReorder || !rowReordering && !!sortModel.length && treeDepth > 1 && Object.keys(editRowsState).length > 0;
+    // when the cell is a reorder cell we are not allowing to reorder the col
+    // fixes https://github.com/mui/mui-x/issues/11126
+    const isReorderCell = column.field === '__reorder__';
+    const isEditingRows = Object.keys(editRowsState).length > 0;
+    const canReorderColumn = !(disableColumnReorder || column.disableReorder);
+    const canReorderRow = rowReordering && !sortModel.length && treeDepth <= 1 && !isEditingRows;
+    const disableDragEvents = !(canReorderColumn || isReorderCell && canReorderRow);
     const editCellState = editRowsState[rowId]?.[column.field] ?? null;
     let cellIsNotVisible = false;
     if (focusedCellColumnIndexNotInRange !== undefined && visibleColumns[focusedCellColumnIndexNotInRange].field === column.field) {

package/node/components/base/GridOverlays.js

@@ -40,7 +40,6 @@ const GridOverlayWrapperRoot = (0, _system.styled)('div', {
   zIndex: overlayType === 'loadingOverlay' ? 5 // Should be above pinned columns, pinned rows, and detail panel
   : 4 // Should be above pinned columns and detail panel
 }));
-
 const GridOverlayWrapperInner = (0, _system.styled)('div', {
   name: 'MuiDataGrid',
   slot: 'OverlayWrapperInner',
@@ -71,7 +70,6 @@ function GridOverlayWrapper(props) {
   if (rootProps.autoHeight && height === 0) {
     height = (0, _gridRowsUtils.getMinimalContentHeight)(apiRef, rootProps.rowHeight); // Give room to show the overlay when there no rows.
   }
-
   const classes = useUtilityClasses((0, _extends2.default)({}, props, {
     classes: rootProps.classes
   }));

package/node/components/cell/GridActionsCell.js

@@ -135,7 +135,6 @@ function GridActionsCell(props) {
     if (newIndex < 0 || newIndex >= numberOfButtons) {
       return; // We're already in the first or last item = do nothing and let the grid listen the event
     }
-
     if (newIndex !== focusedButtonIndex) {
       event.preventDefault(); // Prevent scrolling
       event.stopPropagation(); // Don't stop propagation for other keys, e.g. ArrowUp