Revert "add InitColorSchemeScript"

This reverts commit 82d7240.
siriwatknp · May 17, 2024 · 38de969 · 38de969
1 parent 82d7240
commit 38de969
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 36 deletions.
diff --git a/packages/mui-material/src/styles/CssVarsProvider.tsx b/packages/mui-material/src/styles/CssVarsProvider.tsx
@@ -14,34 +14,35 @@ import THEME_ID from './identifier';
 
 const defaultTheme = experimental_extendTheme();
 
-const { CssVarsProvider, useColorScheme, getInitColorSchemeScript, InitColorSchemeScript } =
-  createCssVarsProvider<SupportedColorScheme, typeof THEME_ID>({
-    themeId: THEME_ID,
-    theme: defaultTheme,
-    attribute: 'data-mui-color-scheme',
-    modeStorageKey: 'mui-mode',
-    colorSchemeStorageKey: 'mui-color-scheme',
-    defaultColorScheme: {
-      light: 'light',
-      dark: 'dark',
-    },
-    resolveTheme: (theme) => {
-      const newTheme = {
-        ...theme,
-        typography: createTypography(theme.palette, theme.typography),
-      };
+const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssVarsProvider<
+  SupportedColorScheme,
+  typeof THEME_ID
+>({
+  themeId: THEME_ID,
+  theme: defaultTheme,
+  attribute: 'data-mui-color-scheme',
+  modeStorageKey: 'mui-mode',
+  colorSchemeStorageKey: 'mui-color-scheme',
+  defaultColorScheme: {
+    light: 'light',
+    dark: 'dark',
+  },
+  resolveTheme: (theme) => {
+    const newTheme = {
+      ...theme,
+      typography: createTypography(theme.palette, theme.typography),
+    };
 
-      newTheme.unstable_sx = function sx(props: SxProps<CssVarsTheme>) {
-        return styleFunctionSx({ sx: props, theme: this });
-      };
+    newTheme.unstable_sx = function sx(props: SxProps<CssVarsTheme>) {
+      return styleFunctionSx({ sx: props, theme: this });
+    };
 
-      return newTheme;
-    },
-  });
+    return newTheme;
+  },
+});
 
 export {
   useColorScheme,
   getInitColorSchemeScript,
   CssVarsProvider as Experimental_CssVarsProvider,
-  InitColorSchemeScript,
 };
diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.d.ts b/packages/mui-system/src/cssVars/createCssVarsProvider.d.ts
@@ -93,9 +93,6 @@ export interface CreateCssVarsProviderResult<
   ) => React.ReactElement;
   useColorScheme: () => ColorSchemeContextValue<ColorScheme>;
   getInitColorSchemeScript: typeof getInitColorSchemeScript;
-  InitColorSchemeScript: (
-    props: Parameters<typeof getInitColorSchemeScript>[0],
-  ) => React.ReactElement;
 }
 
 export default function createCssVarsProvider<

diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.js b/packages/mui-system/src/cssVars/createCssVarsProvider.js
@@ -368,9 +368,5 @@ export default function createCssVarsProvider(options) {
       ...params,
     });
 
-  const InitColorSchemeScript = React.memo(function InitColorSchemeScript(props) {
-    return getInitColorSchemeScript(props);
-  });
-
-  return { CssVarsProvider, useColorScheme, getInitColorSchemeScript, InitColorSchemeScript };
+  return { CssVarsProvider, useColorScheme, getInitColorSchemeScript };
 }
diff --git a/packages/mui-system/src/cssVars/getInitColorSchemeScript.tsx b/packages/mui-system/src/cssVars/getInitColorSchemeScript.tsx
@@ -40,8 +40,6 @@ export interface GetInitColorSchemeScriptOptions {
    * @default 'data-color-scheme'
    */
   attribute?: string;
-  /** Nonce string to pass to the inline script for CSP headers */
-  nonce?: string | undefined;
 }
 
 export default function getInitColorSchemeScript(options?: GetInitColorSchemeScriptOptions) {
@@ -53,13 +51,10 @@ export default function getInitColorSchemeScript(options?: GetInitColorSchemeScr
     colorSchemeStorageKey = DEFAULT_COLOR_SCHEME_STORAGE_KEY,
     attribute = DEFAULT_ATTRIBUTE,
     colorSchemeNode = 'document.documentElement',
-    nonce,
   } = options || {};
   return (
     <script
       key="mui-color-scheme-init"
-      suppressHydrationWarning
-      nonce={typeof window === 'undefined' ? nonce : ''}
       // eslint-disable-next-line react/no-danger
       dangerouslySetInnerHTML={{
         __html: `(function() {