@tamagui/react-native-media-driver 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/cjs/createMedia.cjs

@@ -3,28 +3,31 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var createMedia_exports = {};
 __export(createMedia_exports, {
   createMedia: () => createMedia
 });
 module.exports = __toCommonJS(createMedia_exports);
-var import_web = require("@tamagui/web"),
-  import_matchMedia = require("./matchMedia.cjs");
+var import_web = require("@tamagui/web");
+var import_matchMedia = require("./matchMedia.cjs");
 function createMedia(media) {
-  return (0, import_web.setupMatchMedia)(import_matchMedia.matchMedia), media;
+  (0, import_web.setupMatchMedia)(import_matchMedia.matchMedia);
+  return media;
 }

package/dist/cjs/createMedia.native.js

@@ -5,29 +5,32 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var createMedia_exports = {};
 __export(createMedia_exports, {
   createMedia: () => createMedia
 });
 module.exports = __toCommonJS(createMedia_exports);
-var import_web = require("@tamagui/web"),
-  import_matchMedia = require("./matchMedia.native.js");
+var import_web = require("@tamagui/web");
+var import_matchMedia = require("./matchMedia.native.js");
 function createMedia(media) {
-  return (0, import_web.setupMatchMedia)(import_matchMedia.matchMedia), media;
+  (0, import_web.setupMatchMedia)(import_matchMedia.matchMedia);
+  return media;
 }
 //# sourceMappingURL=createMedia.native.js.map

package/dist/cjs/createMedia.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createMedia_exports","__export","createMedia","module","exports","import_web","require","import_matchMedia","media","setupMatchMedia","matchMedia"],"sources":["../../src/createMedia.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,mBAAA;AAAAC,QAAA,CAAAD,mBAAA;EAAAE,WAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAgCT,YAAA,CAAAK,mBAEhC;AAMO,IAAAK,UAAS,GAAAC,OAId,eAAa;EAAAC,iBAAA,GAAAD,OAAA;AAGb,SAAAJ,YAAAM,KAAA;EAEF,WAAAH,UAAA,CAAAI,eAAA,EAAAF,iBAAA,CAAAG,UAAA,GAAAF,KAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createMedia_exports","__export","createMedia","module","exports","import_web","require","import_matchMedia","media","setupMatchMedia","matchMedia"],"sources":["../../src/createMedia.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,mBAAA;AAAAC,QAAA,CAAAD,mBAAA;EAAAE,WAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAgCT,YAAA,CAAAK,mBAAA;AAEhC,IAAAK,UAAA,GAAAC,OAA2B;AAMpB,IAAAC,iBAIL,GAAAD,OAAa;AAGb,SAAAJ,YAAAM,KAAA;EACA,IAAAH,UAAO,CAAAI,eAAA,EAAAF,iBAAA,CAAAG,UAAA;EACT,OAAAF,KAAA","ignoreList":[]}

package/dist/cjs/index.cjs

@@ -3,15 +3,17 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  },
-  __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);

package/dist/cjs/index.native.js

@@ -5,15 +5,17 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  },
-  __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);

package/dist/cjs/index.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","index_exports","module","exports","__reExport","require"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,aAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAP,YAAc,CAAAK,aAAA;AACdG,UAAA,CAAAH,aAAA,EAAcI,OAAA,6BADdH,MAAA,CAAAC,OAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","index_exports","module","exports","__reExport","require"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,aAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAP,YAAc,CAAAK,aAAA;AACdG,UAAA,CAAAH,aAAA,EAAcI,OAAA,6BADdH,MAAA,CAAAC,OAAA","ignoreList":[]}

package/dist/cjs/matchMedia.cjs

@@ -3,24 +3,26 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var matchMedia_exports = {};
 __export(matchMedia_exports, {
   matchMedia: () => matchMedia
 });
 module.exports = __toCommonJS(matchMedia_exports);
-const matchMedia = globalThis.matchMedia;
+const matchMedia = globalThis["matchMedia"];

package/dist/cjs/matchMedia.native.js

@@ -5,28 +5,30 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var matchMedia_native_exports = {};
 __export(matchMedia_native_exports, {
   matchMedia: () => matchMedia
 });
 module.exports = __toCommonJS(matchMedia_native_exports);
-var import_mediaQueryList = require("./mediaQueryList.native.js"),
-  matchMedia = function (query) {
-    return new import_mediaQueryList.NativeMediaQueryList(query);
-  };
+var import_mediaQueryList = require("./mediaQueryList.native.js");
+var matchMedia = function (query) {
+  return new import_mediaQueryList.NativeMediaQueryList(query);
+};
 //# sourceMappingURL=matchMedia.native.js.map

package/dist/cjs/matchMedia.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["matchMedia_native_exports","__export","matchMedia","module","exports","__toCommonJS","import_mediaQueryList","require","query","NativeMediaQueryList"],"sources":["../../src/matchMedia.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,yBAAA;AAAAC,QAAA,CAAAD,yBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,yBAAA;AAAA,IAAAM,qBAAA,GAAqCC,OAAA;EAC1BL,UAAA,GAAa,SAAAA,CAASM,KAAA,EAAO;IACpC,OAAO,IAAIF,qBAAA,CAAAG,oBAAA,CAAqBD,KAAK;EACzC","ignoreList":[]}
+{"version":3,"names":["matchMedia_native_exports","__export","matchMedia","module","exports","__toCommonJS","import_mediaQueryList","require","query","NativeMediaQueryList"],"sources":["../../src/matchMedia.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,yBAAA;AAAAC,QAAA,CAAAD,yBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,yBAAA;AAAA,IAAAM,qBAAA,GAAqCC,OAAA;AAC9B,IAAIL,UAAA,GAAa,SAAAA,CAASM,KAAA,EAAO;EACpC,OAAO,IAAIF,qBAAA,CAAAG,oBAAA,CAAqBD,KAAK;AACzC","ignoreList":[]}

package/dist/cjs/matchQuery.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var matchQuery_exports = {};
 __export(matchQuery_exports, {
@@ -24,23 +26,27 @@ __export(matchQuery_exports, {
   parseQuery: () => parseQuery
 });
 module.exports = __toCommonJS(matchQuery_exports);
-const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i,
-  RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/,
-  RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
-  RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/,
-  RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
+const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i;
+const RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/;
+const RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/;
+const RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/;
+const RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
 function matchQuery(mediaQuery, values) {
   return parseQuery(mediaQuery).some(query => {
     if (!query) return;
-    const inverse = query.inverse,
-      typeMatch = query.type === "all" || values.type === query.type;
-    if (typeMatch && inverse || !(typeMatch || inverse)) return !1;
+    const inverse = query.inverse;
+    const typeMatch = query.type === "all" || values.type === query.type;
+    if (typeMatch && inverse || !(typeMatch || inverse)) {
+      return false;
+    }
     const expressionsMatch = query.expressions.every(expression => {
-      const feature = expression.feature,
-        modifier = expression.modifier;
-      let expValue = expression.value,
-        value = values[feature];
-      if (!value) return !1;
+      const feature = expression.feature;
+      const modifier = expression.modifier;
+      let expValue = expression.value;
+      let value = values[feature];
+      if (!value) {
+        return false;
+      }
       switch (feature) {
         case "orientation":
         case "scan":
@@ -49,22 +55,26 @@ function matchQuery(mediaQuery, values) {
         case "height":
         case "device-width":
         case "device-height":
-          expValue = toPx(expValue), value = toPx(value);
+          expValue = toPx(expValue);
+          value = toPx(value);
           break;
         case "resolution":
-          expValue = toDpi(expValue), value = toDpi(value);
+          expValue = toDpi(expValue);
+          value = toDpi(value);
           break;
         case "aspect-ratio":
         case "device-aspect-ratio":
         case /* Deprecated */
         "device-pixel-ratio":
-          expValue = toDecimal(expValue), value = toDecimal(value);
+          expValue = toDecimal(expValue);
+          value = toDecimal(value);
           break;
         case "grid":
         case "color":
         case "color-index":
         case "monochrome":
-          expValue = Number.parseInt(expValue, 10) || 1, value = Number.parseInt(value, 10) || 0;
+          expValue = Number.parseInt(expValue, 10) || 1;
+          value = Number.parseInt(value, 10) || 0;
           break;
       }
       switch (modifier) {
@@ -84,15 +94,16 @@ function parseQuery(mediaQuery) {
     query = query.trim();
     const captures = query.match(RE_MEDIA_QUERY);
     if (!captures) return null;
-    const modifier = captures[1],
-      type = captures[2],
-      expressions = (captures[3] || "").match(/\([^)]+\)/g) || [];
+    const modifier = captures[1];
+    const type = captures[2];
+    const expressionsCapture = captures[3] || "";
+    const expressions = expressionsCapture.match(/\([^)]+\)/g) || [];
     return {
       inverse: !!modifier && modifier.toLowerCase() === "not",
       type: type ? type.toLowerCase() : "all",
       expressions: expressions.map(expression => {
-        const captures2 = expression.match(RE_MQ_EXPRESSION),
-          feature = captures2[1].toLowerCase().match(RE_MQ_FEATURE);
+        const captures2 = expression.match(RE_MQ_EXPRESSION);
+        const feature = captures2[1].toLowerCase().match(RE_MQ_FEATURE);
         return {
           modifier: feature[1],
           feature: feature[2],
@@ -103,13 +114,18 @@ function parseQuery(mediaQuery) {
   });
 }
 function toDecimal(ratio) {
-  let decimal = Number(ratio),
-    numbers;
-  return decimal || (numbers = ratio.match(/^(\d+)\s*\/\s*(\d+)$/), decimal = numbers[1] / numbers[2]), decimal;
+  let decimal = Number(ratio);
+  let numbers;
+  if (!decimal) {
+    numbers = ratio.match(/^(\d+)\s*\/\s*(\d+)$/);
+    decimal = numbers[1] / numbers[2];
+  }
+  return decimal;
 }
 function toDpi(resolution) {
   const value = Number.parseFloat(resolution);
-  switch (String(resolution).match(RE_RESOLUTION_UNIT)?.[1]) {
+  const units = String(resolution).match(RE_RESOLUTION_UNIT)?.[1];
+  switch (units) {
     case "dpcm":
       return value / 2.54;
     case "dppx":
@@ -120,7 +136,8 @@ function toDpi(resolution) {
 }
 function toPx(length) {
   const value = Number.parseFloat(length);
-  switch (String(length).match(RE_LENGTH_UNIT)?.[1]) {
+  const units = String(length).match(RE_LENGTH_UNIT)?.[1];
+  switch (units) {
     case "em":
       return value * 16;
     case "rem":

package/dist/cjs/matchQuery.native.js

@@ -5,20 +5,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var matchQuery_exports = {};
 __export(matchQuery_exports, {
@@ -26,60 +28,67 @@ __export(matchQuery_exports, {
   parseQuery: () => parseQuery
 });
 module.exports = __toCommonJS(matchQuery_exports);
-var RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i,
-  RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/,
-  RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
-  RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/,
-  RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
+var RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i;
+var RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/;
+var RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/;
+var RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/;
+var RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
 function matchQuery(mediaQuery, values) {
   return parseQuery(mediaQuery).some(function (query) {
-    if (query) {
-      var inverse = query.inverse,
-        typeMatch = query.type === "all" || values.type === query.type;
-      if (typeMatch && inverse || !(typeMatch || inverse)) return !1;
-      var expressionsMatch = query.expressions.every(function (expression) {
-        var feature = expression.feature,
-          modifier = expression.modifier,
-          expValue = expression.value,
-          value = values[feature];
-        if (!value) return !1;
-        switch (feature) {
-          case "orientation":
-          case "scan":
-            return value.toLowerCase() === expValue.toLowerCase();
-          case "width":
-          case "height":
-          case "device-width":
-          case "device-height":
-            expValue = toPx(expValue), value = toPx(value);
-            break;
-          case "resolution":
-            expValue = toDpi(expValue), value = toDpi(value);
-            break;
-          case "aspect-ratio":
-          case "device-aspect-ratio":
-          case /* Deprecated */
-          "device-pixel-ratio":
-            expValue = toDecimal(expValue), value = toDecimal(value);
-            break;
-          case "grid":
-          case "color":
-          case "color-index":
-          case "monochrome":
-            expValue = Number.parseInt(expValue, 10) || 1, value = Number.parseInt(value, 10) || 0;
-            break;
-        }
-        switch (modifier) {
-          case "min":
-            return value >= expValue;
-          case "max":
-            return value <= expValue;
-          default:
-            return value === expValue;
-        }
-      });
-      return expressionsMatch && !inverse || !expressionsMatch && inverse;
+    if (!query) return;
+    var inverse = query.inverse;
+    var typeMatch = query.type === "all" || values.type === query.type;
+    if (typeMatch && inverse || !(typeMatch || inverse)) {
+      return false;
     }
+    var expressionsMatch = query.expressions.every(function (expression) {
+      var feature = expression.feature;
+      var modifier = expression.modifier;
+      var expValue = expression.value;
+      var value = values[feature];
+      if (!value) {
+        return false;
+      }
+      switch (feature) {
+        case "orientation":
+        case "scan":
+          return value.toLowerCase() === expValue.toLowerCase();
+        case "width":
+        case "height":
+        case "device-width":
+        case "device-height":
+          expValue = toPx(expValue);
+          value = toPx(value);
+          break;
+        case "resolution":
+          expValue = toDpi(expValue);
+          value = toDpi(value);
+          break;
+        case "aspect-ratio":
+        case "device-aspect-ratio":
+        case /* Deprecated */
+        "device-pixel-ratio":
+          expValue = toDecimal(expValue);
+          value = toDecimal(value);
+          break;
+        case "grid":
+        case "color":
+        case "color-index":
+        case "monochrome":
+          expValue = Number.parseInt(expValue, 10) || 1;
+          value = Number.parseInt(value, 10) || 0;
+          break;
+      }
+      switch (modifier) {
+        case "min":
+          return value >= expValue;
+        case "max":
+          return value <= expValue;
+        default:
+          return value === expValue;
+      }
+    });
+    return expressionsMatch && !inverse || !expressionsMatch && inverse;
   });
 }
 function parseQuery(mediaQuery) {
@@ -87,16 +96,16 @@ function parseQuery(mediaQuery) {
     query = query.trim();
     var captures = query.match(RE_MEDIA_QUERY);
     if (!captures) return null;
-    var modifier = captures[1],
-      type = captures[2],
-      expressionsCapture = captures[3] || "",
-      expressions = expressionsCapture.match(/\([^)]+\)/g) || [];
+    var modifier = captures[1];
+    var type = captures[2];
+    var expressionsCapture = captures[3] || "";
+    var expressions = expressionsCapture.match(/\([^)]+\)/g) || [];
     return {
       inverse: !!modifier && modifier.toLowerCase() === "not",
       type: type ? type.toLowerCase() : "all",
       expressions: expressions.map(function (expression) {
-        var captures2 = expression.match(RE_MQ_EXPRESSION),
-          feature = captures2[1].toLowerCase().match(RE_MQ_FEATURE);
+        var captures2 = expression.match(RE_MQ_EXPRESSION);
+        var feature = captures2[1].toLowerCase().match(RE_MQ_FEATURE);
         return {
           modifier: feature[1],
           feature: feature[2],
@@ -107,14 +116,18 @@ function parseQuery(mediaQuery) {
   });
 }
 function toDecimal(ratio) {
-  var decimal = Number(ratio),
-    numbers;
-  return decimal || (numbers = ratio.match(/^(\d+)\s*\/\s*(\d+)$/), decimal = numbers[1] / numbers[2]), decimal;
+  var decimal = Number(ratio);
+  var numbers;
+  if (!decimal) {
+    numbers = ratio.match(/^(\d+)\s*\/\s*(\d+)$/);
+    decimal = numbers[1] / numbers[2];
+  }
+  return decimal;
 }
 function toDpi(resolution) {
-  var _String_match,
-    value = Number.parseFloat(resolution),
-    units = (_String_match = String(resolution).match(RE_RESOLUTION_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
+  var _String_match;
+  var value = Number.parseFloat(resolution);
+  var units = (_String_match = String(resolution).match(RE_RESOLUTION_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
   switch (units) {
     case "dpcm":
       return value / 2.54;
@@ -125,9 +138,9 @@ function toDpi(resolution) {
   }
 }
 function toPx(length) {
-  var _String_match,
-    value = Number.parseFloat(length),
-    units = (_String_match = String(length).match(RE_LENGTH_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
+  var _String_match;
+  var value = Number.parseFloat(length);
+  var units = (_String_match = String(length).match(RE_LENGTH_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
   switch (units) {
     case "em":
       return value * 16;

package/dist/cjs/matchQuery.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","matchQuery_exports","__export","matchQuery","parseQuery","module","exports","RE_MEDIA_QUERY","RE_MQ_EXPRESSION","RE_MQ_FEATURE","RE_LENGTH_UNIT","RE_RESOLUTION_UNIT","mediaQuery","values","some","query","inverse","typeMatch","type","expressionsMatch","expressions","every","expression","feature","modifier","expValue","toLowerCase","toPx","toDpi","toDecimal","Number","parseInt","split","map","trim","captures","match","expressionsCapture","captures2","ratio","decimal","numbers","resolution","_String_match","parseFloat","units","String","length"],"sources":["../../src/matchQuery.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","matchQuery_exports","__export","matchQuery","parseQuery","module","exports","RE_MEDIA_QUERY","RE_MQ_EXPRESSION","RE_MQ_FEATURE","RE_LENGTH_UNIT","RE_RESOLUTION_UNIT","mediaQuery","values","some","query","inverse","typeMatch","type","expressionsMatch","expressions","every","expression","feature","modifier","expValue","toLowerCase","toPx","toDpi","toDecimal","Number","parseInt","split","map","trim","captures","match","expressionsCapture","captures2","ratio","decimal","numbers","resolution","_String_match","parseFloat","units","String","length"],"sources":["../../src/matchQuery.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}