-
-
Notifications
You must be signed in to change notification settings - Fork 31.8k
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.
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
[Button] Fix contained with inherit prop not adapting on dark mode #34508
Merged
ZeeshanTamboli
merged 11 commits into
mui:master
from
jesrodri:fix/29749/contained-inherit-button-dark-mode
Apr 17, 2023
Merged
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
fcea75f
fix: adapt button colors when contained+inherit
jesrodri 8e50a2c
Button: add regression test
a035ca1
Button: changes color lighter
5c55f56
Merge branch 'master' into fix/29749/contained-inherit-button-dark-mode
ZeeshanTamboli 36de4a9
feat(Button): add inheritContainedBg and inheritContainedHoverBg CSS …
ZeeshanTamboli 563847b
feat(Button): use CSS vars token in component styling
ZeeshanTamboli 8ad3a6e
test: improve MulticoloredButton visual regression test
ZeeshanTamboli 2b42c39
Merge branch 'master' into fix/29749/contained-inherit-button-dark-mode
ZeeshanTamboli a32af6f
poke CI
ZeeshanTamboli 34451a8
Merge branch 'master' into fix/29749/contained-inherit-button-dark-mode
ZeeshanTamboli 5abef5a
add CSS vars token for Button in mui-material-next
ZeeshanTamboli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import * as React from 'react'; | ||
import { useTheme } from '@mui/material/styles'; | ||
import Button from '@mui/material/Button'; | ||
import IconButton from '@mui/material/IconButton'; | ||
import Box from '@mui/material/Box'; | ||
import Brightness4Icon from '@mui/icons-material/Brightness4'; | ||
import Brightness7Icon from '@mui/icons-material/Brightness7'; | ||
|
||
export default function MulticoloredButton() { | ||
const theme = useTheme(); | ||
const ColorModeContext = React.createContext({ toggleColorMode: () => {} }); | ||
|
||
const colorMode = React.useContext(ColorModeContext); | ||
return ( | ||
<Box | ||
sx={{ | ||
display: 'flex', | ||
width: '100%', | ||
alignItems: 'center', | ||
justifyContent: 'center', | ||
bgcolor: 'background.default', | ||
color: 'text.primary', | ||
borderRadius: 1, | ||
p: 3, | ||
}} | ||
> | ||
{theme.palette.mode} mode | ||
<IconButton sx={{ ml: 1 }} onClick={colorMode.toggleColorMode} color="inherit"> | ||
{theme.palette.mode === 'dark' ? <Brightness7Icon /> : <Brightness4Icon />} | ||
</IconButton> | ||
<Button variant="contained" color="inherit"> | ||
Button | ||
</Button> | ||
</Box> | ||
); | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When using CSS variables, ideally we would use the same variable for both dark and light mode, and we would only switch the value of the variable. cc @siriwatknp should we add a variable for the inherit background of the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mnajdova @siriwatknp should we use this approach here? or is it good to go as it is?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would tend to use CSS variables, for e.g. as it is done for other components: https://github.com/mui/material-ui/blob/master/packages/mui-material/src/styles/experimental_extendTheme.js#L137. cc @siriwatknp