Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion packages/mui-material/src/styles/ThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { DefaultTheme } from '@mui/system';
import { StorageManager } from '@mui/system/cssVars';
import ThemeProviderNoVars from './ThemeProviderNoVars';
import { CssThemeVariables } from './createThemeNoVars';
import { CssVarsProvider } from './ThemeProviderWithVars';
import { InternalCssVarsProvider as CssVarsProvider } from './ThemeProviderWithVars';
import { CssVarsTheme } from './createThemeWithVars';
import THEME_ID from './identifier';

Expand Down
78 changes: 6 additions & 72 deletions packages/mui-material/src/styles/ThemeProviderWithVars.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import createTypography from './createTypography';
import THEME_ID from './identifier';
import { defaultConfig } from '../InitColorSchemeScript/InitColorSchemeScript';

const {
CssVarsProvider: InternalCssVarsProvider,
useColorScheme,
getInitColorSchemeScript: deprecatedGetInitColorSchemeScript,
} = createCssVarsProvider<SupportedColorScheme, typeof THEME_ID>({
const { CssVarsProvider: InternalCssVarsProvider, useColorScheme } = createCssVarsProvider<
SupportedColorScheme,
typeof THEME_ID
>({
themeId: THEME_ID,
// @ts-ignore ignore module augmentation tests
theme: () => createTheme({ cssVariables: true }),
Expand All @@ -35,71 +34,6 @@ const {
},
});

let warnedOnce = false;
export { useColorScheme };

// TODO: remove in v7
// eslint-disable-next-line @typescript-eslint/naming-convention
function Experimental_CssVarsProvider(props: any) {
if (process.env.NODE_ENV !== 'production') {
if (!warnedOnce) {
console.warn(
[
'MUI: The Experimental_CssVarsProvider component has been ported into ThemeProvider.',
'',
"You should use `import { ThemeProvider } from '@mui/material/styles'` instead.",
'For more details, check out https://mui.com/material-ui/customization/css-theme-variables/usage/',
].join('\n'),
);

warnedOnce = true;
}
}

return <InternalCssVarsProvider {...props} />;
}

let warnedInitScriptOnce = false;

// TODO: remove in v7
const getInitColorSchemeScript: typeof deprecatedGetInitColorSchemeScript = (params) => {
if (!warnedInitScriptOnce) {
console.warn(
[
'MUI: The getInitColorSchemeScript function has been deprecated.',
'',
"You should use `import InitColorSchemeScript from '@mui/material/InitColorSchemeScript'`",
'and replace the function call with `<InitColorSchemeScript />` instead.',
].join('\n'),
);

warnedInitScriptOnce = true;
}
return deprecatedGetInitColorSchemeScript(params);
};

/**
* TODO: remove this export in v7
* @deprecated
* The `CssVarsProvider` component has been deprecated and ported into `ThemeProvider`.
*
* You should use `ThemeProvider` and `createTheme()` instead:
*
* ```diff
* - import { CssVarsProvider, extendTheme } from '@mui/material/styles';
* + import { ThemeProvider, createTheme } from '@mui/material/styles';
*
* - const theme = extendTheme();
* + const theme = createTheme({
* + cssVariables: true,
* + colorSchemes: { light: true, dark: true },
* + });
*
* - <CssVarsProvider theme={theme}>
* + <ThemeProvider theme={theme}>
* ```
*
* To see the full documentation, check out https://mui.com/material-ui/customization/css-theme-variables/usage/.
*/
export const CssVarsProvider = InternalCssVarsProvider;

export { useColorScheme, getInitColorSchemeScript, Experimental_CssVarsProvider };
export { InternalCssVarsProvider };
1 change: 0 additions & 1 deletion packages/mui-material/src/styles/createStyles.d.ts

This file was deleted.

16 changes: 0 additions & 16 deletions packages/mui-material/src/styles/createStyles.js

This file was deleted.

19 changes: 0 additions & 19 deletions packages/mui-material/src/styles/experimental_extendTheme.js

This file was deleted.

4 changes: 0 additions & 4 deletions packages/mui-material/src/styles/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export {
Color,
} from './createPalette';
export { default as createColorScheme } from './createColorScheme';
export { default as createStyles } from './createStyles';
export {
TypographyVariants,
TypographyVariantsOptions,
Expand Down Expand Up @@ -73,9 +72,6 @@ export {
SxProps,
} from '@mui/system';
export { unstable_createBreakpoints } from '@mui/system/createBreakpoints';
// TODO: Remove this function in v6.
// eslint-disable-next-line @typescript-eslint/naming-convention
export function experimental_sx(): any;
export { default as useTheme } from './useTheme';
export { default as useThemeProps } from './useThemeProps';
export * from './useThemeProps';
Expand Down
10 changes: 0 additions & 10 deletions packages/mui-material/src/styles/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,9 @@ export {
keyframes,
} from '@mui/system';
export { unstable_createBreakpoints } from '@mui/system/createBreakpoints';
// TODO: Remove this function in v6.
// eslint-disable-next-line @typescript-eslint/naming-convention
export function experimental_sx() {
throw /* minify-error */ new Error(
'MUI: The `experimental_sx` has been moved to `theme.unstable_sx`.' +
'For more details, see https://github.com/mui/material-ui/pull/35150.',
);
}
export { default as createTheme } from './createTheme';
export { default as enhanceHighContrast } from './enhanceHighContrast';
export { default as unstable_createMuiStrictModeTheme } from './createMuiStrictModeTheme';
export { default as createStyles } from './createStyles';
export { getUnit as unstable_getUnit, toUnitless as unstable_toUnitless } from './cssUtils';
export { default as responsiveFontSizes } from './responsiveFontSizes';
export { default as createTransitions, duration, easing } from './createTransitions';
Expand All @@ -45,7 +36,6 @@ export { default as withTheme } from './withTheme';

export * from './ThemeProviderWithVars';
export { default as extendTheme } from './createThemeWithVars';
export { default as experimental_extendTheme } from './experimental_extendTheme'; // TODO: Remove in v7
export { default as getOverlayAlpha } from './getOverlayAlpha';
export { default as shouldSkipGeneratingVar } from './shouldSkipGeneratingVar';

Expand Down
Loading