@mui/x-data-grid 8.0.0-beta.2 → 8.0.0-beta.3

package/modern/hooks/features/rows/gridRowsSelector.d.ts

@@ -1,49 +1,50 @@
 import { GridRowId } from "../../../models/gridRows.js";
 import { GridStateCommunity } from "../../../models/gridStateCommunity.js";
-export declare const gridRowsStateSelector: import("../../..").OutputSelector<GridStateCommunity, unknown, import("./gridRowsInterfaces").GridRowsState>;
-export declare const gridRowCountSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, number>;
-export declare const gridRowsLoadingSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, boolean | undefined>;
-export declare const gridTopLevelRowCountSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, number>;
-export declare const gridRowsLookupSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, import("./gridRowsInterfaces").GridRowIdToModelLookup<import("../../..").GridValidRowModel>>;
-export declare const gridRowSelector: import("../../..").OutputSelector<GridStateCommunity, GridRowId, import("../../..").GridValidRowModel>;
-export declare const gridRowTreeSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, import("../../..").GridRowTreeConfig>;
-export declare const gridRowNodeSelector: import("../../..").OutputSelector<GridStateCommunity, GridRowId, import("../../..").GridTreeNode>;
-export declare const gridRowGroupsToFetchSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, GridRowId[] | undefined>;
-export declare const gridRowGroupingNameSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, string>;
-export declare const gridRowTreeDepthsSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, import("./gridRowsInterfaces").GridTreeDepths>;
-export declare const gridRowMaximumTreeDepthSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, number>;
-export declare const gridDataRowIdsSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, GridRowId[]>;
+export declare const gridRowsStateSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, unknown, import("@mui/x-data-grid").GridRowsState>;
+export declare const gridRowCountSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, number>;
+export declare const gridRowsLoadingSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, boolean | undefined>;
+export declare const gridTopLevelRowCountSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, number>;
+export declare const gridRowsLookupSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, import("@mui/x-data-grid").GridRowIdToModelLookup<import("@mui/x-data-grid").GridValidRowModel>>;
+export declare const gridRowSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, GridRowId, import("@mui/x-data-grid").GridValidRowModel>;
+export declare const gridRowTreeSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, import("@mui/x-data-grid").GridRowTreeConfig>;
+export declare const gridRowNodeSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, GridRowId, import("@mui/x-data-grid").GridTreeNode>;
+export declare const gridRowGroupsToFetchSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, GridRowId[] | undefined>;
+export declare const gridRowGroupingNameSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, string>;
+export declare const gridRowTreeDepthsSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, import("./gridRowsInterfaces").GridTreeDepths>;
+export declare const gridRowMaximumTreeDepthSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, number>;
+export declare const gridDataRowIdsSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, GridRowId[]>;
+export declare const gridDataRowsSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowIdToModelLookup<import("@mui/x-data-grid").GridValidRowModel>, import("@mui/x-data-grid").GridValidRowModel[]>;
 /**
  * @ignore - do not document.
  */
-export declare const gridAdditionalRowGroupsSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridRowsInterfaces").GridRowsState, {
+export declare const gridAdditionalRowGroupsSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowsState, {
   pinnedRows?: import("./gridRowsInterfaces").GridPinnedRowsState;
 } | undefined>;
 /**
  * @ignore - do not document.
  */
-export declare const gridPinnedRowsSelector: import("../../..").OutputSelector<GridStateCommunity, {
+export declare const gridPinnedRowsSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, {
   pinnedRows?: import("./gridRowsInterfaces").GridPinnedRowsState;
 } | undefined, {
   bottom: {
     id: GridRowId;
-    model: import("../../..").GridValidRowModel;
+    model: import("@mui/x-data-grid").GridValidRowModel;
   }[];
   top: {
     id: GridRowId;
-    model: import("../../..").GridValidRowModel;
+    model: import("@mui/x-data-grid").GridValidRowModel;
   }[];
 }>;
 /**
  * @ignore - do not document.
  */
-export declare const gridPinnedRowsCountSelector: import("../../..").OutputSelector<GridStateCommunity, {
+export declare const gridPinnedRowsCountSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, {
   bottom: {
     id: GridRowId;
-    model: import("../../..").GridValidRowModel;
+    model: import("@mui/x-data-grid").GridValidRowModel;
   }[];
   top: {
     id: GridRowId;
-    model: import("../../..").GridValidRowModel;
+    model: import("@mui/x-data-grid").GridValidRowModel;
   }[];
 }, number>;

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

@@ -20,6 +20,13 @@ export const gridRowMaximumTreeDepthSelector = createSelectorMemoized(gridRowsSt
   return (entries.filter(([, nodeCount]) => nodeCount > 0).map(([depth]) => Number(depth)).sort((a, b) => b - a)[0] ?? 0) + 1;
 });
 export const gridDataRowIdsSelector = createSelector(gridRowsStateSelector, rows => rows.dataRowIds);
+export const gridDataRowsSelector = createSelectorMemoized(gridDataRowIdsSelector, gridRowsLookupSelector, (dataRowIds, rowsLookup) => dataRowIds.reduce((acc, id) => {
+  if (!rowsLookup[id]) {
+    return acc;
+  }
+  acc.push(rowsLookup[id]);
+  return acc;
+}, []));
 
 /**
  * @ignore - do not document.

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

@@ -71,13 +71,13 @@ export function useGridParamsApi(apiRef, props) {
     const cellTabIndex = gridTabIndexCellSelector(apiRef);
     const cellMode = apiRef.current.getCellMode(id, field);
     return apiRef.current.getCellParamsForRow(id, field, row, {
-      colDef: props.unstable_listView && props.unstable_listColumn?.field === field ? gridListColumnSelector(apiRef) : apiRef.current.getColumn(field),
+      colDef: props.listView && props.listViewColumn?.field === field ? gridListColumnSelector(apiRef) : apiRef.current.getColumn(field),
       rowNode,
       hasFocus: cellFocus !== null && cellFocus.field === field && cellFocus.id === id,
       tabIndex: cellTabIndex && cellTabIndex.field === field && cellTabIndex.id === id ? 0 : -1,
       cellMode
     });
-  }, [apiRef, props.unstable_listView, props.unstable_listColumn?.field]);
+  }, [apiRef, props.listView, props.listViewColumn?.field]);
   const getCellValue = React.useCallback((id, field) => {
     const colDef = apiRef.current.getColumn(field);
     const row = apiRef.current.getRow(id);

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

@@ -7,7 +7,7 @@ import { getVisibleRows } from "../../utils/useGridVisibleRows.js";
 import { gridRenderContextSelector } from "../virtualization/gridVirtualizationSelectors.js";
 import { getUnprocessedRange, isRowContextInitialized, getCellValue } from "./gridRowSpanningUtils.js";
 import { GRID_CHECKBOX_SELECTION_FIELD } from "../../../colDef/gridCheckboxSelectionColDef.js";
-import { useGridApiEventHandler } from "../../utils/useGridApiEventHandler.js";
+import { useGridEvent } from "../../utils/useGridEvent.js";
 import { runIf } from "../../../utils/utils.js";
 import { gridPageSizeSelector } from "../pagination/index.js";
 import { gridDataRowIdsSelector } from "./gridRowsSelector.js";
@@ -251,11 +251,11 @@ export const useGridRowSpanning = (apiRef, props) => {
     }
     updateRowSpanningState(renderContext, true);
   }, [apiRef, updateRowSpanningState]);
-  useGridApiEventHandler(apiRef, 'renderedRowsIntervalChange', runIf(props.rowSpanning, updateRowSpanningState));
-  useGridApiEventHandler(apiRef, 'sortedRowsSet', runIf(props.rowSpanning, resetRowSpanningState));
-  useGridApiEventHandler(apiRef, 'paginationModelChange', runIf(props.rowSpanning, resetRowSpanningState));
-  useGridApiEventHandler(apiRef, 'filteredRowsSet', runIf(props.rowSpanning, resetRowSpanningState));
-  useGridApiEventHandler(apiRef, 'columnsChange', runIf(props.rowSpanning, resetRowSpanningState));
+  useGridEvent(apiRef, 'renderedRowsIntervalChange', runIf(props.rowSpanning, updateRowSpanningState));
+  useGridEvent(apiRef, 'sortedRowsSet', runIf(props.rowSpanning, resetRowSpanningState));
+  useGridEvent(apiRef, 'paginationModelChange', runIf(props.rowSpanning, resetRowSpanningState));
+  useGridEvent(apiRef, 'filteredRowsSet', runIf(props.rowSpanning, resetRowSpanningState));
+  useGridEvent(apiRef, 'columnsChange', runIf(props.rowSpanning, resetRowSpanningState));
   React.useEffect(() => {
     if (!props.rowSpanning) {
       if (apiRef.current.state.rowSpanning !== EMPTY_STATE) {

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

@@ -4,11 +4,11 @@ import useLazyRef from '@mui/utils/useLazyRef';
 import { isObjectEmpty } from '@mui/x-internals/isObjectEmpty';
 import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
 import { useGridLogger } from "../../utils/useGridLogger.js";
-import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowGroupingNameSelector, gridRowTreeDepthsSelector, gridDataRowIdsSelector, gridRowMaximumTreeDepthSelector, gridRowGroupsToFetchSelector, gridRowNodeSelector } from "./gridRowsSelector.js";
+import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowGroupingNameSelector, gridRowTreeDepthsSelector, gridDataRowIdsSelector, gridRowMaximumTreeDepthSelector, gridRowGroupsToFetchSelector, gridRowNodeSelector, gridDataRowsSelector } from "./gridRowsSelector.js";
 import { gridRowIdSelector } from "../../core/gridPropsSelectors.js";
 import { useTimeout } from "../../utils/useTimeout.js";
 import { GridSignature } from "../../../constants/signature.js";
-import { useGridApiEventHandler } from "../../utils/useGridApiEventHandler.js";
+import { useGridEvent } from "../../utils/useGridEvent.js";
 import { getVisibleRows } from "../../utils/useGridVisibleRows.js";
 import { gridSortedRowIdsSelector } from "../sorting/gridSortingSelector.js";
 import { gridFilteredRowsLookupSelector } from "../filter/gridFilterSelector.js";
@@ -373,8 +373,8 @@ export const useGridRows = (apiRef, props) => {
       groupRows();
     }
   }, [apiRef, groupRows]);
-  useGridApiEventHandler(apiRef, 'activeStrategyProcessorChange', handleStrategyProcessorChange);
-  useGridApiEventHandler(apiRef, 'strategyAvailabilityChange', handleStrategyActivityChange);
+  useGridEvent(apiRef, 'activeStrategyProcessorChange', handleStrategyProcessorChange);
+  useGridEvent(apiRef, 'strategyAvailabilityChange', handleStrategyActivityChange);
 
   /**
    * APPLIERS
@@ -416,7 +416,7 @@ export const useGridRows = (apiRef, props) => {
       isRowCountPropUpdated = true;
       lastRowCount.current = props.rowCount;
     }
-    const currentRows = props.dataSource ? Array.from(apiRef.current.getRowModels().values()) : props.rows;
+    const currentRows = props.dataSource ? gridDataRowsSelector(apiRef) : props.rows;
     const areNewRowsAlreadyInState = apiRef.current.caches.rows.rowsBeforePartialUpdates === currentRows;
     const isNewLoadingAlreadyInState = apiRef.current.caches.rows.loadingPropBeforePartialUpdates === props.loading;
     const isNewRowCountAlreadyInState = apiRef.current.caches.rows.rowCountPropBeforePartialUpdates === props.rowCount;

package/modern/hooks/features/scroll/useGridScroll.d.ts

@@ -9,4 +9,4 @@ import { DataGridProcessedProps } from "../../../models/props/DataGridProps.js";
  * @requires useGridFilter (state)
  * @requires useGridColumnSpanning (method)
  */
-export declare const useGridScroll: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "pagination" | "unstable_listView">) => void;
+export declare const useGridScroll: (apiRef: RefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, "pagination" | "listView">) => void;

package/modern/hooks/features/scroll/useGridScroll.js

@@ -52,7 +52,7 @@ export const useGridScroll = (apiRef, props) => {
   const scrollToIndexes = React.useCallback(params => {
     const dimensions = gridDimensionsSelector(apiRef);
     const totalRowCount = gridRowCountSelector(apiRef);
-    const visibleColumns = props.unstable_listView ? [gridListColumnSelector(apiRef)] : gridVisibleColumnDefinitionsSelector(apiRef);
+    const visibleColumns = props.listView ? [gridListColumnSelector(apiRef)] : gridVisibleColumnDefinitionsSelector(apiRef);
     const scrollToHeader = params.rowIndex == null;
     if (!scrollToHeader && totalRowCount === 0 || visibleColumns.length === 0) {
       return false;
@@ -99,7 +99,7 @@ export const useGridScroll = (apiRef, props) => {
       return true;
     }
     return false;
-  }, [logger, apiRef, virtualScrollerRef, props.pagination, visibleSortedRows, props.unstable_listView]);
+  }, [logger, apiRef, virtualScrollerRef, props.pagination, visibleSortedRows, props.listView]);
   const scroll = React.useCallback(params => {
     if (virtualScrollerRef.current && params.left !== undefined && colRef.current) {
       const direction = isRtl ? -1 : 1;

package/modern/hooks/features/sorting/gridSortingSelector.d.ts

@@ -5,17 +5,17 @@ import { GridStateCommunity } from "../../../models/gridStateCommunity.js";
  * Get the id of the rows after the sorting process.
  * @category Sorting
  */
-export declare const gridSortedRowIdsSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridSortingState").GridSortingState, GridRowId[]>;
+export declare const gridSortedRowIdsSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridSortingState, GridRowId[]>;
 /**
  * Get the id and the model of the rows after the sorting process.
  * @category Sorting
  */
-export declare const gridSortedRowEntriesSelector: import("../../..").OutputSelector<GridStateCommunity, import("../../..").GridRowTreeConfig, GridRowEntry<GridValidRowModel>[]>;
+export declare const gridSortedRowEntriesSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridRowTreeConfig, GridRowEntry<GridValidRowModel>[]>;
 /**
  * Get the current sorting model.
  * @category Sorting
  */
-export declare const gridSortModelSelector: import("../../..").OutputSelector<GridStateCommunity, import("./gridSortingState").GridSortingState, GridSortModel>;
+export declare const gridSortModelSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridSortingState, GridSortModel>;
 export type GridSortColumnLookup = Record<string, {
   sortDirection: GridSortDirection;
   sortIndex?: number;
@@ -24,9 +24,9 @@ export type GridSortColumnLookup = Record<string, {
  * @category Sorting
  * @ignore - do not document.
  */
-export declare const gridSortColumnLookupSelector: import("../../..").OutputSelector<GridStateCommunity, GridSortModel, GridSortColumnLookup>;
+export declare const gridSortColumnLookupSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, GridSortModel, GridSortColumnLookup>;
 /**
  * @category Sorting
  * @ignore - do not document.
  */
-export declare const gridSortedRowIndexLookupSelector: import("../../..").OutputSelector<GridStateCommunity, GridRowId[], Record<GridRowId, number>>;
+export declare const gridSortedRowIndexLookupSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, GridRowId[], Record<GridRowId, number>>;

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils';
-import { useGridApiEventHandler } from "../../utils/useGridApiEventHandler.js";
+import { useGridEvent } from "../../utils/useGridEvent.js";
 import { useGridApiMethod } from "../../utils/useGridApiMethod.js";
 import { useGridLogger } from "../../utils/useGridLogger.js";
 import { gridColumnLookupSelector } from "../columns/gridColumnsSelector.js";
@@ -226,11 +226,11 @@ export const useGridSorting = (apiRef, props) => {
     }
   }, [apiRef]);
   useGridRegisterPipeProcessor(apiRef, 'columnMenu', addColumnMenuItem);
-  useGridApiEventHandler(apiRef, 'columnHeaderClick', handleColumnHeaderClick);
-  useGridApiEventHandler(apiRef, 'columnHeaderKeyDown', handleColumnHeaderKeyDown);
-  useGridApiEventHandler(apiRef, 'rowsSet', apiRef.current.applySorting);
-  useGridApiEventHandler(apiRef, 'columnsChange', handleColumnsChange);
-  useGridApiEventHandler(apiRef, 'activeStrategyProcessorChange', handleStrategyProcessorChange);
+  useGridEvent(apiRef, 'columnHeaderClick', handleColumnHeaderClick);
+  useGridEvent(apiRef, 'columnHeaderKeyDown', handleColumnHeaderKeyDown);
+  useGridEvent(apiRef, 'rowsSet', apiRef.current.applySorting);
+  useGridEvent(apiRef, 'columnsChange', handleColumnsChange);
+  useGridEvent(apiRef, 'activeStrategyProcessorChange', handleStrategyProcessorChange);
 
   /**
    * 1ST RENDER

package/modern/hooks/features/virtualization/gridFocusedVirtualCellSelector.d.ts

@@ -1,6 +1,6 @@
-export declare const gridFocusedVirtualCellSelector: import("../../..").OutputSelector<import("../../../models/gridStateCommunity").GridStateCommunity, import("../../..").GridCellCoordinates | null, {
+export declare const gridFocusedVirtualCellSelector: import("@mui/x-data-grid").OutputSelector<import("../../../models/gridStateCommunity").GridStateCommunity, import("@mui/x-data-grid").GridCellCoordinates | null, {
   rowIndex: number;
   columnIndex: number;
-  id?: import("../../..").GridRowId | undefined;
+  id?: import("@mui/x-data-grid").GridRowId | undefined;
   field?: string | undefined;
 } | null>;

package/modern/hooks/features/virtualization/gridVirtualizationSelectors.d.ts

@@ -4,33 +4,33 @@ import { GridStateCommunity } from "../../../models/gridStateCommunity.js";
  * Get the columns state
  * @category Virtualization
  */
-export declare const gridVirtualizationSelector: import("../../..").OutputSelector<GridStateCommunity, unknown, import("./useGridVirtualization").GridVirtualizationState>;
+export declare const gridVirtualizationSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, unknown, import("@mui/x-data-grid").GridVirtualizationState>;
 /**
  * Get the enabled state for virtualization
  * @category Virtualization
  * @deprecated Use `gridVirtualizationColumnEnabledSelector` and `gridVirtualizationRowEnabledSelector`
  */
-export declare const gridVirtualizationEnabledSelector: import("../../..").OutputSelector<GridStateCommunity, import("./useGridVirtualization").GridVirtualizationState, boolean>;
+export declare const gridVirtualizationEnabledSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridVirtualizationState, boolean>;
 /**
  * Get the enabled state for column virtualization
  * @category Virtualization
  */
-export declare const gridVirtualizationColumnEnabledSelector: import("../../..").OutputSelector<GridStateCommunity, import("./useGridVirtualization").GridVirtualizationState, boolean>;
+export declare const gridVirtualizationColumnEnabledSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridVirtualizationState, boolean>;
 /**
  * Get the enabled state for row virtualization
  * @category Virtualization
  */
-export declare const gridVirtualizationRowEnabledSelector: import("../../..").OutputSelector<GridStateCommunity, import("./useGridVirtualization").GridVirtualizationState, boolean>;
+export declare const gridVirtualizationRowEnabledSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridVirtualizationState, boolean>;
 /**
  * Get the render context
  * @category Virtualization
  * @ignore - do not document.
  */
-export declare const gridRenderContextSelector: import("../../..").OutputSelector<GridStateCommunity, import("./useGridVirtualization").GridVirtualizationState, import("../../..").GridRenderContext>;
+export declare const gridRenderContextSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, import("@mui/x-data-grid").GridVirtualizationState, import("@mui/x-data-grid").GridRenderContext>;
 /**
  * Get the render context, with only columns filled in.
  * This is cached, so it can be used to only re-render when the column interval changes.
  * @category Virtualization
  * @ignore - do not document.
  */
-export declare const gridRenderContextColumnsSelector: import("../../..").OutputSelector<GridStateCommunity, number, GridColumnsRenderContext>;
+export declare const gridRenderContextColumnsSelector: import("@mui/x-data-grid").OutputSelector<GridStateCommunity, number, GridColumnsRenderContext>;

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

@@ -15,7 +15,7 @@ import { useRunOnce } from "../../utils/useRunOnce.js";
 import { gridVisibleColumnDefinitionsSelector, gridVisiblePinnedColumnDefinitionsSelector, gridColumnPositionsSelector, gridHasColSpanSelector } from "../columns/gridColumnsSelector.js";
 import { gridPinnedRowsSelector, gridRowTreeSelector } from "../rows/gridRowsSelector.js";
 import { useGridVisibleRows, getVisibleRows } from "../../utils/useGridVisibleRows.js";
-import { useGridApiOptionHandler } from "../../utils/index.js";
+import { useGridEventPriority } from "../../utils/index.js";
 import * as platform from "../../../utils/platform.js";
 import { clamp, range } from "../../../utils/utils.js";
 import { gridRowsMetaSelector } from "../rows/gridRowsMetaSelector.js";
@@ -53,7 +53,7 @@ export const useGridVirtualScroller = () => {
   const apiRef = useGridPrivateApiContext();
   const rootProps = useGridRootProps();
   const {
-    unstable_listView: listView
+    listView
   } = rootProps;
   const visibleColumns = useGridSelector(apiRef, () => listView ? [gridListColumnSelector(apiRef)] : gridVisibleColumnDefinitionsSelector(apiRef));
   const enabledForRows = useGridSelector(apiRef, gridVirtualizationRowEnabledSelector) && !isJSDOM;
@@ -500,9 +500,9 @@ export const useGridVirtualScroller = () => {
   apiRef.current.register('private', {
     updateRenderContext: forceUpdateRenderContext
   });
-  useGridApiOptionHandler(apiRef, 'sortedRowsSet', forceUpdateRenderContext);
-  useGridApiOptionHandler(apiRef, 'paginationModelChange', forceUpdateRenderContext);
-  useGridApiOptionHandler(apiRef, 'columnsChange', forceUpdateRenderContext);
+  useGridEventPriority(apiRef, 'sortedRowsSet', forceUpdateRenderContext);
+  useGridEventPriority(apiRef, 'paginationModelChange', forceUpdateRenderContext);
+  useGridEventPriority(apiRef, 'columnsChange', forceUpdateRenderContext);
   return {
     renderContext,
     setPanels,
@@ -549,7 +549,7 @@ function needsHorizontalScrollbarSelector(apiRef) {
 function inputsSelector(apiRef, rootProps, enabledForRows, enabledForColumns) {
   const dimensions = gridDimensionsSelector(apiRef);
   const currentPage = getVisibleRows(apiRef, rootProps);
-  const visibleColumns = rootProps.unstable_listView ? [gridListColumnSelector(apiRef)] : gridVisibleColumnDefinitionsSelector(apiRef);
+  const visibleColumns = rootProps.listView ? [gridListColumnSelector(apiRef)] : gridVisibleColumnDefinitionsSelector(apiRef);
   const hiddenCellsOriginMap = gridRowSpanningHiddenCellsOriginMapSelector(apiRef);
   const lastRowId = apiRef.current.state.rows.dataRowIds.at(-1);
   const lastColumn = visibleColumns.at(-1);
@@ -573,7 +573,7 @@ function inputsSelector(apiRef, rootProps, enabledForRows, enabledForColumns) {
     pinnedColumns: gridVisiblePinnedColumnDefinitionsSelector(apiRef),
     visibleColumns,
     hiddenCellsOriginMap,
-    listView: rootProps.unstable_listView ?? false,
+    listView: rootProps.listView ?? false,
     virtualizeColumnsWithAutoRowHeight: rootProps.virtualizeColumnsWithAutoRowHeight
   };
 }

package/modern/hooks/utils/index.d.ts

@@ -1,4 +1,4 @@
-export { useGridApiEventHandler, useGridApiOptionHandler, unstable_resetCleanupTracking } from "./useGridApiEventHandler.js";
+export { useGridEvent, useGridEventPriority, unstable_resetCleanupTracking } from "./useGridEvent.js";
 export * from "./useGridApiMethod.js";
 export * from "./useGridLogger.js";
 export { useGridSelector } from "./useGridSelector.js";

package/modern/hooks/utils/index.js

@@ -1,4 +1,4 @@
-export { useGridApiEventHandler, useGridApiOptionHandler, unstable_resetCleanupTracking } from "./useGridApiEventHandler.js";
+export { useGridEvent, useGridEventPriority, unstable_resetCleanupTracking } from "./useGridEvent.js";
 export * from "./useGridApiMethod.js";
 export * from "./useGridLogger.js";
 export { useGridSelector } from "./useGridSelector.js";

package/modern/hooks/utils/useGridAriaAttributes.js

@@ -13,8 +13,14 @@ export const useGridAriaAttributes = () => {
   const accessibleRowCount = useGridSelector(apiRef, gridExpandedRowCountSelector);
   const headerGroupingMaxDepth = useGridSelector(apiRef, gridColumnGroupsHeaderMaxDepthSelector);
   const pinnedRowsCount = useGridSelector(apiRef, gridPinnedRowsCountSelector);
+  const ariaLabel = rootProps['aria-label'];
+  const ariaLabelledby = rootProps['aria-labelledby'];
+  // `aria-label` and `aria-labelledby` should take precedence over `label`
+  const shouldUseLabelAsAriaLabel = !ariaLabel && !ariaLabelledby && rootProps.label;
   return {
     role: 'grid',
+    'aria-label': shouldUseLabelAsAriaLabel ? rootProps.label : ariaLabel,
+    'aria-labelledby': ariaLabelledby,
     'aria-colcount': visibleColumns.length,
     'aria-rowcount': headerGroupingMaxDepth + 1 + pinnedRowsCount + accessibleRowCount,
     'aria-multiselectable': isMultipleRowSelectionEnabled(rootProps)

package/{hooks/utils/useGridApiEventHandler.d.ts → modern/hooks/utils/useGridEvent.d.ts}

@@ -4,8 +4,8 @@ import { GridEventListener, GridEvents } from "../../models/events/index.js";
 import { TimerBasedCleanupTracking } from "../../utils/cleanupTracking/TimerBasedCleanupTracking.js";
 import { FinalizationRegistryBasedCleanupTracking } from "../../utils/cleanupTracking/FinalizationRegistryBasedCleanupTracking.js";
 import type { GridApiCommon } from '../../models';
-export declare function useGridApiEventHandler<Api extends GridApiCommon, E extends GridEvents>(apiRef: RefObject<Api>, eventName: E, handler?: GridEventListener<E>, options?: EventListenerOptions): void;
-export declare function useGridApiOptionHandler<Api extends GridApiCommon, E extends GridEvents>(apiRef: RefObject<Api>, eventName: E, handler?: GridEventListener<E>): void;
+export declare function useGridEvent<Api extends GridApiCommon, E extends GridEvents>(apiRef: RefObject<Api>, eventName: E, handler?: GridEventListener<E>, options?: EventListenerOptions): void;
+export declare function useGridEventPriority<Api extends GridApiCommon, E extends GridEvents>(apiRef: RefObject<Api>, eventName: E, handler?: GridEventListener<E>): void;
 export declare function unstable_resetCleanupTracking(): void;
 export declare const internal_registryContainer: {
   current: TimerBasedCleanupTracking | FinalizationRegistryBasedCleanupTracking;

package/{esm/hooks/utils/useGridApiEventHandler.js → modern/hooks/utils/useGridEvent.js}

@@ -14,7 +14,7 @@ const registryContainer = {
   current: createRegistry()
 };
 let cleanupTokensCounter = 0;
-export function useGridApiEventHandler(apiRef, eventName, handler, options) {
+export function useGridEvent(apiRef, eventName, handler, options) {
   const objectRetainedByReact = React.useState(ObjectToBeRetainedByReact.create)[0];
   const subscription = React.useRef(null);
   const handlerRef = React.useRef(null);
@@ -70,8 +70,8 @@ export function useGridApiEventHandler(apiRef, eventName, handler, options) {
 const OPTIONS_IS_FIRST = {
   isFirst: true
 };
-export function useGridApiOptionHandler(apiRef, eventName, handler) {
-  useGridApiEventHandler(apiRef, eventName, handler, OPTIONS_IS_FIRST);
+export function useGridEventPriority(apiRef, eventName, handler) {
+  useGridEvent(apiRef, eventName, handler, OPTIONS_IS_FIRST);
 }
 
 // TODO: move to @mui/x-data-grid/internals

package/modern/hooks/utils/useGridNativeEventListener.js

@@ -1,8 +1,8 @@
 import { useGridLogger } from "./useGridLogger.js";
-import { useGridApiOptionHandler } from "./useGridApiEventHandler.js";
+import { useGridEventPriority } from "./useGridEvent.js";
 export const useGridNativeEventListener = (apiRef, ref, eventName, handler, options) => {
   const logger = useGridLogger(apiRef, 'useNativeEventListener');
-  useGridApiOptionHandler(apiRef, 'rootMount', () => {
+  useGridEventPriority(apiRef, 'rootMount', () => {
     const targetElement = ref();
     if (!targetElement || !eventName) {
       return undefined;

package/modern/hooks/utils/useGridVisibleRows.d.ts

@@ -2,12 +2,12 @@ import { RefObject } from '@mui/x-internals/types';
 import { DataGridProcessedProps } from "../../models/props/DataGridProps.js";
 import type { GridApiCommon } from '../../models';
 export declare const getVisibleRows: <Api extends GridApiCommon>(apiRef: RefObject<Api>, props?: Pick<DataGridProcessedProps, "pagination" | "paginationMode">) => {
-  rows: import("../..").GridRowEntry<import("../..").GridValidRowModel>[];
+  rows: import("@mui/x-data-grid").GridRowEntry<import("@mui/x-data-grid").GridValidRowModel>[];
   range: {
     firstRowIndex: number;
     lastRowIndex: number;
   } | null;
-  rowIdToIndexMap: Map<import("../..").GridRowId, number>;
+  rowIdToIndexMap: Map<import("@mui/x-data-grid").GridRowId, number>;
 };
 /**
  * Computes the list of rows that are reachable by scroll.
@@ -17,10 +17,10 @@ export declare const getVisibleRows: <Api extends GridApiCommon>(apiRef: RefObje
  * - If the row tree is flat, it only contains up to `state.pageSize` rows.
  */
 export declare const useGridVisibleRows: <Api extends GridApiCommon>(apiRef: RefObject<Api>, props?: Pick<DataGridProcessedProps, "pagination" | "paginationMode">) => {
-  rows: import("../..").GridRowEntry<import("../..").GridValidRowModel>[];
+  rows: import("@mui/x-data-grid").GridRowEntry<import("@mui/x-data-grid").GridValidRowModel>[];
   range: {
     firstRowIndex: number;
     lastRowIndex: number;
   } | null;
-  rowIdToIndexMap: Map<import("../..").GridRowId, number>;
+  rowIdToIndexMap: Map<import("@mui/x-data-grid").GridRowId, number>;
 };

package/modern/index.js

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

package/modern/material/augmentation.d.ts

@@ -0,0 +1,74 @@
+import type { AutocompleteProps } from '@mui/material/Autocomplete';
+import type { BadgeProps } from '@mui/material/Badge';
+import type { CheckboxProps } from '@mui/material/Checkbox';
+import type { CircularProgressProps } from '@mui/material/CircularProgress';
+import type { DividerProps } from '@mui/material/Divider';
+import type { LinearProgressProps } from '@mui/material/LinearProgress';
+import type { MenuListProps } from '@mui/material/MenuList';
+import type { MenuItemProps } from '@mui/material/MenuItem';
+import type { TextFieldProps } from '@mui/material/TextField';
+import type { SwitchProps } from '@mui/material/Switch';
+import type { ButtonProps } from '@mui/material/Button';
+import type { IconButtonProps } from '@mui/material/IconButton';
+import type { TablePaginationProps } from '@mui/material/TablePagination';
+import type { PopperProps } from '@mui/material/Popper';
+import type { TooltipProps } from '@mui/material/Tooltip';
+import type { InputProps } from '@mui/material/Input';
+import type { SelectProps } from '@mui/material/Select';
+import type { SkeletonProps } from '@mui/material/Skeleton';
+declare module '@mui/x-data-grid' {
+  interface BaseAutocompletePropsOverrides {
+    material?: Partial<AutocompleteProps<string, true, false, true>>;
+  }
+  interface BaseBadgePropsOverrides {
+    material?: Partial<BadgeProps>;
+  }
+  interface BaseCheckboxPropsOverrides {
+    material?: Partial<CheckboxProps>;
+  }
+  interface BaseCircularProgressPropsOverrides {
+    material?: Partial<CircularProgressProps>;
+  }
+  interface BaseDividerPropsOverrides {
+    material?: Partial<DividerProps>;
+  }
+  interface BaseLinearProgressPropsOverrides {
+    material?: Partial<LinearProgressProps>;
+  }
+  interface BaseMenuListPropsOverrides {
+    material?: Partial<MenuListProps>;
+  }
+  interface BaseMenuItemPropsOverrides {
+    material?: Partial<MenuItemProps>;
+  }
+  interface BaseTextFieldPropsOverrides {
+    material?: Partial<TextFieldProps>;
+  }
+  interface BaseSwitchPropsOverrides {
+    material?: Partial<SwitchProps>;
+  }
+  interface BaseButtonPropsOverrides {
+    material?: Partial<ButtonProps>;
+  }
+  interface BaseIconButtonPropsOverrides {
+    material?: Partial<IconButtonProps>;
+  }
+  interface BasePaginationPropsOverrides {
+    material?: Partial<TablePaginationProps>;
+  }
+  interface BasePopperPropsOverrides {
+    material?: Partial<PopperProps>;
+  }
+  interface BaseTooltipPropsOverrides {
+    material?: Partial<TooltipProps>;
+  }
+  interface BaseInputPropsOverrides {
+    material?: Partial<InputProps>;
+  }
+  interface BaseSelectPropsOverrides {
+    material?: Partial<SelectProps>;
+  }
+  interface BaseSkeletonPropsOverrides {
+    material?: Partial<SkeletonProps>;
+  }
+}

package/modern/material/augmentation.js

@@ -0,0 +1 @@
+export {};

package/modern/material/index.d.ts

@@ -1,5 +1,6 @@
 import type { GridIconSlotsComponent } from '../models';
 import type { GridBaseSlots } from '../models/gridSlotsComponent';
+import "./augmentation.js";
 export { useMaterialCSSVariables } from "./variables.js";
 declare const materialSlots: GridBaseSlots & GridIconSlotsComponent;
 export default materialSlots;