Skip to content

Fix/crashes on safari #17

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

Open
niallpaterson wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix/crashes on safari #17

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ea33a0
fix crash on safari
Jul 5, 2021
f9818ab
spacing is consistent
Jul 5, 2021
4ec1d80
fix typo (oops)
Jul 5, 2021
b3d5534
fix another typo (oops again)
Jul 9, 2021
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
16 changes: 14 additions & 2 deletions src/targets/web/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,21 @@ export function useReduceMotion() {
setMatch(mq.matches);
};
handleChange();
mq.addEventListener('change', handleChange);
// If only has depreciated api use that, otherwise use current api
// Safari 14 + has both, Safari <= 13 only has depreciated
// fixes https://github.com/infiniteluke/react-reduce-motion/issues/8
const usesDepreciatedApi = mq.addListener && !mq.addEventListener;
Copy link
Copy Markdown

@mitchellwarr mitchellwarr Jul 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

depreciated or deprecated?

Copy link
Copy Markdown
Author

@niallpaterson niallpaterson Jul 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mitchellwarr Golly I've been saying that wrong a while! Thanks! 🙈 ❤️

if (usesDepreciatedApi) {
mq.addListener(handleChange);
} else {
mq.addEventListener('change', handleChange);
}
return () => {
mq.removeEventListener('change', handleChange);
if (usesDepreciatedApi) {
mq.removeListener(handleChange);
} else {
mq.removeEventListener('change', handleChange);
}
};
}, []);
return matches;
Expand Down