@tamagui/web 1.52.6 → 1.52.7
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/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/hooks/useTheme.js +5 -1
- package/dist/cjs/hooks/useTheme.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/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/hooks/useTheme.js +5 -1
- package/dist/esm/hooks/useTheme.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/insertStyleRule.tsx +2 -5
- package/src/helpers/propMapper.ts +1 -1
- package/src/helpers/proxyThemeToParents.ts +11 -3
- package/src/hooks/useTheme.tsx +31 -6
- package/src/types.tsx +5 -3
- 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/insertStyleRule.d.ts.map +1 -1
- package/types/helpers/proxyThemeToParents.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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/insertStyleRule.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,gBAAgB;
|
|
4
|
+
"mappings": "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",
|
|
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": "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",
|
|
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
|
}
|
|
@@ -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") {
|
|
@@ -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
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.52.
|
|
3
|
+
"version": "1.52.7",
|
|
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.7",
|
|
31
|
+
"@tamagui/constants": "1.52.7",
|
|
32
|
+
"@tamagui/helpers": "1.52.7",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.52.7",
|
|
34
|
+
"@tamagui/timer": "1.52.7",
|
|
35
|
+
"@tamagui/use-did-finish-ssr": "1.52.7",
|
|
36
|
+
"@tamagui/use-event": "1.52.7",
|
|
37
|
+
"@tamagui/use-force-update": "1.52.7"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"react": "*"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@tamagui/build": "1.52.
|
|
43
|
+
"@tamagui/build": "1.52.7",
|
|
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
|
|
package/src/createTamagui.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isWeb } from '@tamagui/constants'
|
|
2
2
|
|
|
3
|
-
import { configListeners, setConfig } from './config'
|
|
4
|
-
import { Variable } from './createVariable'
|
|
3
|
+
import { configListeners, setConfig, setTokens } from './config'
|
|
4
|
+
import { Variable, createVariable, isVariable } from './createVariable'
|
|
5
5
|
import { createVariables } from './createVariables'
|
|
6
6
|
import { getThemeCSSRules } from './helpers/getThemeCSSRules'
|
|
7
7
|
import {
|
|
@@ -24,6 +24,8 @@ import {
|
|
|
24
24
|
TamaguiInternalConfig,
|
|
25
25
|
ThemeParsed,
|
|
26
26
|
ThemesLikeObject,
|
|
27
|
+
TokensMerged,
|
|
28
|
+
TokensParsed,
|
|
27
29
|
} from './types'
|
|
28
30
|
|
|
29
31
|
// config is re-run by the @tamagui/static, dont double validate
|
|
@@ -48,13 +50,25 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
|
|
51
|
-
//
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
)
|
|
53
|
+
// ensure variables
|
|
54
|
+
const tokens = createVariables(configIn.tokens)
|
|
55
|
+
|
|
56
|
+
// faster lookups
|
|
57
|
+
const tokensParsed: TokensParsed = {} as any
|
|
58
|
+
const tokensMerged: TokensMerged = {} as any
|
|
59
|
+
for (const cat in tokens) {
|
|
60
|
+
tokensParsed[cat] = {}
|
|
61
|
+
tokensMerged[cat] = {}
|
|
62
|
+
const tokenCat = tokens[cat]
|
|
63
|
+
for (const key in tokenCat) {
|
|
64
|
+
const val = tokenCat[key]
|
|
65
|
+
const prefixedKey = `$${key}`
|
|
66
|
+
tokensParsed[cat][prefixedKey] = val as any
|
|
67
|
+
tokensMerged[cat][prefixedKey] = val as any
|
|
68
|
+
tokensMerged[cat][key] = val as any
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
setTokens(tokensMerged)
|
|
58
72
|
|
|
59
73
|
const noThemes = Object.keys(configIn.themes).length === 0
|
|
60
74
|
const foundThemes = scanAllSheets(noThemes, tokensParsed)
|
|
@@ -93,9 +107,9 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
93
107
|
{ name: string; declarations: string[]; language?: string }
|
|
94
108
|
> = {}
|
|
95
109
|
|
|
96
|
-
for (const key in
|
|
97
|
-
for (const skey in
|
|
98
|
-
const variable =
|
|
110
|
+
for (const key in tokens) {
|
|
111
|
+
for (const skey in tokens[key]) {
|
|
112
|
+
const variable = tokens[key][skey] as any as Variable
|
|
99
113
|
|
|
100
114
|
// set specific tokens (like $size.sm)
|
|
101
115
|
specificTokens[`$${key}.${skey}`] = variable
|
|
@@ -240,8 +254,7 @@ ${runtimeStyles}`
|
|
|
240
254
|
animations: {} as any,
|
|
241
255
|
media: {},
|
|
242
256
|
...configIn,
|
|
243
|
-
|
|
244
|
-
tokens: configIn.tokens as any,
|
|
257
|
+
tokens: tokens as any,
|
|
245
258
|
// vite made this into a function if it wasn't set
|
|
246
259
|
shorthands,
|
|
247
260
|
inverseShorthands: shorthands
|
|
@@ -250,7 +263,7 @@ ${runtimeStyles}`
|
|
|
250
263
|
themes: themeConfig.themes as any,
|
|
251
264
|
fontsParsed,
|
|
252
265
|
themeConfig,
|
|
253
|
-
tokensParsed,
|
|
266
|
+
tokensParsed: tokensParsed as any,
|
|
254
267
|
parsed: true,
|
|
255
268
|
getNewCSS,
|
|
256
269
|
getCSS,
|
package/src/createVariables.ts
CHANGED
|
@@ -14,18 +14,25 @@ export type DeepVariableObject<A extends DeepTokenObject> = {
|
|
|
14
14
|
: never
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
+
const cache = new WeakMap()
|
|
18
|
+
|
|
19
|
+
// recursive...
|
|
20
|
+
|
|
17
21
|
export const createVariables = <A extends DeepTokenObject>(
|
|
18
22
|
tokens: A,
|
|
19
23
|
parentPath = '',
|
|
20
24
|
isFont = false
|
|
21
25
|
): DeepVariableObject<A> => {
|
|
26
|
+
if (cache.has(tokens)) return tokens
|
|
27
|
+
|
|
22
28
|
const res: any = {}
|
|
23
29
|
let i = 0
|
|
24
30
|
for (let keyIn in tokens) {
|
|
25
31
|
i++
|
|
26
32
|
const val = tokens[keyIn]
|
|
27
|
-
const
|
|
28
|
-
const
|
|
33
|
+
const isPrefixed = keyIn[0] === '$'
|
|
34
|
+
const keyWithPrefix = isPrefixed ? keyIn : `$${keyIn}`
|
|
35
|
+
const key = isPrefixed ? keyWithPrefix.slice(1) : keyIn
|
|
29
36
|
if (isVariable(val)) {
|
|
30
37
|
res[key] = val
|
|
31
38
|
continue
|
|
@@ -35,11 +42,15 @@ export const createVariables = <A extends DeepTokenObject>(
|
|
|
35
42
|
name = parentPath ? `${parentPath}-${name}` : niceKey
|
|
36
43
|
if (val && typeof val === 'object') {
|
|
37
44
|
// recurse
|
|
38
|
-
res[key] = createVariables(tokens[key] as any, name)
|
|
45
|
+
res[key] = createVariables(tokens[key] as any, name, isFont)
|
|
39
46
|
continue
|
|
40
47
|
}
|
|
41
|
-
|
|
48
|
+
const finalValue = isVariable(val)
|
|
49
|
+
? val
|
|
50
|
+
: createVariable({ val, name, key: keyWithPrefix })
|
|
51
|
+
res[key] = finalValue
|
|
42
52
|
}
|
|
43
53
|
|
|
54
|
+
cache.set(res, true)
|
|
44
55
|
return res
|
|
45
56
|
}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
import { isClient } from '@tamagui/constants'
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import { Variable, createVariable } from '../createVariable'
|
|
3
|
+
import { createVariable } from '../createVariable'
|
|
5
4
|
import type {
|
|
6
5
|
DedupedTheme,
|
|
7
6
|
DedupedThemes,
|
|
8
7
|
RulesToInsert,
|
|
9
8
|
ThemeParsed,
|
|
10
|
-
Tokens,
|
|
11
9
|
TokensParsed,
|
|
12
10
|
} from '../types'
|
|
13
|
-
import { ensureThemeVariable } from './themes'
|
|
14
11
|
|
|
15
12
|
const allSelectors: Record<string, string> = {}
|
|
16
13
|
const allRules: Record<string, string> = {}
|
|
@@ -255,7 +252,7 @@ function addThemesFromCSS(cssStyleRule: CSSStyleRule, tokens?: TokensParsed) {
|
|
|
255
252
|
val: value,
|
|
256
253
|
},
|
|
257
254
|
true
|
|
258
|
-
)
|
|
255
|
+
) as any
|
|
259
256
|
}
|
|
260
257
|
|
|
261
258
|
const dedupedEntry: DedupedTheme = {
|
|
@@ -56,7 +56,7 @@ export const propMapper: PropMapper = (key, value, styleStateIn, subPropsIn) =>
|
|
|
56
56
|
);
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
if (variants && key in variants
|
|
59
|
+
if (variants && key in variants) {
|
|
60
60
|
styleState.curProps[key] = value
|
|
61
61
|
|
|
62
62
|
const variantValue = resolveVariants(key, value, styleProps, styleState, '')
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getToken } from '../config'
|
|
1
|
+
import { getToken, getTokenObject, getTokens } from '../config'
|
|
2
2
|
import { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'
|
|
3
3
|
import { DedupedThemes, ThemeParsed } from '../types'
|
|
4
4
|
|
|
@@ -51,7 +51,15 @@ export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
|
|
|
51
51
|
return new Proxy(theme, {
|
|
52
52
|
get(target, key) {
|
|
53
53
|
if (key === GetThemeUnwrapped) return theme
|
|
54
|
-
if (
|
|
54
|
+
if (
|
|
55
|
+
key == null ||
|
|
56
|
+
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
57
|
+
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
58
|
+
key == 'undefined' ||
|
|
59
|
+
Reflect.has(target, key)
|
|
60
|
+
) {
|
|
61
|
+
return Reflect.get(target, key)
|
|
62
|
+
}
|
|
55
63
|
// check parents
|
|
56
64
|
for (let i = numParents - 1; i >= 0; i--) {
|
|
57
65
|
const parent = themesRaw[parents[i]]
|
|
@@ -60,7 +68,7 @@ export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
|
|
|
60
68
|
return Reflect.get(parent, key)
|
|
61
69
|
}
|
|
62
70
|
}
|
|
63
|
-
return
|
|
71
|
+
return getTokenObject(key as any) ?? Reflect.get(target, key)
|
|
64
72
|
},
|
|
65
73
|
})
|
|
66
74
|
}
|
package/src/hooks/useTheme.tsx
CHANGED
|
@@ -3,7 +3,7 @@ import { isClient, isServer, isWeb } from '@tamagui/constants'
|
|
|
3
3
|
import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
|
|
4
4
|
|
|
5
5
|
import { getConfig } from '../config'
|
|
6
|
-
import { getVariable } from '../createVariable'
|
|
6
|
+
import { Variable, getVariable } from '../createVariable'
|
|
7
7
|
import { createProxy } from '../helpers/createProxy'
|
|
8
8
|
import {
|
|
9
9
|
ThemeManager,
|
|
@@ -11,7 +11,14 @@ import {
|
|
|
11
11
|
getHasThemeUpdatingProps,
|
|
12
12
|
} from '../helpers/ThemeManager'
|
|
13
13
|
import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
|
|
14
|
-
import type {
|
|
14
|
+
import type {
|
|
15
|
+
DebugProp,
|
|
16
|
+
ThemeParsed,
|
|
17
|
+
ThemeProps,
|
|
18
|
+
Tokens,
|
|
19
|
+
VariableVal,
|
|
20
|
+
VariableValGeneric,
|
|
21
|
+
} from '../types'
|
|
15
22
|
import { GetThemeUnwrapped } from './getThemeUnwrapped'
|
|
16
23
|
|
|
17
24
|
export type ChangedThemeResponse = {
|
|
@@ -30,10 +37,22 @@ function getDefaultThemeProxied() {
|
|
|
30
37
|
})
|
|
31
38
|
}
|
|
32
39
|
|
|
40
|
+
type ThemeGettable<Val> = Val & {
|
|
41
|
+
get: () =>
|
|
42
|
+
| string
|
|
43
|
+
| (Val extends Variable<infer X>
|
|
44
|
+
? X extends VariableValGeneric
|
|
45
|
+
? any
|
|
46
|
+
: X
|
|
47
|
+
: Val extends VariableVal
|
|
48
|
+
? string | number
|
|
49
|
+
: unknown)
|
|
50
|
+
}
|
|
51
|
+
|
|
33
52
|
type UseThemeResult = {
|
|
34
|
-
[
|
|
35
|
-
|
|
36
|
-
|
|
53
|
+
[Key in keyof ThemeParsed]: ThemeGettable<ThemeParsed[Key]>
|
|
54
|
+
} & {
|
|
55
|
+
[Key in keyof Tokens['color']]: ThemeGettable<string>
|
|
37
56
|
}
|
|
38
57
|
|
|
39
58
|
export const useTheme = (props: ThemeProps = emptyProps) => {
|
|
@@ -125,7 +144,13 @@ export function getThemeProxied(
|
|
|
125
144
|
if (key === GetThemeUnwrapped) {
|
|
126
145
|
return theme
|
|
127
146
|
}
|
|
128
|
-
if (
|
|
147
|
+
if (
|
|
148
|
+
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
149
|
+
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
150
|
+
key !== 'undefined' &&
|
|
151
|
+
typeof key === 'string' &&
|
|
152
|
+
keys
|
|
153
|
+
) {
|
|
129
154
|
// auto convert variables to plain
|
|
130
155
|
const keyString = key[0] === '$' ? key.slice(1) : key
|
|
131
156
|
const val = theme[keyString]
|
package/src/types.tsx
CHANGED
|
@@ -191,7 +191,7 @@ export type ConfigListener = (conf: TamaguiInternalConfig) => void
|
|
|
191
191
|
// to prevent things from going circular, hoisting some types in this file
|
|
192
192
|
// to generally order them as building up towards TamaguiConfig
|
|
193
193
|
|
|
194
|
-
export type VariableVal = number | string | Variable
|
|
194
|
+
export type VariableVal = number | string | Variable | VariableValGeneric
|
|
195
195
|
export type VariableColorVal = string | Variable
|
|
196
196
|
|
|
197
197
|
type GenericKey = string
|
|
@@ -246,6 +246,8 @@ export type TamaguiBaseTheme = {
|
|
|
246
246
|
shadowColorFocus: VariableColorVal
|
|
247
247
|
}
|
|
248
248
|
|
|
249
|
+
export type VariableValGeneric = { __generic: 1 }
|
|
250
|
+
|
|
249
251
|
type GenericTokens = CreateTokens
|
|
250
252
|
type GenericThemes = {
|
|
251
253
|
[key: string]:
|
|
@@ -317,7 +319,7 @@ export type CreateTamaguiConfig<
|
|
|
317
319
|
// parsed
|
|
318
320
|
themes: {
|
|
319
321
|
[Name in keyof B]: {
|
|
320
|
-
[Key in keyof B[Name]]: Variable
|
|
322
|
+
[Key in keyof B[Name]]: Variable<B[Name][Key]>
|
|
321
323
|
}
|
|
322
324
|
}
|
|
323
325
|
shorthands: C
|
|
@@ -411,7 +413,7 @@ export type ThemeDefinition = BaseThemeDefinitions extends never
|
|
|
411
413
|
: BaseThemeDefinitions
|
|
412
414
|
export type ThemeKeys = keyof ThemeDefinition
|
|
413
415
|
export type ThemeParsed = {
|
|
414
|
-
[key in ThemeKeys]:
|
|
416
|
+
[key in ThemeKeys]: ThemeDefinition[key]
|
|
415
417
|
}
|
|
416
418
|
|
|
417
419
|
export type Tokens = TamaguiConfig['tokens']
|
package/types/config.d.ts
CHANGED
|
@@ -2,12 +2,14 @@ import { ConfigListener, TamaguiInternalConfig, Token, Tokens, TokensMerged } fr
|
|
|
2
2
|
export declare const setConfig: (next: TamaguiInternalConfig) => void;
|
|
3
3
|
export declare const setConfigFont: (name: string, font: any, fontParsed: any) => void;
|
|
4
4
|
export declare const getConfig: () => TamaguiInternalConfig;
|
|
5
|
+
export declare function setTokens(_: TokensMerged): void;
|
|
5
6
|
export declare const getTokens: ({ prefixed, }?: {
|
|
6
7
|
/**
|
|
7
8
|
* Force either with $ or without $ prefix
|
|
8
9
|
*/
|
|
9
10
|
prefixed?: boolean | undefined;
|
|
10
11
|
}) => TokensMerged;
|
|
12
|
+
export declare const getTokenObject: (value: Token, group?: keyof Tokens) => import("./createVariable").Variable<any>;
|
|
11
13
|
export declare const getToken: (value: Token, group?: keyof Tokens, useVariable?: boolean) => any;
|
|
12
14
|
export declare const getTokenValue: (value: Token, group?: keyof Tokens) => any;
|
|
13
15
|
/**
|
|
@@ -21,23 +23,23 @@ export declare const useTokens: ({ prefixed, }?: {
|
|
|
21
23
|
}) => TokensMerged;
|
|
22
24
|
export declare const getThemes: () => {
|
|
23
25
|
[x: string]: {
|
|
24
|
-
[x: string]: import("./createVariable").Variable<
|
|
25
|
-
background?: import("./createVariable").Variable<
|
|
26
|
-
backgroundHover?: import("./createVariable").Variable<
|
|
27
|
-
backgroundPress?: import("./createVariable").Variable<
|
|
28
|
-
backgroundFocus?: import("./createVariable").Variable<
|
|
29
|
-
color?: import("./createVariable").Variable<
|
|
30
|
-
colorHover?: import("./createVariable").Variable<
|
|
31
|
-
colorPress?: import("./createVariable").Variable<
|
|
32
|
-
colorFocus?: import("./createVariable").Variable<
|
|
33
|
-
borderColor?: import("./createVariable").Variable<
|
|
34
|
-
borderColorHover?: import("./createVariable").Variable<
|
|
35
|
-
borderColorPress?: import("./createVariable").Variable<
|
|
36
|
-
borderColorFocus?: import("./createVariable").Variable<
|
|
37
|
-
shadowColor?: import("./createVariable").Variable<
|
|
38
|
-
shadowColorHover?: import("./createVariable").Variable<
|
|
39
|
-
shadowColorPress?: import("./createVariable").Variable<
|
|
40
|
-
shadowColorFocus?: import("./createVariable").Variable<
|
|
26
|
+
[x: string]: import("./createVariable").Variable<import("./types").VariableVal>;
|
|
27
|
+
background?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
28
|
+
backgroundHover?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
29
|
+
backgroundPress?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
30
|
+
backgroundFocus?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
31
|
+
color?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
32
|
+
colorHover?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
33
|
+
colorPress?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
34
|
+
colorFocus?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
35
|
+
borderColor?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
36
|
+
borderColorHover?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
37
|
+
borderColorPress?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
38
|
+
borderColorFocus?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
39
|
+
shadowColor?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
40
|
+
shadowColorHover?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
41
|
+
shadowColorPress?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
42
|
+
shadowColorFocus?: import("./createVariable").Variable<import("./types").VariableColorVal | undefined> | undefined;
|
|
41
43
|
};
|
|
42
44
|
};
|
|
43
45
|
export declare const configListeners: Set<ConfigListener>;
|
package/types/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,YAAY,EACb,MAAM,SAAS,CAAA;AAIhB,eAAO,MAAM,SAAS,SAAU,qBAAqB,SAGpD,CAAA;AAED,eAAO,MAAM,aAAa,SAAU,MAAM,QAAQ,GAAG,cAAc,GAAG,SAMrE,CAAA;AAED,eAAO,MAAM,SAAS,6BASrB,CAAA;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,YAAY,EACb,MAAM,SAAS,CAAA;AAIhB,eAAO,MAAM,SAAS,SAAU,qBAAqB,SAGpD,CAAA;AAED,eAAO,MAAM,aAAa,SAAU,MAAM,QAAQ,GAAG,cAAc,GAAG,SAMrE,CAAA;AAED,eAAO,MAAM,SAAS,6BASrB,CAAA;AAGD,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,QAExC;AAED,eAAO,MAAM,SAAS;IAGpB;;OAEG;;MAEI,YAQR,CAAA;AAED,eAAO,MAAM,cAAc,UAAW,KAAK,UAAU,MAAM,MAAM,6CAShE,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,KAAK,UAAU,MAAM,MAAM,+BAG1D,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,KAAK,UAAU,MAAM,MAAM,QAE/D,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS;IArCpB;;OAEG;;MAEI,YAiCyB,CAAA;AAElC,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;CAAqB,CAAA;AAE3C,eAAO,MAAM,eAAe,qBAA4B,CAAA;AAExD,eAAO,MAAM,gBAAgB,OAAQ,cAAc,SAMlD,CAAA;AAED,eAAO,MAAM,YAAY,QAAS,MAAM,SAAS,GAAG,SAGnD,CAAA;AAGD,eAAO,MAAM,OAAO,SAAU,MAAM,4DAQnC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAiBA,OAAO,EACL,kBAAkB,EAIlB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAiBA,OAAO,EACL,kBAAkB,EAIlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CAsQ1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVariables.d.ts","sourceRoot":"","sources":["../src/createVariables.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAA8B,MAAM,kBAAkB,CAAA;AAEvE,KAAK,eAAe,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,IAAI;IACxD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI;KACzD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAC5C,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAChB,CAAC,CAAC,GAAG,CAAC,SAAS,eAAe,GAC9B,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAC1B,KAAK;CACV,CAAA;
|
|
1
|
+
{"version":3,"file":"createVariables.d.ts","sourceRoot":"","sources":["../src/createVariables.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAA8B,MAAM,kBAAkB,CAAA;AAEvE,KAAK,eAAe,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,IAAI;IACxD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI;KACzD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAC5C,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAChB,CAAC,CAAC,GAAG,CAAC,SAAS,eAAe,GAC9B,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAC1B,KAAK;CACV,CAAA;AAMD,eAAO,MAAM,eAAe,6GAmC3B,CAAA"}
|