@tamagui/web 1.122.7 → 1.123.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/helpers/proxyThemeToParents.cjs +5 -17
- package/dist/cjs/helpers/proxyThemeToParents.js +4 -16
- package/dist/cjs/helpers/proxyThemeToParents.js.map +1 -1
- package/dist/cjs/helpers/proxyThemeToParents.native.js +18 -16
- package/dist/cjs/helpers/proxyThemeToParents.native.js.map +2 -2
- package/dist/cjs/hooks/useTheme.cjs +27 -37
- package/dist/cjs/hooks/useTheme.js +29 -48
- package/dist/cjs/hooks/useTheme.js.map +2 -2
- package/dist/cjs/hooks/useTheme.native.js +48 -65
- package/dist/cjs/hooks/useTheme.native.js.map +2 -2
- package/dist/cjs/types.js.map +1 -1
- package/dist/cjs/types.native.js.map +1 -1
- package/dist/cjs/views/ThemeProvider.cjs +18 -14
- package/dist/cjs/views/ThemeProvider.js +19 -16
- package/dist/cjs/views/ThemeProvider.js.map +1 -1
- package/dist/cjs/views/ThemeProvider.native.js +6 -5
- package/dist/cjs/views/ThemeProvider.native.js.map +2 -2
- package/dist/esm/helpers/proxyThemeToParents.js +4 -16
- package/dist/esm/helpers/proxyThemeToParents.js.map +1 -1
- package/dist/esm/helpers/proxyThemeToParents.mjs +5 -17
- package/dist/esm/helpers/proxyThemeToParents.mjs.map +1 -1
- package/dist/esm/helpers/proxyThemeToParents.native.js +17 -16
- package/dist/esm/helpers/proxyThemeToParents.native.js.map +2 -2
- package/dist/esm/hooks/useTheme.js +29 -49
- package/dist/esm/hooks/useTheme.js.map +2 -2
- package/dist/esm/hooks/useTheme.mjs +28 -38
- package/dist/esm/hooks/useTheme.mjs.map +1 -1
- package/dist/esm/hooks/useTheme.native.js +49 -66
- package/dist/esm/hooks/useTheme.native.js.map +2 -2
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/types.mjs.map +1 -1
- package/dist/esm/types.native.js.map +1 -1
- package/dist/esm/views/ThemeProvider.js +19 -16
- package/dist/esm/views/ThemeProvider.js.map +1 -1
- package/dist/esm/views/ThemeProvider.mjs +18 -14
- package/dist/esm/views/ThemeProvider.mjs.map +1 -1
- package/dist/esm/views/ThemeProvider.native.js +6 -5
- package/dist/esm/views/ThemeProvider.native.js.map +2 -2
- package/package.json +11 -11
- package/src/helpers/proxyThemeToParents.ts +6 -25
- package/src/hooks/useTheme.tsx +107 -142
- package/src/types.tsx +5 -8
- package/src/views/ThemeProvider.tsx +9 -7
- package/types/helpers/proxyThemeToParents.d.ts +1 -1
- package/types/helpers/proxyThemeToParents.d.ts.map +1 -1
- package/types/helpers/sortString.d.ts +1 -1
- package/types/hooks/useConfiguration.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/types.d.ts +5 -5
- package/types/types.d.ts.map +1 -1
- package/types/views/ThemeProvider.d.ts.map +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isClient, isIos, isServer, isWeb } from "@tamagui/constants";
|
|
2
|
-
import { useContext, useEffect,
|
|
2
|
+
import { useContext, useEffect, useRef, useState } from "react";
|
|
3
3
|
import { getConfig, getSetting } from "../config";
|
|
4
4
|
import { getVariable } from "../createVariable";
|
|
5
5
|
import { ThemeManager, getHasThemeUpdatingProps } from "../helpers/ThemeManager";
|
|
@@ -18,79 +18,62 @@ var emptyProps = {
|
|
|
18
18
|
process.env.NODE_ENV === "development" && (state?.theme || process.env.TAMAGUI_DISABLE_NO_THEME_WARNING !== "1" && console.error(`[tamagui] No theme found, this could be due to an invalid theme name (given theme props ${JSON.stringify(props)}).
|
|
19
19
|
|
|
20
20
|
If this is intended and you are using Tamagui without any themes, you can disable this warning by setting the environment variable TAMAGUI_DISABLE_NO_THEME_WARNING=1`));
|
|
21
|
-
var themeProxied =
|
|
22
|
-
return keys.current && (keys.current = null), !themeManager || !state?.theme ? {} : getThemeProxied(state, props.deopt, keys, themeManager, props.debug);
|
|
23
|
-
}, [
|
|
24
|
-
state?.theme,
|
|
25
|
-
themeManager,
|
|
26
|
-
props.deopt,
|
|
27
|
-
props.debug
|
|
28
|
-
]);
|
|
21
|
+
var themeProxied = getThemeProxied(props, state, keys, themeManager);
|
|
29
22
|
return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(` \u{1F539} [${themeManager?.id}] useTheme =>`, state?.name), console.info("returning state", changedThemeState.state, changedThemeState.isNewTheme, "from props", props), console.groupEnd()), [
|
|
30
23
|
changedThemeState,
|
|
31
24
|
themeProxied
|
|
32
25
|
];
|
|
33
|
-
};
|
|
34
|
-
function getThemeProxied(
|
|
35
|
-
var
|
|
36
|
-
if (!theme
|
|
37
|
-
|
|
26
|
+
}, emptyObject = {}, ProxiedThemes = /* @__PURE__ */ new Map(), curKeys, curProps, curThemeManger;
|
|
27
|
+
function getThemeProxied(_props, state, _keys, _themeManager) {
|
|
28
|
+
var theme = state?.theme;
|
|
29
|
+
if (!theme || !_themeManager)
|
|
30
|
+
return emptyObject;
|
|
31
|
+
if (curKeys = _keys, curProps = _props, curThemeManger = _themeManager, ProxiedThemes.has(theme)) {
|
|
32
|
+
var proxied = ProxiedThemes.get(theme);
|
|
33
|
+
return proxied;
|
|
34
|
+
}
|
|
35
|
+
var { name, scheme } = state, config = getConfig();
|
|
38
36
|
function track(key) {
|
|
39
|
-
|
|
40
|
-
themeManager?.selfUpdate();
|
|
41
|
-
})), keys.current.push(key), process.env.NODE_ENV === "development" && debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`);
|
|
37
|
+
curKeys && (curKeys.current || (curKeys.current = []), curKeys.current.push(key), process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
|
|
42
38
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
var keyString = key[0] === "$" ? key.slice(1) : key, val = theme[keyString];
|
|
57
|
-
if (val && typeof val == "object")
|
|
58
|
-
return new Proxy(val, {
|
|
59
|
-
// when they touch the actual value we only track it
|
|
60
|
-
// if its a variable (web), its ignored!
|
|
61
|
-
get(_2, subkey) {
|
|
62
|
-
if (subkey === "val")
|
|
63
|
-
globalThis.tamaguiAvoidTracking || (process.env.NODE_ENV === "development" && debug === "verbose" && console.info(" \u{1F3A8} useTheme() tracking new key because of .val access", new Error().stack), track(keyString));
|
|
64
|
-
else if (subkey === "get")
|
|
65
|
-
return function(platform) {
|
|
66
|
-
var outVal = getVariable(val);
|
|
67
|
-
if (platform !== "web" && isIos && !deopt && getSetting("fastSchemeChange") && !shouldDeoptDueToParentScheme(themeManager) && scheme) {
|
|
68
|
-
var _config_themes_name, _config_themes_oppositeName, oppositeScheme = scheme === "dark" ? "light" : "dark", oppositeName = name.replace(scheme, oppositeScheme), color = getVariable((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[keyString]), oppositeColor = getVariable((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[keyString]), dynamicVal = {
|
|
69
|
-
dynamic: {
|
|
70
|
-
[scheme]: color,
|
|
71
|
-
[oppositeScheme]: oppositeColor
|
|
72
|
-
}
|
|
73
|
-
};
|
|
74
|
-
return dynamicVal;
|
|
75
|
-
}
|
|
76
|
-
return process.env.NODE_ENV === "development" && debug && console.info(` \u{1F3A8} useTheme() tracking new key because of:
|
|
77
|
-
not web: ${platform !== "web"}
|
|
78
|
-
isIOS: ${isIos}
|
|
79
|
-
deopt: ${deopt}
|
|
80
|
-
fastScheme: ${getSetting("fastSchemeChange")}
|
|
81
|
-
inversed: ${getIsInversed(themeManager)}
|
|
82
|
-
`), track(keyString), outVal;
|
|
83
|
-
};
|
|
84
|
-
return Reflect.get(val, subkey);
|
|
39
|
+
var proxied1 = Object.fromEntries(Object.entries(theme).flatMap(function(param) {
|
|
40
|
+
var [key, value] = param, proxied2 = {
|
|
41
|
+
...value,
|
|
42
|
+
get val() {
|
|
43
|
+
return globalThis.tamaguiAvoidTracking || track(key), value.val;
|
|
44
|
+
},
|
|
45
|
+
get(platform) {
|
|
46
|
+
var outVal = getVariable(value);
|
|
47
|
+
if (platform !== "web" && isIos && !curProps.deopt && getSetting("fastSchemeChange") && !shouldDeoptDueToParentScheme(curThemeManger) && scheme) {
|
|
48
|
+
var _config_themes_name, _config_themes_oppositeName, oppositeScheme = scheme === "dark" ? "light" : "dark", oppositeName = name.replace(scheme, oppositeScheme), color = getVariable((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]), oppositeColor = getVariable((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]), dynamicVal = {
|
|
49
|
+
dynamic: {
|
|
50
|
+
[scheme]: color,
|
|
51
|
+
[oppositeScheme]: oppositeColor
|
|
85
52
|
}
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
53
|
+
};
|
|
54
|
+
return dynamicVal;
|
|
55
|
+
}
|
|
56
|
+
return process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key because of:
|
|
57
|
+
not web: ${platform !== "web"}
|
|
58
|
+
isIOS: ${isIos}
|
|
59
|
+
deopt: ${curProps.deopt}
|
|
60
|
+
fastScheme: ${getSetting("fastSchemeChange")}
|
|
61
|
+
inversed: ${getIsInversed(curThemeManger)}
|
|
62
|
+
`), track(key), outVal;
|
|
90
63
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
64
|
+
};
|
|
65
|
+
return [
|
|
66
|
+
[
|
|
67
|
+
key,
|
|
68
|
+
proxied2
|
|
69
|
+
],
|
|
70
|
+
[
|
|
71
|
+
`$${key}`,
|
|
72
|
+
proxied2
|
|
73
|
+
]
|
|
74
|
+
];
|
|
75
|
+
}));
|
|
76
|
+
return ProxiedThemes.set(theme, proxied1), proxied1;
|
|
94
77
|
}
|
|
95
78
|
function getIsInversed(manager) {
|
|
96
79
|
for (var isInversed = !1, cur = manager; cur; ) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/Users/n8/tamagui/code/core/web/src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAASA,UAAUC,OAAOC,UAAUC,aAAa;AACjD,SACEC,YACAC,WAEAC,
|
|
5
|
-
"names": ["isClient", "isIos", "isServer", "isWeb", "useContext", "useEffect", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["isClient", "isIos", "isServer", "isWeb", "useContext", "useEffect", "useRef", "useState", "getConfig", "getSetting", "getVariable", "ThemeManager", "getHasThemeUpdatingProps", "ThemeManagerContext", "isEqualShallow", "shouldDeoptDueToParentScheme", "emptyProps", "name", "useTheme", "props", "_", "theme", "useThemeWithState", "res", "keys", "changedThemeState", "useChangeThemeEffect", "process", "env", "NODE_ENV", "globalThis", "time", "themeManager", "state", "TAMAGUI_DISABLE_NO_THEME_WARNING", "console", "error", "JSON", "stringify", "themeProxied", "getThemeProxied", "debug", "groupCollapsed", "id", "info", "isNewTheme", "groupEnd", "emptyObject", "ProxiedThemes", "Map", "curKeys", "curProps", "curThemeManger", "_props", "_keys", "_themeManager", "has", "proxied", "get", "scheme", "config", "track", "key", "current", "push", "Object", "fromEntries", "entries", "flatMap", "value", "val", "tamaguiAvoidTracking", "platform", "outVal", "deopt", "oppositeScheme", "oppositeName", "replace", "color", "themes", "oppositeColor", "dynamicVal", "dynamic", "getIsInversed", "set", "manager", "isInversed", "cur", "parentManager", "activeThemeManagers", "Set", "_uidToManager", "WeakMap", "_idToUID", "getId", "getThemeManager", "registerThemeManager", "t", "ogLog", "preventWarnSetState", "a", "args", "includes", "getShouldUpdateTheme", "themeState", "nextState", "forceShouldChange", "next", "getState", "isRoot", "disable", "shouldAlwaysUpdate", "needsUpdate", "undefined", "setThemeState", "createState", "mounted", "prevState", "isInversingOnMount", "Boolean", "inverse", "notify", "prev", "add", "updated", "selfListenerDispose", "onChangeTheme", "_a", "_b", "forced", "disposeChangeListener", "force", "shouldTryUpdate", "delete", "componentName", "reset", "inversed", "className", "foundNextState", "hasThemeUpdatingProps", "parentManagerProp", "forceChange", "updateState", "isWebSSR", "response", "shouldReturnPrev", "parentState", "parentId", "themeManagerState"]
|
|
6
6
|
}
|
package/dist/esm/types.js.map
CHANGED
package/dist/esm/types.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sources":["../../src/types.tsx"],"sourcesContent":[null],"mappings":"
|
|
1
|
+
{"version":3,"names":[],"sources":["../../src/types.tsx"],"sourcesContent":[null],"mappings":"AA+BA,cAAc;AACd,cAAc","ignoreList":[]}
|
|
@@ -4,22 +4,25 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
|
|
|
4
4
|
import { Theme } from "./Theme";
|
|
5
5
|
import { getSetting } from "../config";
|
|
6
6
|
import { jsx } from "react/jsx-runtime";
|
|
7
|
-
const ThemeProvider = (props) =>
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
target.
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
7
|
+
const ThemeProvider = (props) => {
|
|
8
|
+
const disableRootThemeClass = props.disableRootThemeClass ?? getSetting("disableRootThemeClass"), themeClassNameOnRoot = props.themeClassNameOnRoot ?? getSetting("themeClassNameOnRoot");
|
|
9
|
+
return isClient && React.useLayoutEffect(() => {
|
|
10
|
+
if (disableRootThemeClass) return;
|
|
11
|
+
const cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = themeClassNameOnRoot ? document.documentElement : document.body;
|
|
12
|
+
return target.classList.add(cn), () => {
|
|
13
|
+
target.classList.remove(cn);
|
|
14
|
+
};
|
|
15
|
+
}, [props.defaultTheme, disableRootThemeClass, themeClassNameOnRoot]), /* @__PURE__ */ jsx(
|
|
16
|
+
Theme,
|
|
17
|
+
{
|
|
18
|
+
className: props.className,
|
|
19
|
+
name: props.defaultTheme,
|
|
20
|
+
forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
|
|
21
|
+
_isRoot: !0,
|
|
22
|
+
children: props.children
|
|
23
|
+
}
|
|
24
|
+
);
|
|
25
|
+
};
|
|
23
26
|
export {
|
|
24
27
|
ThemeProvider
|
|
25
28
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/ThemeProvider.tsx"],
|
|
4
|
-
"mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AAEzB,SAAS,8BAA8B;AACvC,SAAS,aAAa;AACtB,SAAS,kBAAkB;
|
|
4
|
+
"mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AAEzB,SAAS,8BAA8B;AACvC,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAiCvB;AApBG,MAAM,gBAAgB,CAAC,UAA8B;AAC1D,QAAM,wBACJ,MAAM,yBAAyB,WAAW,uBAAuB,GAC7D,uBACJ,MAAM,wBAAwB,WAAW,sBAAsB;AAGjE,SAAI,YACF,MAAM,gBAAgB,MAAM;AAC1B,QAAI,sBAAuB;AAC3B,UAAM,KAAK,GAAG,sBAAsB,GAAG,MAAM,YAAY,IACnD,SAAS,uBAAuB,SAAS,kBAAkB,SAAS;AAC1E,kBAAO,UAAU,IAAI,EAAE,GAChB,MAAM;AACX,aAAO,UAAU,OAAO,EAAE;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,MAAM,cAAc,uBAAuB,oBAAoB,CAAC,GAIpE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,MAAM;AAAA,MACjB,MAAM,MAAM;AAAA,MAEZ,gBAAgB,CAAC,yBAAyB,CAAC;AAAA,MAE3C,SAAO;AAAA,MAEN,gBAAM;AAAA;AAAA,EACT;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -4,19 +4,23 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants.mjs";
|
|
|
4
4
|
import { Theme } from "./Theme.mjs";
|
|
5
5
|
import { getSetting } from "../config.mjs";
|
|
6
6
|
import { jsx } from "react/jsx-runtime";
|
|
7
|
-
const ThemeProvider = props =>
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
7
|
+
const ThemeProvider = props => {
|
|
8
|
+
const disableRootThemeClass = props.disableRootThemeClass ?? getSetting("disableRootThemeClass"),
|
|
9
|
+
themeClassNameOnRoot = props.themeClassNameOnRoot ?? getSetting("themeClassNameOnRoot");
|
|
10
|
+
return isClient && React.useLayoutEffect(() => {
|
|
11
|
+
if (disableRootThemeClass) return;
|
|
12
|
+
const cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`,
|
|
13
|
+
target = themeClassNameOnRoot ? document.documentElement : document.body;
|
|
14
|
+
return target.classList.add(cn), () => {
|
|
15
|
+
target.classList.remove(cn);
|
|
16
|
+
};
|
|
17
|
+
}, [props.defaultTheme, disableRootThemeClass, themeClassNameOnRoot]), /* @__PURE__ */jsx(Theme, {
|
|
18
|
+
className: props.className,
|
|
19
|
+
name: props.defaultTheme,
|
|
20
|
+
forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
|
|
21
|
+
_isRoot: !0,
|
|
22
|
+
children: props.children
|
|
23
|
+
});
|
|
24
|
+
};
|
|
21
25
|
export { ThemeProvider };
|
|
22
26
|
//# sourceMappingURL=ThemeProvider.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","isClient","THEME_CLASSNAME_PREFIX","Theme","getSetting","jsx","ThemeProvider","props","
|
|
1
|
+
{"version":3,"names":["React","isClient","THEME_CLASSNAME_PREFIX","Theme","getSetting","jsx","ThemeProvider","props","disableRootThemeClass","themeClassNameOnRoot","useLayoutEffect","cn","defaultTheme","target","document","documentElement","body","classList","add","remove","className","name","forceClassName","_isRoot","children"],"sources":["../../../src/views/ThemeProvider.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,QAAA,QAAgB;AAEzB,SAASC,sBAAA,QAA8B;AACvC,SAASC,KAAA,QAAa;AACtB,SAASC,UAAA,QAAkB;AAiCvB,SAAAC,GAAA;AApBG,MAAMC,aAAA,GAAiBC,KAAA,IAA8B;EAC1D,MAAMC,qBAAA,GACJD,KAAA,CAAMC,qBAAA,IAAyBJ,UAAA,CAAW,uBAAuB;IAC7DK,oBAAA,GACJF,KAAA,CAAME,oBAAA,IAAwBL,UAAA,CAAW,sBAAsB;EAGjE,OAAIH,QAAA,IACFD,KAAA,CAAMU,eAAA,CAAgB,MAAM;IAC1B,IAAIF,qBAAA,EAAuB;IAC3B,MAAMG,EAAA,GAAK,GAAGT,sBAAsB,GAAGK,KAAA,CAAMK,YAAY;MACnDC,MAAA,GAASJ,oBAAA,GAAuBK,QAAA,CAASC,eAAA,GAAkBD,QAAA,CAASE,IAAA;IAC1E,OAAAH,MAAA,CAAOI,SAAA,CAAUC,GAAA,CAAIP,EAAE,GAChB,MAAM;MACXE,MAAA,CAAOI,SAAA,CAAUE,MAAA,CAAOR,EAAE;IAC5B;EACF,GAAG,CAACJ,KAAA,CAAMK,YAAA,EAAcJ,qBAAA,EAAuBC,oBAAoB,CAAC,GAIpE,eAAAJ,GAAA,CAACF,KAAA;IACCiB,SAAA,EAAWb,KAAA,CAAMa,SAAA;IACjBC,IAAA,EAAMd,KAAA,CAAMK,YAAA;IAEZU,cAAA,EAAgB,CAACd,qBAAA,IAAyB,CAACC,oBAAA;IAE3Cc,OAAA,EAAO;IAENC,QAAA,EAAAjB,KAAA,CAAMiB;EAAA,CACT;AAEJ","ignoreList":[]}
|
|
@@ -5,22 +5,23 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
|
|
|
5
5
|
import { Theme } from "./Theme";
|
|
6
6
|
import { getSetting } from "../config";
|
|
7
7
|
var ThemeProvider = function(props) {
|
|
8
|
+
var _props_disableRootThemeClass, disableRootThemeClass = (_props_disableRootThemeClass = props.disableRootThemeClass) !== null && _props_disableRootThemeClass !== void 0 ? _props_disableRootThemeClass : getSetting("disableRootThemeClass"), _props_themeClassNameOnRoot, themeClassNameOnRoot = (_props_themeClassNameOnRoot = props.themeClassNameOnRoot) !== null && _props_themeClassNameOnRoot !== void 0 ? _props_themeClassNameOnRoot : getSetting("themeClassNameOnRoot");
|
|
8
9
|
return isClient && React.useLayoutEffect(function() {
|
|
9
|
-
if (!
|
|
10
|
-
var cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`,
|
|
10
|
+
if (!disableRootThemeClass) {
|
|
11
|
+
var cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, target = themeClassNameOnRoot ? document.documentElement : document.body;
|
|
11
12
|
return target.classList.add(cn), function() {
|
|
12
13
|
target.classList.remove(cn);
|
|
13
14
|
};
|
|
14
15
|
}
|
|
15
16
|
}, [
|
|
16
17
|
props.defaultTheme,
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
disableRootThemeClass,
|
|
19
|
+
themeClassNameOnRoot
|
|
19
20
|
]), /* @__PURE__ */ _jsx(Theme, {
|
|
20
21
|
className: props.className,
|
|
21
22
|
name: props.defaultTheme,
|
|
22
23
|
// if root class disabled, force class here
|
|
23
|
-
forceClassName: !
|
|
24
|
+
forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
|
|
24
25
|
// @ts-expect-error
|
|
25
26
|
_isRoot: !0,
|
|
26
27
|
children: props.children
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/ThemeProvider.tsx"],
|
|
4
|
-
"mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,gBAAgB;AAEzB,SAASC,8BAA8B;AACvC,SAASC,aAAa;AACtB,SAASC,kBAAkB;AAapB,IAAMC,gBAAgB,SAACC,OAAAA;
|
|
5
|
-
"names": ["React", "isClient", "THEME_CLASSNAME_PREFIX", "Theme", "getSetting", "ThemeProvider", "props", "
|
|
4
|
+
"mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,gBAAgB;AAEzB,SAASC,8BAA8B;AACvC,SAASC,aAAa;AACtB,SAASC,kBAAkB;AAapB,IAAMC,gBAAgB,SAACC,OAAAA;MAE1BA,8BADIC,yBACJD,+BAAAA,MAAMC,2BAAqB,QAA3BD,iCAAAA,SAAAA,+BAA+BF,WAAW,uBAAA,GAE1CE,6BADIE,wBACJF,8BAAAA,MAAME,0BAAoB,QAA1BF,gCAAAA,SAAAA,8BAA8BF,WAAW,sBAAA;AAG3C,SAAIH,YACFD,MAAMS,gBAAgB,WAAA;AACpB,QAAIF,wBACJ;UAAMG,KAAK,GAAGR,sBAAAA,GAAyBI,MAAMK,YAAY,IACnDC,SAASJ,uBAAuBK,SAASC,kBAAkBD,SAASE;AAC1EH,oBAAOI,UAAUC,IAAIP,EAAAA,GACd,WAAA;AACLE,eAAOI,UAAUE,OAAOR,EAAAA;MAC1B;;EACF,GAAG;IAACJ,MAAMK;IAAcJ;IAAuBC;GAAqB,GAIpE,qBAACL,OAAAA;IACCgB,WAAWb,MAAMa;IACjBC,MAAMd,MAAMK;;IAEZU,gBAAgB,CAACd,yBAAyB,CAACC;;IAE3Cc,SAAO;cAENhB,MAAMiB;;AAGb;",
|
|
5
|
+
"names": ["React", "isClient", "THEME_CLASSNAME_PREFIX", "Theme", "getSetting", "ThemeProvider", "props", "disableRootThemeClass", "themeClassNameOnRoot", "useLayoutEffect", "cn", "defaultTheme", "target", "document", "documentElement", "body", "classList", "add", "remove", "className", "name", "forceClassName", "_isRoot", "children"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.123.0",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,22 +27,22 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.
|
|
31
|
-
"@tamagui/constants": "1.
|
|
32
|
-
"@tamagui/helpers": "1.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.
|
|
34
|
-
"@tamagui/timer": "1.
|
|
35
|
-
"@tamagui/types": "1.
|
|
36
|
-
"@tamagui/use-did-finish-ssr": "1.
|
|
37
|
-
"@tamagui/use-event": "1.
|
|
38
|
-
"@tamagui/use-force-update": "1.
|
|
30
|
+
"@tamagui/compose-refs": "1.123.0",
|
|
31
|
+
"@tamagui/constants": "1.123.0",
|
|
32
|
+
"@tamagui/helpers": "1.123.0",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.123.0",
|
|
34
|
+
"@tamagui/timer": "1.123.0",
|
|
35
|
+
"@tamagui/types": "1.123.0",
|
|
36
|
+
"@tamagui/use-did-finish-ssr": "1.123.0",
|
|
37
|
+
"@tamagui/use-event": "1.123.0",
|
|
38
|
+
"@tamagui/use-force-update": "1.123.0"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
41
|
"react": "*",
|
|
42
42
|
"react-dom": "*"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@tamagui/build": "1.
|
|
45
|
+
"@tamagui/build": "1.123.0",
|
|
46
46
|
"@testing-library/react": "^16.1.0",
|
|
47
47
|
"csstype": "^3.0.10",
|
|
48
48
|
"react": "*",
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { getTokenObject } from '../config'
|
|
2
1
|
import type { DedupedThemes, ThemeParsed } from '../types'
|
|
3
2
|
|
|
4
3
|
const themesRaw: Record<string, ThemeParsed> = {}
|
|
@@ -32,6 +31,7 @@ export function proxyThemesToParents(
|
|
|
32
31
|
}
|
|
33
32
|
|
|
34
33
|
export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
|
|
34
|
+
const out = {}
|
|
35
35
|
const cur: string[] = []
|
|
36
36
|
|
|
37
37
|
// if theme is dark_blue_alt1_Button
|
|
@@ -44,28 +44,9 @@ export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
|
|
|
44
44
|
return cur.join('_')
|
|
45
45
|
})
|
|
46
46
|
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
if (
|
|
53
|
-
!key ||
|
|
54
|
-
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
55
|
-
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
56
|
-
key == 'undefined' ||
|
|
57
|
-
Reflect.has(target, key)
|
|
58
|
-
) {
|
|
59
|
-
return Reflect.get(target, key)
|
|
60
|
-
}
|
|
61
|
-
// check parents
|
|
62
|
-
for (let i = numParents - 1; i >= 0; i--) {
|
|
63
|
-
const parent = themesRaw[parents[i]]
|
|
64
|
-
if (parent && Reflect.has(parent, key)) {
|
|
65
|
-
return Reflect.get(parent, key)
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
return getTokenObject(key as any)
|
|
69
|
-
},
|
|
70
|
-
})
|
|
47
|
+
for (const parent of parents) {
|
|
48
|
+
Object.assign(out, themesRaw[parent])
|
|
49
|
+
}
|
|
50
|
+
Object.assign(out, theme)
|
|
51
|
+
return out
|
|
71
52
|
}
|