@mui/system
Advanced tools
Comparing version 6.0.0-alpha.8 to 6.0.0-dev.20240529-082515-213b5e33ab
@@ -59,2 +59,7 @@ /* eslint-disable no-underscore-dangle */ | ||
} | ||
const mergedState = { | ||
...props, | ||
...ownerState, | ||
ownerState | ||
}; | ||
if (!!resolvedStylesArg && typeof resolvedStylesArg === 'object' && Array.isArray(resolvedStylesArg.variants)) { | ||
@@ -69,7 +74,3 @@ const { | ||
if (typeof variant.props === 'function') { | ||
isMatch = variant.props({ | ||
ownerState, | ||
...props, | ||
...ownerState | ||
}); | ||
isMatch = variant.props(mergedState); | ||
} else { | ||
@@ -86,7 +87,3 @@ Object.keys(variant.props).forEach(key => { | ||
} | ||
result.push(typeof variant.style === 'function' ? variant.style({ | ||
ownerState, | ||
...props, | ||
...ownerState | ||
}) : variant.style); | ||
result.push(typeof variant.style === 'function' ? variant.style(mergedState) : variant.style); | ||
} | ||
@@ -93,0 +90,0 @@ }); |
@@ -9,3 +9,3 @@ import { CSSObject } from '@mui/styled-engine'; | ||
* - [Basic theme](https://mui.com/material-ui/customization/dark-mode/) | ||
* - [CSS theme variables](https://mui.com/material-ui/experimental-api/css-theme-variables/overview/) | ||
* - [CSS theme variables](https://mui.com/material-ui/customization/css-theme-variables/overview/) | ||
* - Zero-runtime engine | ||
@@ -12,0 +12,0 @@ * |
@@ -5,3 +5,3 @@ /** | ||
* - [Basic theme](https://mui.com/material-ui/customization/dark-mode/) | ||
* - [CSS theme variables](https://mui.com/material-ui/experimental-api/css-theme-variables/overview/) | ||
* - [CSS theme variables](https://mui.com/material-ui/customization/css-theme-variables/overview/) | ||
* - Zero-runtime engine | ||
@@ -8,0 +8,0 @@ * |
@@ -93,3 +93,3 @@ import * as React from 'react'; | ||
>, | ||
) => React.ReactElement; | ||
) => React.ReactElement<any>; | ||
useColorScheme: () => ColorSchemeContextValue<ColorScheme>; | ||
@@ -96,0 +96,0 @@ getInitColorSchemeScript: typeof getInitColorSchemeScript; |
/** | ||
* @mui/system v6.0.0-alpha.8 | ||
* @mui/system v6.0.0-dev.20240529-082515-213b5e33ab | ||
* | ||
@@ -4,0 +4,0 @@ * @license MIT |
@@ -59,2 +59,7 @@ /* eslint-disable no-underscore-dangle */ | ||
} | ||
const mergedState = { | ||
...props, | ||
...ownerState, | ||
ownerState | ||
}; | ||
if (!!resolvedStylesArg && typeof resolvedStylesArg === 'object' && Array.isArray(resolvedStylesArg.variants)) { | ||
@@ -69,7 +74,3 @@ const { | ||
if (typeof variant.props === 'function') { | ||
isMatch = variant.props({ | ||
ownerState, | ||
...props, | ||
...ownerState | ||
}); | ||
isMatch = variant.props(mergedState); | ||
} else { | ||
@@ -86,7 +87,3 @@ Object.keys(variant.props).forEach(key => { | ||
} | ||
result.push(typeof variant.style === 'function' ? variant.style({ | ||
ownerState, | ||
...props, | ||
...ownerState | ||
}) : variant.style); | ||
result.push(typeof variant.style === 'function' ? variant.style(mergedState) : variant.style); | ||
} | ||
@@ -93,0 +90,0 @@ }); |
@@ -5,3 +5,3 @@ /** | ||
* - [Basic theme](https://mui.com/material-ui/customization/dark-mode/) | ||
* - [CSS theme variables](https://mui.com/material-ui/experimental-api/css-theme-variables/overview/) | ||
* - [CSS theme variables](https://mui.com/material-ui/customization/css-theme-variables/overview/) | ||
* - Zero-runtime engine | ||
@@ -8,0 +8,0 @@ * |
/** | ||
* @mui/system v6.0.0-alpha.8 | ||
* @mui/system v6.0.0-dev.20240529-082515-213b5e33ab | ||
* | ||
@@ -4,0 +4,0 @@ * @license MIT |
@@ -71,2 +71,7 @@ "use strict"; | ||
} | ||
const mergedState = { | ||
...props, | ||
...ownerState, | ||
ownerState | ||
}; | ||
if (!!resolvedStylesArg && typeof resolvedStylesArg === 'object' && Array.isArray(resolvedStylesArg.variants)) { | ||
@@ -81,7 +86,3 @@ const { | ||
if (typeof variant.props === 'function') { | ||
isMatch = variant.props({ | ||
ownerState, | ||
...props, | ||
...ownerState | ||
}); | ||
isMatch = variant.props(mergedState); | ||
} else { | ||
@@ -98,7 +99,3 @@ Object.keys(variant.props).forEach(key => { | ||
} | ||
result.push(typeof variant.style === 'function' ? variant.style({ | ||
ownerState, | ||
...props, | ||
...ownerState | ||
}) : variant.style); | ||
result.push(typeof variant.style === 'function' ? variant.style(mergedState) : variant.style); | ||
} | ||
@@ -105,0 +102,0 @@ }); |
@@ -11,3 +11,3 @@ "use strict"; | ||
* - [Basic theme](https://mui.com/material-ui/customization/dark-mode/) | ||
* - [CSS theme variables](https://mui.com/material-ui/experimental-api/css-theme-variables/overview/) | ||
* - [CSS theme variables](https://mui.com/material-ui/customization/css-theme-variables/overview/) | ||
* - Zero-runtime engine | ||
@@ -14,0 +14,0 @@ * |
/** | ||
* @mui/system v6.0.0-alpha.8 | ||
* @mui/system v6.0.0-dev.20240529-082515-213b5e33ab | ||
* | ||
@@ -4,0 +4,0 @@ * @license MIT |
@@ -131,5 +131,5 @@ "use strict"; | ||
if ( /*#__PURE__*/React.isValidElement(child) && (0, _isMuiElement.default)(child, ['Grid'])) { | ||
var _child$props$unstable; | ||
var _unstable_level; | ||
return /*#__PURE__*/React.cloneElement(child, { | ||
unstable_level: (_child$props$unstable = child.props.unstable_level) != null ? _child$props$unstable : level + 1 | ||
unstable_level: (_unstable_level = child.props.unstable_level) != null ? _unstable_level : level + 1 | ||
}); | ||
@@ -136,0 +136,0 @@ } |
{ | ||
"name": "@mui/system", | ||
"version": "6.0.0-alpha.8", | ||
"version": "6.0.0-dev.20240529-082515-213b5e33ab", | ||
"private": false, | ||
@@ -29,10 +29,10 @@ "author": "MUI Team", | ||
"dependencies": { | ||
"@babel/runtime": "^7.24.5", | ||
"@babel/runtime": "^7.24.6", | ||
"clsx": "^2.1.1", | ||
"csstype": "^3.1.3", | ||
"prop-types": "^15.8.1", | ||
"@mui/private-theming": "^6.0.0-alpha.8", | ||
"@mui/styled-engine": "^6.0.0-alpha.8", | ||
"@mui/utils": "^6.0.0-alpha.8", | ||
"@mui/types": "^7.2.14" | ||
"@mui/types": "^7.2.14-dev.20240529-082515-213b5e33ab", | ||
"@mui/utils": "^6.0.0-dev.20240529-082515-213b5e33ab", | ||
"@mui/private-theming": "^6.0.0-dev.20240529-082515-213b5e33ab", | ||
"@mui/styled-engine": "^6.0.0-dev.20240529-082515-213b5e33ab" | ||
}, | ||
@@ -39,0 +39,0 @@ "peerDependencies": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1485551
17919