[fix] Implement variant matching parity (#111)

mui · May 29, 2024 · e4bb1a2 · e4bb1a2
1 parent 238404c
commit e4bb1a2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/pigment-css-react/src/styled.js b/packages/pigment-css-react/src/styled.js
@@ -3,12 +3,11 @@ import * as React from 'react';
 import clsx from 'clsx';
 import isPropValid from '@emotion/is-prop-valid';
 
-function getVariantClasses(componentProps, variants) {
-  const { ownerState = {} } = componentProps;
+function getVariantClasses({ ownerState = {}, ...componentProps }, variants) {
   const variantClasses = variants
     .filter(({ props: variantProps }) =>
       typeof variantProps === 'function'
-        ? variantProps({ ...componentProps, ...componentProps.ownerState })
+        ? variantProps({ ...componentProps, ...ownerState, ownerState })
         : Object.entries(variantProps).every(([propKey, propValue]) => {
             return ownerState[propKey] === propValue || componentProps[propKey] === propValue;
           }),