Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"use-material-ui-next": "code-infra set-version-overrides --pkg @mui/material@next",
"release:changelog": "node scripts/releaseChangelog.mjs",
"release:version": "lerna version --exact --no-changelog --no-push --no-git-tag-version --no-private",
"release:build": "lerna run --scope '@mui/*' build",
"release:build": "lerna run --scope '@mui/*' --ignore '@mui/*-pro' --ignore '@mui/*-premium' --ignore '@mui/x-data-grid-generator' build",
"release:publish": "pnpm publish --recursive --tag latest",
"release:publish:dry-run": "pnpm publish --recursive --tag latest --registry=\"http://localhost:4873/\"",
"release:tag": "node scripts/releaseTag.mjs",
Expand All @@ -77,7 +77,7 @@
"@mui/internal-netlify-cache": "^0.0.2-canary.0",
"@mui/internal-test-utils": "catalog:",
"@mui/material": "catalog:",
"@mui/monorepo": "github:mui/material-ui#57ae83d02aecf2eeb8cff71cdf8c28ae7b6ea0e5",
"@mui/monorepo": "github:mui/material-ui#28befd2bf5106a3b309bb552d2c764ddbb6335ef",
"@mui/utils": "catalog:",
"@next/eslint-plugin-next": "15.5.6",
"@octokit/plugin-retry": "^8.0.2",
Expand Down Expand Up @@ -159,6 +159,12 @@
"node": ">=22.18"
},
"pnpm": {
"overrides": {
"@mui/material": "https://pkg.pr.new/mui/material-ui/@mui/material@28befd2",
"@mui/system": "https://pkg.pr.new/mui/material-ui/@mui/system@28befd2",
"@mui/utils": "https://pkg.pr.new/mui/material-ui/@mui/utils@28befd2",
"@mui/icons-material": "https://pkg.pr.new/mui/material-ui/@mui/icons-material@28befd2"
},
"packageExtensions": {
"@mui/internal-test-utils": {
"dependencies": {
Expand Down
6 changes: 6 additions & 0 deletions packages/x-data-grid/src/DataGrid/DataGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { forwardRef } from '@mui/x-internals/forwardRef';
import { CreateThemeComponent } from '@mui/material/stylesOptimized';
import { GridRoot } from '../components';
import { useGridAriaAttributes } from '../hooks/utils/useGridAriaAttributes';
import { useGridRowAriaAttributes } from '../hooks/features/rows/useGridRowAriaAttributes';
import { useGridRowsOverridableMethods } from '../hooks/features/rows/useGridRowsOverridableMethods';
import { useGridParamsOverridableMethods } from '../hooks/features/rows/useGridParamsOverridableMethods';
import { DataGridProps } from '../models/props/DataGridProps';
import { GridClassKey } from '../constants/gridClasses';
import { GridContextProvider } from '../context/GridContextProvider';
import { useDataGridComponent } from './useDataGridComponent';
import { useDataGridProps } from './useDataGridProps';
Expand All @@ -20,6 +22,10 @@ import { useGridApiInitialization } from '../hooks/core/useGridApiInitialization

export type { GridSlotsComponent as GridSlots } from '../models';

export type DataGridTheme = {
MuiDataGrid: CreateThemeComponent<GridClassKey, DataGridProps>;
};

const configuration: GridConfiguration = {
hooks: {
useCSSVariables: useMaterialCSSVariables,
Expand Down
Loading
Loading