@tamagui/web 1.52.6 → 1.52.8
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/config.js +14 -10
- package/dist/cjs/config.js.map +1 -1
- package/dist/cjs/createTamagui.js +20 -11
- package/dist/cjs/createTamagui.js.map +2 -2
- package/dist/cjs/createVariables.js +10 -4
- package/dist/cjs/createVariables.js.map +1 -1
- package/dist/cjs/helpers/ThemeManager.js +31 -32
- package/dist/cjs/helpers/ThemeManager.js.map +1 -1
- package/dist/cjs/helpers/insertStyleRule.js.map +1 -1
- package/dist/cjs/helpers/propMapper.js +1 -1
- package/dist/cjs/helpers/propMapper.js.map +1 -1
- package/dist/cjs/helpers/proxyThemeToParents.js +5 -2
- package/dist/cjs/helpers/proxyThemeToParents.js.map +1 -1
- package/dist/cjs/helpers/themeable.js +5 -1
- package/dist/cjs/helpers/themeable.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js +6 -2
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/views/ThemeDebug.js +2 -2
- package/dist/cjs/views/ThemeDebug.js.map +1 -1
- package/dist/esm/config.js +12 -10
- package/dist/esm/config.js.map +1 -1
- package/dist/esm/createTamagui.js +21 -12
- package/dist/esm/createTamagui.js.map +2 -2
- package/dist/esm/createVariables.js +10 -4
- package/dist/esm/createVariables.js.map +1 -1
- package/dist/esm/helpers/ThemeManager.js +31 -32
- package/dist/esm/helpers/ThemeManager.js.map +1 -1
- package/dist/esm/helpers/insertStyleRule.js.map +1 -1
- package/dist/esm/helpers/propMapper.js +1 -1
- package/dist/esm/helpers/propMapper.js.map +1 -1
- package/dist/esm/helpers/proxyThemeToParents.js +6 -3
- package/dist/esm/helpers/proxyThemeToParents.js.map +1 -1
- package/dist/esm/helpers/themeable.js +5 -1
- package/dist/esm/helpers/themeable.js.map +1 -1
- package/dist/esm/hooks/useTheme.js +6 -2
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/views/ThemeDebug.js +2 -2
- package/dist/esm/views/ThemeDebug.js.map +1 -1
- package/package.json +10 -10
- package/src/config.ts +19 -13
- package/src/createTamagui.ts +28 -15
- package/src/createVariables.ts +15 -4
- package/src/helpers/ThemeManager.tsx +32 -35
- package/src/helpers/insertStyleRule.tsx +2 -5
- package/src/helpers/propMapper.ts +1 -1
- package/src/helpers/proxyThemeToParents.ts +11 -3
- package/src/helpers/themeable.tsx +5 -1
- package/src/hooks/useTheme.tsx +33 -7
- package/src/types.tsx +5 -3
- package/src/views/ThemeDebug.tsx +2 -2
- package/types/config.d.ts +19 -17
- package/types/config.d.ts.map +1 -1
- package/types/createTamagui.d.ts.map +1 -1
- package/types/createVariables.d.ts.map +1 -1
- package/types/helpers/ThemeManager.d.ts +3 -2
- package/types/helpers/ThemeManager.d.ts.map +1 -1
- package/types/helpers/insertStyleRule.d.ts.map +1 -1
- package/types/helpers/proxyThemeToParents.d.ts.map +1 -1
- package/types/helpers/themeable.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts +8 -4
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/types.d.ts +6 -3
- package/types/types.d.ts.map +1 -1
package/dist/esm/config.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/config.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AAUtB,IAAI;AAEG,MAAM,YAAY,CAAC,SAAgC;AACxD,SAAO;AACP,kBAAgB,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;AAC1C;AAEO,MAAM,gBAAgB,CAAC,MAAc,MAAW,eAAoB;AACzE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC;AAAM,YAAM,IAAI,MAAM,kCAAkC;AAAA,EAC/D;AACA,OAAM,MAAM,IAAI,IAAI;AACpB,OAAM,YAAY,IAAI,IAAI,EAAE,IAAI;AAClC;AAEO,MAAM,YAAY,MAAM;AAC7B,MAAI,CAAC,MAAM;AACT,UAAM,IAAI;AAAA,MACR,QAAQ,IAAI,aAAa,eACrB,wIACA;AAAA,IACN;AAAA,EACF;AACA,SAAO;AACT;AAEA,IAAI;
|
|
4
|
+
"mappings": "AAAA,SAAS,aAAa;AAUtB,IAAI;AAEG,MAAM,YAAY,CAAC,SAAgC;AACxD,SAAO;AACP,kBAAgB,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;AAC1C;AAEO,MAAM,gBAAgB,CAAC,MAAc,MAAW,eAAoB;AACzE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC;AAAM,YAAM,IAAI,MAAM,kCAAkC;AAAA,EAC/D;AACA,OAAM,MAAM,IAAI,IAAI;AACpB,OAAM,YAAY,IAAI,IAAI,EAAE,IAAI;AAClC;AAEO,MAAM,YAAY,MAAM;AAC7B,MAAI,CAAC,MAAM;AACT,UAAM,IAAI;AAAA,MACR,QAAQ,IAAI,aAAa,eACrB,wIACA;AAAA,IACN;AAAA,EACF;AACA,SAAO;AACT;AAEA,IAAI;AACG,SAAS,UAAU,GAAiB;AACzC,iBAAe;AACjB;AAEO,MAAM,YAAY,CAAC;AAAA,EACxB;AACF,IAKI,CAAC,MAAoB;AACvB,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC;AAAM,YAAM,IAAI,MAAM,kCAAkC;AAAA,EAC/D;AACA,QAAM,EAAE,QAAQ,aAAa,IAAI;AACjC,MAAI,aAAa;AAAO,WAAO;AAC/B,MAAI,aAAa;AAAM,WAAO;AAC9B,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAC,OAAc,UAAyB;AA1DtE;AA2DE,SACE,KAAM,eAAe,KAAK,MACzB,SACG,kBAAa,KAAK,MAAlB,mBAAsB,UACtB,kBACE,OAAO,KAAK,YAAY,EAAE,KAAK,CAAC,QAAQ,aAAa,GAAG,EAAE,KAAK,CAAC,KAAK,EACvE,MAFA,mBAEI;AAEZ;AAEO,MAAM,WAAW,CAAC,OAAc,OAAsB,cAAc,UAAU;AACnF,QAAM,QAAQ,eAAe,OAAO,KAAK;AACzC,SAAO,cAAc,+BAAO,WAAW,+BAAO;AAChD;AAEO,MAAM,gBAAgB,CAAC,OAAc,UAAyB;AACnE,SAAO,SAAS,OAAO,OAAO,KAAK;AACrC;AAKO,MAAM,YAAY;AAElB,MAAM,YAAY,MAAM,KAAM;AAE9B,MAAM,kBAAkB,oBAAI,IAAoB;AAEhD,MAAM,mBAAmB,CAAC,OAAuB;AACtD,MAAI,MAAM;AACR,OAAG,IAAI;AAAA,EACT,OAAO;AACL,oBAAgB,IAAI,EAAE;AAAA,EACxB;AACF;AAEO,MAAM,eAAe,CAAC,KAAa,UAAe;AAEvD,SAAO,OAAO,KAAM,GAAG,GAAG,KAAK;AACjC;AAGO,MAAM,UAAU,CAAC,SAAiB;AArGzC;AAsGE,QAAMA,QAAO,UAAU;AACvB,SACEA,MAAK,YAAY,IAAI,OACrB,YAAO,QAAQA,MAAK,WAAW,EAAE;AAAA,IAC/B,CAAC,CAAC,CAAC,MAAG;AA1GZ,UAAAC,KAAA;AA0Ge,qBAAAA,MAAAD,MAAK,YAAY,CAAC,MAAlB,gBAAAC,IAAqB,WAArB,mBAA8B,YAAW;AAAA;AAAA,EACpD,MAFA,mBAEI;AAER;",
|
|
5
5
|
"names": ["conf", "_a"]
|
|
6
6
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isWeb } from "@tamagui/constants";
|
|
2
|
-
import { configListeners, setConfig } from "./config";
|
|
2
|
+
import { configListeners, setConfig, setTokens } from "./config";
|
|
3
3
|
import { createVariables } from "./createVariables";
|
|
4
4
|
import { getThemeCSSRules } from "./helpers/getThemeCSSRules";
|
|
5
5
|
import {
|
|
@@ -30,12 +30,22 @@ function createTamagui(configIn) {
|
|
|
30
30
|
throw new Error("Must define fonts");
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
|
|
33
|
+
const tokens = createVariables(configIn.tokens);
|
|
34
|
+
const tokensParsed = {};
|
|
35
|
+
const tokensMerged = {};
|
|
36
|
+
for (const cat in tokens) {
|
|
37
|
+
tokensParsed[cat] = {};
|
|
38
|
+
tokensMerged[cat] = {};
|
|
39
|
+
const tokenCat = tokens[cat];
|
|
40
|
+
for (const key in tokenCat) {
|
|
41
|
+
const val = tokenCat[key];
|
|
42
|
+
const prefixedKey = `$${key}`;
|
|
43
|
+
tokensParsed[cat][prefixedKey] = val;
|
|
44
|
+
tokensMerged[cat][prefixedKey] = val;
|
|
45
|
+
tokensMerged[cat][key] = val;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
setTokens(tokensMerged);
|
|
39
49
|
const noThemes = Object.keys(configIn.themes).length === 0;
|
|
40
50
|
const foundThemes = scanAllSheets(noThemes, tokensParsed);
|
|
41
51
|
listenForSheetChanges();
|
|
@@ -63,9 +73,9 @@ function createTamagui(configIn) {
|
|
|
63
73
|
if (process.env.TAMAGUI_DOES_SSR_CSS !== "true") {
|
|
64
74
|
const declarations = [];
|
|
65
75
|
const fontDeclarations = {};
|
|
66
|
-
for (const key in
|
|
67
|
-
for (const skey in
|
|
68
|
-
const variable =
|
|
76
|
+
for (const key in tokens) {
|
|
77
|
+
for (const skey in tokens[key]) {
|
|
78
|
+
const variable = tokens[key][skey];
|
|
69
79
|
specificTokens[`$${key}.${skey}`] = variable;
|
|
70
80
|
if (process.env.NODE_ENV === "development") {
|
|
71
81
|
if (typeof variable === "undefined") {
|
|
@@ -175,8 +185,7 @@ ${runtimeStyles}`;
|
|
|
175
185
|
animations: {},
|
|
176
186
|
media: {},
|
|
177
187
|
...configIn,
|
|
178
|
-
|
|
179
|
-
tokens: configIn.tokens,
|
|
188
|
+
tokens,
|
|
180
189
|
// vite made this into a function if it wasn't set
|
|
181
190
|
shorthands,
|
|
182
191
|
inverseShorthands: shorthands ? Object.fromEntries(Object.entries(shorthands).map(([k, v]) => [v, k])) : {},
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createTamagui.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,iBAAiB,iBAAiB;
|
|
5
|
-
"names": ["
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["declarationsToRuleSet", "declarations", "key"]
|
|
6
6
|
}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import { simpleHash } from "@tamagui/helpers";
|
|
2
2
|
import { createVariable, isVariable } from "./createVariable";
|
|
3
|
+
const cache = /* @__PURE__ */ new WeakMap();
|
|
3
4
|
const createVariables = (tokens, parentPath = "", isFont = false) => {
|
|
5
|
+
if (cache.has(tokens))
|
|
6
|
+
return tokens;
|
|
4
7
|
const res = {};
|
|
5
8
|
let i = 0;
|
|
6
9
|
for (let keyIn in tokens) {
|
|
7
10
|
i++;
|
|
8
11
|
const val = tokens[keyIn];
|
|
9
|
-
const
|
|
10
|
-
const
|
|
12
|
+
const isPrefixed = keyIn[0] === "$";
|
|
13
|
+
const keyWithPrefix = isPrefixed ? keyIn : `$${keyIn}`;
|
|
14
|
+
const key = isPrefixed ? keyWithPrefix.slice(1) : keyIn;
|
|
11
15
|
if (isVariable(val)) {
|
|
12
16
|
res[key] = val;
|
|
13
17
|
continue;
|
|
@@ -16,11 +20,13 @@ const createVariables = (tokens, parentPath = "", isFont = false) => {
|
|
|
16
20
|
let name = isFont ? niceKey.slice(0, 2) : i;
|
|
17
21
|
name = parentPath ? `${parentPath}-${name}` : niceKey;
|
|
18
22
|
if (val && typeof val === "object") {
|
|
19
|
-
res[key] = createVariables(tokens[key], name);
|
|
23
|
+
res[key] = createVariables(tokens[key], name, isFont);
|
|
20
24
|
continue;
|
|
21
25
|
}
|
|
22
|
-
|
|
26
|
+
const finalValue = isVariable(val) ? val : createVariable({ val, name, key: keyWithPrefix });
|
|
27
|
+
res[key] = finalValue;
|
|
23
28
|
}
|
|
29
|
+
cache.set(res, true);
|
|
24
30
|
return res;
|
|
25
31
|
};
|
|
26
32
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createVariables.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;
|
|
4
|
+
"mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;AAcrD,MAAM,QAAQ,oBAAI,QAAQ;AAInB,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,MAAI,MAAM,IAAI,MAAM;AAAG,WAAO;AAE9B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK;AACxB,UAAM,aAAa,MAAM,CAAC,MAAM;AAChC,UAAM,gBAAgB,aAAa,QAAQ,IAAI,KAAK;AACpD,UAAM,MAAM,aAAa,cAAc,MAAM,CAAC,IAAI;AAClD,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,UAAU,IAAI,IAAI,KAAK;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,GAAG,IAAI,gBAAgB,OAAO,GAAG,GAAU,MAAM,MAAM;AAC3D;AAAA,IACF;AACA,UAAM,aAAa,WAAW,GAAG,IAC7B,MACA,eAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AACpD,QAAI,GAAG,IAAI;AAAA,EACb;AAEA,QAAM,IAAI,KAAK,IAAI;AACnB,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -16,7 +16,7 @@ class ThemeManager {
|
|
|
16
16
|
this.scheme = null;
|
|
17
17
|
this._allKeys = null;
|
|
18
18
|
if (parentManagerIn === "root") {
|
|
19
|
-
this.
|
|
19
|
+
this.updateStateFromProps(props, false);
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
22
|
if (!parentManagerIn) {
|
|
@@ -31,42 +31,41 @@ class ThemeManager {
|
|
|
31
31
|
return parentManagerIn;
|
|
32
32
|
}
|
|
33
33
|
this.parentManager = parentManagerIn;
|
|
34
|
-
if (this.
|
|
34
|
+
if (this.updateStateFromProps(props, false)) {
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
37
|
return parentManagerIn || this;
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
68
|
-
return this.state;
|
|
39
|
+
updateStateFromProps(props = this.props || {}, shouldNotify = true) {
|
|
40
|
+
this.props = props;
|
|
41
|
+
if (props.forceTheme) {
|
|
42
|
+
this.state.theme = props.forceTheme;
|
|
43
|
+
this.state.name = props.name || "";
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
const nextState = this.getStateIfChanged(props);
|
|
47
|
+
if (nextState) {
|
|
48
|
+
this.updateState(nextState, shouldNotify);
|
|
49
|
+
return nextState;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
updateState(nextState, shouldNotify = true) {
|
|
53
|
+
this.state = nextState;
|
|
54
|
+
const names = this.state.name.split("_");
|
|
55
|
+
const lastName = names[names.length - 1][0];
|
|
56
|
+
this.isComponent = lastName[0] === lastName[0].toUpperCase();
|
|
57
|
+
this._allKeys = null;
|
|
58
|
+
this.scheme = names[0] === "light" ? "light" : names[0] === "dark" ? "dark" : null;
|
|
59
|
+
if (process.env.NODE_ENV === "development") {
|
|
60
|
+
this["_numChangeEventsSent"] ??= 0;
|
|
61
|
+
this["_numChangeEventsSent"]++;
|
|
62
|
+
}
|
|
63
|
+
if (shouldNotify) {
|
|
64
|
+
queueMicrotask(() => {
|
|
65
|
+
this.notify();
|
|
66
|
+
});
|
|
69
67
|
}
|
|
68
|
+
return this.state;
|
|
70
69
|
}
|
|
71
70
|
getStateIfChanged(props = this.props, state = this.state, parentManager = this.parentManager) {
|
|
72
71
|
const _ = this.getState(props, parentManager);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/ThemeManager.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,iBAAiB;AAC1B,SAAS,wBAAwB,4BAA4B;AA0B7D,MAAM,aAAgC,EAAE,MAAM,GAAG;AAE1C,SAAS,yBAAyB,OAAmB;AAC1D,SAAO,QAAQ,MAAM,QAAQ,MAAM,iBAAiB,MAAM,WAAW,MAAM,KAAK;AAClF;AAEA,IAAI,MAAM;AAEH,MAAM,aAAa;AAAA,EAQxB,YACS,QAAoB,CAAC,GAC5B,iBACA;AAFO;AART,cAAK;AACL,uBAAc;AACd,0BAAiB,oBAAI,IAAmB;AACxC,yBAAqC;AACrC,iBAA2B;AAC3B,kBAAkC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["lastSegment"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/insertStyleRule.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,gBAAgB;
|
|
4
|
+
"mappings": "AAAA,SAAS,gBAAgB;AAEzB,SAAS,sBAAsB;AAS/B,MAAM,eAAuC,CAAC;AAC9C,MAAM,WAAmC,CAAC;AACnC,MAAM,qBAAqB,CAAC;AAE5B,MAAM,kBAAkB,MAAM;AAC9B,MAAM,cAAc,MAAM,OAAO,OAAO,QAAQ;AAChD,MAAM,mBAAmB,MAAM;AAGtC,SAAS,aAAa,YAAoB,KAAa,MAAgB;AACrE,QAAM,IAAI,IAAI,QAAQ,YAAY;AAClC,MAAI,MAAM,IAAI;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,MAAM,0DAAqD,UAAU,EAAE;AAAA,IACjF;AACA;AAAA,EACF;AACA,QAAM,SAAS,IAAI,aAAa;AAChC,QAAM,OAAO,IAAI,QAAQ,GAAG;AAC5B,QAAM,QAAQ,IAAI,MAAM,QAAQ,IAAI;AACpC,MAAI,CAAC,mBAAmB,UAAU,GAAG;AACnC,uBAAmB,UAAU,IAAI;AACjC,WAAO;AAAA,EACT;AACF;AAYA,MAAM,eAAe,oBAAI,QAA+B;AACxD,MAAM,yBAAyB,oBAAI,IAAoB;AAEhD,SAAS,wBAAwB;AACtC,MAAI,CAAC;AAAU;AAEf,QAAM,KAAK,IAAI,iBAAiB,CAAC,YAAY;AAC3C,eAAW,SAAS,SAAS;AAC3B,UACG,iBAAiB,oBAAoB,MAAM,SAC3C,iBAAiB,mBAAmB,MAAM,KAAK,SAAS,MAAM,GAC/D;AACA,sBAAc;AACd;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAED,KAAG,QAAQ,SAAS,MAAM;AAAA,IACxB,WAAW;AAAA,EACb,CAAC;AACH;AAEA,IAAI,oBAA+C;AAE5C,SAAS,cACd,gBAAgB,OAChB,QAC2B;AAC3B,MAAI,QAAQ,IAAI,aAAa;AAAQ;AACrC,MAAI,CAAC;AAAU;AAEf,MAAI;AAEJ,QAAM,SAAS,SAAS,eAAe,CAAC;AACxC,QAAM,OAAO;AACb,QAAM,UAAU,IAAI,IAAI,MAAgC;AACxD,MAAI,SAAS,aAAa;AACxB,eAAWA,UAAS,SAAS;AAC3B,UAAIA,QAAO;AACT,cAAM,MAAM,kBAAkBA,QAAO,OAAO,eAAe,MAAM;AACjE,YAAI,KAAK;AACP,mBAAS;AAAA,QACX;AAAA,MACF;AAAA,IACF;AACA,wBAAoB;AAAA,EACtB;AAEA,MAAI,MAAM;AACR,eAAWA,UAAS,MAAM;AACxB,UAAIA,UAAS,CAAC,QAAQ,IAAIA,MAAK,GAAG;AAChC,0BAAkBA,QAAO,IAAI;AAAA,MAC/B;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,SAAS,MAAM,IAAY,SAAS,OAAO;AACzC,QAAM,QAAQ,uBAAuB,IAAI,EAAE,KAAK,MAAM,SAAS,KAAK;AACpE,yBAAuB,IAAI,IAAI,IAAI;AACnC,SAAO;AACT;AAEA,MAAM,eAAe,QAAQ,IAAI;AACjC,MAAM,YAAY,eAAe,CAAC,eAAe;AAEjD,SAAS,kBACPA,QACA,SAAS,OACT,gBAAgB,OAChB,QAC2B;AAzH7B;AA4HE,MAAI;AACJ,MAAI;AACF,YAAQA,OAAM;AACd,QAAI,CAAC,OAAO;AACV;AAAA,IACF;AAAA,EACF,QAAQ;AACN;AAAA,EACF;AAEA,QAAM,iBAAgB,wBAAmB,MAAM,CAAC,GAAG,aAAa,MAA1C,mBAA8C;AACpE,QAAM,gBAAe,wBAAmB,MAAM,MAAM,SAAS,CAAC,GAAG,aAAa,MAAzD,mBAA6D;AAClF,QAAM,WAAW,GAAG,MAAM,MAAM,GAAG,aAAa,GAAG,YAAY;AAC/D,QAAM,cAAc,aAAa,IAAIA,MAAK;AAE1C,MAAI,CAAC,QAAQ;AAEX,QAAI,gBAAgB,UAAU;AAC5B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,MAAM,MAAM;AAClB,MAAI,QAAQ;AAEZ,MAAI;AAEJ,WAAS,IAAI,GAAG,IAAI,KAAK,KAAK;AAC5B,UAAM,OAAO,MAAM,CAAC;AACpB,QAAI,EAAE,gBAAgB;AAAe;AAErC,UAAM,WAAW,mBAAmB,MAAM,aAAa;AAEvD,QAAI,UAAU;AAEZ,cAAQ;AAAA,IACV,OAAO;AACL;AACA,UAAI,QAAQ,WAAW;AAErB;AAAA,MACF;AACA;AAAA,IACF;AAEA,UAAM,CAAC,YAAY,SAAS,OAAO,IAAI;AAEvC,QAAI,SAAS;AACX,YAAM,UAAU,iBAAiB,SAAS,MAAM;AAChD,UAAI,SAAS;AACX,0BAAkB,CAAC;AACnB,sBAAc,KAAK,OAAO;AAAA,MAC5B;AACA;AAAA,IACF;AAGA,UAAM,QAAQ,MAAM,YAAY,MAAM;AAEtC,QAAI,QAAQ;AACV,UAAI,UAAU,GAAG;AACf,eAAO,aAAa,UAAU;AAAA,MAChC;AAAA,IACF,WAAW,EAAE,cAAc,eAAe;AACxC,YAAM,cAAc,WAAW,WAAW,YAAY;AACtD,YAAM,eAAe,cACjB,aAAa,YAAY,QAAQ,SAAS,OAAO,IACjD;AACJ,UAAI,cAAc;AAChB,qBAAa,UAAU,IAAI,QAAQ;AAAA,MACrC;AAAA,IACF;AAAA,EACF;AAEA,eAAa,IAAIA,QAAO,QAAQ;AAEhC,SAAO;AACT;AAEA,IAAI;AACJ,IAAI,oBAAgD;AAEpD,SAAS,iBAAiB,cAA4B,QAAuB;AAC3E,QAAM,YAAY,aAAa,aAAa,MAAM,GAAG;AAErD,MAAI,CAAC,UAAU;AAAQ;AAEvB,MAAI,UAAU,CAAC,eAAe;AAC5B,oBAAgB,CAAC;AACjB,eAAW,OAAO,OAAO,OAAO;AAC9B,YAAM,QAAQ,OAAO,MAAM,GAAG;AAC9B,oBAAc,MAAM,IAAI,IAAI,MAAM;AAAA,IACpC;AAAA,EACF;AAEA,QAAM,mBAAmB,aAAa,WAAW,IAC9C,MAAM,aAAa,aAAa,SAAS,GAAG,EAAE,EAC9C,KAAK;AACR,QAAM,QAAQ,gBAAgB,MAAM,GAAG;AAGvC,QAAM,SAAsB,CAAC;AAE7B,aAAW,QAAQ,OAAO;AACxB,UAAM,OAAO,KAAK,QAAQ,GAAG;AAC7B,QAAI,SAAS;AAAI;AACjB,UAAM,MAAM,KAAK,MAAM,KAAK,QAAQ,IAAI,IAAI,GAAG,IAAI;AACnD,UAAM,MAAM,KAAK,MAAM,OAAO,CAAC;AAC/B,QAAI;AACJ,QAAI,IAAI,CAAC,MAAM,KAAK;AAElB,YAAM,UAAU,IAAI,MAAM,GAAG,EAAE;AAC/B,YAAM,WAAW,cAAc,OAAO;AAEtC,UAAI,UAAU;AACZ,gBAAQ;AAAA,MACV,OAAO;AACL,8BAAsB,iBAAiB,SAAS,IAAI;AACpD,gBAAQ,kBAAkB,iBAAiB,OAAO,OAAO;AAAA,MAC3D;AAAA,IACF,OAAO;AACL,cAAQ;AAAA,IACV;AACA,WAAO,GAAG,IAAI;AAAA,MACZ;AAAA,QACE;AAAA,QACA,MAAM;AAAA,QACN,KAAK;AAAA,MACP;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,QAAM,eAA6B;AAAA,IACjC,OAAO,CAAC;AAAA,IACR,OAAO;AAAA,EACT;AAGA,aAAW,YAAY,WAAW;AAChC,QAAI,SAAS,SAAS,SAAS,QAAQ,IACnC,SACA,SAAS,SAAS,SAAS,IAC3B,UACA;AACJ,QAAI,OAAO,SAAS,MAAM,SAAS,YAAY,KAAK,IAAI,CAAC;AAEzD,QAAI,KAAK,WAAW,MAAM,GAAG;AAE3B,aAAO,KAAK,MAAM,OAAO,SAAS,CAAC;AAAA,IACrC;AAEA,QAAI,WAAW,MAAM;AACnB,eAAS;AAAA,IACX;AACA,UAAM,YAAY,GAAG,MAAM,GAAG,UAAU,OAAO,MAAM,EAAE,GAAG,IAAI;AAE9D,QAAI,aAAa,MAAM,SAAS,SAAS,GAAG;AAC1C;AAAA,IACF;AAEA,iBAAa,MAAM,KAAK,SAAS;AAAA,EACnC;AAEA,SAAO;AACT;AAEA,SAAS,mBACP,MACA,gBAAgB,OAC4D;AAC5E,MAAI,gBAAgB,cAAc;AAChC,UAAM,OAAO,KAAK;AAClB,QAAI,KAAK,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,KAAK;AACtC,UAAI,KAAK,WAAW,UAAU,GAAG;AAC/B,eAAO,CAAC,iCAAiC,IAAI,GAAG,IAAI;AAAA,MACtD;AACA,UAAI,eAAe;AACjB,YAAI,KAAK,WAAW,UAAU,KAAK,KAAK,WAAW,WAAW,GAAG;AAC/D,iBAAO;AAAA,YACL,KAAK,MAAM,GAAG,EAAE;AAAA;AAAA,YAChB;AAAA,YACA;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF,WAAW,gBAAgB,cAAc;AAEvC,QAAI,KAAK,SAAS,SAAS;AAAG;AAC9B,WAAO,mBAAmB,KAAK,SAAS,CAAC,CAAC;AAAA,EAC5C;AACF;AAEA,MAAM,mCAAmC,CAAC,aAAqB;AAC7D,MAAI,MAAM,SAAS,MAAM,CAAC;AAC1B,MAAI,SAAS,SAAS,GAAG,GAAG;AAC1B,WAAO,IAAI,QAAQ,YAAY,EAAE;AAAA,EACnC;AACA,SAAO;AACT;AAEA,MAAM,QAAQ,WACV,SAAS,KAAK,YAAY,SAAS,cAAc,OAAO,CAAC,EAAE,QAC3D;AAEG,SAAS,YAAY,YAAoB,OAAiB;AAC/D,MAAI,cAAc,UAAU;AAC1B,WAAO;AAAA,EACT;AACA,WAAS,UAAU,IAAI,MAAM,KAAK,GAAG;AACrC,MAAI,WAAW,WAAW,YAAY,GAAG;AACvC,WAAO,aAAa,YAAY,MAAM,CAAC,CAAC;AAAA,EAC1C;AACA,SAAO;AACT;AAEO,SAAS,iBAAiB,eAA8B;AAC7D,MAAI,CAAC,cAAc,UAAU,CAAC,OAAO;AACnC;AAAA,EACF;AAEA,aAAW,EAAE,YAAY,MAAM,KAAK,eAAe;AACjD,QAAI,CAAC,uBAAuB,UAAU,GAAG;AACvC;AAAA,IACF;AAEA,iBAAa,UAAU,IAAI,MAAM,KAAK,IAAI;AAC1C,UAAM,UAAU;AAChB,gBAAY,YAAY,KAAK;AAE7B,eAAW,QAAQ,OAAO;AACxB,UAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,cAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA,MAC9C,OAAO;AACL,YAAI;AACF,gBAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA,QAC9C,SAAS,KAAK;AACZ,kBAAQ;AAAA,YACN,4CAA4C,OAAO,GAAG,CAAC;AAAA,UACzD;AAEA,kBAAQ,IAAI,EAAE,MAAM,cAAc,CAAC;AACnC,kBAAQ,MAAM;AACd,kBAAQ,SAAS;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;AAEO,SAAS,uBAAuB,YAAoB;AACzD,MAAI,QAAQ,IAAI,cAAc,aAAa;AACzC,WAAO;AAAA,EACT;AACA,QAAM,QAAQ,uBAAuB,IAAI,UAAU;AAEnD,SAAO,UAAU,UAAa,QAAQ;AACxC;",
|
|
5
5
|
"names": ["sheet"]
|
|
6
6
|
}
|
|
@@ -27,7 +27,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
|
27
27
|
)}`
|
|
28
28
|
);
|
|
29
29
|
}
|
|
30
|
-
if (variants && key in variants
|
|
30
|
+
if (variants && key in variants) {
|
|
31
31
|
styleState.curProps[key] = value;
|
|
32
32
|
const variantValue = resolveVariants(key, value, styleProps, styleState, "");
|
|
33
33
|
if (variantValue) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/propMapper.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,WAAW,aAAa;AACjC,SAAS,uBAAuB;AAEhC,SAAS,kBAAkB;AAC3B,SAAmB,kBAAkB,kBAAkB;AASvD,SAAS,mBAAmB;AAC5B,SAAS,0CAA0C;AACnD,SAAS,qBAAqB,wBAAwB;AACtD,SAAS,aAAa;AACtB,SAAS,yBAAyB;AAI3B,MAAM,aAAyB,CAAC,KAAK,OAAO,cAAc,eAAe;AAC9E,MAAI,EAAE,QAAQ,IAAI,mBAAmB,YAAY,YAAY;AAE3D,QAAI,QAAQ;AAAoB;AAAA,EAClC;AAKA,QAAM,WAAW,aAAa,WAAW,iBAAiB;AAE1D,QAAM,aAAa,WACf,IAAI,MAAM,cAAc;AAAA,IACtB,IAAI,GAAG,GAAG;AACR,aAAO,MAAM,aAAa,WAAW,QAAQ,IAAI,GAAG,CAAC;AAAA,IACvD;AAAA,EACF,CAAC,IACD;AAEJ,QAAM,EAAE,MAAM,YAAY,YAAY,aAAa,IAAI;AACvD,QAAM,EAAE,SAAS,IAAI;AAGrB,MACE,QAAQ,IAAI,aAAa,iBACzB,cACA,WAAW,CAAC,MAAM,OAClB,EAAE,cAAc,KAAK,cACrB;AAEA,YAAQ;AAAA,MACN,2BAA2B,UAAU,sBAAsB,OAAO,KAAK,KAAK,WAAW,EAAE;AAAA,QACvF;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AAEA,MAAI,YAAY,OAAO,
|
|
4
|
+
"mappings": "AAAA,SAAS,WAAW,aAAa;AACjC,SAAS,uBAAuB;AAEhC,SAAS,kBAAkB;AAC3B,SAAmB,kBAAkB,kBAAkB;AASvD,SAAS,mBAAmB;AAC5B,SAAS,0CAA0C;AACnD,SAAS,qBAAqB,wBAAwB;AACtD,SAAS,aAAa;AACtB,SAAS,yBAAyB;AAI3B,MAAM,aAAyB,CAAC,KAAK,OAAO,cAAc,eAAe;AAC9E,MAAI,EAAE,QAAQ,IAAI,mBAAmB,YAAY,YAAY;AAE3D,QAAI,QAAQ;AAAoB;AAAA,EAClC;AAKA,QAAM,WAAW,aAAa,WAAW,iBAAiB;AAE1D,QAAM,aAAa,WACf,IAAI,MAAM,cAAc;AAAA,IACtB,IAAI,GAAG,GAAG;AACR,aAAO,MAAM,aAAa,WAAW,QAAQ,IAAI,GAAG,CAAC;AAAA,IACvD;AAAA,EACF,CAAC,IACD;AAEJ,QAAM,EAAE,MAAM,YAAY,YAAY,aAAa,IAAI;AACvD,QAAM,EAAE,SAAS,IAAI;AAGrB,MACE,QAAQ,IAAI,aAAa,iBACzB,cACA,WAAW,CAAC,MAAM,OAClB,EAAE,cAAc,KAAK,cACrB;AAEA,YAAQ;AAAA,MACN,2BAA2B,UAAU,sBAAsB,OAAO,KAAK,KAAK,WAAW,EAAE;AAAA,QACvF;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AAEA,MAAI,YAAY,OAAO,UAAU;AAC/B,eAAW,SAAS,GAAG,IAAI;AAE3B,UAAM,eAAe,gBAAgB,KAAK,OAAO,YAAY,YAAY,EAAE;AAC3E,QAAI,cAAc;AAChB,aAAO;AAAA,IACT;AAAA,EACF;AAEA,MAAI,eAAe;AAGnB,MAAI,OAAO,KAAK,YAAY;AAC1B,mBAAe;AACf,UAAM,KAAK,WAAW,GAAG;AAAA,EAC3B;AAEA,MAAI,OAAO;AACT,QAAI,MAAM,CAAC,MAAM,KAAK;AACpB,cAAQ,SAAS,KAAK,OAAO,YAAY,UAAU;AAAA,IACrD,WAAW,WAAW,KAAK,GAAG;AAC5B,cAAQ,qBAAqB,OAAO,UAAU;AAAA,IAChD;AAAA,EACF;AAEA,MAAI,gBAAgB,SAAS,MAAM;AACjC,WAAO,YAAY,KAAK,KAAK,KAAK,CAAC,CAAC,KAAK,KAAK,CAAC;AAAA,EACjD;AACF;AAEA,MAAM,kBAAiC,CACrC,KACA,OACA,YACA,YACA,qBACG;AACH,QAAM,EAAE,cAAc,MAAM,MAAM,IAAI;AACtC,QAAM,EAAE,SAAS,IAAI;AACrB,MAAI,CAAC;AAAU;AAEf,MAAI,eAAe,qBAAqB,SAAS,GAAG,GAAG,KAAK,OAAO,IAAI;AAEvE,MAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,WAAW;AACjE,YAAQ,eAAe,wDAA0B,GAAG,EAAE;AAEtD,YAAQ,IAAI;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,UAAU,EAAE,GAAG,WAAW,SAAS;AAAA,IACrC,CAAC;AACD,YAAQ,SAAS;AAAA,EACnB;AAEA,MAAI,CAAC,cAAc;AAGjB,QAAI,QAAQ,IAAI,oCAAoC,KAAK;AAEvD,UAAI,OAAO,UAAU,WAAW;AAC9B,cAAM,OAAO,aAAa,iBAAiB;AAC3C,gBAAQ;AAAA,UACN,qBAAqB,IAAI,iBAAiB,GAAG,6BAA6B,KAAK;AAAA,QACjF;AAAA,MACF;AAAA,IACF;AACA;AAAA,EACF;AAEA,MAAI,OAAO,iBAAiB,YAAY;AACtC,UAAM,KAAK;AACX,UAAM,SAAS,iBAAiB,UAAU;AAC1C,mBAAe,GAAG,OAAO,MAAM;AAE/B,QAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,WAAW;AACjE,cAAQ,eAAe,kCAAkC,GAAG;AAE5D,cAAQ,IAAI,EAAE,IAAI,cAAc,OAAO,CAAC;AACxC,cAAQ,SAAS;AAAA,IACnB;AAAA,EACF;AAEA,MAAI;AAEJ,MAAI,MAAM,YAAY,GAAG;AACvB,UAAM,mBACJ,aAAa,cAAc,aAAa,KAAK,kBAAkB,UAAU;AAE3E,QAAI,kBAAkB;AACpB,yBAAmB,gCAAgC,kBAAkB,IAAI;AACzE,iBAAW,aAAa;AAExB,UAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,WAAW;AAEjE,gBAAQ,IAAI,2BAA2B,gBAAgB;AAAA,MACzD;AAAA,IACF;AAEA,mBAAe;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,cAAc;AAChB,UAAM,WAAW,mCAAmC,YAAY;AAChE,UAAM,OAAO,OAAO,QAAQ,QAAQ;AAGpC,QAAI,oBAAoB,iBAAiB,CAAC,MAAM,KAAK;AACnD,sBAAgB,IAAI,MAAM,iBAAiB,gBAAgB,CAAC;AAAA,IAC9D;AAEA,WAAO;AAAA,EACT;AACF;AAIO,SAAS,gCAAgC,OAAY,MAA6B;AACvF,MAAI,WAAW,KAAK,GAAG;AACrB,UAAM,MAAM,wBAAwB,IAAI,KAAK;AAC7C,QAAI;AAAK,aAAO;AAChB,eAAW,OAAO,KAAK,aAAa;AAClC,YAAM,iBAAiB,KAAK,YAAY,GAAG,EAAE;AAC7C,UAAI,WAAW,cAAc,GAAG;AAC9B,gCAAwB,IAAI,gBAAgB,GAAG;AAC/C,YAAI,mBAAmB,OAAO;AAC5B,iBAAO;AAAA,QACT;AAAA,MACF;AAAA,IACF;AAAA,EACF,WAAW,OAAO,UAAU,UAAU;AACpC,QAAI,MAAM,CAAC,MAAM,KAAK;AACpB,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,MAAM,0BAA0B,oBAAI,QAA0B;AAG9D,MAAM,kBAAkB,oBAAI,QAAQ;AAC7B,MAAM,0BAA0B,CAAC,aAAmB;AACzD,SAAO,YAAY,gBAAgB,IAAI,QAAQ;AACjD;AAEA,MAAM,2BAAkD,CACtD,KACA,OACA,YACA,YACA,qBACG;AAxNL;AAyNE,QAAM,EAAE,MAAM,cAAc,OAAO,MAAM,IAAI;AAC7C,QAAM,EAAE,SAAS,IAAI;AACrB,QAAM,MAAM,CAAC;AAEb,MAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,WAAW;AAEjE,YAAQ,IAAI,iCAAiC,KAAK,KAAK;AAAA,EACzD;AAEA,aAAW,QAAQ,OAAO;AACxB,UAAM,OAAO,KAAK,WAAW,IAAI,KAAK;AACtC,UAAM,MAAM,MAAM,IAAI;AAEtB,QAAI,YAAY,QAAQ,UAAU;AAEhC,iBAAW,SAAS,IAAI,IAAI;AAI5B,UAAI,oBAAoB,qBAAqB,KAAK;AAChD,YAAI,IAAI;AAAA,QAEN,IAAI,CAAC,MAAM,MAAM,SAAS,MAAM,KAAK,YAAY,UAAU,IAAI;AAAA,MACnE,OAAO;AACL,cAAM,aAAa,gBAAgB,MAAM,KAAK,YAAY,YAAY,GAAG;AAGzE,YAAI,YAAY;AACd,qBAAW,CAACA,MAAKC,IAAG,KAAK,YAAY;AACnC,gBAAIA,QAAO;AAAM;AACjB,gBAAID,QAAO,mBAAmB;AAC5B,kBAAIA,IAAG,MAAM,CAAC;AACd,qBAAO,OAAO,IAAIA,IAAG,GAAGC,IAAG;AAAA,YAC7B,OAAO;AACL,kBAAID,IAAG,IAAIC;AAAA,YACb;AAAA,UACF;AAAA,QACF;AAAA,MACF;AACA;AAAA,IACF;AAEA,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,IAAI,IAAI,qBAAqB,KAAK,UAAU;AAChD;AAAA,IACF;AAEA,QAAI,OAAO,QAAQ,UAAU;AAC3B,YAAM;AAAA;AAAA,QAEJ,IAAI,CAAC,MAAM,MAAM,SAAS,MAAM,KAAK,YAAY,UAAU,IAAI;AAAA;AACjE,UAAI,IAAI,IAAI;AACZ;AAAA,IACF;AAEA,QAAI,MAAM,GAAG,GAAG;AACd,YAAM,YAAY,yBAAyB,MAAM,KAAK,YAAY,YAAY,GAAG;AAEjF,UAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,WAAW;AAEjE,gBAAQ,IAAI,UAAU,MAAM,SAAS;AAAA,MACvC;AAGA,UAAI,IAAI,MAAM,CAAC;AACf,aAAO,OAAO,IAAI,IAAI,GAAG,SAAS;AAAA,IACpC,OAAO;AAEL,UAAI,IAAI,IAAI;AAAA,IACd;AAEA,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAI,OAAO;AACT,cAAI,SAAI,IAAI,MAAR,mBAAY,QAAO,KAAK;AAC1B,kBAAQ,KAAK,uCAA6B,MAAM,IAAI,KAAK,MAAM,IAAI,IAAI,GAAG,KAAK;AAAA,QACjF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,YAAY,CAAC,QAAQ,SAAS,UAAU,SAAS,QAAQ,EAAE,IAAI,CAAC,UAAU;AAAA,EAC9E;AAAA,EACA,YAAY,MAAM,IAAI;AACxB,EAAE;AAGF,SAAS,qBACP,SACA,KACA,OACA,MACA;AACA,MAAI,OAAO,YAAY,YAAY;AACjC,WAAO;AAAA,EACT;AACA,MAAI,QAAQ,KAAK,GAAG;AAClB,WAAO,QAAQ,KAAK;AAAA,EACtB;AACA,QAAM,EAAE,aAAa,IAAI;AACzB,aAAW,EAAE,MAAM,WAAW,KAAK,WAAW;AAC5C,QAAI,cAAc,WAAW,SAAS,aAAa,IAAI,GAAG;AACxD,aAAO,QAAQ,UAAU;AAAA,IAC3B;AAAA,EACF;AACA,QAAM,kBAAkB,QAAQ,aAAa;AAC7C,MAAI,mBAAmB,KAAK,eAAe,IAAI,KAAK,GAAG;AACrD,WAAO;AAAA,EACT;AAEA,SAAO,QAAQ,IAAI,OAAO,KAAK,EAAE,KAAK,QAAQ,KAAK,KAAK,QAAQ,SAAS;AAC3E;AAEA,MAAM,gBAAgB;AAAA,EACpB,UAAU;AAAA,EACV,YAAY;AACd;AAEA,MAAM,WAAW,CACf,KACA,OACA,YACA,eACG;AAtVL;AAuVE,QAAM,EAAE,OAAO,MAAM,iBAAiB,WAAW,IAAI;AAErD,QAAM,eAAe,KAAK;AAC1B,MAAI;AACJ,MAAI,SAAS;AACb,MAAI,SAAS,OAAO;AAClB,QAAI,QAAQ,IAAI,aAAa,iBAAiB,WAAW,UAAU,WAAW;AAE5E,cAAQ,IAAI,8BAA8B,GAAG,SAAS,KAAK,EAAE;AAAA,IAC/D;AACA,eAAW,MAAM,KAAK;AACtB,aAAS;AAAA,EACX,OAAO;AACL,QAAI,SAAS,KAAK,gBAAgB;AAChC,eAAS;AACT,iBAAW,KAAK,eAAe,KAAK;AAAA,IACtC,OAAO;AACL,cAAQ,KAAK;AAAA,QACX,KAAK,cAAc;AACjB,gBAAM,cAAc,kBAChB,oBAAoB,KAAK,aAAa,eAAe,IACrD,KAAK;AACT,uBAAW,iBAAY,KAAK,MAAjB,mBAAoB,WAAU;AACzC,mBAAS;AACT;AAAA,QACF;AAAA,QACA,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK,cAAc;AACjB,gBAAM,MAAM,cAAc,WAAW,KAAK;AAC1C,cAAI,KAAK;AACP,kBAAM,cAAc,kBAChB,oBAAoB,KAAK,aAAa,eAAe,IACrD,KAAK;AACT,kBAAM,OAAO,YAAY,GAAG;AAC5B,yBAAW,kCAAO,cAAc,GAAG,KAAK,SAA7B,mBAAoC,WAAU;AACzD,qBAAS;AAAA,UACX;AACA;AAAA,QACF;AAAA,MACF;AACA,iBAAW,OAAO,iBAAiB;AACjC,YAAI,OAAO,gBAAgB,GAAG,GAAG;AAC/B,gBAAM,MAAM,aAAa,GAAG,EAAE,KAAK;AACnC,cAAI,OAAO,MAAM;AACf,uBAAW;AACX,qBAAS;AAAA,UACX;AAAA,QACF;AAAA,MACF;AACA,UAAI,CAAC,QAAQ;AACX,cAAM,WAAW,aAAa,MAAM,KAAK;AACzC,YAAI,YAAY,MAAM;AACpB,qBAAW;AACX,mBAAS;AAAA,QACX;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,MAAI,QAAQ;AACV,UAAM,MAAM,qBAAqB,UAAU,UAAU;AACrD,WAAO;AAAA,EACT;AAEA,MACE,QAAQ,IAAI,aAAa,iBACzB,cACA,WAAW,UAAU,WACrB;AACA,YAAQ,eAAe,0BAAqB,KAAK,KAAK;AAEtD,YAAQ,IAAI,EAAE,UAAU,OAAO,OAAO,GAAG,MAAM,GAAG,CAAC;AACnD,YAAQ,SAAS;AAAA,EACnB;AAEA,SAAO;AACT;AAEA,SAAS,qBACP,UACA,EAAE,mBAAmB,GACrB;AACA,MAAI,WAAW,QAAQ,GAAG;AACxB,QAAI,CAAC,SAAS,uBAAuB,SAAS;AAC5C,aAAO,SAAS;AAAA,IAClB;AACA,WAAO,SAAS;AAAA,EAClB;AACA,SAAO;AACT;",
|
|
5
5
|
"names": ["key", "val"]
|
|
6
6
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getTokenObject } from "../config";
|
|
2
2
|
import { GetThemeUnwrapped } from "../hooks/getThemeUnwrapped";
|
|
3
3
|
const themesRaw = {};
|
|
4
4
|
function proxyThemesToParents(dedupedThemes) {
|
|
@@ -27,8 +27,11 @@ function proxyThemeToParents(themeName, theme) {
|
|
|
27
27
|
get(target, key) {
|
|
28
28
|
if (key === GetThemeUnwrapped)
|
|
29
29
|
return theme;
|
|
30
|
-
if (
|
|
30
|
+
if (key == null || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
31
|
+
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
32
|
+
key == "undefined" || Reflect.has(target, key)) {
|
|
31
33
|
return Reflect.get(target, key);
|
|
34
|
+
}
|
|
32
35
|
for (let i = numParents - 1; i >= 0; i--) {
|
|
33
36
|
const parent = themesRaw[parents[i]];
|
|
34
37
|
if (!parent)
|
|
@@ -37,7 +40,7 @@ function proxyThemeToParents(themeName, theme) {
|
|
|
37
40
|
return Reflect.get(parent, key);
|
|
38
41
|
}
|
|
39
42
|
}
|
|
40
|
-
return
|
|
43
|
+
return getTokenObject(key) ?? Reflect.get(target, key);
|
|
41
44
|
}
|
|
42
45
|
});
|
|
43
46
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/proxyThemeToParents.ts"],
|
|
4
|
-
"mappings": "AAAA,
|
|
4
|
+
"mappings": "AAAA,SAAmB,sBAAiC;AACpD,SAAS,yBAAyB;AAG3B,MAAM,YAAyC,CAAC;AAIhD,SAAS,qBACd,eAC6B;AAE7B,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,QAAQ,OAAO;AACxB,gBAAU,IAAI,IAAI;AAAA,IACpB;AAAA,EACF;AAEA,QAAM,SAAsC,CAAC;AAM7C,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,aAAa,OAAO;AAC7B,YAAM,eAAe,oBAAoB,WAAW,KAAK;AACzD,aAAO,SAAS,IAAI;AAAA,IACtB;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,oBAAoB,WAAmB,OAAoB;AACzE,QAAM,MAAgB,CAAC;AAIvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ;AAAmB,eAAO;AACtC,UACE,OAAO;AAAA;AAAA,MAGP,OAAO,eACP,QAAQ,IAAI,QAAQ,GAAG,GACvB;AACA,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,aAAa,GAAG,KAAK,GAAG,KAAK;AACxC,cAAM,SAAS,UAAU,QAAQ,CAAC,CAAC;AACnC,YAAI,CAAC;AAAQ;AACb,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,eAAe,GAAU,KAAK,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAC9D;AAAA,EACF,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -4,7 +4,11 @@ import { Theme } from "../views/Theme";
|
|
|
4
4
|
function themeable(component, staticConfig) {
|
|
5
5
|
const withThemeComponent = forwardRef(function WithTheme(props, ref) {
|
|
6
6
|
const { themeInverse, theme, componentName, themeReset, ...rest } = props;
|
|
7
|
-
const element = React.createElement(component, {
|
|
7
|
+
const element = React.createElement(component, {
|
|
8
|
+
...rest,
|
|
9
|
+
ref,
|
|
10
|
+
"data-disable-theme": true
|
|
11
|
+
});
|
|
8
12
|
let contents = /* @__PURE__ */ jsx(
|
|
9
13
|
Theme,
|
|
10
14
|
{
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "AA2BM;AA3BN,OAAO,SAAS,kBAAkB;AAGlC,SAAS,aAAa;AAUf,SAAS,UACd,WACA,cACA;AACA,QAAM,qBAAqB,WAAW,SAAS,UAAU,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI;AAEpE,UAAM,UAAU,MAAM,cAAc,WAAW;AAAA,MAC7C,GAAG;AAAA,MACH;AAAA,MACA,sBAAsB;AAAA,IACxB,CAAQ;AAER,QAAI,WACF;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAO,SAAiB;AAAA,QACxB,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAGF,WAAO;AAAA,EACT,CAAC;AAED,QAAM,YAAiB;AACvB,YAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ,WACjE;AAEA,SAAO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -85,7 +85,11 @@ function getThemeProxied({
|
|
|
85
85
|
if (key === GetThemeUnwrapped) {
|
|
86
86
|
return theme;
|
|
87
87
|
}
|
|
88
|
-
if (
|
|
88
|
+
if (
|
|
89
|
+
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
90
|
+
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
91
|
+
key !== "undefined" && typeof key === "string" && keys
|
|
92
|
+
) {
|
|
89
93
|
const keyString = key[0] === "$" ? key.slice(1) : key;
|
|
90
94
|
const val = theme[keyString];
|
|
91
95
|
if (val && typeof val === "object") {
|
|
@@ -247,7 +251,7 @@ const useChangeThemeEffect = (props, root = false, keys, shouldUpdate) => {
|
|
|
247
251
|
if (!prev.isNewTheme || !isWeb) {
|
|
248
252
|
themeManager2 = getNewThemeManager();
|
|
249
253
|
} else {
|
|
250
|
-
themeManager2.updateState(nextState
|
|
254
|
+
themeManager2.updateState(nextState);
|
|
251
255
|
}
|
|
252
256
|
} else {
|
|
253
257
|
if (prev.isNewTheme) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": "AACA,SAAS,UAAU,UAAU,aAAa;AAC1C,SAAS,YAAY,WAAW,iBAAiB,SAAS,QAAQ,gBAAgB;AAElF,SAAS,iBAAiB;AAC1B,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
|
|
6
6
|
}
|
|
@@ -23,7 +23,7 @@ function ThemeDebug({
|
|
|
23
23
|
node.style.overflowY = "scroll";
|
|
24
24
|
node.style.position = "fixed";
|
|
25
25
|
node.style.zIndex = 1e7;
|
|
26
|
-
node.style.
|
|
26
|
+
node.style.bottom = "30px";
|
|
27
27
|
node.style.left = "30px";
|
|
28
28
|
node.style.right = "30px";
|
|
29
29
|
node.style.display = "flex";
|
|
@@ -39,7 +39,7 @@ function ThemeDebug({
|
|
|
39
39
|
var _a3, _b3, _c2;
|
|
40
40
|
setOnChangeCount((p) => ++p);
|
|
41
41
|
console.warn(
|
|
42
|
-
`theme changed for ${(_a3 = themeState.themeManager) == null ? void 0 : _a3.id} from parent ${(_c2 = (_b3 = themeState.themeManager) == null ? void 0 : _b3.parentManager) == null ? void 0 : _c2.id}`,
|
|
42
|
+
`theme changed for ${(_a3 = themeState.themeManager) == null ? void 0 : _a3.id} from parent ${(_c2 = (_b3 = themeState.themeManager) == null ? void 0 : _b3.parentManager) == null ? void 0 : _c2.id} to new name`,
|
|
43
43
|
name
|
|
44
44
|
);
|
|
45
45
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/ThemeDebug.tsx"],
|
|
4
|
-
"mappings": "AA+DM,mBA+BE,KA7BE,YAFJ;AA/DN,SAAS,sBAAsB;AAC/B,SAAS,WAAW,OAAO,gBAAgB;AAC3C,SAAS,oBAAoB;AAK7B,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAjBH;AAmBE,MAAI,WAAW,qBAAqB,GAAG;AACrC,WAAO;AAAA,EACT;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAS,CAAC;AACpD,UAAM,WAAW,eAAe;AAChC,UAAM,KAAK,MAAM;AAEjB,QAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,aAAa,aAAa;AAC7E,UAAI,CAAC,MAAM;AACT,eAAO,SAAS,cAAc,KAAK;AACnC,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,YAAY;AACvB,aAAK,MAAM,WAAW;AACtB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,
|
|
4
|
+
"mappings": "AA+DM,mBA+BE,KA7BE,YAFJ;AA/DN,SAAS,sBAAsB;AAC/B,SAAS,WAAW,OAAO,gBAAgB;AAC3C,SAAS,oBAAoB;AAK7B,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAjBH;AAmBE,MAAI,WAAW,qBAAqB,GAAG;AACrC,WAAO;AAAA,EACT;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAS,CAAC;AACpD,UAAM,WAAW,eAAe;AAChC,UAAM,KAAK,MAAM;AAEjB,QAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,aAAa,aAAa;AAC7E,UAAI,CAAC,MAAM;AACT,eAAO,SAAS,cAAc,KAAK;AACnC,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,YAAY;AACvB,aAAK,MAAM,WAAW;AACtB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,OAAO;AAClB,aAAK,MAAM,QAAQ;AACnB,aAAK,MAAM,UAAU;AACrB,aAAK,MAAM,SAAS;AACpB,aAAK,MAAM,gBAAgB;AAC3B,aAAK,MAAM,aAAa;AACxB,iBAAS,KAAK,YAAY,IAAI;AAAA,MAChC;AAAA,IACF;AAEA,cAAU,MAAM;AA9CpB,UAAAA,KAAAC;AA+CM,OAAAA,OAAAD,MAAA,WAAW,iBAAX,gBAAAA,IAAyB,kBAAzB,gBAAAC,IAAwC,cAAc,CAAC,MAAM,YAAY;AA/C/E,YAAAD,KAAAC,KAAAC;AAgDQ,yBAAiB,CAAC,MAAM,EAAE,CAAC;AAC3B,gBAAQ;AAAA,UACN,sBAAqBF,MAAA,WAAW,iBAAX,gBAAAA,IAAyB,EAAE,iBAAgBE,OAAAD,MAAA,WAAW,iBAAX,gBAAAA,IAAyB,kBAAzB,gBAAAC,IAAwC,EAAE;AAAA,UAC1G;AAAA,QACF;AAAA,MACF;AAAA,IACF,GAAG,CAAC,WAAW,YAAY,CAAC;AAE5B,cAAU,MAAM;AAEd,YAAM,KAAK,YAAY,UAAU,GAAI;AACrC,aAAO,MAAM,aAAa,EAAE;AAAA,IAC9B,GAAG,CAAC,CAAC;AAEL,WACE,iCACG;AAAA;AAAA,QACC;AAAA,UAAC;AAAA;AAAA,YACC,OAAO;AAAA,cACL,YAAY;AAAA,YACd;AAAA,YACD;AAAA;AAAA,cACY;AAAA,cAAG;AAAA,cACb,KAAK;AAAA,gBACJ;AAAA,kBACE,MAAM,WAAW,MAAM;AAAA,kBACvB,WAAW,WAAW,MAAM;AAAA,kBAC5B,SAAS,WAAW;AAAA,kBACpB,gBAAgB,WAAW;AAAA,kBAC3B,SAAQ,gBAAW,iBAAX,mBAAyB,MAAM;AAAA,kBACvC,KAAI,gBAAW,iBAAX,mBAAyB;AAAA,kBAC7B,WAAU,sBAAW,iBAAX,mBAAyB,kBAAzB,mBAAwC;AAAA,kBAClD,OAAO,WAAW;AAAA,kBAClB;AAAA,kBACA,WAAW,CAAC,KAAI,gBAAW,iBAAX,mBAA0B,qBAAoB,CAAC,CAAE,EAAE;AAAA,oBACjE;AAAA,kBACF;AAAA,kBACA,uBAAsB,gBAAW,iBAAX,mBAA0B;AAAA,gBAClD;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA;AAAA;AAAA,QACF;AAAA,QACA;AAAA,MACF;AAAA,MAEA,oBAAC,SAAI,OAAO,EAAE,OAAO,MAAM,GAAI,cAAG;AAAA,MAEjC;AAAA,OACH;AAAA,EAEJ;AACA,SAAO;AACT;",
|
|
5
5
|
"names": ["_a", "_b", "_c"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.52.
|
|
3
|
+
"version": "1.52.8",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,20 +27,20 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.52.
|
|
31
|
-
"@tamagui/constants": "1.52.
|
|
32
|
-
"@tamagui/helpers": "1.52.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.52.
|
|
34
|
-
"@tamagui/timer": "1.52.
|
|
35
|
-
"@tamagui/use-did-finish-ssr": "1.52.
|
|
36
|
-
"@tamagui/use-event": "1.52.
|
|
37
|
-
"@tamagui/use-force-update": "1.52.
|
|
30
|
+
"@tamagui/compose-refs": "1.52.8",
|
|
31
|
+
"@tamagui/constants": "1.52.8",
|
|
32
|
+
"@tamagui/helpers": "1.52.8",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.52.8",
|
|
34
|
+
"@tamagui/timer": "1.52.8",
|
|
35
|
+
"@tamagui/use-did-finish-ssr": "1.52.8",
|
|
36
|
+
"@tamagui/use-event": "1.52.8",
|
|
37
|
+
"@tamagui/use-force-update": "1.52.8"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"react": "*"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@tamagui/build": "1.52.
|
|
43
|
+
"@tamagui/build": "1.52.8",
|
|
44
44
|
"@testing-library/react": "^13.4.0",
|
|
45
45
|
"csstype": "^3.0.10",
|
|
46
46
|
"react": "^18.2.0",
|
package/src/config.ts
CHANGED
|
@@ -34,7 +34,10 @@ export const getConfig = () => {
|
|
|
34
34
|
return conf
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
let
|
|
37
|
+
let tokensMerged: TokensMerged
|
|
38
|
+
export function setTokens(_: TokensMerged) {
|
|
39
|
+
tokensMerged = _
|
|
40
|
+
}
|
|
38
41
|
|
|
39
42
|
export const getTokens = ({
|
|
40
43
|
prefixed,
|
|
@@ -48,21 +51,24 @@ export const getTokens = ({
|
|
|
48
51
|
if (!conf) throw new Error(`Haven't called createTamagui yet`)
|
|
49
52
|
}
|
|
50
53
|
const { tokens, tokensParsed } = conf!
|
|
51
|
-
if (prefixed === false) return tokens
|
|
52
|
-
if (prefixed === true) return tokensParsed
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return
|
|
54
|
+
if (prefixed === false) return tokens as any
|
|
55
|
+
if (prefixed === true) return tokensParsed as any
|
|
56
|
+
return tokensMerged
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export const getTokenObject = (value: Token, group?: keyof Tokens) => {
|
|
60
|
+
return (
|
|
61
|
+
conf!.specificTokens[value] ??
|
|
62
|
+
(group
|
|
63
|
+
? tokensMerged[group]?.[value]
|
|
64
|
+
: tokensMerged[
|
|
65
|
+
Object.keys(tokensMerged).find((cat) => tokensMerged[cat][value]) || ''
|
|
66
|
+
]?.[value])
|
|
67
|
+
)
|
|
58
68
|
}
|
|
59
69
|
|
|
60
70
|
export const getToken = (value: Token, group?: keyof Tokens, useVariable = isWeb) => {
|
|
61
|
-
const
|
|
62
|
-
const token =
|
|
63
|
-
value in conf!.specificTokens
|
|
64
|
-
? conf!.specificTokens[value]
|
|
65
|
-
: (tokens[group as any]?.[value] as any)
|
|
71
|
+
const token = getTokenObject(value, group)
|
|
66
72
|
return useVariable ? token?.variable : token?.val
|
|
67
73
|
}
|
|
68
74
|
|