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.

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

[material-ui] Do not generate CSS variables for a custom spacing function #43389

Merged
merged 6 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion packages/mui-material/src/styles/createThemeWithVars.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function getSpacingVal(spacingInput) {
return spacingInput;
}
if (typeof spacingInput === 'function') {
return getSpacingVal(spacingInput(1));
return spacingInput;
DiegoAndai marked this conversation as resolved.
Show resolved Hide resolved
}
if (Array.isArray(spacingInput)) {
return spacingInput;
Expand Down
24 changes: 22 additions & 2 deletions packages/mui-material/src/styles/extendTheme.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,28 @@ describe('extendTheme', () => {

it('can be customized as a function', () => {
const theme = extendTheme({ spacing: (factor) => `${0.25 * factor}rem` });
expect(theme.vars.spacing).to.deep.equal('var(--mui-spacing, 0.25rem)');
expect(theme.spacing(2)).to.equal('calc(2 * var(--mui-spacing, 0.25rem))');
expect('spacing' in theme.vars).to.equal(false);
expect(theme.spacing(2)).to.equal('0.5rem');
});

it('a custom function should not be altered', () => {
const theme = extendTheme({
spacing: (val) => {
const base = 8;

if (val === 'xs') {
return `100px`;
}

if (typeof val === 'string') {
return val;
}

return `${Number(val) * base}px`;
},
siriwatknp marked this conversation as resolved.
Show resolved Hide resolved
});
expect('spacing' in theme.vars).to.equal(false);
expect(theme.spacing('xs')).to.equal('100px');
});
});

Expand Down