Skip to content

[useMediaQuery] Workaround Safari wrong implementation of matchMedia #17315

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
Sep 5, 2019
Merged

[useMediaQuery] Workaround Safari wrong implementation of matchMedia #17315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779abba
For useMediaQuery(), don't call setState() once unmounting begins. Th…
momentpaul Sep 4, 2019
a52f004
add comment
oliviertassinari Sep 5, 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
9 changes: 8 additions & 1 deletion packages/material-ui/src/useMediaQuery/useMediaQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ function useMediaQuery(queryInput, options = {}) {
});

React.useEffect(() => {
let active = true;
hydrationCompleted = true;

if (!supportMatchMedia) {
Expand All @@ -59,11 +60,17 @@ function useMediaQuery(queryInput, options = {}) {

const queryList = window.matchMedia(query);
const updateMatch = () => {
setMatch(queryList.matches);
// Workaround Safari wrong implementation of matchMedia
// TODO can we remove it?
// https://github.com/mui-org/material-ui/pull/17315#issuecomment-528286677
if (active) {
setMatch(queryList.matches);
}
};
updateMatch();
queryList.addListener(updateMatch);
return () => {
active = false;
queryList.removeListener(updateMatch);
};
}, [query, supportMatchMedia]);
Expand Down