Skip to content

[system] Pass the stylesheet directly to GlobalStyles #43739

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 7 commits into from
Sep 17, 2024
Merged

[system] Pass the stylesheet directly to GlobalStyles #43739

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea34ccf
pass the array directly
siriwatknp Sep 13, 2024
1cfc277
trigger build
siriwatknp Sep 13, 2024
3402323
add regression
siriwatknp Sep 16, 2024
29093e0
Merge branch 'master' of https://github.com/mui/material-ui into fix/…
siriwatknp Sep 16, 2024
1945364
render GlobalStyles last to be injected first
siriwatknp Sep 16, 2024
9085e7c
Merge branch 'master' of https://github.com/mui/material-ui into fix/…
siriwatknp Sep 16, 2024
054986f
Merge branch 'master' of https://github.com/mui/material-ui into fix/…
siriwatknp Sep 17, 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
8 changes: 1 addition & 7 deletions packages/mui-system/src/cssVars/createCssVarsProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,7 @@ export default function createCssVarsProvider(options) {

const element = (
<React.Fragment>
{shouldGenerateStyleSheet && (
<React.Fragment>
{(theme.generateStyleSheets?.() || []).map((styles, index) => (
<GlobalStyles key={index} styles={styles} />
))}
</React.Fragment>
)}
{shouldGenerateStyleSheet && <GlobalStyles styles={theme.generateStyleSheets?.() || []} />}
<ThemeProvider
themeId={scopedTheme ? themeId : undefined}
theme={resolveTheme ? resolveTheme(theme) : theme}
Expand Down