@tamagui/react-native-media-driver 2.0.0-rc.0 → 2.0.0-rc.0-1769998500160
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/matchQuery.cjs +3 -3
- package/dist/cjs/matchQuery.js +2 -2
- package/dist/cjs/matchQuery.js.map +1 -1
- package/dist/cjs/matchQuery.native.js +3 -3
- package/dist/cjs/matchQuery.native.js.map +1 -1
- package/dist/esm/matchQuery.js +2 -2
- package/dist/esm/matchQuery.js.map +1 -1
- package/dist/esm/matchQuery.mjs +3 -3
- package/dist/esm/matchQuery.mjs.map +1 -1
- package/dist/esm/matchQuery.native.js +3 -3
- package/dist/esm/matchQuery.native.js.map +1 -1
- package/package.json +20 -20
- package/src/matchQuery.ts +3 -3
- package/types/matchQuery.d.ts.map +1 -1
package/dist/cjs/matchQuery.cjs
CHANGED
|
@@ -24,8 +24,8 @@ __export(matchQuery_exports, {
|
|
|
24
24
|
parseQuery: () => parseQuery
|
|
25
25
|
});
|
|
26
26
|
module.exports = __toCommonJS(matchQuery_exports);
|
|
27
|
-
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s
|
|
28
|
-
RE_MQ_EXPRESSION = /\(\s*([^\s
|
|
27
|
+
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i,
|
|
28
|
+
RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/,
|
|
29
29
|
RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
|
|
30
30
|
RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/,
|
|
31
31
|
RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
|
|
@@ -86,7 +86,7 @@ function parseQuery(mediaQuery) {
|
|
|
86
86
|
if (!captures) return null;
|
|
87
87
|
const modifier = captures[1],
|
|
88
88
|
type = captures[2],
|
|
89
|
-
expressions = (captures[3] || "").match(/\([
|
|
89
|
+
expressions = (captures[3] || "").match(/\([^)]+\)/g) || [];
|
|
90
90
|
return {
|
|
91
91
|
inverse: !!modifier && modifier.toLowerCase() === "not",
|
|
92
92
|
type: type ? type.toLowerCase() : "all",
|
package/dist/cjs/matchQuery.js
CHANGED
|
@@ -18,7 +18,7 @@ __export(matchQuery_exports, {
|
|
|
18
18
|
parseQuery: () => parseQuery
|
|
19
19
|
});
|
|
20
20
|
module.exports = __toCommonJS(matchQuery_exports);
|
|
21
|
-
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s
|
|
21
|
+
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)?$/;
|
|
22
22
|
function matchQuery(mediaQuery, values) {
|
|
23
23
|
return parseQuery(mediaQuery).some((query) => {
|
|
24
24
|
if (!query) return;
|
|
@@ -73,7 +73,7 @@ function parseQuery(mediaQuery) {
|
|
|
73
73
|
query = query.trim();
|
|
74
74
|
const captures = query.match(RE_MEDIA_QUERY);
|
|
75
75
|
if (!captures) return null;
|
|
76
|
-
const modifier = captures[1], type = captures[2], expressions = (captures[3] || "").match(/\([
|
|
76
|
+
const modifier = captures[1], type = captures[2], expressions = (captures[3] || "").match(/\([^)]+\)/g) || [];
|
|
77
77
|
return {
|
|
78
78
|
inverse: !!modifier && modifier.toLowerCase() === "not",
|
|
79
79
|
type: type ? type.toLowerCase() : "all",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/matchQuery.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,MAAM,iBAAiB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["captures"]
|
|
6
6
|
}
|
|
@@ -26,8 +26,8 @@ __export(matchQuery_exports, {
|
|
|
26
26
|
parseQuery: () => parseQuery
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(matchQuery_exports);
|
|
29
|
-
var RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s
|
|
30
|
-
RE_MQ_EXPRESSION = /\(\s*([^\s
|
|
29
|
+
var RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i,
|
|
30
|
+
RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/,
|
|
31
31
|
RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
|
|
32
32
|
RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/,
|
|
33
33
|
RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
|
|
@@ -90,7 +90,7 @@ function parseQuery(mediaQuery) {
|
|
|
90
90
|
var modifier = captures[1],
|
|
91
91
|
type = captures[2],
|
|
92
92
|
expressionsCapture = captures[3] || "",
|
|
93
|
-
expressions = expressionsCapture.match(/\([
|
|
93
|
+
expressions = expressionsCapture.match(/\([^)]+\)/g) || [];
|
|
94
94
|
return {
|
|
95
95
|
inverse: !!modifier && modifier.toLowerCase() === "not",
|
|
96
96
|
type: type ? type.toLowerCase() : "all",
|
|
@@ -1 +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":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA,UAAA;EAAAC,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAQAC,MAAM,CAAAC,OAAA,GAAAV,YAAiB,CAAAK,kBAAA;AAMhB,IAAAM,cAAS,GAAW,
|
|
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":[]}
|
package/dist/esm/matchQuery.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s
|
|
1
|
+
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)?$/;
|
|
2
2
|
function matchQuery(mediaQuery, values) {
|
|
3
3
|
return parseQuery(mediaQuery).some((query) => {
|
|
4
4
|
if (!query) return;
|
|
@@ -53,7 +53,7 @@ function parseQuery(mediaQuery) {
|
|
|
53
53
|
query = query.trim();
|
|
54
54
|
const captures = query.match(RE_MEDIA_QUERY);
|
|
55
55
|
if (!captures) return null;
|
|
56
|
-
const modifier = captures[1], type = captures[2], expressions = (captures[3] || "").match(/\([
|
|
56
|
+
const modifier = captures[1], type = captures[2], expressions = (captures[3] || "").match(/\([^)]+\)/g) || [];
|
|
57
57
|
return {
|
|
58
58
|
inverse: !!modifier && modifier.toLowerCase() === "not",
|
|
59
59
|
type: type ? type.toLowerCase() : "all",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/matchQuery.ts"],
|
|
4
|
-
"mappings": "AAQA,MAAM,iBAAiB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["captures"]
|
|
6
6
|
}
|
package/dist/esm/matchQuery.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s
|
|
2
|
-
RE_MQ_EXPRESSION = /\(\s*([^\s
|
|
1
|
+
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i,
|
|
2
|
+
RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/,
|
|
3
3
|
RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
|
|
4
4
|
RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/,
|
|
5
5
|
RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
|
|
@@ -60,7 +60,7 @@ function parseQuery(mediaQuery) {
|
|
|
60
60
|
if (!captures) return null;
|
|
61
61
|
const modifier = captures[1],
|
|
62
62
|
type = captures[2],
|
|
63
|
-
expressions = (captures[3] || "").match(/\([
|
|
63
|
+
expressions = (captures[3] || "").match(/\([^)]+\)/g) || [];
|
|
64
64
|
return {
|
|
65
65
|
inverse: !!modifier && modifier.toLowerCase() === "not",
|
|
66
66
|
type: type ? type.toLowerCase() : "all",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RE_MEDIA_QUERY","RE_MQ_EXPRESSION","RE_MQ_FEATURE","RE_LENGTH_UNIT","RE_RESOLUTION_UNIT","matchQuery","mediaQuery","values","parseQuery","some","query","inverse","typeMatch","type","expressionsMatch","expressions","every","expression","feature","modifier","expValue","value","toLowerCase","toPx","toDpi","toDecimal","Number","parseInt","split","map","trim","captures","match","captures2","ratio","decimal","numbers","resolution","parseFloat","String","length"],"sources":["../../src/matchQuery.ts"],"sourcesContent":[null],"mappings":"AAQA,MAAMA,cAAA,GAAiB;EACjBC,gBAAA,GAAmB;EACnBC,aAAA,GAAgB;EAChBC,cAAA,GAAiB;EACjBC,kBAAA,GAAqB;AAEpB,SAASC,WAAWC,UAAA,EAAoBC,MAAA,EAAsC;EACnF,OAAOC,UAAA,CAAWF,UAAU,EAAEG,IAAA,CAAMC,KAAA,IAAU;IAC5C,IAAI,CAACA,KAAA,EAAO;IAEZ,MAAMC,OAAA,GAAUD,KAAA,CAAMC,OAAA;MAIhBC,SAAA,GAAYF,KAAA,CAAMG,IAAA,KAAS,SAASN,MAAA,CAAOM,IAAA,KAASH,KAAA,CAAMG,IAAA;IAGhE,IAAKD,SAAA,IAAaD,OAAA,IAAY,EAAEC,SAAA,IAAaD,OAAA,GAC3C,OAAO;IAGT,MAAMG,gBAAA,GAAmBJ,KAAA,CAAMK,WAAA,CAAYC,KAAA,CAAOC,UAAA,IAAe;MAC/D,MAAMC,OAAA,GAAUD,UAAA,CAAWC,OAAA;QACrBC,QAAA,GAAWF,UAAA,CAAWE,QAAA;MAC5B,IAAIC,QAAA,GAAWH,UAAA,CAAWI,KAAA;QACtBA,KAAA,GAAQd,MAAA,CAAOW,OAAO;MAG1B,IAAI,CAACG,KAAA,EACH,OAAO;MAGT,QAAQH,OAAA;QACN,KAAK;QACL,KAAK;UACH,OAAOG,KAAA,CAAMC,WAAA,CAAY,MAAMF,QAAA,CAASE,WAAA,CAAY;QAEtD,KAAK;QACL,KAAK;QACL,KAAK;QACL,KAAK;UACHF,QAAA,GAAWG,IAAA,CAAKH,QAAQ,GACxBC,KAAA,GAAQE,IAAA,CAAKF,KAAK;UAClB;QAEF,KAAK;UACHD,QAAA,GAAWI,KAAA,CAAMJ,QAAQ,GACzBC,KAAA,GAAQG,KAAA,CAAMH,KAAK;UACnB;QAEF,KAAK;QACL,KAAK;QACL;QAAsB;UACpBD,QAAA,GAAWK,SAAA,CAAUL,QAAQ,GAC7BC,KAAA,GAAQI,SAAA,CAAUJ,KAAK;UACvB;QAEF,KAAK;QACL,KAAK;QACL,KAAK;QACL,KAAK;UACHD,QAAA,GAAWM,MAAA,CAAOC,QAAA,CAASP,QAAA,EAAU,EAAE,KAAK,GAC5CC,KAAA,GAAQK,MAAA,CAAOC,QAAA,CAASN,KAAA,EAAO,EAAE,KAAK;UACtC;MACJ;MAEA,QAAQF,QAAA;QACN,KAAK;UACH,OAAOE,KAAA,IAASD,QAAA;QAClB,KAAK;UACH,OAAOC,KAAA,IAASD,QAAA;QAClB;UACE,OAAOC,KAAA,KAAUD,QAAA;MACrB;IACF,CAAC;IAED,OAAQN,gBAAA,IAAoB,CAACH,OAAA,IAAa,CAACG,gBAAA,IAAoBH,OAAA;EACjE,CAAC;AACH;AAEO,SAASH,WAAWF,UAAA,EAQf;EACV,OAAOA,UAAA,CAAWsB,KAAA,CAAM,GAAG,EAAEC,GAAA,CAAKnB,KAAA,IAAU;IAC1CA,KAAA,GAAQA,KAAA,CAAMoB,IAAA,CAAK;IAEnB,MAAMC,QAAA,GAAWrB,KAAA,CAAMsB,KAAA,CAAMhC,cAAc;IAE3C,IAAI,CAAC+B,QAAA,EAAU,OAAO;IAEtB,MAAMZ,QAAA,GAAWY,QAAA,CAAS,CAAC;MACrBlB,IAAA,GAAOkB,QAAA,CAAS,CAAC;MAGjBhB,WAAA,IAFqBgB,QAAA,CAAS,CAAC,KAAK,IAEHC,KAAA,CAAM,
|
|
1
|
+
{"version":3,"names":["RE_MEDIA_QUERY","RE_MQ_EXPRESSION","RE_MQ_FEATURE","RE_LENGTH_UNIT","RE_RESOLUTION_UNIT","matchQuery","mediaQuery","values","parseQuery","some","query","inverse","typeMatch","type","expressionsMatch","expressions","every","expression","feature","modifier","expValue","value","toLowerCase","toPx","toDpi","toDecimal","Number","parseInt","split","map","trim","captures","match","captures2","ratio","decimal","numbers","resolution","parseFloat","String","length"],"sources":["../../src/matchQuery.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
var RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s
|
|
2
|
-
RE_MQ_EXPRESSION = /\(\s*([^\s
|
|
1
|
+
var RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i,
|
|
2
|
+
RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/,
|
|
3
3
|
RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/,
|
|
4
4
|
RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/,
|
|
5
5
|
RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/;
|
|
@@ -62,7 +62,7 @@ function parseQuery(mediaQuery) {
|
|
|
62
62
|
var modifier = captures[1],
|
|
63
63
|
type = captures[2],
|
|
64
64
|
expressionsCapture = captures[3] || "",
|
|
65
|
-
expressions = expressionsCapture.match(/\([
|
|
65
|
+
expressions = expressionsCapture.match(/\([^)]+\)/g) || [];
|
|
66
66
|
return {
|
|
67
67
|
inverse: !!modifier && modifier.toLowerCase() === "not",
|
|
68
68
|
type: type ? type.toLowerCase() : "all",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RE_MEDIA_QUERY","RE_MQ_EXPRESSION","RE_MQ_FEATURE","RE_LENGTH_UNIT","RE_RESOLUTION_UNIT","matchQuery","mediaQuery","values","parseQuery","some","query","inverse","typeMatch","type","expressionsMatch","expressions","every","expression","feature","modifier","expValue","value","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":"AAQA,IAAAA,cAAM,
|
|
1
|
+
{"version":3,"names":["RE_MEDIA_QUERY","RE_MQ_EXPRESSION","RE_MQ_FEATURE","RE_LENGTH_UNIT","RE_RESOLUTION_UNIT","matchQuery","mediaQuery","values","parseQuery","some","query","inverse","typeMatch","type","expressionsMatch","expressions","every","expression","feature","modifier","expValue","value","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":[]}
|
package/package.json
CHANGED
|
@@ -1,42 +1,35 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/react-native-media-driver",
|
|
3
|
-
"version": "2.0.0-rc.0",
|
|
4
|
-
"type": "module",
|
|
5
|
-
"sideEffects": false,
|
|
6
|
-
"source": "src/index.ts",
|
|
7
|
-
"main": "dist/cjs",
|
|
8
|
-
"module": "dist/esm",
|
|
9
|
-
"types": "./types/index.d.ts",
|
|
3
|
+
"version": "2.0.0-rc.0-1769998500160",
|
|
10
4
|
"license": "MIT",
|
|
5
|
+
"source": "src/index.ts",
|
|
11
6
|
"files": [
|
|
12
7
|
"src",
|
|
13
8
|
"types",
|
|
14
9
|
"dist"
|
|
15
10
|
],
|
|
11
|
+
"type": "module",
|
|
12
|
+
"sideEffects": false,
|
|
13
|
+
"main": "dist/cjs",
|
|
14
|
+
"module": "dist/esm",
|
|
15
|
+
"types": "./types/index.d.ts",
|
|
16
16
|
"exports": {
|
|
17
17
|
"./package.json": "./package.json",
|
|
18
18
|
".": {
|
|
19
|
+
"types": "./types/index.d.ts",
|
|
19
20
|
"react-native": {
|
|
20
21
|
"module": "./dist/esm/index.native.js",
|
|
21
22
|
"import": "./dist/esm/index.native.js",
|
|
22
23
|
"require": "./dist/cjs/index.native.js"
|
|
23
24
|
},
|
|
24
|
-
"types": "./types/index.d.ts",
|
|
25
25
|
"module": "./dist/esm/index.mjs",
|
|
26
26
|
"import": "./dist/esm/index.mjs",
|
|
27
27
|
"require": "./dist/cjs/index.cjs",
|
|
28
28
|
"default": "./dist/cjs/index.native.js"
|
|
29
29
|
}
|
|
30
30
|
},
|
|
31
|
-
"
|
|
32
|
-
"
|
|
33
|
-
},
|
|
34
|
-
"devDependencies": {
|
|
35
|
-
"@tamagui/build": "2.0.0-rc.0",
|
|
36
|
-
"react-native": "0.81.5"
|
|
37
|
-
},
|
|
38
|
-
"peerDependencies": {
|
|
39
|
-
"react-native": "*"
|
|
31
|
+
"publishConfig": {
|
|
32
|
+
"access": "public"
|
|
40
33
|
},
|
|
41
34
|
"scripts": {
|
|
42
35
|
"build": "tamagui-build",
|
|
@@ -44,7 +37,14 @@
|
|
|
44
37
|
"clean": "tamagui-build clean",
|
|
45
38
|
"clean:build": "tamagui-build clean:build"
|
|
46
39
|
},
|
|
47
|
-
"
|
|
48
|
-
"
|
|
40
|
+
"dependencies": {
|
|
41
|
+
"@tamagui/web": "2.0.0-rc.0-1769998500160"
|
|
42
|
+
},
|
|
43
|
+
"devDependencies": {
|
|
44
|
+
"@tamagui/build": "2.0.0-rc.0-1769998500160",
|
|
45
|
+
"react-native": "0.81.5"
|
|
46
|
+
},
|
|
47
|
+
"peerDependencies": {
|
|
48
|
+
"react-native": "*"
|
|
49
49
|
}
|
|
50
|
-
}
|
|
50
|
+
}
|
package/src/matchQuery.ts
CHANGED
|
@@ -6,8 +6,8 @@ See the accompanying LICENSE file for terms.
|
|
|
6
6
|
|
|
7
7
|
// -----------------------------------------------------------------------------
|
|
8
8
|
|
|
9
|
-
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s
|
|
10
|
-
const RE_MQ_EXPRESSION = /\(\s*([^\s
|
|
9
|
+
const RE_MEDIA_QUERY = /(?:(only|not)?\s*([^\s()]+)(?:\s*and)?\s*)?(.+)?/i
|
|
10
|
+
const RE_MQ_EXPRESSION = /\(\s*([^\s:)]+)\s*(?::\s*([^\s)]+))?\s*\)/
|
|
11
11
|
const RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/
|
|
12
12
|
const RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/
|
|
13
13
|
const RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/
|
|
@@ -106,7 +106,7 @@ export function parseQuery(mediaQuery: string): ({
|
|
|
106
106
|
const type = captures[2]
|
|
107
107
|
const expressionsCapture = captures[3] || ''
|
|
108
108
|
// Split expressions into a list.
|
|
109
|
-
const expressions = expressionsCapture.match(/\([
|
|
109
|
+
const expressions = expressionsCapture.match(/\([^)]+\)/g) || []
|
|
110
110
|
|
|
111
111
|
return {
|
|
112
112
|
inverse: !!modifier && modifier.toLowerCase() === 'not',
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"src/matchQuery.ts"
|
|
6
6
|
],
|
|
7
7
|
"sourcesContent": [
|
|
8
|
-
"/*\nCopyright (c) 2014, Yahoo! Inc. All rights reserved.\nCopyrights licensed under the New BSD License.\nSee the accompanying LICENSE file for terms.\n*/\n\n// -----------------------------------------------------------------------------\n\nconst RE_MEDIA_QUERY = /(?:(only|not)?\\s*([^\\s
|
|
8
|
+
"/*\nCopyright (c) 2014, Yahoo! Inc. All rights reserved.\nCopyrights licensed under the New BSD License.\nSee the accompanying LICENSE file for terms.\n*/\n\n// -----------------------------------------------------------------------------\n\nconst RE_MEDIA_QUERY = /(?:(only|not)?\\s*([^\\s()]+)(?:\\s*and)?\\s*)?(.+)?/i\nconst RE_MQ_EXPRESSION = /\\(\\s*([^\\s:)]+)\\s*(?::\\s*([^\\s)]+))?\\s*\\)/\nconst RE_MQ_FEATURE = /^(?:(min|max)-)?(.+)/\nconst RE_LENGTH_UNIT = /(em|rem|px|cm|mm|in|pt|pc)?$/\nconst RE_RESOLUTION_UNIT = /(dpi|dpcm|dppx)?$/\n\nexport function matchQuery(mediaQuery: string, values: Record<string, any>): boolean {\n return parseQuery(mediaQuery).some((query) => {\n if (!query) return\n\n const inverse = query.inverse\n\n // Either the parsed or specified `type` is \"all\", or the types must be\n // equal for a match.\n const typeMatch = query.type === 'all' || values.type === query.type\n\n // Quit early when `type` doesn't match, but take \"not\" into account.\n if ((typeMatch && inverse) || !(typeMatch || inverse)) {\n return false\n }\n\n const expressionsMatch = query.expressions.every((expression) => {\n const feature = expression.feature\n const modifier = expression.modifier\n let expValue = expression.value\n let value = values[feature]\n\n // Missing or falsy values don't match.\n if (!value) {\n return false\n }\n\n switch (feature) {\n case 'orientation':\n case 'scan':\n return value.toLowerCase() === expValue.toLowerCase()\n\n case 'width':\n case 'height':\n case 'device-width':\n case 'device-height':\n expValue = toPx(expValue)\n value = toPx(value)\n break\n\n case 'resolution':\n expValue = toDpi(expValue)\n value = toDpi(value)\n break\n\n case 'aspect-ratio':\n case 'device-aspect-ratio':\n case /* Deprecated */ 'device-pixel-ratio':\n expValue = toDecimal(expValue)\n value = toDecimal(value)\n break\n\n case 'grid':\n case 'color':\n case 'color-index':\n case 'monochrome':\n expValue = Number.parseInt(expValue, 10) || 1\n value = Number.parseInt(value, 10) || 0\n break\n }\n\n switch (modifier) {\n case 'min':\n return value >= expValue\n case 'max':\n return value <= expValue\n default:\n return value === expValue\n }\n })\n\n return (expressionsMatch && !inverse) || (!expressionsMatch && inverse)\n })\n}\n\nexport function parseQuery(mediaQuery: string): ({\n inverse: boolean\n type: string\n expressions: {\n modifier: any\n feature: any\n value: any\n }[]\n} | null)[] {\n return mediaQuery.split(',').map((query) => {\n query = query.trim()\n\n const captures = query.match(RE_MEDIA_QUERY)\n\n if (!captures) return null\n\n const modifier = captures[1]\n const type = captures[2]\n const expressionsCapture = captures[3] || ''\n // Split expressions into a list.\n const expressions = expressionsCapture.match(/\\([^)]+\\)/g) || []\n\n return {\n inverse: !!modifier && modifier.toLowerCase() === 'not',\n type: type ? type.toLowerCase() : 'all',\n expressions: expressions.map((expression) => {\n const captures = expression.match(RE_MQ_EXPRESSION)\n const feature = captures[1].toLowerCase().match(RE_MQ_FEATURE)\n return {\n modifier: feature[1],\n feature: feature[2],\n value: captures[2],\n }\n }),\n }\n })\n}\n\n// -- Utilities ----------------------------------------------------------------\n\nfunction toDecimal(ratio) {\n let decimal = Number(ratio)\n let numbers\n\n if (!decimal) {\n numbers = ratio.match(/^(\\d+)\\s*\\/\\s*(\\d+)$/)\n decimal = numbers[1] / numbers[2]\n }\n\n return decimal\n}\n\nfunction toDpi(resolution: string) {\n const value = Number.parseFloat(resolution)\n const units = String(resolution).match(RE_RESOLUTION_UNIT)?.[1]\n\n switch (units) {\n case 'dpcm':\n return value / 2.54\n case 'dppx':\n return value * 96\n default:\n return value\n }\n}\n\nfunction toPx(length: string) {\n const value = Number.parseFloat(length)\n const units = String(length).match(RE_LENGTH_UNIT)?.[1]\n switch (units) {\n case 'em':\n return value * 16\n case 'rem':\n return value * 16\n case 'cm':\n return (value * 96) / 2.54\n case 'mm':\n return (value * 96) / 2.54 / 10\n case 'in':\n return value * 96\n case 'pt':\n return value * 72\n case 'pc':\n return (value * 72) / 12\n default:\n return value\n }\n}\n"
|
|
9
9
|
],
|
|
10
10
|
"version": 3
|
|
11
11
|
}
|