Skip to content

[system] Apply theme variants to all slots by default #48503

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

Open
starboyvarun wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −8
Open

[system] Apply theme variants to all slots by default #48503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions packages/mui-system/src/createStyled/createStyled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,8 @@ export default function createStyled(input = {}) {
? 'components'
: 'custom';

// if skipVariantsResolver option is defined, take the value, otherwise, true for root and false for other slots.
const skipVariantsResolver =
inputSkipVariantsResolver !== undefined
? inputSkipVariantsResolver
: // TODO v6: remove `Root` in the next major release
// For more details: https://github.com/mui/material-ui/pull/37908
(componentSlot && componentSlot !== 'Root' && componentSlot !== 'root') || false;
inputSkipVariantsResolver !== undefined ? inputSkipVariantsResolver : false;

const skipSx = inputSkipSx || false;

Expand Down
29 changes: 27 additions & 2 deletions packages/mui-system/src/styled/styled.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ describe('styled', () => {
});
});

it('variants should be skipped for non root slots', () => {
it('variants should apply to non-root slots by default', () => {
const TestSlot = styled('div', {
shouldForwardProp: (prop) => prop !== 'variant' && prop !== 'size' && prop !== 'sx',
name: 'MuiTest',
Expand All @@ -307,6 +307,31 @@ describe('styled', () => {
</ThemeProvider>,
);

expect(container.firstChild).toHaveComputedStyle({
width: '400px',
height: '400px',
});
});

it('variants should be skipped for non-root slots when skipVariantsResolver is true', () => {
const TestSlot = styled('div', {
shouldForwardProp: (prop) => prop !== 'variant' && prop !== 'size' && prop !== 'sx',
name: 'MuiTest',
slot: 'Slot',
skipVariantsResolver: true,
})`
width: 200px;
height: 300px;
`;

const { container } = render(
<ThemeProvider theme={theme}>
<TestSlot variant="rect" size="large">
Test
</TestSlot>
</ThemeProvider>,
);

expect(container.firstChild).toHaveComputedStyle({
width: '200px',
height: '300px',
Expand Down Expand Up @@ -337,7 +362,7 @@ describe('styled', () => {
});
});

it('variants should respect skipVariantsResolver if defined', () => {
it('variants should apply when skipVariantsResolver is explicitly false', () => {
const TestSlot = styled('div', {
shouldForwardProp: (prop) => prop !== 'variant' && prop !== 'size' && prop !== 'sx',
name: 'MuiTest',
Expand Down
Loading