fix: fixed the useMediaQuery hook

md-rehman · md-rehman · commit f9fbca53a903 · 2021-12-06T15:49:03.000+05:30
diff --git a/src/hooks/useMediaQuery.ts b/src/hooks/useMediaQuery.ts
@@ -14,30 +14,34 @@ type SubQuery = {
 type Query = Array<SubQuery>;
 
 export function useMediaQuery(query: SubQuery | Query) {
-  let dims = useWindowDimensions();
+  const dims = useWindowDimensions();
   const height = dims?.height;
   const width = dims?.width;
+
   return iterateQuery(query, height, width);
 }
 
+function queryResolver(query: any, width?: number, height?: number) {
+  for (const queryKey in query) {
+    if (!calculateQuery(queryKey, query[queryKey], height, width)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 function iterateQuery(
   query: SubQuery | Query,
   height?: number,
   width?: number
 ) {
-  let key;
-  let val;
-  let queryResults = [];
+  const queryResults = [];
   if (Array.isArray(query)) {
     query.forEach((subQuery: SubQuery) => {
-      key = Object.keys(subQuery)[0];
-      val = Object.values(subQuery)[0];
-      queryResults.push(calculateQuery(key, val, height, width));
+      queryResults.push(queryResolver(subQuery, width, height));
     });
   } else {
-    key = Object.keys(query)[0];
-    val = Object.values(query)[0];
-    queryResults.push(calculateQuery(key, val, height, width));
+    queryResults.push(queryResolver(query, width, height));
   }
   return queryResults;
 }
