Skip to content
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

Jump to bottom

[ListItemText] Fix variant mapping in primaryTypography #33880

Merged
merged 6 commits into from Sep 8, 2022
Merged

[ListItemText] Fix variant mapping in primaryTypography #33880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8af956b
[ListItemText] fix variant mapping
iamxukai Aug 10, 2022
20ee1ef
prettier
iamxukai Aug 10, 2022
3bae805
Merge branch 'master' of https://github.com/mui/material-ui into fix-…
iamxukai Aug 10, 2022
17d8fb7
improve readability in test
iamxukai Aug 10, 2022
37950b7
Merge branch 'master' into fix-variant-mapping
ZeeshanTamboli Sep 7, 2022
69e7498
Merge branch 'master' into fix-variant-mapping
ZeeshanTamboli Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/mui-material/src/ListItemText/ListItemText.js
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ const ListItemText = React.forwardRef(function ListItemText(inProps, ref) {
<Typography
variant={dense ? 'body2' : 'body1'}
className={classes.primary}
component="span"
component={primaryTypographyProps?.variant ? undefined : 'span'}
display="block"
{...primaryTypographyProps}
>
Expand Down
21 changes: 21 additions & 0 deletions packages/mui-material/src/ListItemText/ListItemText.test.js
View file
Open in desktop
Expand Up @@ -155,6 +155,27 @@ describe('<ListItemText />', () => {
expect(texts[1]).have.text('This is the secondary text');
});

it('should use variant if provided', () => {
const { getByText } = render(
<ListItemText
primary="This is the primary text"
primaryTypographyProps={{ variant: 'h3' }}
secondary="This is the secondary text"
secondaryTypographyProps={{ variant: 'h4' }}
/>,
);
expect(getByText('This is the primary text')).to.have.tagName('h3');
expect(getByText('This is the secondary text')).to.have.tagName('h4');
});

it('should fall back to the default tag name if no variant provided', () => {
const { getByText } = render(
<ListItemText primary="This is the primary text" secondary="This is the secondary text" />,
);
expect(getByText('This is the primary text')).to.have.tagName('span');
expect(getByText('This is the secondary text')).to.have.tagName('p');
});

it('should pass primaryTypographyProps to primary Typography component', () => {
const { container } = render(
<ListItemText
Expand Down