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

[docs] Update code snippet in docs for custom color palette #32946

Merged
merged 9 commits into from Jun 23, 2022
Merged

[docs] Update code snippet in docs for custom color palette #32946

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c8a5fd2
test(Chip): add test case for custom color in theme palette
ZeeshanTamboli May 30, 2022
4e1aac1
fix(Chip): calculate contrastColor if custom color is provided in the…
ZeeshanTamboli May 30, 2022
f8791d4
resolve conflict
ZeeshanTamboli Jun 20, 2022
cce47b4
revert changes
ZeeshanTamboli Jun 22, 2022
d60d5a4
update code snippet
ZeeshanTamboli Jun 22, 2022
c7f2ebd
Merge branch 'master' into issue/32926-chip-crash-with-custom-color
ZeeshanTamboli Jun 22, 2022
02b3602
update docs
ZeeshanTamboli Jun 23, 2022
2faf706
Merge branch 'master' into issue/32926-chip-crash-with-custom-color
ZeeshanTamboli Jun 23, 2022
15ee409
improve indentation
ZeeshanTamboli Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/mui-material/src/Chip/Chip.js
View file
Open in desktop
Expand Up @@ -152,7 +152,11 @@ const ChipRoot = styled('div', {
marginLeft: -4,
}),
...(ownerState.color !== 'default' && {
color: alpha(theme.palette[ownerState.color].contrastText, 0.7),
color: alpha(
ZeeshanTamboli marked this conversation as resolved.
Show resolved Hide resolved
theme.palette[ownerState.color].contrastText ||
theme.palette.getContrastText(theme.palette[ownerState.color].main),
0.7,
),
'&:hover, &:active': {
color: theme.palette[ownerState.color].contrastText,
},
Expand Down
18 changes: 18 additions & 0 deletions packages/mui-material/src/Chip/Chip.test.js
View file
Open in desktop
Expand Up @@ -616,4 +616,22 @@ describe('<Chip />', () => {
expect(chip).not.to.have.class(classes.focusVisible);
});
});

it('should not throw error when a new palette color is added in theme', () => {
const theme = createTheme({
palette: {
custom: {
main: '#f90',
},
},
});

expect(() =>
render(
<ThemeProvider theme={theme}>
<Chip color="custom" label="A test" />
</ThemeProvider>,
),
).not.to.throw();
});
});