@tamagui/web 1.48.7 → 1.48.9
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/createComponent.js +3 -7
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/createTamagui.js +2 -1
- package/dist/cjs/createTamagui.js.map +1 -1
- package/dist/cjs/helpers/ThemeManager.js +1 -1
- package/dist/cjs/helpers/ThemeManager.js.map +1 -1
- package/dist/cjs/helpers/proxyThemeToParents.js +75 -0
- package/dist/cjs/helpers/proxyThemeToParents.js.map +6 -0
- package/dist/cjs/helpers/themes.js +2 -49
- package/dist/cjs/helpers/themes.js.map +1 -1
- package/dist/cjs/hooks/useMedia.js +1 -1
- package/dist/cjs/hooks/useMedia.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js +4 -4
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/index.js +2 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/createComponent.js +3 -7
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/createTamagui.js +3 -2
- package/dist/esm/createTamagui.js.map +1 -1
- package/dist/esm/helpers/ThemeManager.js +1 -1
- package/dist/esm/helpers/ThemeManager.js.map +1 -1
- package/dist/esm/helpers/proxyThemeToParents.js +49 -0
- package/dist/esm/helpers/proxyThemeToParents.js.map +6 -0
- package/dist/esm/helpers/themes.js +1 -46
- package/dist/esm/helpers/themes.js.map +1 -1
- package/dist/esm/hooks/useMedia.js +1 -1
- package/dist/esm/hooks/useMedia.js.map +1 -1
- package/dist/esm/hooks/useTheme.js +4 -4
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/package.json +9 -9
- package/src/createComponent.tsx +3 -7
- package/src/createTamagui.ts +3 -2
- package/src/helpers/ThemeManager.tsx +1 -1
- package/src/helpers/proxyThemeToParents.ts +66 -0
- package/src/helpers/themes.ts +0 -78
- package/src/hooks/useMedia.tsx +1 -1
- package/src/hooks/useTheme.tsx +5 -4
- package/src/index.ts +1 -0
- package/types/createComponent.d.ts.map +1 -1
- package/types/createTamagui.d.ts.map +1 -1
- package/types/helpers/proxyThemeToParents.d.ts +5 -0
- package/types/helpers/proxyThemeToParents.d.ts.map +1 -0
- package/types/helpers/themes.d.ts +0 -3
- package/types/helpers/themes.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/index.d.ts +1 -0
- package/types/index.d.ts.map +1 -1
|
@@ -7,8 +7,9 @@ import {
|
|
|
7
7
|
listenForSheetChanges,
|
|
8
8
|
scanAllSheets
|
|
9
9
|
} from "./helpers/insertStyleRule";
|
|
10
|
+
import { proxyThemesToParents } from "./helpers/proxyThemeToParents";
|
|
10
11
|
import { registerCSSVariable, variableToCSS } from "./helpers/registerCSSVariable";
|
|
11
|
-
import { ensureThemeVariable
|
|
12
|
+
import { ensureThemeVariable } from "./helpers/themes";
|
|
12
13
|
import { configureMedia } from "./hooks/useMedia";
|
|
13
14
|
import { parseFont, registerFontVariables } from "./insertFont";
|
|
14
15
|
import { Tamagui } from "./Tamagui";
|
|
@@ -113,7 +114,7 @@ ${JSON.stringify(
|
|
|
113
114
|
}
|
|
114
115
|
const themesIn = { ...configIn.themes };
|
|
115
116
|
const dedupedThemes = foundThemes ?? getThemesDeduped(themesIn);
|
|
116
|
-
const themes = proxyThemesToParents(dedupedThemes
|
|
117
|
+
const themes = proxyThemesToParents(dedupedThemes);
|
|
117
118
|
return {
|
|
118
119
|
themes,
|
|
119
120
|
cssRuleSets,
|
|
@@ -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;AAE3C,SAAS,uBAAuB;AAChC,SAAS,wBAAwB;AACjC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,qBAAqB,qBAAqB;AACnD,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["k", "v", "declarationsToRuleSet", "declarations", "key"]
|
|
6
6
|
}
|
|
@@ -110,7 +110,7 @@ class ThemeManager {
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
function getNextThemeClassName(name) {
|
|
113
|
-
const next =
|
|
113
|
+
const next = `${THEME_CLASSNAME_PREFIX}${name}`;
|
|
114
114
|
return next.replace("light_", "").replace("dark_", "");
|
|
115
115
|
}
|
|
116
116
|
function getState(props, parentManager) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/ThemeManager.tsx"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["lastSegment"]
|
|
6
6
|
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { getToken } from "../config";
|
|
2
|
+
import { GetThemeUnwrapped } from "../hooks/getThemeUnwrapped";
|
|
3
|
+
const themesRaw = {};
|
|
4
|
+
function proxyThemesToParents(dedupedThemes) {
|
|
5
|
+
for (const { names, theme } of dedupedThemes) {
|
|
6
|
+
for (const name of names) {
|
|
7
|
+
themesRaw[name] = theme;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
const themes = {};
|
|
11
|
+
for (const { names, theme } of dedupedThemes) {
|
|
12
|
+
for (const themeName of names) {
|
|
13
|
+
const proxiedTheme = proxyThemeToParents(themeName, theme);
|
|
14
|
+
themes[themeName] = proxiedTheme;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
return themes;
|
|
18
|
+
}
|
|
19
|
+
function proxyThemeToParents(themeName, theme) {
|
|
20
|
+
const cur = [];
|
|
21
|
+
const parents = themeName.split("_").slice(0, -1).map((part) => {
|
|
22
|
+
cur.push(part);
|
|
23
|
+
return cur.join("_");
|
|
24
|
+
});
|
|
25
|
+
const numParents = parents.length;
|
|
26
|
+
return new Proxy(theme, {
|
|
27
|
+
get(target, key) {
|
|
28
|
+
if (key === GetThemeUnwrapped)
|
|
29
|
+
return theme;
|
|
30
|
+
if (Reflect.has(target, key))
|
|
31
|
+
return Reflect.get(target, key);
|
|
32
|
+
for (let i = numParents - 1; i >= 0; i--) {
|
|
33
|
+
const parent = themesRaw[parents[i]];
|
|
34
|
+
if (!parent)
|
|
35
|
+
continue;
|
|
36
|
+
if (Reflect.has(parent, key)) {
|
|
37
|
+
return Reflect.get(parent, key);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return getToken(key) ?? Reflect.get(target, key);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
export {
|
|
45
|
+
proxyThemeToParents,
|
|
46
|
+
proxyThemesToParents,
|
|
47
|
+
themesRaw
|
|
48
|
+
};
|
|
49
|
+
//# sourceMappingURL=proxyThemeToParents.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/helpers/proxyThemeToParents.ts"],
|
|
4
|
+
"mappings": "AAAA,SAAS,gBAAgB;AACzB,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,UAAI,QAAQ,IAAI,QAAQ,GAAG;AAAG,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAE5D,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,SAAS,GAAU,KAAK,QAAQ,IAAI,QAAQ,GAAG;AAAA,IACxD;AAAA,EACF,CAAC;AACH;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import { getConfig } from "../config";
|
|
2
1
|
import { createVariable, isVariable } from "../createVariable";
|
|
3
|
-
import { GetThemeUnwrapped } from "../hooks/getThemeUnwrapped";
|
|
4
2
|
function ensureThemeVariable(theme, key) {
|
|
5
3
|
const val = theme[key];
|
|
6
4
|
const themeKey = key;
|
|
@@ -20,50 +18,7 @@ function ensureThemeVariable(theme, key) {
|
|
|
20
18
|
}
|
|
21
19
|
}
|
|
22
20
|
}
|
|
23
|
-
const themesRaw = {};
|
|
24
|
-
function proxyThemesToParents(dedupedThemes, tokens) {
|
|
25
|
-
for (const { names, theme } of dedupedThemes) {
|
|
26
|
-
for (const name of names) {
|
|
27
|
-
themesRaw[name] = theme;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
const themes = {};
|
|
31
|
-
for (const { names, theme } of dedupedThemes) {
|
|
32
|
-
for (const themeName of names) {
|
|
33
|
-
const proxiedTheme = proxyThemeToParents(themeName, theme, tokens);
|
|
34
|
-
themes[themeName] = proxiedTheme;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
return themes;
|
|
38
|
-
}
|
|
39
|
-
function proxyThemeToParents(themeName, theme, tokens = getConfig().tokensParsed) {
|
|
40
|
-
const cur = [];
|
|
41
|
-
const parents = themeName.split("_").slice(0, -1).map((part) => {
|
|
42
|
-
cur.push(part);
|
|
43
|
-
return cur.join("_");
|
|
44
|
-
});
|
|
45
|
-
const numParents = parents.length;
|
|
46
|
-
return new Proxy(theme, {
|
|
47
|
-
get(target, key) {
|
|
48
|
-
if (key === GetThemeUnwrapped)
|
|
49
|
-
return theme;
|
|
50
|
-
if (Reflect.has(target, key))
|
|
51
|
-
return Reflect.get(target, key);
|
|
52
|
-
for (let i = numParents - 1; i >= 0; i--) {
|
|
53
|
-
const parent = themesRaw[parents[i]];
|
|
54
|
-
if (!parent)
|
|
55
|
-
continue;
|
|
56
|
-
if (Reflect.has(parent, key)) {
|
|
57
|
-
return Reflect.get(parent, key);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
return Reflect.get(tokens, key);
|
|
61
|
-
}
|
|
62
|
-
});
|
|
63
|
-
}
|
|
64
21
|
export {
|
|
65
|
-
ensureThemeVariable
|
|
66
|
-
proxyThemeToParents,
|
|
67
|
-
proxyThemesToParents
|
|
22
|
+
ensureThemeVariable
|
|
68
23
|
};
|
|
69
24
|
//# sourceMappingURL=themes.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themes.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,
|
|
4
|
+
"mappings": "AAAA,SAAS,gBAAgB,kBAAkB;AAIpC,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM,GAAG;AACrB,QAAM,WAAW;AACjB,MAAI,CAAC,WAAW,GAAG,GAAG;AACpB,UAAM,GAAG,IAAI,eAAe;AAAA,MAC1B,KAAK;AAAA,MACL,MAAM;AAAA,MACN;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,QAAI,IAAI,SAAS,UAAU;AAEzB,YAAM,GAAG,IAAI,eAAe;AAAA,QAC1B,KAAK,IAAI;AAAA,QACT,MAAM;AAAA,QACN,KAAK,IAAI;AAAA,MACX,CAAC;AAAA,IACH;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -125,7 +125,7 @@ function useMedia(uid, debug) {
|
|
|
125
125
|
}
|
|
126
126
|
const { touched, prev } = internal.current;
|
|
127
127
|
const componentState = uid ? shouldUpdate.get(uid) : void 0;
|
|
128
|
-
if (!(componentState == null ? void 0 : componentState.enabled)
|
|
128
|
+
if (!(componentState == null ? void 0 : componentState.enabled)) {
|
|
129
129
|
return prev;
|
|
130
130
|
}
|
|
131
131
|
const testKeys = (componentState == null ? void 0 : componentState.keys) ?? ((!componentState || componentState.enabled) && touched ? [...touched] : null);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["update"]
|
|
6
6
|
}
|
|
@@ -35,11 +35,11 @@ const useThemeWithState = (props) => {
|
|
|
35
35
|
const { themeManager, state } = changedThemeState;
|
|
36
36
|
const { theme, name, className } = state;
|
|
37
37
|
if (!theme) {
|
|
38
|
-
if (process.env.NODE_ENV === "
|
|
38
|
+
if (process.env.NODE_ENV === "development") {
|
|
39
39
|
throw new Error(
|
|
40
|
-
`No theme given props ${JSON.stringify(
|
|
41
|
-
|
|
42
|
-
)}`
|
|
40
|
+
`No theme found given props ${JSON.stringify(
|
|
41
|
+
props
|
|
42
|
+
)}. Themes given to tamagui are: ${Object.keys(getConfig().themes)}`
|
|
43
43
|
);
|
|
44
44
|
}
|
|
45
45
|
throw `\u274C`;
|
|
@@ -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,SAAS,mBAAmB;AAC5B,SAAS,mBAAmB;AAC5B;AAAA,EACE;AAAA,EAEA;AAAA,OACK;AACP,SAAS,2BAA2B;AAEpC,SAAS,yBAA4C;AASrD,MAAM,aAAa,EAAE,MAAM,KAAK;AAEhC,SAAS,yBAAyB;AAChC,QAAM,SAAS,UAAU;AACzB,SAAO,gBAAgB;AAAA,IACrB,OAAO,OAAO,OAAO,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,CAAC;AAAA,EACpD,CAAC;AACH;AAQO,MAAM,WAAW,CAAC,QAAoB,eAAe;AAC1D,QAAM,CAAC,GAAG,KAAK,IAAI,kBAAkB,KAAK;AAC1C,QAAM,MAAM,SAAS,uBAAuB;AAC5C,SAAO;AACT;AAEO,MAAM,oBAAoB,CAC/B,UACwC;AACxC,QAAM,OAAO,OAAiB,CAAC,CAAC;AAEhC,QAAM,oBAAoB;AAAA,IACxB;AAAA,IACA;AAAA,IACA,KAAK;AAAA,IACL,CAAC,WACG,MAAM;AAtDd;AAuDU,eAAO,WAAM,iBAAN,oCAA2B,KAAK,QAAQ,SAAS,IAAI,OAAO;AAAA,IACrE,IACA;AAAA,EACN;AAEA,QAAM,EAAE,cAAc,MAAM,IAAI;AAChC,QAAM,EAAE,OAAO,MAAM,UAAU,IAAI;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
|
|
6
6
|
}
|
package/dist/esm/index.js
CHANGED
|
@@ -35,6 +35,7 @@ export * from "./helpers/matchMedia";
|
|
|
35
35
|
export * from "./helpers/mergeProps";
|
|
36
36
|
export * from "./helpers/normalizeColor";
|
|
37
37
|
export * from "./helpers/proxyThemeVariables";
|
|
38
|
+
export * from "./helpers/proxyThemeToParents";
|
|
38
39
|
export * from "./helpers/pseudoDescriptors";
|
|
39
40
|
export * from "./helpers/themeable";
|
|
40
41
|
export * from "./helpers/themes";
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
|
|
4
|
+
"mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AAEd;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.48.
|
|
3
|
+
"version": "1.48.9",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.48.
|
|
31
|
-
"@tamagui/constants": "1.48.
|
|
32
|
-
"@tamagui/helpers": "1.48.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.48.
|
|
34
|
-
"@tamagui/use-did-finish-ssr": "1.48.
|
|
35
|
-
"@tamagui/use-event": "1.48.
|
|
36
|
-
"@tamagui/use-force-update": "1.48.
|
|
30
|
+
"@tamagui/compose-refs": "1.48.9",
|
|
31
|
+
"@tamagui/constants": "1.48.9",
|
|
32
|
+
"@tamagui/helpers": "1.48.9",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.48.9",
|
|
34
|
+
"@tamagui/use-did-finish-ssr": "1.48.9",
|
|
35
|
+
"@tamagui/use-event": "1.48.9",
|
|
36
|
+
"@tamagui/use-force-update": "1.48.9"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.48.
|
|
42
|
+
"@tamagui/build": "1.48.9",
|
|
43
43
|
"@testing-library/react": "^13.4.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"react": "^18.2.0",
|
package/src/createComponent.tsx
CHANGED
|
@@ -385,7 +385,7 @@ export function createComponent<
|
|
|
385
385
|
`%c ${banner} (unmounted: ${state.unmounted})${
|
|
386
386
|
presence ? ` (presence: ${presence[0]})` : ''
|
|
387
387
|
} ${isHydrated ? '💦' : '🏜️'}`,
|
|
388
|
-
'background: green;'
|
|
388
|
+
'background: green; color: white;'
|
|
389
389
|
)
|
|
390
390
|
if (!isServer) {
|
|
391
391
|
console.groupCollapsed(
|
|
@@ -882,11 +882,7 @@ export function createComponent<
|
|
|
882
882
|
if (process.env.NODE_ENV === 'development') {
|
|
883
883
|
if (debugProp) {
|
|
884
884
|
const element = typeof elementType === 'string' ? elementType : 'Component'
|
|
885
|
-
console.groupCollapsed(
|
|
886
|
-
`render <${element} /> with props`,
|
|
887
|
-
initialState,
|
|
888
|
-
willBeAnimated
|
|
889
|
-
)
|
|
885
|
+
console.groupCollapsed(`render <${element} /> with props`)
|
|
890
886
|
// rome-ignore lint/nursery/noConsoleLog: <explanation>
|
|
891
887
|
console.log('viewProps', viewProps)
|
|
892
888
|
// rome-ignore lint/nursery/noConsoleLog: <explanation>
|
|
@@ -900,7 +896,7 @@ export function createComponent<
|
|
|
900
896
|
if (typeof window !== 'undefined') {
|
|
901
897
|
// prettier-ignore
|
|
902
898
|
// rome-ignore lint/nursery/noConsoleLog: <explanation>
|
|
903
|
-
console.log({ state, styleProps, themeState, isAnimated, isAnimatedReactNativeWeb, defaultProps, viewProps, splitStyles, animationStyles, handlesPressEvents, isStringElement, classNamesIn: props.className?.split(' '), classNamesOut: viewProps.className?.split(' '), events, shouldAttach, pseudos, content, shouldAvoidClasses, animation: props.animation, style: splitStylesStyle, staticConfig, tamaguiConfig, shouldForcePseudo, elementType, initialState, classNames })
|
|
899
|
+
console.log({ state, styleProps, themeState, isAnimated, isAnimatedReactNativeWeb, defaultProps, viewProps, splitStyles, animationStyles, handlesPressEvents, willBeAnimated, isStringElement, classNamesIn: props.className?.split(' '), classNamesOut: viewProps.className?.split(' '), events, shouldAttach, pseudos, content, shouldAvoidClasses, animation: props.animation, style: splitStylesStyle, staticConfig, tamaguiConfig, shouldForcePseudo, elementType, initialState, classNames })
|
|
904
900
|
}
|
|
905
901
|
console.groupEnd()
|
|
906
902
|
console.groupEnd()
|
package/src/createTamagui.ts
CHANGED
|
@@ -9,8 +9,9 @@ import {
|
|
|
9
9
|
listenForSheetChanges,
|
|
10
10
|
scanAllSheets,
|
|
11
11
|
} from './helpers/insertStyleRule'
|
|
12
|
+
import { proxyThemesToParents } from './helpers/proxyThemeToParents'
|
|
12
13
|
import { registerCSSVariable, variableToCSS } from './helpers/registerCSSVariable'
|
|
13
|
-
import { ensureThemeVariable
|
|
14
|
+
import { ensureThemeVariable } from './helpers/themes'
|
|
14
15
|
import { configureMedia } from './hooks/useMedia'
|
|
15
16
|
import { parseFont, registerFontVariables } from './insertFont'
|
|
16
17
|
import { Tamagui } from './Tamagui'
|
|
@@ -155,7 +156,7 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
155
156
|
|
|
156
157
|
const themesIn = { ...configIn.themes } as ThemesLikeObject
|
|
157
158
|
const dedupedThemes = foundThemes ?? getThemesDeduped(themesIn)
|
|
158
|
-
const themes = proxyThemesToParents(dedupedThemes
|
|
159
|
+
const themes = proxyThemesToParents(dedupedThemes)
|
|
159
160
|
|
|
160
161
|
return {
|
|
161
162
|
themes,
|
|
@@ -174,7 +174,7 @@ export class ThemeManager {
|
|
|
174
174
|
}
|
|
175
175
|
|
|
176
176
|
function getNextThemeClassName(name: string) {
|
|
177
|
-
const next =
|
|
177
|
+
const next = `${THEME_CLASSNAME_PREFIX}${name}`
|
|
178
178
|
return next.replace('light_', '').replace('dark_', '')
|
|
179
179
|
}
|
|
180
180
|
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { getToken } from '../config'
|
|
2
|
+
import { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'
|
|
3
|
+
import { DedupedThemes, ThemeParsed } from '../types'
|
|
4
|
+
|
|
5
|
+
export const themesRaw: Record<string, ThemeParsed> = {}
|
|
6
|
+
|
|
7
|
+
// this seems expensive but its necessary to do two loops unless we want to refactor a variety of things again
|
|
8
|
+
// not *too* much work but not a big cost doing the two loops
|
|
9
|
+
export function proxyThemesToParents(
|
|
10
|
+
dedupedThemes: DedupedThemes
|
|
11
|
+
): Record<string, ThemeParsed> {
|
|
12
|
+
// fill it in so we can look it up next
|
|
13
|
+
for (const { names, theme } of dedupedThemes) {
|
|
14
|
+
for (const name of names) {
|
|
15
|
+
themesRaw[name] = theme
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
const themes: Record<string, ThemeParsed> = {}
|
|
20
|
+
// now go back and re-fill it in
|
|
21
|
+
// we do have to call this once per non-duplicated theme!
|
|
22
|
+
// because they could have different parent chains
|
|
23
|
+
// despite being the same theme
|
|
24
|
+
|
|
25
|
+
for (const { names, theme } of dedupedThemes) {
|
|
26
|
+
for (const themeName of names) {
|
|
27
|
+
const proxiedTheme = proxyThemeToParents(themeName, theme)
|
|
28
|
+
themes[themeName] = proxiedTheme
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
return themes
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
|
|
36
|
+
const cur: string[] = []
|
|
37
|
+
|
|
38
|
+
// if theme is dark_blue_alt1_Button
|
|
39
|
+
// this will be the parent names in order: ['dark', 'dark_blue', 'dark_blue_alt1"]
|
|
40
|
+
const parents = themeName
|
|
41
|
+
.split('_')
|
|
42
|
+
.slice(0, -1)
|
|
43
|
+
.map((part) => {
|
|
44
|
+
cur.push(part)
|
|
45
|
+
return cur.join('_')
|
|
46
|
+
})
|
|
47
|
+
|
|
48
|
+
const numParents = parents.length
|
|
49
|
+
|
|
50
|
+
// proxy fallback values to parent theme values
|
|
51
|
+
return new Proxy(theme, {
|
|
52
|
+
get(target, key) {
|
|
53
|
+
if (key === GetThemeUnwrapped) return theme
|
|
54
|
+
if (Reflect.has(target, key)) return Reflect.get(target, key)
|
|
55
|
+
// check parents
|
|
56
|
+
for (let i = numParents - 1; i >= 0; i--) {
|
|
57
|
+
const parent = themesRaw[parents[i]]
|
|
58
|
+
if (!parent) continue
|
|
59
|
+
if (Reflect.has(parent, key)) {
|
|
60
|
+
return Reflect.get(parent, key)
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return getToken(key as any) ?? Reflect.get(target, key)
|
|
64
|
+
},
|
|
65
|
+
})
|
|
66
|
+
}
|
package/src/helpers/themes.ts
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
|
-
import { getConfig } from '../config'
|
|
2
1
|
import { createVariable, isVariable } from '../createVariable'
|
|
3
|
-
import { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'
|
|
4
|
-
import {
|
|
5
|
-
CreateTamaguiProps,
|
|
6
|
-
DedupedThemes,
|
|
7
|
-
ThemeParsed,
|
|
8
|
-
Tokens,
|
|
9
|
-
TokensParsed,
|
|
10
|
-
} from '../types'
|
|
11
2
|
|
|
12
3
|
// mutates, freeze after
|
|
13
4
|
// shared by createTamagui so extracted here
|
|
@@ -31,72 +22,3 @@ export function ensureThemeVariable(theme: any, key: string) {
|
|
|
31
22
|
}
|
|
32
23
|
}
|
|
33
24
|
}
|
|
34
|
-
|
|
35
|
-
const themesRaw: Record<string, ThemeParsed> = {}
|
|
36
|
-
|
|
37
|
-
// this seems expensive but its necessary to do two loops unless we want to refactor a variety of things again
|
|
38
|
-
// not *too* much work but not a big cost doing the two loops
|
|
39
|
-
export function proxyThemesToParents(
|
|
40
|
-
dedupedThemes: DedupedThemes,
|
|
41
|
-
tokens: Tokens
|
|
42
|
-
): Record<string, ThemeParsed> {
|
|
43
|
-
// fill it in so we can look it up next
|
|
44
|
-
for (const { names, theme } of dedupedThemes) {
|
|
45
|
-
for (const name of names) {
|
|
46
|
-
themesRaw[name] = theme
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
const themes: Record<string, ThemeParsed> = {}
|
|
51
|
-
// now go back and re-fill it in
|
|
52
|
-
// we do have to call this once per non-duplicated theme!
|
|
53
|
-
// because they could have different parent chains
|
|
54
|
-
// despite being the same theme
|
|
55
|
-
|
|
56
|
-
for (const { names, theme } of dedupedThemes) {
|
|
57
|
-
for (const themeName of names) {
|
|
58
|
-
const proxiedTheme = proxyThemeToParents(themeName, theme, tokens)
|
|
59
|
-
themes[themeName] = proxiedTheme
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
return themes
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
export function proxyThemeToParents(
|
|
67
|
-
themeName: string,
|
|
68
|
-
theme: ThemeParsed,
|
|
69
|
-
tokens: TokensParsed = getConfig().tokensParsed
|
|
70
|
-
) {
|
|
71
|
-
const cur: string[] = []
|
|
72
|
-
|
|
73
|
-
// if theme is dark_blue_alt1_Button
|
|
74
|
-
// this will be the parent names in order: ['dark', 'dark_blue', 'dark_blue_alt1"]
|
|
75
|
-
const parents = themeName
|
|
76
|
-
.split('_')
|
|
77
|
-
.slice(0, -1)
|
|
78
|
-
.map((part) => {
|
|
79
|
-
cur.push(part)
|
|
80
|
-
return cur.join('_')
|
|
81
|
-
})
|
|
82
|
-
|
|
83
|
-
const numParents = parents.length
|
|
84
|
-
|
|
85
|
-
// TODO maybe faster to just object spread? needs profiling on native + web
|
|
86
|
-
// proxy fallback values to parent theme values
|
|
87
|
-
return new Proxy(theme, {
|
|
88
|
-
get(target, key) {
|
|
89
|
-
if (key === GetThemeUnwrapped) return theme
|
|
90
|
-
if (Reflect.has(target, key)) return Reflect.get(target, key)
|
|
91
|
-
// check parents
|
|
92
|
-
for (let i = numParents - 1; i >= 0; i--) {
|
|
93
|
-
const parent = themesRaw[parents[i]]
|
|
94
|
-
if (!parent) continue
|
|
95
|
-
if (Reflect.has(parent, key)) {
|
|
96
|
-
return Reflect.get(parent, key)
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
return Reflect.get(tokens, key)
|
|
100
|
-
},
|
|
101
|
-
})
|
|
102
|
-
}
|
package/src/hooks/useMedia.tsx
CHANGED
|
@@ -194,7 +194,7 @@ export function useMedia(uid?: any, debug?: any): UseMediaState {
|
|
|
194
194
|
const { touched, prev } = internal.current
|
|
195
195
|
const componentState = uid ? shouldUpdate.get(uid) : undefined
|
|
196
196
|
|
|
197
|
-
if (!componentState?.enabled
|
|
197
|
+
if (!componentState?.enabled) {
|
|
198
198
|
return prev
|
|
199
199
|
}
|
|
200
200
|
|
package/src/hooks/useTheme.tsx
CHANGED
|
@@ -60,12 +60,13 @@ export const useThemeWithState = (
|
|
|
60
60
|
|
|
61
61
|
const { themeManager, state } = changedThemeState
|
|
62
62
|
const { theme, name, className } = state
|
|
63
|
+
|
|
63
64
|
if (!theme) {
|
|
64
|
-
if (process.env.NODE_ENV === '
|
|
65
|
+
if (process.env.NODE_ENV === 'development') {
|
|
65
66
|
throw new Error(
|
|
66
|
-
`No theme given props ${JSON.stringify(
|
|
67
|
-
|
|
68
|
-
)}`
|
|
67
|
+
`No theme found given props ${JSON.stringify(
|
|
68
|
+
props
|
|
69
|
+
)}. Themes given to tamagui are: ${Object.keys(getConfig().themes)}`
|
|
69
70
|
)
|
|
70
71
|
}
|
|
71
72
|
throw `❌`
|
package/src/index.ts
CHANGED
|
@@ -38,6 +38,7 @@ export * from './helpers/matchMedia'
|
|
|
38
38
|
export * from './helpers/mergeProps'
|
|
39
39
|
export * from './helpers/normalizeColor'
|
|
40
40
|
export * from './helpers/proxyThemeVariables'
|
|
41
|
+
export * from './helpers/proxyThemeToParents'
|
|
41
42
|
export * from './helpers/pseudoDescriptors'
|
|
42
43
|
export * from './helpers/themeable'
|
|
43
44
|
export * from './helpers/themes'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAWN,MAAM,OAAO,CAAA;AAgBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,UAAU,EACV,WAAW,EACX,YAAY,EACZ,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAUhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAwBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,KAWN,MAAM,OAAO,CAAA;AAgBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,UAAU,EACV,WAAW,EACX,YAAY,EACZ,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAUhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAwBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EACjB,YAAY,EAAE,YAAY,4DAw1B3B;AAGD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;AAMD,eAAO,MAAM,MAAM,0DA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAkGxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAiBA,OAAO,EACL,kBAAkB,EAIlB,kBAAkB,EAInB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CAyP1B"}
|