Skip to content

[DataGrid] Fix numeric font size not being applied #19552

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
Sep 15, 2025
Merged

[DataGrid] Fix numeric font size not being applied #19552

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
3fca237
fix CSS variable when numeric font size value is used
cherniavskii Sep 12, 2025
0bad19a
add regression test
cherniavskii Sep 12, 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
3 changes: 2 additions & 1 deletion packages/x-data-grid/src/material/variables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ function formatFont(font: React.CSSProperties | undefined) {
if (!font) {
return undefined;
}
return `${font.fontWeight} ${font.fontSize} / ${font.lineHeight} ${font.fontFamily}`;
const fontSize = typeof font.fontSize === 'number' ? `${font.fontSize}px` : font.fontSize;
return `${font.fontWeight} ${fontSize} / ${font.lineHeight} ${font.fontFamily}`;
}

/**
Expand Down
30 changes: 30 additions & 0 deletions test/regressions/data-grid/DataGridFontSize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import * as React from 'react';
import Box from '@mui/material/Box';
import { DataGrid } from '@mui/x-data-grid';
import { createTheme, ThemeProvider } from '@mui/material/styles';

const columns = [{ field: 'id' }, { field: 'firstName' }, { field: 'lastName' }];

const rows = [
{ id: 1, lastName: 'Snow', firstName: 'Jon' },
{ id: 2, lastName: 'Lannister', firstName: 'Cersei' },
{ id: 3, lastName: 'Lannister', firstName: 'Jaime' },
];

export default function DataGridDemo() {
const theme = createTheme({
typography: {
body2: {
fontSize: 14,
},
},
});

return (
<ThemeProvider theme={theme}>
<Box sx={{ height: 400, width: '100%' }}>
<DataGrid rows={rows} columns={columns} />
</Box>
</ThemeProvider>
);
}
Loading