Skip to content

[material-ui] Fix default props theme scoping #44340

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 3 commits into from
Nov 11, 2024
Merged

[material-ui] Fix default props theme scoping #44340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d354ba
fix default props theme scoping
siriwatknp Nov 7, 2024
d3315b7
update rtlValue for theme scoping
siriwatknp Nov 8, 2024
a4fdb6c
Merge branch 'master' of https://github.com/mui/material-ui into fix/…
siriwatknp Nov 8, 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
9 changes: 6 additions & 3 deletions packages/mui-system/src/ThemeProvider/ThemeProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,16 @@ function ThemeProvider(props) {

const engineTheme = useThemeScoping(themeId, upperTheme, localTheme);
const privateTheme = useThemeScoping(themeId, upperPrivateTheme, localTheme, true);
const rtlValue = engineTheme.direction === 'rtl';

const rtlValue = (themeId ? engineTheme[themeId] : engineTheme).direction === 'rtl';
return (
<MuiThemeProvider theme={privateTheme}>
<StyledEngineThemeContext.Provider value={engineTheme}>
<RtlProvider value={rtlValue}>
<DefaultPropsProvider value={engineTheme?.components}>{children}</DefaultPropsProvider>
<DefaultPropsProvider
value={themeId ? engineTheme[themeId].components : engineTheme.components}
>
{children}
</DefaultPropsProvider>
</RtlProvider>
</StyledEngineThemeContext.Provider>
</MuiThemeProvider>
Expand Down
14 changes: 14 additions & 0 deletions packages/mui-system/src/ThemeProvider/ThemeProvider.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useTheme as usePrivateTheme } from '@mui/private-theming';
import { ThemeContext } from '@mui/styled-engine';
import { ThemeProvider } from '@mui/system';
import { useRtl } from '@mui/system/RtlProvider';
import { useDefaultProps } from '../DefaultPropsProvider';

const useEngineTheme = () => React.useContext(ThemeContext);

Expand Down Expand Up @@ -297,6 +298,19 @@ describe('ThemeProvider', () => {
]);
});

it('theme scope: should pass scoped theme to DefaultPropsProvider', () => {
function Test(props) {
const defaultProps = useDefaultProps({ props, name: 'MuiTest' });
return defaultProps.text;
}
const { container } = render(
<ThemeProvider themeId="mui" theme={{ components: { MuiTest: { text: 'foo' } } }}>
<Test />
</ThemeProvider>,
);
expect(container.firstChild).to.have.text('foo');
});

it('sets the correct value for the RtlProvider based on the theme.direction', () => {
let rtlValue = null;
function Test() {
Expand Down