Skip to content

[system] Merge props and ownerState in the variants props callback #41219

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
mnajdova merged 3 commits into from
Feb 21, 2024
Merged

[system] Merge props and ownerState in the variants props callback #41219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50cb0c6
[system] Merge props and ownerState in the variants props callback
mnajdova Feb 21, 2024
6a13138
fix wrong spread
mnajdova Feb 21, 2024
2adb748
prettier
mnajdova Feb 21, 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
8 changes: 5 additions & 3 deletions packages/mui-system/src/createStyled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ function defaultOverridesResolver(slot) {

function processStyleArg(callableStyle, { ownerState, ...props }) {
const resolvedStylesArg =
typeof callableStyle === 'function' ? callableStyle({ ownerState, ...props }) : callableStyle;
typeof callableStyle === 'function'
? callableStyle({ ownerState, ...props, ...ownerState })
: callableStyle;

if (Array.isArray(resolvedStylesArg)) {
return resolvedStylesArg.flatMap((resolvedStyle) =>
Expand All @@ -66,7 +68,7 @@ function processStyleArg(callableStyle, { ownerState, ...props }) {
variants.forEach((variant) => {
let isMatch = true;
if (typeof variant.props === 'function') {
isMatch = variant.props({ ownerState, ...props });
isMatch = variant.props({ ownerState, ...props, ...ownerState });
} else {
Object.keys(variant.props).forEach((key) => {
if (ownerState?.[key] !== variant.props[key] && props[key] !== variant.props[key]) {
Expand All @@ -80,7 +82,7 @@ function processStyleArg(callableStyle, { ownerState, ...props }) {
}
result.push(
typeof variant.style === 'function'
? variant.style({ ownerState, ...props })
? variant.style({ ownerState, ...props, ...ownerState })
: variant.style,
);
}
Expand Down
32 changes: 32 additions & 0 deletions test/integration/mui-system/createStyled.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,38 @@ describe('createStyled', () => {
expect(getByTestId('red')).toHaveComputedStyle({ backgroundColor: 'rgb(255, 0, 0)' });
});

it('should merge props and ownerState in props callback', () => {
const styled = createStyled({
defaultTheme: {
colors: { blue: 'rgb(0, 0, 255)', red: 'rgb(255, 0, 0)', green: 'rgb(0, 255, 0)' },
},
});

const Test = styled('div')(({ theme, color }) => ({
variants: [
{
props: (props) => props.color === 'green' || props.color === 'red',
style: {
backgroundColor: theme.colors[color],
},
},
],
}));

const { getByTestId } = render(
<React.Fragment>
<Test data-testid="red" ownerState={{ color: 'red' }}>
Red
</Test>
<Test data-testid="green" ownerState={{ color: 'green' }}>
Green
</Test>
</React.Fragment>,
);
expect(getByTestId('green')).toHaveComputedStyle({ backgroundColor: 'rgb(0, 255, 0)' });
expect(getByTestId('red')).toHaveComputedStyle({ backgroundColor: 'rgb(255, 0, 0)' });
});

it('should accept variants in arrays', () => {
const styled = createStyled({ defaultTheme: { colors: { blue: 'rgb(0, 0, 255)' } } });

Expand Down