@tamagui/create-theme 1.84.2 → 1.85.0
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/combineMasks.js +3 -3
- package/dist/cjs/combineMasks.js.map +1 -1
- package/dist/cjs/combineMasks.native.js +3 -3
- package/dist/cjs/combineMasks.native.js.map +1 -1
- package/dist/cjs/masks.js +2 -1
- package/dist/cjs/masks.js.map +1 -1
- package/dist/cjs/masks.native.js +2 -1
- package/dist/cjs/masks.native.js.map +1 -1
- package/dist/esm/combineMasks.js +3 -3
- package/dist/esm/combineMasks.js.map +1 -1
- package/dist/esm/combineMasks.native.js +3 -3
- package/dist/esm/combineMasks.native.js.map +1 -1
- package/dist/esm/masks.js +2 -1
- package/dist/esm/masks.js.map +1 -1
- package/dist/esm/masks.native.js +2 -1
- package/dist/esm/masks.native.js.map +1 -1
- package/package.json +3 -3
- package/src/combineMasks.tsx +9 -12
- package/src/createTheme.tsx +3 -3
- package/src/masks.tsx +2 -1
- package/types/combineMasks.d.ts.map +1 -1
- package/types/masks.d.ts.map +1 -1
package/dist/cjs/combineMasks.js
CHANGED
|
@@ -24,13 +24,13 @@ const combineMasks = (...masks) => ({
|
|
|
24
24
|
let current = (0, import_themeInfo.getThemeInfo)(template, opts.parentName), theme;
|
|
25
25
|
for (const mask2 of masks) {
|
|
26
26
|
if (!current)
|
|
27
|
-
throw
|
|
28
|
-
`
|
|
27
|
+
throw new Error(
|
|
28
|
+
`Nothing returned from mask: ${current}, for template: ${template} and mask: ${mask2.toString()}, given opts ${JSON.stringify(
|
|
29
29
|
opts,
|
|
30
30
|
null,
|
|
31
31
|
2
|
|
32
32
|
)}`
|
|
33
|
-
)
|
|
33
|
+
);
|
|
34
34
|
const next = (0, import_applyMask.applyMaskStateless)(current, mask2, opts);
|
|
35
35
|
current = next, theme = next.theme;
|
|
36
36
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/combineMasks.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAmC,wBAEnC,mBAA6B;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,cAAU,+BAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAmC,wBAEnC,mBAA6B;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,cAAU,+BAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,cAAM,IAAI;AAAA,UACR,+BAA+B,OAAO,mBAAmB,QAAQ,cAAcA,MAAK,SAAS,CAAC,gBAAgB,KAAK;AAAA,YACjH;AAAA,YACA;AAAA,YACA;AAAA,UACF,CAAC;AAAA,QACH;AAEF,YAAM,WAAO,qCAAmB,SAASA,OAAM,IAAI;AACnD,gBAAU,MACV,QAAQ,KAAK;AAAA,IACf;AACA,WAAO;AAAA,EACT;AACF;",
|
|
5
5
|
"names": ["mask"]
|
|
6
6
|
}
|
|
@@ -25,13 +25,13 @@ const combineMasks = (...masks) => ({
|
|
|
25
25
|
let current = (0, import_themeInfo.getThemeInfo)(template, opts.parentName), theme;
|
|
26
26
|
for (const mask2 of masks) {
|
|
27
27
|
if (!current)
|
|
28
|
-
throw
|
|
29
|
-
`
|
|
28
|
+
throw new Error(
|
|
29
|
+
`Nothing returned from mask: ${current}, for template: ${template} and mask: ${mask2.toString()}, given opts ${JSON.stringify(
|
|
30
30
|
opts,
|
|
31
31
|
null,
|
|
32
32
|
2
|
|
33
33
|
)}`
|
|
34
|
-
)
|
|
34
|
+
);
|
|
35
35
|
const next = (0, import_applyMask.applyMaskStateless)(current, mask2, opts);
|
|
36
36
|
current = next, theme = next.theme;
|
|
37
37
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/combineMasks.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAmC,wBAEnC,mBAA6B;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,cAAU,+BAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAmC,wBAEnC,mBAA6B;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,cAAU,+BAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,cAAM,IAAI;AAAA,UACR,+BAA+B,OAAO,mBAAmB,QAAQ,cAAcA,MAAK,SAAS,CAAC,gBAAgB,KAAK;AAAA,YACjH;AAAA,YACA;AAAA,YACA;AAAA,UACF,CAAC;AAAA,QACH;AAEF,YAAM,WAAO,qCAAmB,SAASA,OAAM,IAAI;AACnD,gBAAU,MACV,QAAQ,KAAK;AAAA,IACf;AACA,WAAO;AAAA,EACT;AACF;",
|
|
5
5
|
"names": ["mask"]
|
|
6
6
|
}
|
package/dist/cjs/masks.js
CHANGED
|
@@ -80,7 +80,8 @@ const createIdentityMask = () => ({
|
|
|
80
80
|
const overrideVal = override[key];
|
|
81
81
|
out[key] = overrideStrategy === "shift" ? value + overrideVal : overrideVal;
|
|
82
82
|
continue;
|
|
83
|
-
}
|
|
83
|
+
}
|
|
84
|
+
if (typeof (override == null ? void 0 : override[key]) == "string") {
|
|
84
85
|
out[key] = override[key];
|
|
85
86
|
continue;
|
|
86
87
|
}
|
package/dist/cjs/masks.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/masks.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAAiD,sBACjD,qBAA4B;AAErB,MAAM,aAAa,CACxBA,gBAEA,OAAOA,eAAe,aAClB,EAAE,MAAMA,YAAW,QAAQ,WAAW,MAAMA,YAAW,IACvDA,aAEO,WAAuB;AAAA,EAClC,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,EAAE,KAAK,IAAI;AAOjB,WANe,OAAO;AAAA,MACpB,OAAO,QAAQ,QAAQ,EACpB,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,EACrC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,eAAe,GAAG,GAAG,IAAI,CAAC,CAAC;AAAA,IACpD;AAAA,EAGF;AACF;AAEA,SAAS,eAAe,KAAa,OAAwB,MAAmB;AAzBhF;AA0BE,MAAI,UACA,WAAW,KAAK;AAEpB,QAAM,gBAAe,UAAK,iBAAL,mBAAoB;AACzC,MAAI,OAAO,eAAiB;AAC1B,eAAW,cACX,WAAW;AAAA,OACN;AACL,UAAM,iBAAgB,UAAK,kBAAL,mBAAqB;AAC3C,QAAI,OAAO,gBAAkB;AAC3B,iBAAW,eACX,WAAW;AAAA,SACN;AACL,YAAM,mBAAkB,UAAK,aAAL,mBAAgB;AACxC,MAAI,OAAO,kBAAoB,QAC7B,WAAW,iBACX,WAAW,KAAK;AAAA,IAEpB;AAAA,EACF;AAGA,SADI,OAAO,WAAa,OACpB,OAAO,YAAa,WAAiB,QAErC,aAAa,SACR,WAGF;AACT;AAEO,MAAM,qBAAqB,OAAmB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS,SAAS,KAAK,UAAU,IAAI;AACxD,IAEa,oBAAoB,OACN;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,eAAW;AAAA,UACf,8BAAc,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAAA,IACjD;AACA,WAAO,SAAS,KAAK,UAAU,IAAI;AAAA,EACrC;AACF,IAMW,kBAAkB,CAC7B,EAAE,QAAQ,IAAsB,CAAC,GACjC,oBAEyB;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM;AAAA,MACJ;AAAA,MACA,mBAAmB;AAAA,MACnB,KAAK;AAAA,MACL;AAAA,MACA,MAAM;AAAA,MACN,WAAW;AAAA,IACb,IAAI,EAAE,GAAG,gBAAgB,GAAG,KAAK,GAC3B,SAAS,OAAO,QAAQ,QAAQ,GAChC,MAAM,UAAU,UAAU,OAAO,OAAO,OAAO,EAAE,SAAS,IAAI,QAC9D,MAAM,CAAC;AACb,eAAW,CAAC,KAAK,KAAK,KAAK,QAAQ;AACjC,UAAI,OAAO,SAAU;AAAU;AAC/B,UAAI,QAAO,qCAAW,SAAS,UAAU;AACvC,cAAM,cAAc,SAAS,GAAG;AAChC,YAAI,GAAG,IAAI,qBAAqB,UAAU,QAAQ,cAAc;AAChE;AAAA,MACF,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["createMask"]
|
|
6
6
|
}
|
package/dist/cjs/masks.native.js
CHANGED
|
@@ -81,7 +81,8 @@ const createIdentityMask = () => ({
|
|
|
81
81
|
const overrideVal = override[key];
|
|
82
82
|
out[key] = overrideStrategy === "shift" ? value + overrideVal : overrideVal;
|
|
83
83
|
continue;
|
|
84
|
-
}
|
|
84
|
+
}
|
|
85
|
+
if (typeof (override == null ? void 0 : override[key]) == "string") {
|
|
85
86
|
out[key] = override[key];
|
|
86
87
|
continue;
|
|
87
88
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/masks.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAAiD,sBACjD,qBAA4B;AAErB,MAAM,aAAa,CACxBA,gBAEA,OAAOA,eAAe,aAClB,EAAE,MAAMA,YAAW,QAAQ,WAAW,MAAMA,YAAW,IACvDA,aAEO,WAAuB;AAAA,EAClC,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,EAAE,KAAK,IAAI;AAOjB,WANe,OAAO;AAAA,MACpB,OAAO,QAAQ,QAAQ,EACpB,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,EACrC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,eAAe,GAAG,GAAG,IAAI,CAAC,CAAC;AAAA,IACpD;AAAA,EAGF;AACF;AAEA,SAAS,eAAe,KAAa,OAAwB,MAAmB;AAzBhF;AA0BE,MAAI,UACA,WAAW,KAAK;AAEpB,QAAM,gBAAe,UAAK,iBAAL,mBAAoB;AACzC,MAAI,OAAO,eAAiB;AAC1B,eAAW,cACX,WAAW;AAAA,OACN;AACL,UAAM,iBAAgB,UAAK,kBAAL,mBAAqB;AAC3C,QAAI,OAAO,gBAAkB;AAC3B,iBAAW,eACX,WAAW;AAAA,SACN;AACL,YAAM,mBAAkB,UAAK,aAAL,mBAAgB;AACxC,MAAI,OAAO,kBAAoB,QAC7B,WAAW,iBACX,WAAW,KAAK;AAAA,IAEpB;AAAA,EACF;AAGA,SADI,OAAO,WAAa,OACpB,OAAO,YAAa,WAAiB,QAErC,aAAa,SACR,WAGF;AACT;AAEO,MAAM,qBAAqB,OAAmB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS,SAAS,KAAK,UAAU,IAAI;AACxD,IAEa,oBAAoB,OACN;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,eAAW;AAAA,UACf,8BAAc,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAAA,IACjD;AACA,WAAO,SAAS,KAAK,UAAU,IAAI;AAAA,EACrC;AACF,IAMW,kBAAkB,CAC7B,EAAE,QAAQ,IAAsB,CAAC,GACjC,oBAEyB;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM;AAAA,MACJ;AAAA,MACA,mBAAmB;AAAA,MACnB,KAAK;AAAA,MACL;AAAA,MACA,MAAM;AAAA,MACN,WAAW;AAAA,IACb,IAAI,EAAE,GAAG,gBAAgB,GAAG,KAAK,GAC3B,SAAS,OAAO,QAAQ,QAAQ,GAChC,MAAM,UAAU,UAAU,OAAO,OAAO,OAAO,EAAE,SAAS,IAAI,QAC9D,MAAM,CAAC;AACb,eAAW,CAAC,KAAK,KAAK,KAAK,QAAQ;AACjC,UAAI,OAAO,SAAU;AAAU;AAC/B,UAAI,QAAO,qCAAW,SAAS,UAAU;AACvC,cAAM,cAAc,SAAS,GAAG;AAChC,YAAI,GAAG,IAAI,qBAAqB,UAAU,QAAQ,cAAc;AAChE;AAAA,MACF,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["createMask"]
|
|
6
6
|
}
|
package/dist/esm/combineMasks.js
CHANGED
|
@@ -6,13 +6,13 @@ const combineMasks = (...masks) => ({
|
|
|
6
6
|
let current = getThemeInfo(template, opts.parentName), theme;
|
|
7
7
|
for (const mask2 of masks) {
|
|
8
8
|
if (!current)
|
|
9
|
-
throw
|
|
10
|
-
`
|
|
9
|
+
throw new Error(
|
|
10
|
+
`Nothing returned from mask: ${current}, for template: ${template} and mask: ${mask2.toString()}, given opts ${JSON.stringify(
|
|
11
11
|
opts,
|
|
12
12
|
null,
|
|
13
13
|
2
|
|
14
14
|
)}`
|
|
15
|
-
)
|
|
15
|
+
);
|
|
16
16
|
const next = applyMaskStateless(current, mask2, opts);
|
|
17
17
|
current = next, theme = next.theme;
|
|
18
18
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/combineMasks.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,0BAA0B;AAEnC,SAAS,oBAAoB;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,UAAU,aAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,
|
|
4
|
+
"mappings": "AAAA,SAAS,0BAA0B;AAEnC,SAAS,oBAAoB;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,UAAU,aAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,cAAM,IAAI;AAAA,UACR,+BAA+B,OAAO,mBAAmB,QAAQ,cAAcA,MAAK,SAAS,CAAC,gBAAgB,KAAK;AAAA,YACjH;AAAA,YACA;AAAA,YACA;AAAA,UACF,CAAC;AAAA,QACH;AAEF,YAAM,OAAO,mBAAmB,SAASA,OAAM,IAAI;AACnD,gBAAU,MACV,QAAQ,KAAK;AAAA,IACf;AACA,WAAO;AAAA,EACT;AACF;",
|
|
5
5
|
"names": ["mask"]
|
|
6
6
|
}
|
|
@@ -6,13 +6,13 @@ const combineMasks = (...masks) => ({
|
|
|
6
6
|
let current = getThemeInfo(template, opts.parentName), theme;
|
|
7
7
|
for (const mask2 of masks) {
|
|
8
8
|
if (!current)
|
|
9
|
-
throw
|
|
10
|
-
`
|
|
9
|
+
throw new Error(
|
|
10
|
+
`Nothing returned from mask: ${current}, for template: ${template} and mask: ${mask2.toString()}, given opts ${JSON.stringify(
|
|
11
11
|
opts,
|
|
12
12
|
null,
|
|
13
13
|
2
|
|
14
14
|
)}`
|
|
15
|
-
)
|
|
15
|
+
);
|
|
16
16
|
const next = applyMaskStateless(current, mask2, opts);
|
|
17
17
|
current = next, theme = next.theme;
|
|
18
18
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/combineMasks.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,0BAA0B;AAEnC,SAAS,oBAAoB;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,UAAU,aAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,
|
|
4
|
+
"mappings": "AAAA,SAAS,0BAA0B;AAEnC,SAAS,oBAAoB;AAEtB,MAAM,eAAe,IAAI,WACL;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,QAAI,UAAU,aAAa,UAAU,KAAK,UAAU,GAChD;AACJ,eAAWA,SAAQ,OAAO;AACxB,UAAI,CAAC;AACH,cAAM,IAAI;AAAA,UACR,+BAA+B,OAAO,mBAAmB,QAAQ,cAAcA,MAAK,SAAS,CAAC,gBAAgB,KAAK;AAAA,YACjH;AAAA,YACA;AAAA,YACA;AAAA,UACF,CAAC;AAAA,QACH;AAEF,YAAM,OAAO,mBAAmB,SAASA,OAAM,IAAI;AACnD,gBAAU,MACV,QAAQ,KAAK;AAAA,IACf;AACA,WAAO;AAAA,EACT;AACF;",
|
|
5
5
|
"names": ["mask"]
|
|
6
6
|
}
|
package/dist/esm/masks.js
CHANGED
|
@@ -54,7 +54,8 @@ const createIdentityMask = () => ({
|
|
|
54
54
|
const overrideVal = override[key];
|
|
55
55
|
out[key] = overrideStrategy === "shift" ? value + overrideVal : overrideVal;
|
|
56
56
|
continue;
|
|
57
|
-
}
|
|
57
|
+
}
|
|
58
|
+
if (typeof override?.[key] == "string") {
|
|
58
59
|
out[key] = override[key];
|
|
59
60
|
continue;
|
|
60
61
|
}
|
package/dist/esm/masks.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/masks.tsx"],
|
|
4
|
-
"mappings": "AACA,SAAS,eAAe,yBAAyB;AACjD,SAAS,mBAAmB;AAErB,MAAM,aAAa,CACxBA,gBAEA,OAAOA,eAAe,aAClB,EAAE,MAAMA,YAAW,QAAQ,WAAW,MAAMA,YAAW,IACvDA,aAEO,WAAuB;AAAA,EAClC,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,EAAE,KAAK,IAAI;AAOjB,WANe,OAAO;AAAA,MACpB,OAAO,QAAQ,QAAQ,EACpB,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,EACrC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,eAAe,GAAG,GAAG,IAAI,CAAC,CAAC;AAAA,IACpD;AAAA,EAGF;AACF;AAEA,SAAS,eAAe,KAAa,OAAwB,MAAmB;AAC9E,MAAI,UACA,WAAW,KAAK;AAEpB,QAAM,eAAe,KAAK,eAAe,GAAG;AAC5C,MAAI,OAAO,eAAiB;AAC1B,eAAW,cACX,WAAW;AAAA,OACN;AACL,UAAM,gBAAgB,KAAK,gBAAgB,GAAG;AAC9C,QAAI,OAAO,gBAAkB;AAC3B,iBAAW,eACX,WAAW;AAAA,SACN;AACL,YAAM,kBAAkB,KAAK,WAAW,GAAG;AAC3C,MAAI,OAAO,kBAAoB,QAC7B,WAAW,iBACX,WAAW,KAAK;AAAA,IAEpB;AAAA,EACF;AAGA,SADI,OAAO,WAAa,OACpB,OAAO,YAAa,WAAiB,QAErC,aAAa,SACR,WAGF;AACT;AAEO,MAAM,qBAAqB,OAAmB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS,SAAS,KAAK,UAAU,IAAI;AACxD,IAEa,oBAAoB,OACN;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,WAAW;AAAA,MACf,cAAc,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAAA,IACjD;AACA,WAAO,SAAS,KAAK,UAAU,IAAI;AAAA,EACrC;AACF,IAMW,kBAAkB,CAC7B,EAAE,QAAQ,IAAsB,CAAC,GACjC,oBAEyB;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM;AAAA,MACJ;AAAA,MACA,mBAAmB;AAAA,MACnB,KAAK;AAAA,MACL;AAAA,MACA,MAAM;AAAA,MACN,WAAW;AAAA,IACb,IAAI,EAAE,GAAG,gBAAgB,GAAG,KAAK,GAC3B,SAAS,OAAO,QAAQ,QAAQ,GAChC,MAAM,UAAU,UAAU,OAAO,OAAO,OAAO,EAAE,SAAS,IAAI,QAC9D,MAAM,CAAC;AACb,eAAW,CAAC,KAAK,KAAK,KAAK,QAAQ;AACjC,UAAI,OAAO,SAAU;AAAU;AAC/B,UAAI,OAAO,WAAW,GAAG,KAAM,UAAU;AACvC,cAAM,cAAc,SAAS,GAAG;AAChC,YAAI,GAAG,IAAI,qBAAqB,UAAU,QAAQ,cAAc;AAChE;AAAA,MACF,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["createMask"]
|
|
6
6
|
}
|
package/dist/esm/masks.native.js
CHANGED
|
@@ -54,7 +54,8 @@ const createIdentityMask = () => ({
|
|
|
54
54
|
const overrideVal = override[key];
|
|
55
55
|
out[key] = overrideStrategy === "shift" ? value + overrideVal : overrideVal;
|
|
56
56
|
continue;
|
|
57
|
-
}
|
|
57
|
+
}
|
|
58
|
+
if (typeof override?.[key] == "string") {
|
|
58
59
|
out[key] = override[key];
|
|
59
60
|
continue;
|
|
60
61
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/masks.tsx"],
|
|
4
|
-
"mappings": "AACA,SAAS,eAAe,yBAAyB;AACjD,SAAS,mBAAmB;AAErB,MAAM,aAAa,CACxBA,gBAEA,OAAOA,eAAe,aAClB,EAAE,MAAMA,YAAW,QAAQ,WAAW,MAAMA,YAAW,IACvDA,aAEO,WAAuB;AAAA,EAClC,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,EAAE,KAAK,IAAI;AAOjB,WANe,OAAO;AAAA,MACpB,OAAO,QAAQ,QAAQ,EACpB,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,EACrC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,eAAe,GAAG,GAAG,IAAI,CAAC,CAAC;AAAA,IACpD;AAAA,EAGF;AACF;AAEA,SAAS,eAAe,KAAa,OAAwB,MAAmB;AAC9E,MAAI,UACA,WAAW,KAAK;AAEpB,QAAM,eAAe,KAAK,eAAe,GAAG;AAC5C,MAAI,OAAO,eAAiB;AAC1B,eAAW,cACX,WAAW;AAAA,OACN;AACL,UAAM,gBAAgB,KAAK,gBAAgB,GAAG;AAC9C,QAAI,OAAO,gBAAkB;AAC3B,iBAAW,eACX,WAAW;AAAA,SACN;AACL,YAAM,kBAAkB,KAAK,WAAW,GAAG;AAC3C,MAAI,OAAO,kBAAoB,QAC7B,WAAW,iBACX,WAAW,KAAK;AAAA,IAEpB;AAAA,EACF;AAGA,SADI,OAAO,WAAa,OACpB,OAAO,YAAa,WAAiB,QAErC,aAAa,SACR,WAGF;AACT;AAEO,MAAM,qBAAqB,OAAmB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS,SAAS,KAAK,UAAU,IAAI;AACxD,IAEa,oBAAoB,OACN;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,WAAW;AAAA,MACf,cAAc,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAAA,IACjD;AACA,WAAO,SAAS,KAAK,UAAU,IAAI;AAAA,EACrC;AACF,IAMW,kBAAkB,CAC7B,EAAE,QAAQ,IAAsB,CAAC,GACjC,oBAEyB;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM;AAAA,MACJ;AAAA,MACA,mBAAmB;AAAA,MACnB,KAAK;AAAA,MACL;AAAA,MACA,MAAM;AAAA,MACN,WAAW;AAAA,IACb,IAAI,EAAE,GAAG,gBAAgB,GAAG,KAAK,GAC3B,SAAS,OAAO,QAAQ,QAAQ,GAChC,MAAM,UAAU,UAAU,OAAO,OAAO,OAAO,EAAE,SAAS,IAAI,QAC9D,MAAM,CAAC;AACb,eAAW,CAAC,KAAK,KAAK,KAAK,QAAQ;AACjC,UAAI,OAAO,SAAU;AAAU;AAC/B,UAAI,OAAO,WAAW,GAAG,KAAM,UAAU;AACvC,cAAM,cAAc,SAAS,GAAG;AAChC,YAAI,GAAG,IAAI,qBAAqB,UAAU,QAAQ,cAAc;AAChE;AAAA,MACF,
|
|
4
|
+
"mappings": "AACA,SAAS,eAAe,yBAAyB;AACjD,SAAS,mBAAmB;AAErB,MAAM,aAAa,CACxBA,gBAEA,OAAOA,eAAe,aAClB,EAAE,MAAMA,YAAW,QAAQ,WAAW,MAAMA,YAAW,IACvDA,aAEO,WAAuB;AAAA,EAClC,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,EAAE,KAAK,IAAI;AAOjB,WANe,OAAO;AAAA,MACpB,OAAO,QAAQ,QAAQ,EACpB,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,EACrC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,eAAe,GAAG,GAAG,IAAI,CAAC,CAAC;AAAA,IACpD;AAAA,EAGF;AACF;AAEA,SAAS,eAAe,KAAa,OAAwB,MAAmB;AAC9E,MAAI,UACA,WAAW,KAAK;AAEpB,QAAM,eAAe,KAAK,eAAe,GAAG;AAC5C,MAAI,OAAO,eAAiB;AAC1B,eAAW,cACX,WAAW;AAAA,OACN;AACL,UAAM,gBAAgB,KAAK,gBAAgB,GAAG;AAC9C,QAAI,OAAO,gBAAkB;AAC3B,iBAAW,eACX,WAAW;AAAA,SACN;AACL,YAAM,kBAAkB,KAAK,WAAW,GAAG;AAC3C,MAAI,OAAO,kBAAoB,QAC7B,WAAW,iBACX,WAAW,KAAK;AAAA,IAEpB;AAAA,EACF;AAGA,SADI,OAAO,WAAa,OACpB,OAAO,YAAa,WAAiB,QAErC,aAAa,SACR,WAGF;AACT;AAEO,MAAM,qBAAqB,OAAmB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS,SAAS,KAAK,UAAU,IAAI;AACxD,IAEa,oBAAoB,OACN;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM,WAAW;AAAA,MACf,cAAc,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAAA,IACjD;AACA,WAAO,SAAS,KAAK,UAAU,IAAI;AAAA,EACrC;AACF,IAMW,kBAAkB,CAC7B,EAAE,QAAQ,IAAsB,CAAC,GACjC,oBAEyB;AAAA,EACvB,MAAM;AAAA,EACN,MAAM,CAAC,UAAU,SAAS;AACxB,UAAM;AAAA,MACJ;AAAA,MACA,mBAAmB;AAAA,MACnB,KAAK;AAAA,MACL;AAAA,MACA,MAAM;AAAA,MACN,WAAW;AAAA,IACb,IAAI,EAAE,GAAG,gBAAgB,GAAG,KAAK,GAC3B,SAAS,OAAO,QAAQ,QAAQ,GAChC,MAAM,UAAU,UAAU,OAAO,OAAO,OAAO,EAAE,SAAS,IAAI,QAC9D,MAAM,CAAC;AACb,eAAW,CAAC,KAAK,KAAK,KAAK,QAAQ;AACjC,UAAI,OAAO,SAAU;AAAU;AAC/B,UAAI,OAAO,WAAW,GAAG,KAAM,UAAU;AACvC,cAAM,cAAc,SAAS,GAAG;AAChC,YAAI,GAAG,IAAI,qBAAqB,UAAU,QAAQ,cAAc;AAChE;AAAA,MACF;AACA,UAAI,OAAO,WAAW,GAAG,KAAM,UAAU;AACvC,YAAI,GAAG,IAAI,SAAS,GAAG;AACvB;AAAA,MACF;AACA,YAAM,aAAa,UAAU,IAAI,CAAC,YAAY,KAAK,IAAI,SAAS,GAC1D,YAAY,aAAa,IAAI,IAC7B,SAAS,UAAU,KAAK,GACxB,OAAO,QAAQ,WAAW,YAAY,QACtC,UAAU,aACZ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,IAAI,CAAC,IACjC,KAAK,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC;AAEvC,UAAI,GAAG,IAAI;AAAA,IACb;AAGA,WADgB,SAAS,KAAK,KAAK,IAAI;AAAA,EAEzC;AACF,IAIW,mBAAmB,CAAC,oBAA8C;AAAA,EAC7E,MAAM;AAAA,EACN,MAAM,gBAAgB,CAAC,GAAG,cAAc,EAAE;AAC5C,IAEa,mBAAmB,kBAEnB,uBAAuB,CAAC,oBAA8C;AAAA,EACjF,MAAM;AAAA,EACN,MAAM,gBAAgB,EAAE,SAAS,GAAK,GAAG,cAAc,EAAE;AAC3D;",
|
|
5
5
|
"names": ["createMask"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/create-theme",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.85.0",
|
|
4
4
|
"types": "./types/index.d.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -29,10 +29,10 @@
|
|
|
29
29
|
}
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@tamagui/web": "1.
|
|
32
|
+
"@tamagui/web": "1.85.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@tamagui/build": "1.
|
|
35
|
+
"@tamagui/build": "1.85.0"
|
|
36
36
|
},
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
package/src/combineMasks.tsx
CHANGED
|
@@ -9,18 +9,15 @@ export const combineMasks = (...masks: CreateMask[]) => {
|
|
|
9
9
|
let current = getThemeInfo(template, opts.parentName)
|
|
10
10
|
let theme: any
|
|
11
11
|
for (const mask of masks) {
|
|
12
|
-
if (!current)
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
} else {
|
|
22
|
-
throw `❌`
|
|
23
|
-
}
|
|
12
|
+
if (!current) {
|
|
13
|
+
throw new Error(
|
|
14
|
+
`Nothing returned from mask: ${current}, for template: ${template} and mask: ${mask.toString()}, given opts ${JSON.stringify(
|
|
15
|
+
opts,
|
|
16
|
+
null,
|
|
17
|
+
2
|
|
18
|
+
)}`
|
|
19
|
+
)
|
|
20
|
+
}
|
|
24
21
|
const next = applyMaskStateless(current, mask, opts)
|
|
25
22
|
current = next
|
|
26
23
|
theme = next.theme
|
package/src/createTheme.tsx
CHANGED
|
@@ -11,7 +11,7 @@ const identityCache = new Map()
|
|
|
11
11
|
|
|
12
12
|
export function createThemeWithPalettes<
|
|
13
13
|
Definition extends ThemeMask,
|
|
14
|
-
Extras extends GenericTheme = {}
|
|
14
|
+
Extras extends GenericTheme = {},
|
|
15
15
|
>(
|
|
16
16
|
palettes: Record<string, CreateThemePalette>,
|
|
17
17
|
defaultPalette: string,
|
|
@@ -48,7 +48,7 @@ export function createThemeWithPalettes<
|
|
|
48
48
|
|
|
49
49
|
export function createTheme<
|
|
50
50
|
Definition extends ThemeMask,
|
|
51
|
-
Extras extends GenericTheme = {}
|
|
51
|
+
Extras extends GenericTheme = {},
|
|
52
52
|
>(
|
|
53
53
|
palette: CreateThemePalette,
|
|
54
54
|
definition: Definition,
|
|
@@ -108,7 +108,7 @@ type ChildGetter<Name extends string | number | symbol, Theme extends GenericThe
|
|
|
108
108
|
|
|
109
109
|
export function addChildren<
|
|
110
110
|
Themes extends { [key: string]: GenericTheme },
|
|
111
|
-
GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]
|
|
111
|
+
GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>,
|
|
112
112
|
>(
|
|
113
113
|
themes: Themes,
|
|
114
114
|
getChildren: GetChildren
|
package/src/masks.tsx
CHANGED
|
@@ -99,7 +99,8 @@ export const createShiftMask = (
|
|
|
99
99
|
const overrideVal = override[key] as number
|
|
100
100
|
out[key] = overrideStrategy === 'shift' ? value + overrideVal : overrideVal
|
|
101
101
|
continue
|
|
102
|
-
}
|
|
102
|
+
}
|
|
103
|
+
if (typeof override?.[key] === 'string') {
|
|
103
104
|
out[key] = override[key]
|
|
104
105
|
continue
|
|
105
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combineMasks.d.ts","sourceRoot":"","sources":["../src/combineMasks.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAG/C,eAAO,MAAM,YAAY,aAAc,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"combineMasks.d.ts","sourceRoot":"","sources":["../src/combineMasks.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAG/C,eAAO,MAAM,YAAY,aAAc,UAAU,EAAE,eAwBlD,CAAA"}
|
package/types/masks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masks.d.ts","sourceRoot":"","sources":["../src/masks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAI1E,eAAO,MAAM,UAAU,0DAEpB,UAGa,CAAA;AAEhB,eAAO,MAAM,QAAQ,EAAE,UAYtB,CAAA;AAkCD,eAAO,MAAM,kBAAkB,QAAO,UAGpC,CAAA;AAEF,eAAO,MAAM,iBAAiB,kBAW7B,CAAA;AAED,KAAK,gBAAgB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAE7C,eAAO,MAAM,eAAe,iBACb,gBAAgB,mBACZ,WAAW,
|
|
1
|
+
{"version":3,"file":"masks.d.ts","sourceRoot":"","sources":["../src/masks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAI1E,eAAO,MAAM,UAAU,0DAEpB,UAGa,CAAA;AAEhB,eAAO,MAAM,QAAQ,EAAE,UAYtB,CAAA;AAkCD,eAAO,MAAM,kBAAkB,QAAO,UAGpC,CAAA;AAEF,eAAO,MAAM,iBAAiB,kBAW7B,CAAA;AAED,KAAK,gBAAgB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAE7C,eAAO,MAAM,eAAe,iBACb,gBAAgB,mBACZ,WAAW,eA2C7B,CAAA;AAED,eAAO,MAAM,gBAAgB,oBAAqB,WAAW,KAAG,UAG9D,CAAA;AAEF,eAAO,MAAM,gBAAgB,oBALqB,WAAW,KAAG,UAKhB,CAAA;AAEhD,eAAO,MAAM,oBAAoB,oBAAqB,WAAW,KAAG,UAGlE,CAAA"}
|