Skip to content

Commit

Permalink
fix(media-query): correct useMediaQuery hook to correctly report quer…
Browse files Browse the repository at this point in the history
…y match
  • Loading branch information
primos63 committed Oct 7, 2021
1 parent cb49051 commit f2df9cf
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
8 changes: 8 additions & 0 deletions .changeset/three-peaches-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@chakra-ui/media-query": patch
---

This fixes an issue where the useMediaQuery was not updating the array of
statuses correctly when resizing the view. It also removes deprecated calls
addListener and removeListener in favor of the recommended addEventListener and
removeEventListener calls.
19 changes: 11 additions & 8 deletions packages/media-query/src/use-media-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,24 @@ export function useMediaQuery(query: string | string[]): boolean[] {
const mediaQueryList = queries.map((query) => env.window.matchMedia(query))

const listenerList = mediaQueryList.map((mediaQuery, index) => {
const listener = () =>
setMatches((prev) =>
prev.map((prevValue, idx) =>
index === idx ? !!mediaQuery.matches : prevValue,
),
)
const listener = () => {
const isEqual = (prev: boolean[], curr: boolean[]) =>
prev.length === curr.length &&
prev.every((elem, idx) => elem === curr[idx])

mediaQuery.addListener(listener)
const currentMatches = mediaQueryList.map((query) => query.matches)

!isEqual(matches, currentMatches) && setMatches(currentMatches)
}

env.window.addEventListener("resize", listener)

return listener
})

return () => {
mediaQueryList.forEach((mediaQuery, index) => {
mediaQuery.removeListener(listenerList[index])
env.window.removeEventListener("resize", listenerList[index])
})
}
}, [query])
Expand Down

0 comments on commit f2df9cf

Please sign in to comment.