From 08d1a2ca651fd64f0b366bc06d1aeefdfa8c5b59 Mon Sep 17 00:00:00 2001
From: mnajdova <mnajdova@gmail.com>
Date: Wed, 21 Feb 2024 13:04:36 +0100
Subject: [PATCH] [system][zero] Consolidate the variants props callback
 arguments

---
 packages/mui-system/src/createStyled.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mui-system/src/createStyled.js b/packages/mui-system/src/createStyled.js
index da61ca564547da..eaaf392f62cb8c 100644
--- a/packages/mui-system/src/createStyled.js
+++ b/packages/mui-system/src/createStyled.js
@@ -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]) {
@@ -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,
         );
       }