Skip to content

[material-ui] Support CssVarsTheme in responsiveFontSizes return type (@jxdp) #42806

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
Jun 30, 2024
Merged

[material-ui] Support CssVarsTheme in responsiveFontSizes return type (@jxdp) #42806

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
e775b63
[material-ui] Support `CssVarsTheme` in `responsiveFontSizes` return …
ijxy Jun 30, 2024
76df173
fix test
ZeeshanTamboli Jun 30, 2024
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
16 changes: 16 additions & 0 deletions packages/mui-material/src/styles/responsiveFontSize.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import {
responsiveFontSizes,
experimental_extendTheme,
createTheme,
Theme,
CssVarsTheme,
} from '@mui/material/styles';
import { expectType } from '@mui/types';

const cssVarsTheme = responsiveFontSizes(experimental_extendTheme());
expectType<Omit<Theme, 'palette' | 'applyStyles'> & CssVarsTheme, typeof cssVarsTheme>(
cssVarsTheme,
);

const theme = responsiveFontSizes(createTheme());
expectType<Theme, typeof theme>(theme);
7 changes: 3 additions & 4 deletions packages/mui-material/src/styles/responsiveFontSizes.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Breakpoint } from '@mui/system';
import { Typography } from './createTypography';
import { Theme } from './createTheme';

export interface ResponsiveFontSizesOptions {
breakpoints?: Breakpoint[];
Expand All @@ -9,7 +8,7 @@ export interface ResponsiveFontSizesOptions {
variants?: Array<keyof Typography>;
}

export default function responsiveFontSizes(
theme: Theme,
export default function responsiveFontSizes<T extends { typography: Typography }>(
theme: T,
options?: ResponsiveFontSizesOptions,
): Theme;
): T;