Skip to content
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

Jump to bottom

[Badge] Use the variants API in the styled call #40213

Merged
merged 9 commits into from
Dec 25, 2023
Merged

[Badge] Use the variants API in the styled call #40213

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7eac70f
[system] Support props callback in the variant's definition
mnajdova Dec 4, 2023
8e6e464
add docs
mnajdova Dec 4, 2023
53a9ce2
lint issues
mnajdova Dec 4, 2023
3c1c429
Merge branch 'system/variants-props-callback' into badge/use-variants…
mnajdova Dec 15, 2023
fa8c5a2
[Badge] Migrate to use the variants API
mnajdova Dec 15, 2023
146d868
don't use owner state
mnajdova Dec 15, 2023
11acea0
use theme palette keys instead of hard-coded
mnajdova Dec 19, 2023
2853ed9
fix on createStyled
mnajdova Dec 20, 2023
28780ce
Merge branch 'master' into badge/use-variants-api
mnajdova Dec 21, 2023
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
243 changes: 146 additions & 97 deletions packages/mui-material/src/Badge/Badge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const BadgeBadge = styled('span', {
ownerState.invisible && styles.invisible,
];
},
})(({ theme, ownerState }) => ({
})(({ theme }) => ({
display: 'flex',
flexDirection: 'row',
flexWrap: 'wrap',
Expand All @@ -87,110 +87,159 @@ const BadgeBadge = styled('span', {
easing: theme.transitions.easing.easeInOut,
duration: theme.transitions.duration.enteringScreen,
}),
...(ownerState.color !== 'default' && {
backgroundColor: (theme.vars || theme).palette[ownerState.color].main,
color: (theme.vars || theme).palette[ownerState.color].contrastText,
}),
...(ownerState.variant === 'dot' && {
borderRadius: RADIUS_DOT,
height: RADIUS_DOT * 2,
minWidth: RADIUS_DOT * 2,
padding: 0,
}),
...(ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'rectangular' && {
top: 0,
right: 0,
transform: 'scale(1) translate(50%, -50%)',
transformOrigin: '100% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, -50%)',
variants: [
...Object.keys((theme.vars ?? theme).palette)
.filter(
(key) =>
(theme.vars ?? theme).palette[key].main &&
(theme.vars ?? theme).palette[key].contrastText,
)
.map((color) => ({
props: { color },
style: {
backgroundColor: (theme.vars || theme).palette[color].main,
color: (theme.vars || theme).palette[color].contrastText,
},
})),
{
props: { variant: 'dot' },
style: {
borderRadius: RADIUS_DOT,
height: RADIUS_DOT * 2,
minWidth: RADIUS_DOT * 2,
padding: 0,
},
}),
...(ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'rectangular' && {
bottom: 0,
right: 0,
transform: 'scale(1) translate(50%, 50%)',
transformOrigin: '100% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, 50%)',
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'rectangular',
style: {
top: 0,
right: 0,
transform: 'scale(1) translate(50%, -50%)',
transformOrigin: '100% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, -50%)',
},
},
}),
...(ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'rectangular' && {
top: 0,
left: 0,
transform: 'scale(1) translate(-50%, -50%)',
transformOrigin: '0% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, -50%)',
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'rectangular',
style: {
bottom: 0,
right: 0,
transform: 'scale(1) translate(50%, 50%)',
transformOrigin: '100% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, 50%)',
},
},
}),
...(ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'rectangular' && {
bottom: 0,
left: 0,
transform: 'scale(1) translate(-50%, 50%)',
transformOrigin: '0% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, 50%)',
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'rectangular',
style: {
top: 0,
left: 0,
transform: 'scale(1) translate(-50%, -50%)',
transformOrigin: '0% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, -50%)',
},
},
}),
...(ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'circular' && {
top: '14%',
right: '14%',
transform: 'scale(1) translate(50%, -50%)',
transformOrigin: '100% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, -50%)',
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'rectangular',
style: {
bottom: 0,
left: 0,
transform: 'scale(1) translate(-50%, 50%)',
transformOrigin: '0% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, 50%)',
},
},
}),
...(ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'circular' && {
bottom: '14%',
right: '14%',
transform: 'scale(1) translate(50%, 50%)',
transformOrigin: '100% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, 50%)',
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'circular',
style: {
top: '14%',
right: '14%',
transform: 'scale(1) translate(50%, -50%)',
transformOrigin: '100% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, -50%)',
},
},
}),
...(ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'circular' && {
top: '14%',
left: '14%',
transform: 'scale(1) translate(-50%, -50%)',
transformOrigin: '0% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, -50%)',
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'right' &&
ownerState.overlap === 'circular',
style: {
bottom: '14%',
right: '14%',
transform: 'scale(1) translate(50%, 50%)',
transformOrigin: '100% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(50%, 50%)',
},
},
}),
...(ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'circular' && {
bottom: '14%',
left: '14%',
transform: 'scale(1) translate(-50%, 50%)',
transformOrigin: '0% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, 50%)',
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'top' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'circular',
style: {
top: '14%',
left: '14%',
transform: 'scale(1) translate(-50%, -50%)',
transformOrigin: '0% 0%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, -50%)',
},
},
}),
...(ownerState.invisible && {
transition: theme.transitions.create('transform', {
easing: theme.transitions.easing.easeInOut,
duration: theme.transitions.duration.leavingScreen,
}),
}),
},
{
props: ({ ownerState }) =>
ownerState.anchorOrigin.vertical === 'bottom' &&
ownerState.anchorOrigin.horizontal === 'left' &&
ownerState.overlap === 'circular',
style: {
bottom: '14%',
left: '14%',
transform: 'scale(1) translate(-50%, 50%)',
transformOrigin: '0% 100%',
[`&.${badgeClasses.invisible}`]: {
transform: 'scale(0) translate(-50%, 50%)',
},
},
},
{
props: { invisible: true },
style: {
transition: theme.transitions.create('transform', {
easing: theme.transitions.easing.easeInOut,
duration: theme.transitions.duration.leavingScreen,
}),
},
},
],
}));

const Badge = React.forwardRef(function Badge(inProps, ref) {
Expand Down
Loading