Skip to content

[theme] Support breakpoints.between(a, b) with number #19003

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

Merged
merged 2 commits into from Dec 31, 2019
Merged

[theme] Support breakpoints.between(a, b) with number #19003

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
5a25be2
[Theme] Add support for custom breakpoint values in between() function
Dec 27, 2019
e2138cb
add test case
oliviertassinari Dec 31, 2019
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 docs/src/pages/customization/breakpoints/breakpoints.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ const styles = theme => ({

#### Arguments

1. `start` (*String*): A breakpoint key (`xs`, `sm`, etc.).
2. `end` (*String*): A breakpoint key (`xs`, `sm`, etc.).
1. `start` (*String*): A breakpoint key (`xs`, `sm`, etc.) or a screen width number in pixels.
2. `end` (*String*): A breakpoint key (`xs`, `sm`, etc.) or a screen width number in pixels.

#### Returns

Expand Down
13 changes: 9 additions & 4 deletions packages/material-ui/src/styles/createBreakpoints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,20 @@ export default function createBreakpoints(breakpoints) {
}

function between(start, end) {
const endIndex = keys.indexOf(end) + 1;
const endIndex = keys.indexOf(end);

if (endIndex === keys.length) {
if (endIndex === keys.length - 1) {
return up(start);
}

return (
`@media (min-width:${values[start]}${unit}) and ` +
`(max-width:${values[keys[endIndex]] - step / 100}${unit})`
`@media (min-width:${
typeof values[start] === 'number' ? values[start] : start
}${unit}) and ` +
`(max-width:${(endIndex !== -1 && typeof values[keys[endIndex + 1]] === 'number'
? values[keys[endIndex + 1]]
: end) -
step / 100}${unit})`
);
}

Expand Down
9 changes: 8 additions & 1 deletion packages/material-ui/src/styles/createBreakpoints.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('createBreakpoints', () => {
assert.strictEqual(breakpoints.down('md'), '@media (max-width:1279.95px)');
});

it('should use the specified key if it is not a recognized breakpoint', () => {
it('should accept a number', () => {
assert.strictEqual(breakpoints.down(600), '@media (max-width:599.95px)');
});

Expand All @@ -40,6 +40,13 @@ describe('createBreakpoints', () => {
);
});

it('should accept numbers', () => {
assert.strictEqual(
breakpoints.between(600, 800),
'@media (min-width:600px) and (max-width:799.95px)',
);
});

it('on xl should call up', () => {
assert.strictEqual(breakpoints.between('lg', 'xl'), '@media (min-width:1280px)');
});
Expand Down