@mui/x-data-grid 6.18.1 → 7.0.0-alpha.1

package/colDef/gridDateOperators.js

@@ -1,5 +1,4 @@
 import { GridFilterInputDate } from '../components/panel/filterPanel/GridFilterInputDate';
-import { convertLegacyOperators } from './utils';
 const dateRegex = /(\d+)-(\d+)-(\d+)/;
 const dateTimeRegex = /(\d+)-(\d+)-(\d+)T(\d+):(\d+)/;
 function buildApplyFilterFn(filterItem, compareFn, showTime, keepHours) {
@@ -22,9 +21,9 @@ function buildApplyFilterFn(filterItem, compareFn, showTime, keepHours) {
     return compareFn(timeToCompare, time);
   };
 }
-export const getGridDateOperators = showTime => convertLegacyOperators([{
+export const getGridDateOperators = showTime => [{
   value: 'is',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     return buildApplyFilterFn(filterItem, (value1, value2) => value1 === value2, showTime);
   },
   InputComponent: GridFilterInputDate,
@@ -33,7 +32,7 @@ export const getGridDateOperators = showTime => convertLegacyOperators([{
   }
 }, {
   value: 'not',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     return buildApplyFilterFn(filterItem, (value1, value2) => value1 !== value2, showTime);
   },
   InputComponent: GridFilterInputDate,
@@ -42,7 +41,7 @@ export const getGridDateOperators = showTime => convertLegacyOperators([{
   }
 }, {
   value: 'after',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     return buildApplyFilterFn(filterItem, (value1, value2) => value1 > value2, showTime);
   },
   InputComponent: GridFilterInputDate,
@@ -51,7 +50,7 @@ export const getGridDateOperators = showTime => convertLegacyOperators([{
   }
 }, {
   value: 'onOrAfter',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     return buildApplyFilterFn(filterItem, (value1, value2) => value1 >= value2, showTime);
   },
   InputComponent: GridFilterInputDate,
@@ -60,7 +59,7 @@ export const getGridDateOperators = showTime => convertLegacyOperators([{
   }
 }, {
   value: 'before',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     return buildApplyFilterFn(filterItem, (value1, value2) => value1 < value2, showTime, !showTime);
   },
   InputComponent: GridFilterInputDate,
@@ -69,7 +68,7 @@ export const getGridDateOperators = showTime => convertLegacyOperators([{
   }
 }, {
   value: 'onOrBefore',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     return buildApplyFilterFn(filterItem, (value1, value2) => value1 <= value2, showTime);
   },
   InputComponent: GridFilterInputDate,
@@ -78,7 +77,7 @@ export const getGridDateOperators = showTime => convertLegacyOperators([{
   }
 }, {
   value: 'isEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value == null;
     };
@@ -86,10 +85,10 @@ export const getGridDateOperators = showTime => convertLegacyOperators([{
   requiresFilterValue: false
 }, {
   value: 'isNotEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value != null;
     };
   },
   requiresFilterValue: false
-}]);
+}];

package/colDef/gridNumericColDef.js

@@ -3,7 +3,6 @@ import { gridNumberComparator } from '../hooks/features/sorting/gridSortingUtils
 import { isNumber } from '../utils/utils';
 import { getGridNumericOperators, getGridNumericQuickFilterFn } from './gridNumericOperators';
 import { GRID_STRING_COL_DEF } from './gridStringColDef';
-import { convertQuickFilterV7ToLegacy } from './utils';
 export const GRID_NUMERIC_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
   type: 'number',
   align: 'right',
@@ -14,6 +13,5 @@ export const GRID_NUMERIC_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
     value
   }) => isNumber(value) ? value.toLocaleString() : value || '',
   filterOperators: getGridNumericOperators(),
-  getApplyQuickFilterFn: convertQuickFilterV7ToLegacy(getGridNumericQuickFilterFn),
-  getApplyQuickFilterFnV7: getGridNumericQuickFilterFn
+  getApplyQuickFilterFn: getGridNumericQuickFilterFn
 });

package/colDef/gridNumericOperators.d.ts

@@ -1,4 +1,4 @@
 import { GridFilterOperator } from '../models/gridFilterOperator';
-import type { GridApplyQuickFilterV7 } from '../models/colDef/gridColDef';
-export declare const getGridNumericQuickFilterFn: (value: any) => GridApplyQuickFilterV7 | null;
+import type { GetApplyQuickFilterFn } from '../models/colDef/gridColDef';
+export declare const getGridNumericQuickFilterFn: GetApplyQuickFilterFn<any, number | string | null>;
 export declare const getGridNumericOperators: () => GridFilterOperator<any, number | string | null, any>[];

package/colDef/gridNumericOperators.js

@@ -1,23 +1,22 @@
 import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilterInputValue';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
-import { convertLegacyOperators, tagInternalFilter } from './utils';
 const parseNumericValue = value => {
   if (value == null) {
     return null;
   }
   return Number(value);
 };
-export const getGridNumericQuickFilterFn = tagInternalFilter(value => {
+export const getGridNumericQuickFilterFn = value => {
   if (value == null || Number.isNaN(value) || value === '') {
     return null;
   }
   return columnValue => {
     return parseNumericValue(columnValue) === parseNumericValue(value);
   };
-});
-export const getGridNumericOperators = () => convertLegacyOperators([{
+};
+export const getGridNumericOperators = () => [{
   value: '=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -31,7 +30,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '!=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -45,7 +44,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '>',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -62,7 +61,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '>=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -79,7 +78,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '<',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -96,7 +95,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '<=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -113,7 +112,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: 'isEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value == null;
     };
@@ -121,7 +120,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   requiresFilterValue: false
 }, {
   value: 'isNotEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value != null;
     };
@@ -129,7 +128,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   requiresFilterValue: false
 }, {
   value: 'isAnyOf',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
       return null;
     }
@@ -141,4 +140,4 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   InputComponentProps: {
     type: 'number'
   }
-}]);
+}];

package/colDef/gridSingleSelectOperators.js

@@ -1,16 +1,15 @@
 import { GridFilterInputSingleSelect } from '../components/panel/filterPanel/GridFilterInputSingleSelect';
 import { GridFilterInputMultipleSingleSelect } from '../components/panel/filterPanel/GridFilterInputMultipleSingleSelect';
 import { isObject } from '../utils/utils';
-import { convertLegacyOperators } from './utils';
 const parseObjectValue = value => {
   if (value == null || !isObject(value)) {
     return value;
   }
   return value.value;
 };
-export const getGridSingleSelectOperators = () => convertLegacyOperators([{
+export const getGridSingleSelectOperators = () => [{
   value: 'is',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || filterItem.value === '') {
       return null;
     }
@@ -19,7 +18,7 @@ export const getGridSingleSelectOperators = () => convertLegacyOperators([{
   InputComponent: GridFilterInputSingleSelect
 }, {
   value: 'not',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || filterItem.value === '') {
       return null;
     }
@@ -28,7 +27,7 @@ export const getGridSingleSelectOperators = () => convertLegacyOperators([{
   InputComponent: GridFilterInputSingleSelect
 }, {
   value: 'isAnyOf',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
       return null;
     }
@@ -36,4 +35,4 @@ export const getGridSingleSelectOperators = () => convertLegacyOperators([{
     return value => filterItemValues.includes(parseObjectValue(value));
   },
   InputComponent: GridFilterInputMultipleSingleSelect
-}]);
+}];

package/colDef/gridStringColDef.js

@@ -1,7 +1,6 @@
 import { renderEditInputCell } from '../components/cell/GridEditInputCell';
 import { gridStringOrNumberComparator } from '../hooks/features/sorting/gridSortingUtils';
 import { getGridStringOperators, getGridStringQuickFilterFn } from './gridStringOperators';
-import { convertQuickFilterV7ToLegacy } from './utils';
 
 /**
  * TODO: Move pro and premium properties outside of this Community file
@@ -24,6 +23,5 @@ export const GRID_STRING_COL_DEF = {
   align: 'left',
   filterOperators: getGridStringOperators(),
   renderEditCell: renderEditInputCell,
-  getApplyQuickFilterFn: convertQuickFilterV7ToLegacy(getGridStringQuickFilterFn),
-  getApplyQuickFilterFnV7: getGridStringQuickFilterFn
+  getApplyQuickFilterFn: getGridStringQuickFilterFn
 };

package/colDef/gridStringOperators.d.ts

@@ -1,4 +1,4 @@
-import type { GridApplyQuickFilterV7 } from '../models/colDef/gridColDef';
+import type { GetApplyQuickFilterFn } from '../models/colDef/gridColDef';
 import { GridFilterOperator } from '../models/gridFilterOperator';
-export declare const getGridStringQuickFilterFn: (value: any) => GridApplyQuickFilterV7 | null;
+export declare const getGridStringQuickFilterFn: GetApplyQuickFilterFn<any, unknown>;
 export declare const getGridStringOperators: (disableTrim?: boolean) => GridFilterOperator<any, number | string | null, any>[];

package/colDef/gridStringOperators.js

@@ -1,9 +1,8 @@
 import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilterInputValue';
 import { escapeRegExp } from '../utils/utils';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
-import { convertLegacyOperators, tagInternalFilter } from './utils';
 import { removeDiacritics } from '../hooks/features/filter/gridFilterUtils';
-export const getGridStringQuickFilterFn = tagInternalFilter(value => {
+export const getGridStringQuickFilterFn = value => {
   if (!value) {
     return null;
   }
@@ -15,10 +14,10 @@ export const getGridStringQuickFilterFn = tagInternalFilter(value => {
     }
     return columnValue != null ? filterRegex.test(columnValue.toString()) : false;
   };
-});
-export const getGridStringOperators = (disableTrim = false) => convertLegacyOperators([{
+};
+export const getGridStringOperators = (disableTrim = false) => [{
   value: 'contains',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -31,7 +30,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'equals',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -47,7 +46,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'startsWith',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -60,7 +59,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'endsWith',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -73,7 +72,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'isEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value === '' || value == null;
     };
@@ -81,7 +80,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   requiresFilterValue: false
 }, {
   value: 'isNotEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value !== '' && value != null;
     };
@@ -89,7 +88,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   requiresFilterValue: false
 }, {
   value: 'isAnyOf',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
       return null;
     }
@@ -103,4 +102,4 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
     }) : false;
   },
   InputComponent: GridFilterInputMultipleValue
-}]);
+}];

package/components/toolbar/GridToolbarFilterButton.js

@@ -130,6 +130,8 @@ process.env.NODE_ENV !== "production" ? GridToolbarFilterButton.propTypes = {
    * The props used for each slot inside.
    * @default {}
    */
-  componentsProps: PropTypes.object
+  componentsProps: PropTypes.shape({
+    button: PropTypes.object
+  })
 } : void 0;
 export { GridToolbarFilterButton };

package/constants/defaultGridSlotsComponents.js

@@ -9,21 +9,21 @@ import materialSlots from '../material';
 // TODO: camelCase these key. It's a private helper now.
 // Remove then need to call `uncapitalizeObjectKeys`.
 export const DATA_GRID_DEFAULT_SLOTS_COMPONENTS = _extends({}, materialSlots, {
-  Cell: GridCellV7,
-  SkeletonCell: GridSkeletonCell,
-  ColumnHeaderFilterIconButton: GridColumnHeaderFilterIconButton,
-  ColumnMenu: GridColumnMenu,
-  ColumnHeaders: GridColumnHeaders,
-  Footer: GridFooter,
-  FooterRowCount: GridRowCount,
-  Toolbar: null,
-  PreferencesPanel: GridPreferencesPanel,
-  LoadingOverlay: GridLoadingOverlay,
-  NoResultsOverlay: GridNoResultsOverlay,
-  NoRowsOverlay: GridNoRowsOverlay,
-  Pagination: GridPagination,
-  FilterPanel: GridFilterPanel,
-  ColumnsPanel: GridColumnsPanel,
-  Panel: GridPanel,
-  Row: GridRow
+  cell: GridCellV7,
+  skeletonCell: GridSkeletonCell,
+  columnHeaderFilterIconButton: GridColumnHeaderFilterIconButton,
+  columnMenu: GridColumnMenu,
+  columnHeaders: GridColumnHeaders,
+  footer: GridFooter,
+  footerRowCount: GridRowCount,
+  toolbar: null,
+  preferencesPanel: GridPreferencesPanel,
+  loadingOverlay: GridLoadingOverlay,
+  noResultsOverlay: GridNoResultsOverlay,
+  noRowsOverlay: GridNoRowsOverlay,
+  pagination: GridPagination,
+  filterPanel: GridFilterPanel,
+  columnsPanel: GridColumnsPanel,
+  panel: GridPanel,
+  row: GridRow
 });

package/hooks/features/export/useGridPrintExport.js

@@ -7,7 +7,7 @@ import { gridColumnDefinitionsSelector, gridColumnVisibilityModelSelector } from
 import { gridClasses } from '../../../constants/gridClasses';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
-import { getColumnsToExport } from './utils';
+import { defaultGetRowsToExport, getColumnsToExport } from './utils';
 import { mergeStateWithPaginationModel } from '../pagination/useGridPagination';
 import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
 import { GridPrintExportMenuItem } from '../../../components/toolbar/GridToolbarExport';
@@ -121,12 +121,10 @@ export const useGridPrintExport = (apiRef, props) => {
     // the footer is always being placed at the bottom of the page as if all rows are exported
     // so if getRowsToExport is being used to only export a subset of rows then we need to
     // adjust the footer position to be correctly placed at the bottom of the grid
-    if (options != null && options.getRowsToExport) {
-      const gridFooterElement = gridClone.querySelector(`.${gridClasses.footerContainer}`);
-      gridFooterElement.style.position = 'absolute';
-      gridFooterElement.style.width = '100%';
-      gridFooterElement.style.top = `${computedTotalHeight - gridFooterElementHeight}px`;
-    }
+    const gridFooterElement = gridClone.querySelector(`.${gridClasses.footerContainer}`);
+    gridFooterElement.style.position = 'absolute';
+    gridFooterElement.style.width = '100%';
+    gridFooterElement.style.top = `${computedTotalHeight - gridFooterElementHeight}px`;
 
     // printDoc.body.appendChild(gridClone); should be enough but a clone isolation bug in Safari
     // prevents us to do it
@@ -210,6 +208,7 @@ export const useGridPrintExport = (apiRef, props) => {
     previousRows.current = [];
   }, [apiRef]);
   const exportDataAsPrint = React.useCallback(async options => {
+    var _options$getRowsToExp;
     logger.debug(`Export data as Print`);
     if (!apiRef.current.rootElementRef.current) {
       throw new Error('MUI: No grid root element available.');
@@ -230,9 +229,7 @@ export const useGridPrintExport = (apiRef, props) => {
       apiRef.current.forceUpdate();
     }
     await updateGridColumnsForPrint(options == null ? void 0 : options.fields, options == null ? void 0 : options.allColumns, options == null ? void 0 : options.includeCheckboxes);
-    if (options != null && options.getRowsToExport) {
-      updateGridRowsForPrint(options.getRowsToExport);
-    }
+    updateGridRowsForPrint((_options$getRowsToExp = options == null ? void 0 : options.getRowsToExport) != null ? _options$getRowsToExp : defaultGetRowsToExport);
     apiRef.current.unstable_setVirtualization(false);
     await raf(); // wait for the state changes to take action
     const printWindow = buildPrintWindow(options == null ? void 0 : options.fileName);

package/hooks/features/filter/gridFilterUtils.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { GridLogicOperator } from '../../../models';
-import { GLOBAL_API_REF, isInternalFilter } from '../../../colDef/utils';
 import { getDefaultGridFilterModel } from './gridFilterState';
 import { buildWarning } from '../../../utils/warning';
 import { getPublicApiRef } from '../../../utils/getPublicApiRef';
@@ -109,42 +108,19 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
   if (!filterOperator) {
     throw new Error(`MUI: No filter operator found for column '${column.field}' and operator value '${newFilterItem.operator}'.`);
   }
-  const hasUserFunctionLegacy = !isInternalFilter(filterOperator.getApplyFilterFn);
-  const hasUserFunctionV7 = !isInternalFilter(filterOperator.getApplyFilterFnV7);
   const publicApiRef = getPublicApiRef(apiRef);
-  if (filterOperator.getApplyFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
-    const applyFilterOnRow = filterOperator.getApplyFilterFnV7(newFilterItem, column);
-    if (typeof applyFilterOnRow !== 'function') {
-      return null;
-    }
-    return {
-      v7: true,
-      item: newFilterItem,
-      fn: row => {
-        let value = apiRef.current.getRowValue(row, column);
-        if (ignoreDiacritics) {
-          value = removeDiacritics(value);
-        }
-        return applyFilterOnRow(value, row, column, publicApiRef);
-      }
-    };
-  }
   const applyFilterOnRow = filterOperator.getApplyFilterFn(newFilterItem, column);
   if (typeof applyFilterOnRow !== 'function') {
     return null;
   }
   return {
-    v7: false,
     item: newFilterItem,
-    fn: rowId => {
-      const params = apiRef.current.getCellParams(rowId, newFilterItem.field);
-      GLOBAL_API_REF.current = publicApiRef;
+    fn: row => {
+      let value = apiRef.current.getRowValue(row, column);
       if (ignoreDiacritics) {
-        params.value = removeDiacritics(params.value);
+        value = removeDiacritics(value);
       }
-      const result = applyFilterOnRow(params);
-      GLOBAL_API_REF.current = null;
-      return result;
+      return applyFilterOnRow(value, row, column, publicApiRef);
     }
   };
 };
@@ -171,7 +147,7 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
       for (let i = 0; i < appliers.length; i += 1) {
         const applier = appliers[i];
         if (!shouldApplyFilter || shouldApplyFilter(applier.item.field)) {
-          resultPerItemId[applier.item.id] = applier.v7 ? applier.fn(row) : applier.fn(apiRef.current.getRowId(row));
+          resultPerItemId[applier.item.id] = applier.fn(row);
         }
       }
       return resultPerItemId;
@@ -187,7 +163,7 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
       ${appliers.map((applier, i) => `${JSON.stringify(String(applier.item.id))}:
           !shouldApply${i} ?
             false :
-            ${applier.v7 ? `appliers[${i}].fn(row)` : `appliers[${i}].fn(getRowId(row))`},
+            appliers[${i}].fn(row),
       `).join('\n')}};
 
       return result$$;
@@ -222,27 +198,12 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   columnFields.forEach(field => {
     const column = apiRef.current.getColumn(field);
     const getApplyQuickFilterFn = column == null ? void 0 : column.getApplyQuickFilterFn;
-    const getApplyQuickFilterFnV7 = column == null ? void 0 : column.getApplyQuickFilterFnV7;
-    const hasUserFunctionLegacy = !isInternalFilter(getApplyQuickFilterFn);
-    const hasUserFunctionV7 = !isInternalFilter(getApplyQuickFilterFnV7);
-    if (getApplyQuickFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
+    if (getApplyQuickFilterFn) {
       appliersPerField.push({
         column,
         appliers: quickFilterValues.map(quickFilterValue => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
-            v7: true,
-            fn: getApplyQuickFilterFnV7(value, column, publicApiRef)
-          };
-        })
-      });
-    } else if (getApplyQuickFilterFn) {
-      appliersPerField.push({
-        column,
-        appliers: quickFilterValues.map(quickFilterValue => {
-          const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
-          return {
-            v7: false,
             fn: getApplyQuickFilterFn(value, column, publicApiRef)
           };
         })
@@ -251,7 +212,6 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   });
   return function isRowMatchingQuickFilter(row, shouldApplyFilter) {
     const result = {};
-    const usedCellParams = {};
 
     /* eslint-disable no-restricted-syntax, no-labels */
     outer: for (let v = 0; v < quickFilterValues.length; v += 1) {
@@ -272,27 +232,13 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
         if (applier.fn === null) {
           continue;
         }
-        if (applier.v7) {
-          if (ignoreDiacritics) {
-            value = removeDiacritics(value);
-          }
-          const isMatching = applier.fn(value, row, column, publicApiRef);
-          if (isMatching) {
-            result[filterValue] = true;
-            continue outer;
-          }
-        } else {
-          var _usedCellParams$field;
-          const cellParams = (_usedCellParams$field = usedCellParams[field]) != null ? _usedCellParams$field : apiRef.current.getCellParams(apiRef.current.getRowId(row), field);
-          if (ignoreDiacritics) {
-            cellParams.value = removeDiacritics(cellParams.value);
-          }
-          usedCellParams[field] = cellParams;
-          const isMatching = applier.fn(cellParams);
-          if (isMatching) {
-            result[filterValue] = true;
-            continue outer;
-          }
+        if (ignoreDiacritics) {
+          value = removeDiacritics(value);
+        }
+        const isMatching = applier.fn(value, row, column, publicApiRef);
+        if (isMatching) {
+          result[filterValue] = true;
+          continue outer;
         }
       }
       result[filterValue] = false;

package/hooks/features/rows/useGridRows.js

@@ -289,7 +289,10 @@ export const useGridRows = (apiRef, props) => {
     });
 
     // Removes potential remaining skeleton rows from the dataRowIds.
-    const dataRowIds = rootGroupChildren.filter(childId => tree[childId].type === 'leaf');
+    const dataRowIds = rootGroupChildren.filter(childId => {
+      var _tree$childId;
+      return ((_tree$childId = tree[childId]) == null ? void 0 : _tree$childId.type) === 'leaf';
+    });
     apiRef.current.caches.rows.dataRowIdToModelLookup = dataRowIdToModelLookup;
     apiRef.current.caches.rows.dataRowIdToIdLookup = dataRowIdToIdLookup;
     apiRef.current.setState(state => _extends({}, state, {

package/index.js

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

package/internals/index.d.ts

@@ -79,5 +79,4 @@ export * from '../hooks/utils/useOnMount';
 export type { GridApiCommunity } from '../models/api/gridApiCommunity';
 export type { GridApiCaches } from '../models/gridApiCaches';
 export { serializeCellValue } from '../hooks/features/export/serializers/csvSerializer';
-export * from '../colDef/utils';
 export * from './utils';

package/internals/index.js

@@ -63,5 +63,4 @@ export * from '../utils/getPublicApiRef';
 export { useGridPrivateApiContext } from '../hooks/utils/useGridPrivateApiContext';
 export * from '../hooks/utils/useOnMount';
 export { serializeCellValue } from '../hooks/features/export/serializers/csvSerializer';
-export * from '../colDef/utils';
 export * from './utils';

package/internals/utils/computeSlots.d.ts

@@ -1,6 +1,4 @@
-import { UncapitalizeObjectKeys } from './slotsMigration';
-export declare function computeSlots<SlotComponents extends object>({ defaultSlots, slots, components, }: {
-    defaultSlots: UncapitalizeObjectKeys<SlotComponents>;
-    slots?: UncapitalizeObjectKeys<Partial<SlotComponents>>;
-    components?: Partial<SlotComponents>;
-}): UncapitalizeObjectKeys<SlotComponents>;
+export declare function computeSlots<SlotComponents extends object>({ defaultSlots, slots, }: {
+    defaultSlots: SlotComponents;
+    slots?: Partial<SlotComponents>;
+}): SlotComponents;