-
Notifications
You must be signed in to change notification settings - Fork 371
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
fix: Billing Contact UI Regression from by MUI Update #9667
Merged
bnussman-akamai
merged 2 commits into
linode:develop
from
bnussman-akamai:fix/billing-contact-grid
Sep 13, 2023
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@linode/manager": Fixed | ||
--- | ||
|
||
Billing Contact UI Regression caused by MUI Update ([#9667](https://github.com/linode/manager/pull/9667)) |
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 |
---|---|---|
@@ -1,4 +1,3 @@ | ||
import { Box } from 'src/components/Box'; | ||
import Grid from '@mui/material/Unstable_Grid2'; | ||
import { styled } from '@mui/material/styles'; | ||
import countryData from 'country-region-data'; | ||
|
@@ -104,7 +103,7 @@ const ContactInformation = (props: Props) => { | |
(_country) => _country.countryShortCode === country | ||
)?.countryName; | ||
|
||
const sxBox = { | ||
const sxGrid = { | ||
flex: 1, | ||
maxWidth: '100%', | ||
position: 'relative', | ||
|
@@ -140,7 +139,7 @@ const ContactInformation = (props: Props) => { | |
state || | ||
zip || | ||
country) && ( | ||
<Box sx={sxBox}> | ||
<Grid sx={sxGrid}> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Now that's it's a Grid I don't think you need the extra CSS here. You can most likely remove There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sadly, that did not work 😖 |
||
{(firstName || lastName) && ( | ||
<StyledTypography | ||
data-qa-contact-name | ||
|
@@ -170,10 +169,9 @@ const ContactInformation = (props: Props) => { | |
{city && state && ','} {state} {zip} | ||
</StyledTypography> | ||
<StyledTypography>{countryName}</StyledTypography> | ||
</Box> | ||
</Grid> | ||
)} | ||
|
||
<Box sx={sxBox}> | ||
<Grid sx={sxGrid}> | ||
<StyledTypography | ||
data-qa-contact-email | ||
sx={{ wordBreak: 'break-all' }} | ||
|
@@ -188,7 +186,7 @@ const ContactInformation = (props: Props) => { | |
<strong>Tax ID</strong> {taxId} | ||
</StyledTypography> | ||
)} | ||
</Box> | ||
</Grid> | ||
</Grid> | ||
</BillingPaper> | ||
<BillingContactDrawer | ||
|
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.
Adding m={0} at line 133 would also solves the issue and consistent with other boxes without having additional padding to subelements.
Also, you can completely lift sxGrid styles.
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.
We could do that, but do we really want to override MUI's Grid rules? Also, lifting lift
sxGrid
/sxBox
styles still breaks some UI