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] Do not generate CSS variables for a custom spacing function #43389

Merged
merged 6 commits into from
Aug 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75ab905
use the custom spacing function
siriwatknp Aug 21, 2024
14827c4
fix test name
siriwatknp Aug 21, 2024
613b1a8
Update packages/mui-material/src/styles/extendTheme.test.js
siriwatknp Aug 21, 2024
df44769
Merge branch 'next' of https://github.com/mui/material-ui into fix/cs…
siriwatknp Aug 22, 2024
5653111
prettier
siriwatknp Aug 22, 2024
17784e9
refactor
siriwatknp Aug 22, 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
12 changes: 5 additions & 7 deletions packages/mui-material/src/styles/createThemeWithVars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,11 @@ function getSpacingVal(spacingInput) {
if (typeof spacingInput === 'number') {
return `${spacingInput}px`;
}
if (typeof spacingInput === 'string') {
return spacingInput;
}
if (typeof spacingInput === 'function') {
return getSpacingVal(spacingInput(1));
}
if (Array.isArray(spacingInput)) {
if (
typeof spacingInput === 'string' ||
typeof spacingInput === 'function' ||
Array.isArray(spacingInput)
) {
return spacingInput;
}
return '8px';
Expand Down
12 changes: 10 additions & 2 deletions packages/mui-material/src/styles/extendTheme.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,16 @@ 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) => (val === 'xs' ? '100px' : val),
});
expect('spacing' in theme.vars).to.equal(false);
expect(theme.spacing('xs')).to.equal('100px');
});
});

Expand Down