Merge pull request #53 from heyjul3s/refactor/usematchmedia-usewindow…

…size Hooks Update
heyjul3s · Jan 26, 2021 · 40bdcf2 · 40bdcf2
2 parents 5dbefae + 222fc3c
commit 40bdcf2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/usematchmedia/src/useMatchMedia.ts b/packages/usematchmedia/src/useMatchMedia.ts
@@ -8,9 +8,14 @@ export function useMatchMedia(query: string): boolean {
   }, []);
 
   useEffect(() => {
-    matchListRef.current = window.matchMedia(query);
-    matchListRef.current.addEventListener('change', onMediaQueryListEvent);
-    setIsMatch(matchListRef.current.matches);
+    if (!!window) {
+      matchListRef.current = window.matchMedia(query);
+      matchListRef.current.addEventListener('change', onMediaQueryListEvent);
+      setIsMatch(matchListRef.current.matches);
+    } else {
+      console.error('Error: typeof "window" is undefined.');
+      setIsMatch(false);
+    }
 
     return function unmountUseMatchMedia() {
       if (matchListRef.current) {

diff --git a/packages/usewindowsize/src/useWindowSize.ts b/packages/usewindowsize/src/useWindowSize.ts
@@ -5,7 +5,7 @@ export function useWindowSize(): WindowSize {
   const [windowSize, setWindowSize] = useState<WindowSize>(getSize());
 
   function getSize() {
-    if (typeof window !== 'undefined') {
+    if (!!window) {
       return {
         innerHeight: window.innerHeight,
         innerWidth: window.innerWidth,