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.

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

[system] Pass the stylesheet directly to GlobalStyles #43739

Merged
merged 7 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import * as React from 'react';
import {
ThemeProvider,
createTheme,
StyledEngineProvider,
useColorScheme,
} from '@mui/material/styles';
import Box from '@mui/material/Box';

const theme = createTheme({
colorSchemes: { dark: true },
cssVariables: { colorSchemeSelector: '.regression-inject-first-%s' },
});

function AutoDark() {
const { setMode } = useColorScheme();
React.useEffect(() => {
setMode('dark');
}, [setMode]);
return null;
}

export default function InjectFirstWithThemeVars() {
return (
<StyledEngineProvider injectFirst>
<ThemeProvider theme={theme} modeStorageKey="regression-inject-first">
<AutoDark />
<Box
sx={{
border: 2,
borderColor: 'divider',
backgroundColor: 'background.default',
width: 100,
height: 100,
m: 1,
}}
/>
</ThemeProvider>
</StyledEngineProvider>
);
}