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

[system] Fix transform not firing when theme provided #24010

Merged
merged 5 commits into from
Dec 14, 2020
Merged

[system] Fix transform not firing when theme provided #24010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65f341b
fixed/added tests for transform w. theme provided
ZovcIfzm Dec 14, 2020
2ba9c13
Update packages/material-ui-system/src/style.test.js
ZovcIfzm Dec 14, 2020
68c604c
Update packages/material-ui-system/src/style.test.js
ZovcIfzm Dec 14, 2020
d3edec9
ran prettier- fixed styling
ZovcIfzm Dec 14, 2020
34295a2
moved const inside
ZovcIfzm Dec 14, 2020
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
6 changes: 3 additions & 3 deletions packages/material-ui-system/src/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ function getValue(themeMapping, transform, propValueFinal, userValue = propValue
value = themeMapping[propValueFinal] || userValue;
} else {
value = getPath(themeMapping, propValueFinal) || userValue;
}

if (transform) {
value = transform(value);
}
if (transform) {
value = transform(value);
}

return value;
Expand Down
26 changes: 26 additions & 0 deletions packages/material-ui-system/src/style.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,32 @@ describe('style', () => {
});
});

it('should transform the property correctly using theme', () => {
const vSpacingWithTheme = style({
prop: 'vSpacing',
cssProperty: false,
themeKey: 'spacing',
transform: (value) => ({
'& > :not(:last-child)': {
marginBottom: value,
},
}),
});

const output = vSpacingWithTheme({
theme: {
spacing: (value) => value * 2,
},
vSpacing: 8,
});

expect(output).to.deep.equal({
'& > :not(:last-child)': {
marginBottom: 16,
},
});
});

it('should fallback to composed theme keys', () => {
const fontWeight = style({
prop: 'fontWeight',
Expand Down