Skip to content

Commit 38de969

Browse files
committed
Revert "add InitColorSchemeScript"
This reverts commit 82d7240.
1 parent 82d7240 commit 38de969

File tree

4 files changed

+25
-36
lines changed

4 files changed

+25
-36
lines changed

packages/mui-material/src/styles/CssVarsProvider.tsx

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,35 @@ import THEME_ID from './identifier';
1414

1515
const defaultTheme = experimental_extendTheme();
1616

17-
const { CssVarsProvider, useColorScheme, getInitColorSchemeScript, InitColorSchemeScript } =
18-
createCssVarsProvider<SupportedColorScheme, typeof THEME_ID>({
19-
themeId: THEME_ID,
20-
theme: defaultTheme,
21-
attribute: 'data-mui-color-scheme',
22-
modeStorageKey: 'mui-mode',
23-
colorSchemeStorageKey: 'mui-color-scheme',
24-
defaultColorScheme: {
25-
light: 'light',
26-
dark: 'dark',
27-
},
28-
resolveTheme: (theme) => {
29-
const newTheme = {
30-
...theme,
31-
typography: createTypography(theme.palette, theme.typography),
32-
};
17+
const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssVarsProvider<
18+
SupportedColorScheme,
19+
typeof THEME_ID
20+
>({
21+
themeId: THEME_ID,
22+
theme: defaultTheme,
23+
attribute: 'data-mui-color-scheme',
24+
modeStorageKey: 'mui-mode',
25+
colorSchemeStorageKey: 'mui-color-scheme',
26+
defaultColorScheme: {
27+
light: 'light',
28+
dark: 'dark',
29+
},
30+
resolveTheme: (theme) => {
31+
const newTheme = {
32+
...theme,
33+
typography: createTypography(theme.palette, theme.typography),
34+
};
3335

34-
newTheme.unstable_sx = function sx(props: SxProps<CssVarsTheme>) {
35-
return styleFunctionSx({ sx: props, theme: this });
36-
};
36+
newTheme.unstable_sx = function sx(props: SxProps<CssVarsTheme>) {
37+
return styleFunctionSx({ sx: props, theme: this });
38+
};
3739

38-
return newTheme;
39-
},
40-
});
40+
return newTheme;
41+
},
42+
});
4143

4244
export {
4345
useColorScheme,
4446
getInitColorSchemeScript,
4547
CssVarsProvider as Experimental_CssVarsProvider,
46-
InitColorSchemeScript,
4748
};

packages/mui-system/src/cssVars/createCssVarsProvider.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ export interface CreateCssVarsProviderResult<
9393
) => React.ReactElement;
9494
useColorScheme: () => ColorSchemeContextValue<ColorScheme>;
9595
getInitColorSchemeScript: typeof getInitColorSchemeScript;
96-
InitColorSchemeScript: (
97-
props: Parameters<typeof getInitColorSchemeScript>[0],
98-
) => React.ReactElement;
9996
}
10097

10198
export default function createCssVarsProvider<

packages/mui-system/src/cssVars/createCssVarsProvider.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,5 @@ export default function createCssVarsProvider(options) {
368368
...params,
369369
});
370370

371-
const InitColorSchemeScript = React.memo(function InitColorSchemeScript(props) {
372-
return getInitColorSchemeScript(props);
373-
});
374-
375-
return { CssVarsProvider, useColorScheme, getInitColorSchemeScript, InitColorSchemeScript };
371+
return { CssVarsProvider, useColorScheme, getInitColorSchemeScript };
376372
}

packages/mui-system/src/cssVars/getInitColorSchemeScript.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ export interface GetInitColorSchemeScriptOptions {
4040
* @default 'data-color-scheme'
4141
*/
4242
attribute?: string;
43-
/** Nonce string to pass to the inline script for CSP headers */
44-
nonce?: string | undefined;
4543
}
4644

4745
export default function getInitColorSchemeScript(options?: GetInitColorSchemeScriptOptions) {
@@ -53,13 +51,10 @@ export default function getInitColorSchemeScript(options?: GetInitColorSchemeScr
5351
colorSchemeStorageKey = DEFAULT_COLOR_SCHEME_STORAGE_KEY,
5452
attribute = DEFAULT_ATTRIBUTE,
5553
colorSchemeNode = 'document.documentElement',
56-
nonce,
5754
} = options || {};
5855
return (
5956
<script
6057
key="mui-color-scheme-init"
61-
suppressHydrationWarning
62-
nonce={typeof window === 'undefined' ? nonce : ''}
6358
// eslint-disable-next-line react/no-danger
6459
dangerouslySetInnerHTML={{
6560
__html: `(function() {

0 commit comments

Comments
 (0)