Skip to content

[DataGrid] Fix theme defaultProps causing unwanted re-renders (@KenanYusuf) #17530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2025
Merged

[DataGrid] Fix theme defaultProps causing unwanted re-renders (@KenanYusuf) #17530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce501ec
[DataGrid] Fix theme `defaultProps` causing unwanted re-renders (#17490)
KenanYusuf Apr 24, 2025
3d3d4f2
fix
KenanYusuf Apr 24, 2025
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
13 changes: 7 additions & 6 deletions packages/x-data-grid-premium/src/DataGridPremium/useDataGridPremiumProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { useThemeProps } from '@mui/material/styles';
import { useTheme } from '@mui/material/styles';
import { getThemeProps } from '@mui/system';
import {
DATA_GRID_PRO_PROPS_DEFAULT_VALUES,
GRID_DEFAULT_LOCALE_TEXT,
Expand Down Expand Up @@ -60,12 +61,12 @@ export const DATA_GRID_PREMIUM_PROPS_DEFAULT_VALUES: DataGridPremiumPropsWithDef
const defaultSlots = DATA_GRID_PREMIUM_DEFAULT_SLOTS_COMPONENTS;

export const useDataGridPremiumProps = (inProps: DataGridPremiumProps) => {
const theme = useTheme();
const themedProps = useProps(
// eslint-disable-next-line material-ui/mui-name-matches-component-name
useThemeProps({
props: inProps,
name: 'MuiDataGrid',
}),
React.useMemo(
() => getThemeProps({ props: inProps, theme, name: 'MuiDataGrid' }),
[theme, inProps],
),
);

const localeText = React.useMemo(
Expand Down
13 changes: 7 additions & 6 deletions packages/x-data-grid-pro/src/DataGridPro/useDataGridProProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { useThemeProps } from '@mui/material/styles';
import { useTheme } from '@mui/material/styles';
import { getThemeProps } from '@mui/system';
import {
GRID_DEFAULT_LOCALE_TEXT,
DATA_GRID_PROPS_DEFAULT_VALUES,
Expand Down Expand Up @@ -61,12 +62,12 @@ export const DATA_GRID_PRO_PROPS_DEFAULT_VALUES: DataGridProPropsWithDefaultValu
const defaultSlots = DATA_GRID_PRO_DEFAULT_SLOTS_COMPONENTS;

export const useDataGridProProps = <R extends GridValidRowModel>(inProps: DataGridProProps<R>) => {
const theme = useTheme();
const themedProps = useProps(
// eslint-disable-next-line material-ui/mui-name-matches-component-name
useThemeProps({
props: inProps,
name: 'MuiDataGrid',
}),
React.useMemo(
() => getThemeProps({ props: inProps, theme, name: 'MuiDataGrid' }),
[theme, inProps],
),
);

const localeText = React.useMemo(
Expand Down
13 changes: 7 additions & 6 deletions packages/x-data-grid/src/DataGrid/useDataGridProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { useThemeProps } from '@mui/material/styles';
import { useTheme } from '@mui/material/styles';
import { getThemeProps } from '@mui/system';
import {
DataGridProcessedProps,
DataGridProps,
Expand Down Expand Up @@ -28,12 +29,12 @@ const DATA_GRID_FORCED_PROPS: { [key in DataGridForcedPropsKey]?: DataGridProces
const defaultSlots = DATA_GRID_DEFAULT_SLOTS_COMPONENTS;

export const useDataGridProps = <R extends GridValidRowModel>(inProps: DataGridProps<R>) => {
const theme = useTheme();
const themedProps = useProps(
// eslint-disable-next-line material-ui/mui-name-matches-component-name
useThemeProps({
props: inProps,
name: 'MuiDataGrid',
}),
React.useMemo(
() => getThemeProps({ props: inProps, theme, name: 'MuiDataGrid' }),
[theme, inProps],
),
);

const localeText = React.useMemo(
Expand Down