@tamagui/web 1.74.15 → 1.74.17
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.map +1 -1
- package/dist/cjs/createComponent.native.js.map +1 -1
- package/dist/cjs/helpers/ThemeManager.js +43 -61
- package/dist/cjs/helpers/ThemeManager.js.map +2 -2
- package/dist/cjs/helpers/ThemeManager.native.js +43 -61
- package/dist/cjs/helpers/ThemeManager.native.js.map +2 -2
- package/dist/cjs/helpers/createShallowSetState.js +7 -2
- package/dist/cjs/helpers/createShallowSetState.js.map +1 -1
- package/dist/cjs/helpers/createShallowSetState.native.js +7 -2
- package/dist/cjs/helpers/createShallowSetState.native.js.map +1 -1
- package/dist/cjs/helpers/scheme.js +1 -0
- package/dist/cjs/helpers/scheme.js.map +6 -0
- package/dist/cjs/helpers/scheme.native.js +2 -0
- package/dist/cjs/helpers/scheme.native.js.map +6 -0
- package/dist/cjs/helpers/themeable.js +1 -1
- package/dist/cjs/helpers/themeable.js.map +1 -1
- package/dist/cjs/helpers/themeable.native.js +1 -1
- package/dist/cjs/helpers/themeable.native.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js +19 -12
- package/dist/cjs/hooks/useTheme.js.map +2 -2
- package/dist/cjs/hooks/useTheme.native.js +44 -27
- package/dist/cjs/hooks/useTheme.native.js.map +2 -2
- package/dist/cjs/setupReactNative.js.map +1 -1
- package/dist/cjs/setupReactNative.native.js.map +1 -1
- package/dist/cjs/views/Theme.js +17 -29
- package/dist/cjs/views/Theme.js.map +1 -1
- package/dist/cjs/views/Theme.native.js +17 -29
- package/dist/cjs/views/Theme.native.js.map +1 -1
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/createComponent.native.js.map +1 -1
- package/dist/esm/helpers/ThemeManager.js +41 -58
- package/dist/esm/helpers/ThemeManager.js.map +2 -2
- package/dist/esm/helpers/ThemeManager.native.js +41 -58
- package/dist/esm/helpers/ThemeManager.native.js.map +2 -2
- package/dist/esm/helpers/createShallowSetState.js +6 -2
- package/dist/esm/helpers/createShallowSetState.js.map +1 -1
- package/dist/esm/helpers/createShallowSetState.native.js +6 -2
- package/dist/esm/helpers/createShallowSetState.native.js.map +1 -1
- package/dist/esm/helpers/scheme.js +1 -0
- package/dist/esm/helpers/scheme.js.map +6 -0
- package/dist/esm/helpers/scheme.native.js +1 -0
- package/dist/esm/helpers/scheme.native.js.map +6 -0
- package/dist/esm/helpers/themeable.js +1 -1
- package/dist/esm/helpers/themeable.js.map +1 -1
- package/dist/esm/helpers/themeable.native.js +1 -1
- package/dist/esm/helpers/themeable.native.js.map +1 -1
- package/dist/esm/hooks/useTheme.js +27 -11
- package/dist/esm/hooks/useTheme.js.map +2 -2
- package/dist/esm/hooks/useTheme.native.js +52 -26
- package/dist/esm/hooks/useTheme.native.js.map +2 -2
- package/dist/esm/setupReactNative.js.map +1 -1
- package/dist/esm/setupReactNative.native.js.map +1 -1
- package/dist/esm/views/Theme.js +14 -24
- package/dist/esm/views/Theme.js.map +1 -1
- package/dist/esm/views/Theme.native.js +14 -24
- package/dist/esm/views/Theme.native.js.map +1 -1
- package/package.json +9 -9
- package/src/createComponent.tsx +1 -2
- package/src/helpers/ThemeManager.tsx +91 -97
- package/src/helpers/createShallowSetState.tsx +7 -5
- package/src/helpers/themeable.tsx +1 -1
- package/src/hooks/useTheme.tsx +66 -18
- package/src/setupReactNative.ts +3 -0
- package/src/types.tsx +2 -0
- package/src/views/Theme.tsx +33 -29
- package/types/createComponent.d.ts.map +1 -1
- package/types/helpers/ThemeManager.d.ts +7 -8
- package/types/helpers/ThemeManager.d.ts.map +1 -1
- package/types/helpers/createShallowSetState.d.ts +1 -0
- package/types/helpers/createShallowSetState.d.ts.map +1 -1
- package/types/helpers/scheme.d.ts.map +1 -0
- package/types/hooks/useTheme.d.ts +2 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/setupReactNative.d.ts.map +1 -1
- package/types/types.d.ts +1 -0
- package/types/types.d.ts.map +1 -1
- package/types/views/Theme.d.ts +0 -12
- package/types/views/Theme.d.ts.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/ThemeManager.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,gBAA0B,sBAC1BA,oBAA6D;AA0B7D,MAAM,aAAgC,EAAE,MAAM,GAAG;AAE1C,SAAS,yBAAyB,OAAmB;AAC1D,SAAO,MAAM,QAAQ,MAAM,iBAAiB,MAAM,WAAW,MAAM;AACrE;AAEA,IAAI,MAAM;AAEH,MAAM,aAAa;AAAA,
|
|
5
|
-
"names": ["import_constants"
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["import_constants"]
|
|
6
6
|
}
|
|
@@ -15,6 +15,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
|
|
|
15
15
|
var createShallowSetState_exports = {};
|
|
16
16
|
__export(createShallowSetState_exports, {
|
|
17
17
|
createShallowSetState: () => createShallowSetState,
|
|
18
|
+
isEqualShallow: () => isEqualShallow,
|
|
18
19
|
mergeIfNotShallowEqual: () => mergeIfNotShallowEqual
|
|
19
20
|
});
|
|
20
21
|
module.exports = __toCommonJS(createShallowSetState_exports);
|
|
@@ -22,14 +23,18 @@ function createShallowSetState(setter) {
|
|
|
22
23
|
return (next) => setter((prev) => mergeIfNotShallowEqual(prev, next));
|
|
23
24
|
}
|
|
24
25
|
function mergeIfNotShallowEqual(prev, next) {
|
|
26
|
+
return isEqualShallow(prev, next) ? prev : { ...prev, ...next };
|
|
27
|
+
}
|
|
28
|
+
function isEqualShallow(prev, next) {
|
|
25
29
|
for (const key in next)
|
|
26
30
|
if (prev[key] !== next[key])
|
|
27
|
-
return
|
|
28
|
-
return
|
|
31
|
+
return !1;
|
|
32
|
+
return !0;
|
|
29
33
|
}
|
|
30
34
|
// Annotate the CommonJS export names for ESM import in node:
|
|
31
35
|
0 && (module.exports = {
|
|
32
36
|
createShallowSetState,
|
|
37
|
+
isEqualShallow,
|
|
33
38
|
mergeIfNotShallowEqual
|
|
34
39
|
});
|
|
35
40
|
//# sourceMappingURL=createShallowSetState.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/createShallowSetState.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,SAAS,sBACd,QACA;AACA,SAAO,CAAC,SAAyB,OAAO,CAAC,SAAS,uBAAuB,MAAM,IAAI,CAAC;AACtF;AAEO,SAAS,uBAAuB,MAAW,MAAW;AAC3D,SAAO,eAAe,MAAM,IAAI,IAAI,OAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAChE;AAEO,SAAS,eAAe,MAAM,MAAM;AACzC,aAAW,OAAO;AAChB,QAAI,KAAK,GAAG,MAAM,KAAK,GAAG;AACxB,aAAO;AAGX,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -16,6 +16,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
|
|
|
16
16
|
var createShallowSetState_exports = {};
|
|
17
17
|
__export(createShallowSetState_exports, {
|
|
18
18
|
createShallowSetState: () => createShallowSetState,
|
|
19
|
+
isEqualShallow: () => isEqualShallow,
|
|
19
20
|
mergeIfNotShallowEqual: () => mergeIfNotShallowEqual
|
|
20
21
|
});
|
|
21
22
|
module.exports = __toCommonJS(createShallowSetState_exports);
|
|
@@ -23,14 +24,18 @@ function createShallowSetState(setter) {
|
|
|
23
24
|
return (next) => setter((prev) => mergeIfNotShallowEqual(prev, next));
|
|
24
25
|
}
|
|
25
26
|
function mergeIfNotShallowEqual(prev, next) {
|
|
27
|
+
return isEqualShallow(prev, next) ? prev : { ...prev, ...next };
|
|
28
|
+
}
|
|
29
|
+
function isEqualShallow(prev, next) {
|
|
26
30
|
for (const key in next)
|
|
27
31
|
if (prev[key] !== next[key])
|
|
28
|
-
return
|
|
29
|
-
return
|
|
32
|
+
return !1;
|
|
33
|
+
return !0;
|
|
30
34
|
}
|
|
31
35
|
// Annotate the CommonJS export names for ESM import in node:
|
|
32
36
|
0 && (module.exports = {
|
|
33
37
|
createShallowSetState,
|
|
38
|
+
isEqualShallow,
|
|
34
39
|
mergeIfNotShallowEqual
|
|
35
40
|
});
|
|
36
41
|
//# sourceMappingURL=createShallowSetState.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/createShallowSetState.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,SAAS,sBACd,QACA;AACA,SAAO,CAAC,SAAyB,OAAO,CAAC,SAAS,uBAAuB,MAAM,IAAI,CAAC;AACtF;AAEO,SAAS,uBAAuB,MAAW,MAAW;AAC3D,SAAO,eAAe,MAAM,IAAI,IAAI,OAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAChE;AAEO,SAAS,eAAe,MAAM,MAAM;AACzC,aAAW,OAAO;AAChB,QAAI,KAAK,GAAG,MAAM,KAAK,GAAG;AACxB,aAAO;AAGX,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=scheme.js.map
|
|
@@ -25,7 +25,7 @@ function themeable(Component, staticConfig) {
|
|
|
25
25
|
import_Theme.Theme,
|
|
26
26
|
{
|
|
27
27
|
componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName),
|
|
28
|
-
name: theme
|
|
28
|
+
name: theme,
|
|
29
29
|
"disable-child-theme": !0,
|
|
30
30
|
debug: props.debug,
|
|
31
31
|
inverse: themeInverse,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC,kBAGlC,eAAsB,2BAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,gBAtBqB,yBAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAM
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC,kBAGlC,eAAsB,2BAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,gBAtBqB,yBAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAM;AAAA,QACN,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ,WACjE,KAEO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -26,7 +26,7 @@ function themeable(Component, staticConfig) {
|
|
|
26
26
|
import_Theme.Theme,
|
|
27
27
|
{
|
|
28
28
|
componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName),
|
|
29
|
-
name: theme
|
|
29
|
+
name: theme,
|
|
30
30
|
"disable-child-theme": !0,
|
|
31
31
|
debug: props.debug,
|
|
32
32
|
inverse: themeInverse,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC,kBAGlC,eAAsB,2BAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,gBAtBqB,yBAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAM
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC,kBAGlC,eAAsB,2BAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,gBAtBqB,yBAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAM;AAAA,QACN,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ,WACjE,KAEO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -21,7 +21,7 @@ __export(useTheme_exports, {
|
|
|
21
21
|
useThemeWithState: () => useThemeWithState
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(useTheme_exports);
|
|
24
|
-
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_createProxy = require("../helpers/createProxy"), import_ThemeManager = require("../helpers/ThemeManager"), import_ThemeManagerContext = require("../helpers/ThemeManagerContext"), import_getThemeUnwrapped = require("./getThemeUnwrapped");
|
|
24
|
+
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_createProxy = require("../helpers/createProxy"), import_createShallowSetState = require("../helpers/createShallowSetState"), import_ThemeManager = require("../helpers/ThemeManager"), import_ThemeManagerContext = require("../helpers/ThemeManagerContext"), import_getThemeUnwrapped = require("./getThemeUnwrapped");
|
|
25
25
|
const emptyProps = { name: null };
|
|
26
26
|
let cached;
|
|
27
27
|
function getDefaultThemeProxied() {
|
|
@@ -57,7 +57,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
|
|
|
57
57
|
const themeProxied = (0, import_react.useMemo)(() => !themeManager || !(state != null && state.theme) ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug), [state, themeManager, props.deopt, props.debug]);
|
|
58
58
|
return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(" \u{1F539} useTheme =>", state == null ? void 0 : state.name), console.info("returning state", changedThemeState, "from props", props), console.groupEnd()), [changedThemeState, themeProxied];
|
|
59
59
|
};
|
|
60
|
-
function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug) {
|
|
60
|
+
function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys, debug) {
|
|
61
61
|
if (!theme)
|
|
62
62
|
return {};
|
|
63
63
|
const config = (0, import_config.getConfig)();
|
|
@@ -105,7 +105,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
105
105
|
state: parentManager == null ? void 0 : parentManager.state,
|
|
106
106
|
themeManager: parentManager
|
|
107
107
|
};
|
|
108
|
-
const [themeState, setThemeState] = (0, import_react.useState)(createState), { state, mounted, isNewTheme, themeManager } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
|
|
108
|
+
const [themeState, setThemeState] = (0, import_react.useState)(createState), { state, mounted, isNewTheme, themeManager, inversed } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
|
|
109
109
|
function getShouldUpdateTheme(manager = themeManager, nextState, prevState = state, forceShouldChange = !1) {
|
|
110
110
|
const forceUpdate = shouldUpdate == null ? void 0 : shouldUpdate();
|
|
111
111
|
if (!manager || !forceShouldChange && forceUpdate === !1)
|
|
@@ -120,7 +120,10 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
120
120
|
if (!themeManager)
|
|
121
121
|
return;
|
|
122
122
|
if (props.inverse && !mounted) {
|
|
123
|
-
setThemeState(
|
|
123
|
+
setThemeState((prev) => createState({
|
|
124
|
+
...prev,
|
|
125
|
+
mounted: !0
|
|
126
|
+
}));
|
|
124
127
|
return;
|
|
125
128
|
}
|
|
126
129
|
isNewTheme && themeManager && activeThemeManagers.add(themeManager), (isNewTheme || getShouldUpdateTheme(themeManager)) && setThemeState(createState);
|
|
@@ -154,6 +157,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
154
157
|
}), [themeManager])), isInversingOnMount)
|
|
155
158
|
return {
|
|
156
159
|
isNewTheme: !1,
|
|
160
|
+
inversed: !1,
|
|
157
161
|
themeManager: parentManager,
|
|
158
162
|
state: {
|
|
159
163
|
name: "",
|
|
@@ -164,10 +168,10 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
164
168
|
return {
|
|
165
169
|
state,
|
|
166
170
|
isNewTheme,
|
|
171
|
+
inversed,
|
|
167
172
|
themeManager
|
|
168
173
|
};
|
|
169
174
|
function createState(prev, force = !1) {
|
|
170
|
-
var _a;
|
|
171
175
|
if (prev && (shouldUpdate == null ? void 0 : shouldUpdate()) === !1)
|
|
172
176
|
return prev;
|
|
173
177
|
let themeManager2 = parentManager, state2;
|
|
@@ -186,15 +190,18 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
186
190
|
themeManager2 = getNewThemeManager(), state2 = { ...themeManager2.state };
|
|
187
191
|
}
|
|
188
192
|
const isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse), mounted2 = props.inverse ? isRoot || (prev == null ? void 0 : prev.mounted) : !0;
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
const response = {
|
|
192
|
-
state: state2,
|
|
193
|
+
state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager));
|
|
194
|
+
const wasInversed = prev == null ? void 0 : prev.inversed, inversed2 = isNewTheme2 && state2.scheme !== (parentManager == null ? void 0 : parentManager.state.scheme) ? !0 : wasInversed ? !1 : null, response = {
|
|
193
195
|
themeManager: themeManager2,
|
|
194
196
|
isNewTheme: isNewTheme2,
|
|
195
|
-
mounted: mounted2
|
|
196
|
-
|
|
197
|
-
|
|
197
|
+
mounted: mounted2,
|
|
198
|
+
inversed: inversed2
|
|
199
|
+
}, shouldReturnPrev = !force && prev && // isEqualShallow uses the second arg as the keys so this should compare without state first...
|
|
200
|
+
(0, import_createShallowSetState.isEqualShallow)(prev, response) && // ... and then compare just the state, because we make a new state obj but is likely the same
|
|
201
|
+
(0, import_createShallowSetState.isEqualShallow)(prev.state, state2);
|
|
202
|
+
if (prev && shouldReturnPrev)
|
|
203
|
+
return prev;
|
|
204
|
+
if (response.state = state2, process.env.NODE_ENV === "development" && props.debug && import_constants.isClient) {
|
|
198
205
|
console.groupCollapsed(` \u{1F537} ${themeManager2.id} useChangeThemeEffect createState`);
|
|
199
206
|
const parentState = { ...parentManager == null ? void 0 : parentManager.state }, parentId = parentManager == null ? void 0 : parentManager.id, themeManagerState = { ...themeManager2.state };
|
|
200
207
|
console.info({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C,+BAC1C,
|
|
5
|
-
"names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["_", "themeManager", "state", "isNewTheme", "mounted", "inversed"]
|
|
6
6
|
}
|
|
@@ -22,7 +22,7 @@ __export(useTheme_exports, {
|
|
|
22
22
|
useThemeWithState: () => useThemeWithState
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(useTheme_exports);
|
|
25
|
-
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_createProxy = require("../helpers/createProxy"), import_ThemeManager = require("../helpers/ThemeManager"), import_ThemeManagerContext = require("../helpers/ThemeManagerContext"), import_getThemeUnwrapped = require("./getThemeUnwrapped");
|
|
25
|
+
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_createProxy = require("../helpers/createProxy"), import_createShallowSetState = require("../helpers/createShallowSetState"), import_ThemeManager = require("../helpers/ThemeManager"), import_ThemeManagerContext = require("../helpers/ThemeManagerContext"), import_getThemeUnwrapped = require("./getThemeUnwrapped");
|
|
26
26
|
const emptyProps = { name: null };
|
|
27
27
|
let cached;
|
|
28
28
|
function getDefaultThemeProxied() {
|
|
@@ -58,7 +58,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
|
|
|
58
58
|
const themeProxied = (0, import_react.useMemo)(() => !themeManager || !(state != null && state.theme) ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug), [state, themeManager, props.deopt, props.debug]);
|
|
59
59
|
return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(" \u{1F539} useTheme =>", state == null ? void 0 : state.name), console.info("returning state", changedThemeState, "from props", props), console.groupEnd()), [changedThemeState, themeProxied];
|
|
60
60
|
};
|
|
61
|
-
function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug) {
|
|
61
|
+
function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys, debug) {
|
|
62
62
|
if (!theme)
|
|
63
63
|
return {};
|
|
64
64
|
const config = (0, import_config.getConfig)();
|
|
@@ -91,21 +91,18 @@ function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug)
|
|
|
91
91
|
else if (subkey === "get")
|
|
92
92
|
return (platform) => {
|
|
93
93
|
const outVal = (0, import_createVariable.getVariable)(val);
|
|
94
|
-
if (platform !== "web" && import_constants.isIos && !deopt && config.settings.fastSchemeChange) {
|
|
95
|
-
const
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
};
|
|
108
|
-
}
|
|
94
|
+
if (platform !== "web" && import_constants.isIos && !deopt && config.settings.fastSchemeChange && !someParentIsInversed(themeManager) && scheme) {
|
|
95
|
+
const oppositeThemeName = name.replace(
|
|
96
|
+
scheme === "dark" ? "dark" : "light",
|
|
97
|
+
scheme === "dark" ? "light" : "dark"
|
|
98
|
+
), oppositeTheme = config.themes[oppositeThemeName], oppositeVal = (0, import_createVariable.getVariable)(oppositeTheme == null ? void 0 : oppositeTheme[keyString]);
|
|
99
|
+
if (oppositeVal)
|
|
100
|
+
return {
|
|
101
|
+
dynamic: {
|
|
102
|
+
dark: scheme === "dark" ? outVal : oppositeVal,
|
|
103
|
+
light: scheme === "light" ? outVal : oppositeVal
|
|
104
|
+
}
|
|
105
|
+
};
|
|
109
106
|
}
|
|
110
107
|
return track(keyString), outVal;
|
|
111
108
|
};
|
|
@@ -117,6 +114,19 @@ function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug)
|
|
|
117
114
|
}
|
|
118
115
|
});
|
|
119
116
|
}
|
|
117
|
+
function someParentIsInversed(manager) {
|
|
118
|
+
{
|
|
119
|
+
let cur = manager;
|
|
120
|
+
for (; cur; ) {
|
|
121
|
+
if (!cur.parentManager)
|
|
122
|
+
return !0;
|
|
123
|
+
if (cur.parentManager.state.scheme !== cur.state.scheme)
|
|
124
|
+
return !1;
|
|
125
|
+
cur = cur.parentManager;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
return !1;
|
|
129
|
+
}
|
|
120
130
|
const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
|
|
121
131
|
const { disable } = props, parentManager = (0, import_react.useContext)(import_ThemeManagerContext.ThemeManagerContext);
|
|
122
132
|
if (!isRoot && !parentManager || disable)
|
|
@@ -125,7 +135,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
125
135
|
state: parentManager == null ? void 0 : parentManager.state,
|
|
126
136
|
themeManager: parentManager
|
|
127
137
|
};
|
|
128
|
-
const [themeState, setThemeState] = (0, import_react.useState)(createState), { state, mounted, isNewTheme, themeManager } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
|
|
138
|
+
const [themeState, setThemeState] = (0, import_react.useState)(createState), { state, mounted, isNewTheme, themeManager, inversed } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
|
|
129
139
|
function getShouldUpdateTheme(manager = themeManager, nextState, prevState = state, forceShouldChange = !1) {
|
|
130
140
|
const forceUpdate = shouldUpdate == null ? void 0 : shouldUpdate();
|
|
131
141
|
if (!manager || !forceShouldChange && forceUpdate === !1)
|
|
@@ -140,7 +150,10 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
140
150
|
if (!themeManager)
|
|
141
151
|
return;
|
|
142
152
|
if (props.inverse && !mounted) {
|
|
143
|
-
setThemeState(
|
|
153
|
+
setThemeState((prev) => createState({
|
|
154
|
+
...prev,
|
|
155
|
+
mounted: !0
|
|
156
|
+
}));
|
|
144
157
|
return;
|
|
145
158
|
}
|
|
146
159
|
isNewTheme && themeManager && activeThemeManagers.add(themeManager), (isNewTheme || getShouldUpdateTheme(themeManager)) && setThemeState(createState);
|
|
@@ -174,6 +187,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
174
187
|
}), [themeManager])), isInversingOnMount)
|
|
175
188
|
return {
|
|
176
189
|
isNewTheme: !1,
|
|
190
|
+
inversed: !1,
|
|
177
191
|
themeManager: parentManager,
|
|
178
192
|
state: {
|
|
179
193
|
name: "",
|
|
@@ -184,10 +198,10 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
184
198
|
return {
|
|
185
199
|
state,
|
|
186
200
|
isNewTheme,
|
|
201
|
+
inversed,
|
|
187
202
|
themeManager
|
|
188
203
|
};
|
|
189
204
|
function createState(prev, force = !1) {
|
|
190
|
-
var _a;
|
|
191
205
|
if (prev && (shouldUpdate == null ? void 0 : shouldUpdate()) === !1)
|
|
192
206
|
return prev;
|
|
193
207
|
let themeManager2 = parentManager, state2;
|
|
@@ -206,15 +220,18 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
|
|
|
206
220
|
themeManager2 = getNewThemeManager(), state2 = { ...themeManager2.state };
|
|
207
221
|
}
|
|
208
222
|
const isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse), mounted2 = props.inverse ? isRoot || (prev == null ? void 0 : prev.mounted) : !0;
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
const response = {
|
|
212
|
-
state: state2,
|
|
223
|
+
state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager));
|
|
224
|
+
const wasInversed = prev == null ? void 0 : prev.inversed, inversed2 = isNewTheme2 && state2.scheme !== (parentManager == null ? void 0 : parentManager.state.scheme) ? !0 : wasInversed ? !1 : null, response = {
|
|
213
225
|
themeManager: themeManager2,
|
|
214
226
|
isNewTheme: isNewTheme2,
|
|
215
|
-
mounted: mounted2
|
|
216
|
-
|
|
217
|
-
|
|
227
|
+
mounted: mounted2,
|
|
228
|
+
inversed: inversed2
|
|
229
|
+
}, shouldReturnPrev = !force && prev && // isEqualShallow uses the second arg as the keys so this should compare without state first...
|
|
230
|
+
(0, import_createShallowSetState.isEqualShallow)(prev, response) && // ... and then compare just the state, because we make a new state obj but is likely the same
|
|
231
|
+
(0, import_createShallowSetState.isEqualShallow)(prev.state, state2);
|
|
232
|
+
if (prev && shouldReturnPrev)
|
|
233
|
+
return prev;
|
|
234
|
+
if (response.state = state2, process.env.NODE_ENV === "development" && props.debug && import_constants.isClient) {
|
|
218
235
|
console.groupCollapsed(` \u{1F537} ${themeManager2.id} useChangeThemeEffect createState`);
|
|
219
236
|
const parentState = { ...parentManager == null ? void 0 : parentManager.state }, parentId = parentManager == null ? void 0 : parentManager.id, themeManagerState = { ...themeManager2.state };
|
|
220
237
|
console.info({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C,+BAC1C,
|
|
5
|
-
"names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["_", "themeManager", "state", "isNewTheme", "mounted", "inversed"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/setupReactNative.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AAJrD;AAKE,MAAK;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AAJrD;AAKE,MAAK;AAkBH,WAAI,UAAU,WAAW,UAAU,WAC1B,UAAU,QAEf,UAAU,gBAAgB,UAAU,UAAU,SACzC,UAAU,OAGjB,UAAU,WACT,UAAU,gBAAgB,gBAAgB,UAAU,gBAAgB,UAE9D,UAAU,WAEf,eAAU,UAAV,WAAiB,gBACZ,UAAU,YAId,yBAAyB,IAAI,SAAS;AAC/C;AAEA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,IACL,eAAe;AAAA,IACf,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AAAA,EACA,MAAM;AAAA,IACJ,eAAe;AAAA,IACf,QAAQ;AAAA,EACV;AAAA,EACA,WAAW;AAAA,IACT,eAAe;AAAA,IACf,SAAS;AAAA,IACT,QAAQ;AAAA,EACV;AAAA,EACA,SAAS;AAAA,IACP,eAAe;AAAA,EACjB;AACF;AAKO,SAAS,iBAAiB,WAAgC;AAcjE;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/setupReactNative.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AAJrD;AAKE,MAAK;AAGH,YAAI,eAAU,cAAV,WAAqB,gBAAe,eAAU,cAAV,WAAqB,eACpD,UAAU,YAEf,UAAU,qBACL,UAAU,SAEf,eAAU,cAAV,WAAqB,oBAChB,UAAU,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,MAAM,2BAA2B,oBAAI,QAA2C;AAEzE,SAAS,qBAAqB,WAAgB;AAJrD;AAKE,MAAK;AAGH,YAAI,eAAU,cAAV,WAAqB,gBAAe,eAAU,cAAV,WAAqB,eACpD,UAAU,YAEf,UAAU,qBACL,UAAU,SAEf,eAAU,cAAV,WAAqB,oBAChB,UAAU,OAMZ,UAAU;AAoBrB;AAEA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,IACL,eAAe;AAAA,IACf,aAAa,oBAAI,IAAI,CAAC,OAAO,SAAS,QAAQ,CAAC;AAAA,EACjD;AAAA,EACA,MAAM;AAAA,IACJ,eAAe;AAAA,IACf,QAAQ;AAAA,EACV;AAAA,EACA,WAAW;AAAA,IACT,eAAe;AAAA,IACf,SAAS;AAAA,IACT,QAAQ;AAAA,EACV;AAAA,EACA,SAAS;AAAA,IACP,eAAe;AAAA,EACjB;AACF;AAKO,SAAS,iBAAiB,WAAgC;AAcjE;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/cjs/views/Theme.js
CHANGED
|
@@ -23,9 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
23
23
|
var Theme_exports = {};
|
|
24
24
|
__export(Theme_exports, {
|
|
25
25
|
Theme: () => Theme,
|
|
26
|
-
|
|
27
|
-
useThemedChildren: () => useThemedChildren,
|
|
28
|
-
wrapThemeElements: () => wrapThemeElements
|
|
26
|
+
useThemedChildren: () => useThemedChildren
|
|
29
27
|
});
|
|
30
28
|
module.exports = __toCommonJS(Theme_exports);
|
|
31
29
|
var import_constants = require("@tamagui/constants"), import_react = __toESM(require("react")), import_createVariable = require("../createVariable"), import_ThemeManagerContext = require("../helpers/ThemeManagerContext"), import_useTheme = require("../hooks/useTheme"), import_ThemeDebug = require("./ThemeDebug"), import_jsx_runtime = require("react/jsx-runtime");
|
|
@@ -65,47 +63,37 @@ function useThemedChildren(themeState, children, props, isRoot = !1, avoidWrap =
|
|
|
65
63
|
isRoot
|
|
66
64
|
}) : elementsWithContext;
|
|
67
65
|
}
|
|
68
|
-
function getThemeCNStyle(themeState, isRoot = !1) {
|
|
69
|
-
var _a, _b;
|
|
70
|
-
if (!themeState.isNewTheme)
|
|
71
|
-
return;
|
|
72
|
-
const themeColor = (_a = themeState.state) != null && _a.theme && themeState.isNewTheme ? (0, import_createVariable.variableToString)(themeState.state.theme.color) : "", style = themeColor ? {
|
|
73
|
-
color: themeColor
|
|
74
|
-
} : void 0;
|
|
75
|
-
let className = ((_b = themeState.state) == null ? void 0 : _b.className) || "";
|
|
76
|
-
return isRoot && (className = className.replace("t_sub_theme", "")), { style, className };
|
|
77
|
-
}
|
|
78
66
|
function wrapThemeElements({
|
|
79
67
|
children,
|
|
80
68
|
themeState,
|
|
81
69
|
forceClassName,
|
|
82
70
|
isRoot
|
|
83
71
|
}) {
|
|
84
|
-
var _a
|
|
72
|
+
var _a;
|
|
85
73
|
if (isRoot && forceClassName === !1)
|
|
86
74
|
return children;
|
|
87
|
-
const inverse =
|
|
88
|
-
if (!themeState.isNewTheme && !
|
|
75
|
+
const inverse = themeState.inversed, requiresExtraWrapper = inverse != null || forceClassName;
|
|
76
|
+
if (!themeState.isNewTheme && !requiresExtraWrapper)
|
|
89
77
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "_dsp_contents is_Theme", children });
|
|
90
|
-
const { className, style } =
|
|
78
|
+
const { className, style } = getThemeClassNameAndStyle(themeState, isRoot);
|
|
91
79
|
let themedChildren = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: `${className} _dsp_contents is_Theme`, style, children });
|
|
92
|
-
if (
|
|
93
|
-
const name = ((
|
|
94
|
-
themedChildren = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
95
|
-
"span",
|
|
96
|
-
{
|
|
97
|
-
className: `${name.startsWith("light") ? "t_light" : name.startsWith("dark") ? "t_dark" : ""} _dsp_contents ${inverse ? "is_inversed" : ""}`,
|
|
98
|
-
children: themedChildren
|
|
99
|
-
}
|
|
100
|
-
);
|
|
80
|
+
if (requiresExtraWrapper) {
|
|
81
|
+
const name = ((_a = themeState.state) == null ? void 0 : _a.name) || "", inverseClassName = name.startsWith("light") ? "t_light is_inversed" : name.startsWith("dark") ? "t_dark is_inversed" : "";
|
|
82
|
+
themedChildren = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: `${inverse ? inverseClassName : ""} _dsp_contents`, children: themedChildren });
|
|
101
83
|
}
|
|
102
84
|
return themedChildren;
|
|
103
85
|
}
|
|
86
|
+
function getThemeClassNameAndStyle(themeState, isRoot = !1) {
|
|
87
|
+
var _a, _b;
|
|
88
|
+
const themeColor = (_a = themeState.state) != null && _a.theme && themeState.isNewTheme ? (0, import_createVariable.variableToString)(themeState.state.theme.color) : "", style = themeColor ? {
|
|
89
|
+
color: themeColor
|
|
90
|
+
} : void 0;
|
|
91
|
+
let className = ((_b = themeState.state) == null ? void 0 : _b.className) || "";
|
|
92
|
+
return isRoot && (className = className.replace("t_sub_theme", "")), { style, className };
|
|
93
|
+
}
|
|
104
94
|
// Annotate the CommonJS export names for ESM import in node:
|
|
105
95
|
0 && (module.exports = {
|
|
106
96
|
Theme,
|
|
107
|
-
|
|
108
|
-
useThemedChildren,
|
|
109
|
-
wrapThemeElements
|
|
97
|
+
useThemedChildren
|
|
110
98
|
});
|
|
111
99
|
//# sourceMappingURL=Theme.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Theme.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["children", "React"]
|
|
6
6
|
}
|