Can pass optional width or height (#2)

Author: d6u

README.md

@@ -43,11 +43,22 @@ expect(result5).toEqual({a: false, b: false, c: false, d: true});
 
 const result6 = matchQueries(query)({width: 700, height: 700});
 expect(result6).toEqual({a: false, b: false, c: false, d: false});
+
+// {min|max}Height would be ignored if height is not provided.
+const result7 = matchQueries(query)({width: 450});
+expect(result7).toEqual({a: true, b: false, c: true, d: false});
+
+// {min|max}Width would be ignored if width is not provided.
+const result8 = matchQueries(query)({height: 450});
+expect(result8).toEqual({a: true, b: true, c: false, d: false});
 ```
 
 ## API
 
 ### `matchQueries(rules)(contentSize)`
 
 - `rules: {[key: string]: {minWidth?: number, maxWidth?: number, minHeight?: number, maxHeight?: number}}`
-- `contentSize: {height: number, width: number}`
+
+- `contentSize: {height?: number, width?: number}`
+
+	If `contentSize` is missing `height` or `width`, `{min|max}Height` or `{min|max}Width` rules will be ignored respectively.

src/matchQueries.ts

@@ -22,16 +22,22 @@ export default function matchQueries(rules: Rules) {
     className: className
   }));
 
-  return function ({height, width}: {height: number, width: number}) {
+  return function ({height, width}: {height?: number, width?: number}) {
     const classNameMap: {[key: string]: boolean} = {};
 
     for (const {className, minWidth, maxWidth, minHeight, maxHeight} of entries) {
-      classNameMap[className] = (
-        minWidth <= width &&
-        width <= maxWidth &&
-        minHeight <= height &&
-        height <= maxHeight
-      );
+      if (height != null && width != null) {
+        classNameMap[className] = (
+          minWidth <= width && width <= maxWidth &&
+          minHeight <= height && height <= maxHeight
+        );
+      } else if (height == null && width != null) {
+        classNameMap[className] = minWidth <= width && width <= maxWidth;
+      } else if (height != null && width == null) {
+        classNameMap[className] = minHeight <= height && height <= maxHeight;
+      } else {
+        classNameMap[className] = true;
+      }
     }
 
     return classNameMap;

test/matchQueries.js

@@ -145,4 +145,54 @@ describe('matchQueries', function () {
 
   });
 
+  describe('no height info', function () {
+
+    it('ignores rules of height', function () {
+      const query = {
+        a: {minWidth: 400, maxWidth: 500, minHeight: 400, maxHeight: 500},
+        b: {minWidth: 500, maxWidth: 600, minHeight: 400, maxHeight: 500},
+        c: {minWidth: 400, maxWidth: 500, minHeight: 500, maxHeight: 600},
+        d: {minWidth: 500, maxWidth: 600, minHeight: 500, maxHeight: 600},
+      };
+
+      const result1 = matchQueries(query)({width: 300});
+      expect(result1).toEqual({a: false, b: false, c: false, d: false});
+
+      const result2 = matchQueries(query)({width: 450});
+      expect(result2).toEqual({a: true, b: false, c: true, d: false});
+
+      const result5 = matchQueries(query)({width: 550});
+      expect(result5).toEqual({a: false, b: true, c: false, d: true});
+
+      const result6 = matchQueries(query)({width: 700});
+      expect(result6).toEqual({a: false, b: false, c: false, d: false});
+    });
+
+  });
+
+  describe('no width info', function () {
+
+    it('ignores rules of width', function () {
+      const query = {
+        a: {minWidth: 400, maxWidth: 500, minHeight: 400, maxHeight: 500},
+        b: {minWidth: 500, maxWidth: 600, minHeight: 400, maxHeight: 500},
+        c: {minWidth: 400, maxWidth: 500, minHeight: 500, maxHeight: 600},
+        d: {minWidth: 500, maxWidth: 600, minHeight: 500, maxHeight: 600},
+      };
+
+      const result1 = matchQueries(query)({height: 300});
+      expect(result1).toEqual({a: false, b: false, c: false, d: false});
+
+      const result2 = matchQueries(query)({height: 450});
+      expect(result2).toEqual({a: true, b: true, c: false, d: false});
+
+      const result3 = matchQueries(query)({height: 550});
+      expect(result3).toEqual({a: false, b: false, c: true, d: true});
+
+      const result6 = matchQueries(query)({height: 700});
+      expect(result6).toEqual({a: false, b: false, c: false, d: false});
+    });
+
+  });
+
 });