Skip to content

[system][zero] Consolidate the variants props callback arguments #41222

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 1 commit into from
Feb 21, 2024
Merged

[system][zero] Consolidate the variants props callback arguments #41222

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
[system][zero] Consolidate the variants props callback arguments
  • Loading branch information
@mnajdova
mnajdova committed Feb 21, 2024
commit 08d1a2ca651fd64f0b366bc06d1aeefdfa8c5b59
4 changes: 2 additions & 2 deletions packages/mui-system/src/createStyled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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 +80,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