[ToggleButton] Add support for CSS variables #32600
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ariyapong
changed the title
65 tasks
|
@material-ui/core: parsed: +0.12% , gzip: +0.07% |
ZeeshanTamboli
added
component: toggle button
mnajdova
requested changes
May 4, 2022
| @@ -38,40 +38,48 @@ const ToggleButtonRoot = styled(ButtonBase, { | |||
| })(({ theme, ownerState }) => { | |||
| const selectedColor = | |||
| ownerState.color === 'standard' | |||
| ? theme.palette.text.primary | |||
| : theme.palette[ownerState.color].main; | |||
| ? (theme.vars || theme).palette.text.primaryChannel | |||
There was a problem hiding this comment.
It would be more readable if we create selectedColor & selectedColorChannel and use those below. Note that theme.palette.text.primaryChannel does not even exists, this is why the tests are failing.
There was a problem hiding this comment.
I have made the changes as you suggested and the tests have been passed
siriwatknp
reviewed
May 4, 2022
| @@ -38,40 +38,48 @@ const ToggleButtonRoot = styled(ButtonBase, { | |||
| })(({ theme, ownerState }) => { | |||
| const selectedColor = | |||
There was a problem hiding this comment.
You can create selecteColorChannel like @mnajdova suggested:
// ToggleButton.js
import { colorChannel } from '@mui/system';
...
let selectedColor = ownerState.color === 'standard'
? theme.palette.text.primary
: theme.palette[ownerState.color].main;
const selectedColorChannel = colorChannel(selectedColor);
if (theme.vars) {
selectedColor = ownerState.color === 'standard'
? theme.vars.palette.text.primary
: theme.vars.palette[ownerState.color].main;
}Then replace the alpha(...) like this:
backgroundColor: theme.vars ? `rgba(${selectedColor} / ${theme.palette.action.selectedOpacity})` : alpha(selectedColor, theme.palette.action.selectedOpacity),There was a problem hiding this comment.
I have already updated the code as you and @mnajdova suggested.
siriwatknp
reviewed
May 6, 2022
siriwatknp
approved these changes
May 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
One of #32049
cc: @mui/contributors