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

[material-ui][Grid v1] Fix regression spacing prop with string value #44376

Merged
merged 2 commits into from
Nov 13, 2024
Merged

[material-ui][Grid v1] Fix regression spacing prop with string value #44376

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
130cea6
fix regression
siriwatknp Nov 11, 2024
90a91d1
apply suggestion
siriwatknp Nov 12, 2024
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
4 changes: 2 additions & 2 deletions packages/mui-material/src/Grid/Grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export function generateRowGap({ theme, ownerState }) {

if (themeSpacing !== '0px') {
return {
marginTop: theme.spacing(-propValue),
marginTop: `-${themeSpacing}`,
[`& > .${gridClasses.item}`]: {
paddingTop: themeSpacing,
},
Expand Down Expand Up @@ -214,7 +214,7 @@ export function generateColumnGap({ theme, ownerState }) {
styles = handleBreakpoints({ theme }, columnSpacingValues, (propValue, breakpoint) => {
const themeSpacing = theme.spacing(propValue);
if (themeSpacing !== '0px') {
const negativeValue = theme.spacing(-propValue);
const negativeValue = `-${themeSpacing}`;
return {
width: `calc(100% + ${themeSpacing})`,
marginLeft: negativeValue,
Expand Down
17 changes: 15 additions & 2 deletions packages/mui-material/src/Grid/Grid.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ describe('Material UI <Grid />', () => {
generateRowGap({
ownerState: {
container: true,
rowSpacing: { xs: 1, sm: 2 },
rowSpacing: { xs: 1, sm: 2, md: '16px' },
},
theme,
}),
Expand All @@ -763,13 +763,19 @@ describe('Material UI <Grid />', () => {
},
marginTop: '-16px',
},
[`@media (min-width:${defaultTheme.breakpoints.values.md}px)`]: {
'& > .MuiGrid-item': {
paddingTop: '16px',
},
marginTop: '-16px',
},
});

expect(
generateColumnGap({
ownerState: {
container: true,
columnSpacing: { xs: 1, sm: 2 },
columnSpacing: { xs: 1, sm: 2, md: '16px' },
},
theme,
}),
Expand All @@ -788,6 +794,13 @@ describe('Material UI <Grid />', () => {
marginLeft: '-16px',
width: 'calc(100% + 16px)',
},
[`@media (min-width:${defaultTheme.breakpoints.values.md}px)`]: {
'& > .MuiGrid-item': {
paddingLeft: '16px',
},
marginLeft: '-16px',
width: 'calc(100% + 16px)',
},
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/mui-system/src/createTheme/createSpacing.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ describe('createSpacing', () => {
expect(spacing(1, 'auto', 2, 3)).to.equal('0.25rem auto 0.5rem 0.75rem');
});

it('should support valid CSS unit', () => {
const spacing = createSpacing();
expect(spacing('16px')).to.equal('16px');
expect(spacing('1rem')).to.equal('1rem');
});

describe('warnings', () => {
it('should warn for wrong input', () => {
expect(() => {
Expand Down