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

package/hooks/utils/index.js

@@ -4,27 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  useGridApiEventHandler: true,
-  useGridApiOptionHandler: true,
+  useGridEvent: true,
+  useGridEventPriority: true,
   unstable_resetCleanupTracking: true,
   useGridSelector: true
 };
 Object.defineProperty(exports, "unstable_resetCleanupTracking", {
   enumerable: true,
   get: function () {
-    return _useGridApiEventHandler.unstable_resetCleanupTracking;
+    return _useGridEvent.unstable_resetCleanupTracking;
   }
 });
-Object.defineProperty(exports, "useGridApiEventHandler", {
+Object.defineProperty(exports, "useGridEvent", {
   enumerable: true,
   get: function () {
-    return _useGridApiEventHandler.useGridApiEventHandler;
+    return _useGridEvent.useGridEvent;
   }
 });
-Object.defineProperty(exports, "useGridApiOptionHandler", {
+Object.defineProperty(exports, "useGridEventPriority", {
   enumerable: true,
   get: function () {
-    return _useGridApiEventHandler.useGridApiOptionHandler;
+    return _useGridEvent.useGridEventPriority;
   }
 });
 Object.defineProperty(exports, "useGridSelector", {
@@ -33,7 +33,7 @@ Object.defineProperty(exports, "useGridSelector", {
     return _useGridSelector.useGridSelector;
   }
 });
-var _useGridApiEventHandler = require("./useGridApiEventHandler");
+var _useGridEvent = require("./useGridEvent");
 var _useGridApiMethod = require("./useGridApiMethod");
 Object.keys(_useGridApiMethod).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/hooks/utils/useGridAriaAttributes.js

@@ -19,8 +19,14 @@ const useGridAriaAttributes = () => {
   const accessibleRowCount = (0, _useGridSelector.useGridSelector)(apiRef, _gridFilterSelector.gridExpandedRowCountSelector);
   const headerGroupingMaxDepth = (0, _useGridSelector.useGridSelector)(apiRef, _gridColumnGroupsSelector.gridColumnGroupsHeaderMaxDepthSelector);
   const pinnedRowsCount = (0, _useGridSelector.useGridSelector)(apiRef, _gridRowsSelector.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': (0, _utils.isMultipleRowSelectionEnabled)(rootProps)

package/{modern/hooks/utils/useGridApiEventHandler.d.ts → 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/hooks/utils/{useGridApiEventHandler.js → useGridEvent.js}

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.internal_registryContainer = void 0;
 exports.unstable_resetCleanupTracking = unstable_resetCleanupTracking;
-exports.useGridApiEventHandler = useGridApiEventHandler;
-exports.useGridApiOptionHandler = useGridApiOptionHandler;
+exports.useGridEvent = useGridEvent;
+exports.useGridEventPriority = useGridEventPriority;
 var React = _interopRequireWildcard(require("react"));
 var _TimerBasedCleanupTracking = require("../../utils/cleanupTracking/TimerBasedCleanupTracking");
 var _FinalizationRegistryBasedCleanupTracking = require("../../utils/cleanupTracking/FinalizationRegistryBasedCleanupTracking");
@@ -24,7 +24,7 @@ const registryContainer = {
   current: createRegistry()
 };
 let cleanupTokensCounter = 0;
-function useGridApiEventHandler(apiRef, eventName, handler, options) {
+function useGridEvent(apiRef, eventName, handler, options) {
   const objectRetainedByReact = React.useState(ObjectToBeRetainedByReact.create)[0];
   const subscription = React.useRef(null);
   const handlerRef = React.useRef(null);
@@ -80,8 +80,8 @@ function useGridApiEventHandler(apiRef, eventName, handler, options) {
 const OPTIONS_IS_FIRST = {
   isFirst: true
 };
-function useGridApiOptionHandler(apiRef, eventName, handler) {
-  useGridApiEventHandler(apiRef, eventName, handler, OPTIONS_IS_FIRST);
+function useGridEventPriority(apiRef, eventName, handler) {
+  useGridEvent(apiRef, eventName, handler, OPTIONS_IS_FIRST);
 }
 
 // TODO: move to @mui/x-data-grid/internals

package/hooks/utils/useGridNativeEventListener.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useGridNativeEventListener = void 0;
 var _useGridLogger = require("./useGridLogger");
-var _useGridApiEventHandler = require("./useGridApiEventHandler");
+var _useGridEvent = require("./useGridEvent");
 const useGridNativeEventListener = (apiRef, ref, eventName, handler, options) => {
   const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useNativeEventListener');
-  (0, _useGridApiEventHandler.useGridApiOptionHandler)(apiRef, 'rootMount', () => {
+  (0, _useGridEvent.useGridEventPriority)(apiRef, 'rootMount', () => {
     const targetElement = ref();
     if (!targetElement || !eventName) {
       return undefined;

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

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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