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

[Typography] Apply font properties to typography inherit variant #33621

Merged
merged 10 commits into from
Mar 14, 2023
Merged

[Typography] Apply font properties to typography inherit variant #33621

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
34e119b
[typography] apply font properties to typography inherit variant
Jul 23, 2022
6c0f586
Restart CI
michaldudak Aug 1, 2022
bdfe6b9
Prettier
michaldudak Aug 1, 2022
b04ed90
Merge remote-tracking branch 'upstream/master' into fix-inherit-varia…
michaldudak Aug 1, 2022
42bb806
fix unit test
Aug 1, 2022
f6532ae
Merge branch 'master' into fix-inherit-variant-typography
ZeeshanTamboli Mar 8, 2023
224fdaa
fix overriding inherit font properties with the sx prop
ZeeshanTamboli Mar 10, 2023
38bb742
add test
ZeeshanTamboli Mar 10, 2023
6f15212
Merge branch 'master' into fix-inherit-variant-typography
ZeeshanTamboli Mar 10, 2023
8b6f44a
Improve the sx config
mnajdova Mar 14, 2023
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
7 changes: 7 additions & 0 deletions packages/mui-material/src/styles/createTypography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ export default function createTypography(palette, typography) {
button: buildVariant(fontWeightMedium, 14, 1.75, 0.4, caseAllCaps),
caption: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
inherit: {
fontFamily: 'inherit',
fontWeight: 'inherit',
fontSize: 'inherit',
lineHeight: 'inherit',
letterSpacing: 'inherit',
}
};

return deepmerge(
Expand Down
15 changes: 15 additions & 0 deletions packages/mui-material/src/styles/createTypography.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,21 @@ describe('createTypography', () => {
);
});

it('should apply font CSS properties to inherit variant', () => {
const typography = createTypography(palette, {});
const fontProperties = [
'fontFamily',
'fontWeight',
'fontSize',
'lineHeight',
'letterSpacing',
];

fontProperties.forEach((prop) => {
expect(typography.inherit[prop]).to.equal('inherit');
});
});

describe('warnings', () => {
it('logs an error if `fontSize` is not of type number', () => {
expect(() => {
Expand Down