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

[SvgIcon] Apply custom color if defined in the theme #27923

Merged
merged 2 commits into from
Aug 24, 2021
Merged

[SvgIcon] Apply custom color if defined in the theme #27923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c16a028
[test] Add current behavior for `SvgIcon` with custom `color`
eps1lon Aug 23, 2021
9240056
[SvgIcon] Apply custom color if defined in the theme
eps1lon Aug 23, 2021
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
18 changes: 7 additions & 11 deletions packages/material-ui/src/SvgIcon/SvgIcon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,13 @@ const SvgIconRoot = styled('svg', {
large: theme.typography.pxToRem(35),
}[ownerState.fontSize],
// TODO v5 deprecate, v6 remove for sx
color: {
primary: theme.palette.primary.main,
secondary: theme.palette.secondary.main,
info: theme.palette.info.main,
success: theme.palette.success.main,
warning: theme.palette.warning.main,
action: theme.palette.action.active,
error: theme.palette.error.main,
disabled: theme.palette.action.disabled,
inherit: undefined,
}[ownerState.color],
color:
theme.palette[ownerState.color]?.main ??
{
action: theme.palette.action.active,
disabled: theme.palette.action.disabled,
inherit: undefined,
}[ownerState.color],
}));

const SvgIcon = React.forwardRef(function SvgIcon(inProps, ref) {
Expand Down
27 changes: 27 additions & 0 deletions test/regressions/fixtures/SvgIcon/CustomColorSvgIcon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as React from 'react';
import { createTheme, ThemeProvider } from '@material-ui/core/styles';
import SvgIcon from '@material-ui/core/SvgIcon';

function FavoriteRounded(props) {
return (
<SvgIcon {...props}>
<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76l-.1.09z" />
</SvgIcon>
);
}

export default function SvgIconsColor() {
const theme = createTheme({
palette: {
custom: { main: '#ec407a' },
},
});

return (
<ThemeProvider theme={theme}>
<FavoriteRounded fontSize="large" />
<FavoriteRounded fontSize="large" color="secondary" />
<FavoriteRounded fontSize="large" color="custom" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add some instructions for typescript? Or do we already support extending the color prop values?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I saw, we already have it. Nevermind looks good :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will go through #25934 and add tests accordingly. #25934 just changed documentation but there was no verification of the implementation (either manually or automatically).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect! Thanks for taking this up 💯

</ThemeProvider>
);
}