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

[mui-system][style] bug fix for style value check color in nullable object #39457

Merged
merged 2 commits into from
Oct 16, 2023
Merged

[mui-system][style] bug fix for style value check color in nullable object #39457

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
1debd25
fix bug
DarhkVoyd Oct 15, 2023
9695219
remove warning
DarhkVoyd Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions packages/mui-material/src/Typography/Typography.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,20 +112,6 @@ describe('<Typography />', () => {
});
});

describe('prop: color', () => {
it('should check for invalid color value', () => {
const msg =
'MUI: The value found in theme for prop: "background" is an [Object] instead of string or number. Check if you forgot to add the correct dotted notation, eg, "background.paper" instead of "background".';
expect(() => {
render(
<Typography variant="h6" color="background">
Hello
</Typography>,
);
}).toWarnDev([msg, msg]);
});
});

it('combines system properties with the sx prop', () => {
const { container } = render(<Typography mt={2} mr={1} sx={{ marginRight: 5, mb: 2 }} />);

Expand Down
13 changes: 4 additions & 9 deletions packages/mui-system/src/palette.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,10 @@ const theme = {

describe('palette', () => {
it('should treat grey as CSS color', () => {
let output;
expect(() => {
output = palette({
theme,
backgroundColor: 'grey',
});
}).toWarnDev(
'MUI: The value found in theme for prop: "grey" is an [Object] instead of string or number. Check if you forgot to add the correct dotted notation, eg, "background.paper" instead of "background".',
);
const output = palette({
theme,
backgroundColor: 'grey',
});

expect(output).to.deep.equal({
backgroundColor: 'grey',
Expand Down
8 changes: 0 additions & 8 deletions packages/mui-system/src/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@ export function getStyleValue(themeMapping, transform, propValueFinal, userValue
value = getPath(themeMapping, propValueFinal) || userValue;
}

if (typeof value === 'object') {
if (process.env.NODE_ENV !== 'production') {
console.warn(
`MUI: The value found in theme for prop: "${propValueFinal}" is an [Object] instead of string or number. Check if you forgot to add the correct dotted notation, eg, "background.paper" instead of "background".`,
);
}
}

if (transform) {
value = transform(value, userValue, themeMapping);
}
Expand Down
58 changes: 1 addition & 57 deletions packages/mui-system/src/style.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import style, { getStyleValue } from './style';
import style from './style';

describe('style', () => {
const bgcolor = style({
Expand Down Expand Up @@ -258,60 +258,4 @@ describe('style', () => {
});
});
});
describe('getStyleValue', () => {
it('should warn on acceptable object', () => {
const round = (value) => Math.round(value * 1e5) / 1e5;
let output;

expect(() => {
output = getStyleValue(
{
body1: {
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
fontSize: '1rem',
letterSpacing: `${round(0.15 / 16)}em`,
fontWeight: 400,
lineHeight: 1.5,
},
},
null,
'body1',
);
}).toWarnDev(
'MUI: The value found in theme for prop: "body1" is an [Object] instead of string or number. Check if you forgot to add the correct dotted notation, eg, "background.paper" instead of "background".',
);

expect(output).to.deep.equal({
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
fontSize: '1rem',
letterSpacing: `${round(0.15 / 16)}em`,
fontWeight: 400,
lineHeight: 1.5,
});
});

it('should warn on unacceptable object', () => {
const theme = {
palette: {
grey: { 100: '#f5f5f5' },
},
};

const paletteTransform = (value, userValue) => {
if (userValue === 'grey') {
return userValue;
}
return value;
};
let output;

expect(() => {
output = getStyleValue(theme.palette, paletteTransform, 'grey');
}).toWarnDev(
'MUI: The value found in theme for prop: "grey" is an [Object] instead of string or number. Check if you forgot to add the correct dotted notation, eg, "background.paper" instead of "background".',
);

expect(output).to.be.equal('grey');
});
});
});
15 changes: 4 additions & 11 deletions packages/mui-system/src/styleFunctionSx/styleFunctionSx.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,10 @@ describe('styleFunctionSx', () => {
});

it('resolves system typography', () => {
let result;

expect(() => {
result = styleFunctionSx({
theme,
sx: { typography: ['body2', 'body1'] },
});
}).toWarnDev([
'MUI: The value found in theme for prop: "body2" is an [Object] instead of string or number. Check if you forgot to add the correct dotted notation, eg, "background.paper" instead of "background".',
'MUI: The value found in theme for prop: "body1" is an [Object] instead of string or number. Check if you forgot to add the correct dotted notation, eg, "background.paper" instead of "background".',
]);
const result = styleFunctionSx({
theme,
sx: { typography: ['body2', 'body1'] },
});

expect(result).to.deep.equal({
'@media (min-width:0px)': {
Expand Down