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

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

@@ -13,9 +13,9 @@ import { useGridRootProps } from "../../utils/useGridRootProps.js";
 import { useGridSelector } from "../../utils/useGridSelector.js";
 import { useRunOnce } from "../../utils/useRunOnce.js";
 import { gridVisibleColumnDefinitionsSelector, gridVisiblePinnedColumnDefinitionsSelector, gridColumnPositionsSelector, gridHasColSpanSelector } from "../columns/gridColumnsSelector.js";
-import { gridPinnedRowsSelector } from "../rows/gridRowsSelector.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;
@@ -259,6 +259,7 @@ export const useGridVirtualScroller = () => {
     if (!params.rows && !currentPage.range) {
       return [];
     }
+    const rowTree = gridRowTreeSelector(apiRef);
     let baseRenderContext = renderContext;
     if (params.renderContext) {
       baseRenderContext = params.renderContext;
@@ -304,6 +305,16 @@ export const useGridVirtualScroller = () => {
         id,
         model
       } = rowModels[rowIndexInPage];
+
+      // In certain cases, the state might already be updated and `currentPage.rows` (which sets `rowModels`)
+      // contains stale data.
+      // In that case, skip any further row processing.
+      // See:
+      // - https://github.com/mui/mui-x/issues/16638
+      // - https://github.com/mui/mui-x/issues/17022
+      if (!rowTree[id]) {
+        return;
+      }
       const rowIndex = (currentPage?.range?.firstRowIndex || 0) + rowIndexOffset + rowIndexInPage;
 
       // NOTE: This is an expensive feature, the colSpan code could be optimized.
@@ -489,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,
@@ -538,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);
@@ -562,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/esm/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/esm/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/esm/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/esm/hooks/utils/{useGridApiEventHandler.d.ts → 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/{modern/hooks/utils/useGridApiEventHandler.js → esm/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/esm/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/esm/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/esm/index.js

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

package/esm/locales/deDE.js

@@ -108,7 +108,7 @@ const deDEGrid = {
   filterValueFalse: 'Nein',
   // Column menu text
   columnMenuLabel: 'Menü',
-  // columnMenuAriaLabel: (columnName: string) => `${columnName} column menu`,
+  columnMenuAriaLabel: columnName => `${columnName} Spaltenmenü`,
   columnMenuShowColumns: 'Zeige alle Spalten',
   columnMenuManageColumns: 'Spalten verwalten',
   columnMenuFilter: 'Filter',
@@ -155,18 +155,18 @@ const deDEGrid = {
   collapseDetailPanel: 'Zuklappen',
   // Pagination
   paginationRowsPerPage: 'Zeilen pro Seite:',
-  // paginationDisplayedRows: ({
-  //   from,
-  //   to,
-  //   count,
-  //   estimated
-  // }) => {
-  //   if (!estimated) {
-  //     return `${from}–${to} of ${count !== -1 ? count : `more than ${to}`}`;
-  //   }
-  //   const estimatedLabel = estimated && estimated > to ? `around ${estimated}` : `more than ${to}`;
-  //   return `${from}–${to} of ${count !== -1 ? count : estimatedLabel}`;
-  // },
+  paginationDisplayedRows: ({
+    from,
+    to,
+    count,
+    estimated
+  }) => {
+    if (!estimated) {
+      return `${from}–${to} von ${count !== -1 ? count : `mehr als ${to}`}`;
+    }
+    const estimatedLabel = estimated && estimated > to ? `ungefähr ${estimated}` : `mehr als ${to}`;
+    return `${from}–${to} von ${count !== -1 ? count : estimatedLabel}`;
+  },
   paginationItemAriaLabel: type => {
     if (type === 'first') {
       return 'Zur ersten Seite';

package/esm/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/esm/material/augmentation.js

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

package/esm/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;