@tamagui/web 1.28.2 → 1.29.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/createComponent.js +7 -8
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/createTamagui.js +10 -5
- package/dist/cjs/createTamagui.js.map +1 -1
- package/dist/cjs/helpers/getThemeCSSRules.js +7 -5
- package/dist/cjs/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/cjs/helpers/themeable.js +5 -2
- package/dist/cjs/helpers/themeable.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js +38 -26
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/hooks/useThemeName.js.map +1 -1
- package/dist/cjs/views/Theme.js +23 -34
- package/dist/cjs/views/Theme.js.map +1 -1
- package/dist/esm/createComponent.js +7 -8
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/createTamagui.js +10 -5
- package/dist/esm/createTamagui.js.map +1 -1
- package/dist/esm/helpers/getThemeCSSRules.js +7 -5
- package/dist/esm/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/esm/helpers/themeable.js +5 -2
- package/dist/esm/helpers/themeable.js.map +1 -1
- package/dist/esm/hooks/useTheme.js +40 -27
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/hooks/useThemeName.js.map +1 -1
- package/dist/esm/views/Theme.js +24 -35
- package/dist/esm/views/Theme.js.map +1 -1
- package/package.json +9 -9
- package/src/createComponent.tsx +10 -8
- package/src/createTamagui.ts +13 -6
- package/src/helpers/getThemeCSSRules.ts +9 -7
- package/src/helpers/themeable.tsx +8 -2
- package/src/hooks/useTheme.tsx +52 -37
- package/src/hooks/useThemeName.tsx +1 -0
- package/src/types.tsx +2 -2
- package/src/views/Theme.tsx +43 -54
- package/types/createComponent.d.ts.map +1 -1
- package/types/createTamagui.d.ts.map +1 -1
- package/types/helpers/getThemeCSSRules.d.ts.map +1 -1
- package/types/helpers/themeable.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/hooks/useThemeName.d.ts.map +1 -1
- package/types/types.d.ts +2 -2
- package/types/types.d.ts.map +1 -1
- package/types/views/Theme.d.ts.map +1 -1
|
@@ -148,20 +148,25 @@ function createTamagui(configIn) {
|
|
|
148
148
|
);
|
|
149
149
|
const shorthands = configIn.shorthands || {};
|
|
150
150
|
let lastCSSInsertedRulesIndex = -1;
|
|
151
|
-
const getCSS = ({ separator = "\n", sinceLastCall,
|
|
151
|
+
const getCSS = ({ separator = "\n", sinceLastCall, exclude } = {}) => {
|
|
152
152
|
if (sinceLastCall && lastCSSInsertedRulesIndex >= 0) {
|
|
153
153
|
const rules = getAllRules();
|
|
154
154
|
lastCSSInsertedRulesIndex = rules.length;
|
|
155
155
|
return rules.slice(lastCSSInsertedRulesIndex).join(separator);
|
|
156
156
|
}
|
|
157
157
|
lastCSSInsertedRulesIndex = 0;
|
|
158
|
-
|
|
158
|
+
const runtimeStyles = getAllRules().join(separator);
|
|
159
|
+
if (exclude === "design-system") {
|
|
160
|
+
return runtimeStyles;
|
|
161
|
+
}
|
|
162
|
+
const designSystem = `._ovs-contain {overscroll-behavior:contain;}
|
|
159
163
|
.t_unmounted .t_will-mount {opacity:0;visibility:hidden;}
|
|
160
164
|
.is_Text .is_Text {display:inline-flex;}
|
|
161
165
|
._dsp_contents {display:contents;}
|
|
162
|
-
${themeConfig.cssRuleSets.join(separator)}
|
|
163
|
-
|
|
164
|
-
${
|
|
166
|
+
${themeConfig.cssRuleSets.join(separator)}`;
|
|
167
|
+
return `${designSystem}
|
|
168
|
+
${exclude ? "" : themeConfig.getThemeRulesSets().join(separator)}
|
|
169
|
+
${runtimeStyles}`;
|
|
165
170
|
};
|
|
166
171
|
const getNewCSS = (opts) => getCSS({ ...opts, sinceLastCall: true });
|
|
167
172
|
const defaultFont = configIn.defaultFont || Object.keys(configIn.fonts)[0];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createTamagui.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["declarationsToRuleSet", "declarations", "key", "k", "v"]
|
|
6
6
|
}
|
|
@@ -96,11 +96,13 @@ function getThemeCSSRules({
|
|
|
96
96
|
if (config.selectionStyles) {
|
|
97
97
|
const selectionSelectors = baseSelectors.map((s) => `${s} ::selection`).join(", ");
|
|
98
98
|
const rules = config.selectionStyles(theme);
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
99
|
+
if (rules) {
|
|
100
|
+
const styles = Object.entries(rules).flatMap(
|
|
101
|
+
([k, v]) => v ? `${k === "backgroundColor" ? "background" : k}:${variableToString(v)}` : []
|
|
102
|
+
).join(";");
|
|
103
|
+
const css2 = `${selectionSelectors} {${styles}}`;
|
|
104
|
+
cssRuleSets.push(css2);
|
|
105
|
+
}
|
|
104
106
|
}
|
|
105
107
|
return cssRuleSets;
|
|
106
108
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getThemeCSSRules.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["css"]
|
|
6
6
|
}
|
|
@@ -5,10 +5,9 @@ function themeable(component, staticConfig) {
|
|
|
5
5
|
const withThemeComponent = forwardRef(function WithTheme(props, ref) {
|
|
6
6
|
const { themeInverse, theme, componentName, themeReset, ...rest } = props;
|
|
7
7
|
const element = React.createElement(component, { ...rest, ref });
|
|
8
|
-
|
|
8
|
+
let contents = /* @__PURE__ */ jsx(
|
|
9
9
|
Theme,
|
|
10
10
|
{
|
|
11
|
-
inverse: themeInverse,
|
|
12
11
|
componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName),
|
|
13
12
|
name: theme || null,
|
|
14
13
|
"disable-child-theme": true,
|
|
@@ -17,6 +16,10 @@ function themeable(component, staticConfig) {
|
|
|
17
16
|
children: element
|
|
18
17
|
}
|
|
19
18
|
);
|
|
19
|
+
if (themeInverse) {
|
|
20
|
+
contents = /* @__PURE__ */ jsx(Theme, { inverse: true, children: contents });
|
|
21
|
+
}
|
|
22
|
+
return contents;
|
|
20
23
|
});
|
|
21
24
|
const withTheme = withThemeComponent;
|
|
22
25
|
withTheme.displayName = `Themed(${(component == null ? void 0 : component.displayName) || (component == null ? void 0 : component.name) || "Anonymous"})`;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": "AAuBM;AAvBN,OAAO,SAAS,kBAAkB;AAGlC,SAAS,aAAa;AAUf,SAAS,UACd,WACA,cACA;AACA,QAAM,qBAAqB,WAAW,SAAS,UAAU,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI;AAEpE,UAAM,UAAU,MAAM,cAAc,WAAW,EAAE,GAAG,MAAM,IAAI,CAAQ;AAEtE,
|
|
4
|
+
"mappings": "AAuBM;AAvBN,OAAO,SAAS,kBAAkB;AAGlC,SAAS,aAAa;AAUf,SAAS,UACd,WACA,cACA;AACA,QAAM,qBAAqB,WAAW,SAAS,UAAU,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI;AAEpE,UAAM,UAAU,MAAM,cAAc,WAAW,EAAE,GAAG,MAAM,IAAI,CAAQ;AAEtE,QAAI,WACF;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAO,SAAiB;AAAA,QACxB,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAIF,QAAI,cAAc;AAChB,iBAAW,oBAAC,SAAM,SAAO,MAAE,oBAAS;AAAA,IACtC;AAEA,WAAO;AAAA,EACT,CAAC;AAED,QAAM,YAAiB;AACvB,YAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ;AAGjE,SAAO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -5,7 +5,8 @@ import { isDevTools } from "../constants/isDevTools";
|
|
|
5
5
|
import { createProxy } from "../helpers/createProxy";
|
|
6
6
|
import {
|
|
7
7
|
ThemeManager,
|
|
8
|
-
getNonComponentParentManager
|
|
8
|
+
getNonComponentParentManager,
|
|
9
|
+
hasNoThemeUpdatingProps
|
|
9
10
|
} from "../helpers/ThemeManager";
|
|
10
11
|
import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
|
|
11
12
|
import { GetThemeUnwrapped } from "./getThemeUnwrapped";
|
|
@@ -111,17 +112,16 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
|
|
|
111
112
|
// @ts-expect-error internal use only
|
|
112
113
|
disable
|
|
113
114
|
} = props;
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
}
|
|
115
|
+
const ogParentManager = useContext(ThemeManagerContext);
|
|
116
|
+
const hasThemeUpdatingProps = !hasNoThemeUpdatingProps(props);
|
|
117
|
+
const parentManager = disable ? ogParentManager : getNonComponentParentManager(ogParentManager);
|
|
118
118
|
if (disable) {
|
|
119
|
-
if (!
|
|
119
|
+
if (!ogParentManager)
|
|
120
120
|
throw `\u274C`;
|
|
121
121
|
return {
|
|
122
122
|
isNewTheme: false,
|
|
123
|
-
...
|
|
124
|
-
themeManager:
|
|
123
|
+
...ogParentManager.state,
|
|
124
|
+
themeManager: ogParentManager
|
|
125
125
|
};
|
|
126
126
|
}
|
|
127
127
|
const [themeState, setThemeState] = useState(createState);
|
|
@@ -215,37 +215,50 @@ const useChangeThemeEffect = (props, root = false, keys, disableUpdate) => {
|
|
|
215
215
|
if (prev && (disableUpdate == null ? void 0 : disableUpdate())) {
|
|
216
216
|
return prev;
|
|
217
217
|
}
|
|
218
|
-
let themeManager2;
|
|
218
|
+
let themeManager2 = parentManager;
|
|
219
219
|
let state2;
|
|
220
220
|
const getNewThemeManager = () => {
|
|
221
221
|
return new ThemeManager(props, root ? "root" : parentManager);
|
|
222
222
|
};
|
|
223
|
-
if (
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
223
|
+
if (hasThemeUpdatingProps) {
|
|
224
|
+
if (prev == null ? void 0 : prev.themeManager) {
|
|
225
|
+
themeManager2 = prev.themeManager;
|
|
226
|
+
const forceChange = Boolean(keys == null ? void 0 : keys.length);
|
|
227
|
+
const next = themeManager2.getState(props, parentManager);
|
|
228
|
+
const nextState = getShouldUpdateTheme(
|
|
229
|
+
themeManager2,
|
|
230
|
+
next,
|
|
231
|
+
prev.state,
|
|
232
|
+
forceChange
|
|
233
|
+
);
|
|
234
|
+
if (nextState) {
|
|
235
|
+
state2 = nextState;
|
|
236
|
+
if (!prev.isNewTheme || !isWeb) {
|
|
237
|
+
themeManager2 = getNewThemeManager();
|
|
238
|
+
} else {
|
|
239
|
+
themeManager2.updateState(nextState, true);
|
|
240
|
+
}
|
|
232
241
|
} else {
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
if (parentManager && !next) {
|
|
238
|
-
themeManager2 = parentManager;
|
|
242
|
+
if (prev.isNewTheme) {
|
|
243
|
+
if (parentManager && !next) {
|
|
244
|
+
themeManager2 = parentManager;
|
|
245
|
+
}
|
|
239
246
|
}
|
|
240
247
|
}
|
|
248
|
+
} else {
|
|
249
|
+
themeManager2 = getNewThemeManager();
|
|
250
|
+
state2 = { ...themeManager2.state };
|
|
241
251
|
}
|
|
242
|
-
} else {
|
|
243
|
-
themeManager2 = getNewThemeManager();
|
|
244
252
|
}
|
|
245
253
|
const isNewTheme2 = Boolean(themeManager2 !== parentManager);
|
|
246
254
|
const mounted2 = !props.inverse ? true : root || (prev == null ? void 0 : prev.mounted);
|
|
247
255
|
if (!state2) {
|
|
248
|
-
|
|
256
|
+
if (isNewTheme2) {
|
|
257
|
+
state2 = { ...themeManager2.state };
|
|
258
|
+
} else {
|
|
259
|
+
state2 = ogParentManager.state;
|
|
260
|
+
themeManager2 = ogParentManager;
|
|
261
|
+
}
|
|
249
262
|
}
|
|
250
263
|
if (!force && state2.name === (prev == null ? void 0 : prev.state.name)) {
|
|
251
264
|
return prev;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": "AACA,SAAS,UAAU,OAAO,UAAU,aAAa;AACjD,SAAS,YAAY,WAAW,iBAAiB,SAAS,gBAAgB;AAE1E,SAAS,iBAAiB;AAC1B,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B;AAAA,EACE;AAAA,EAEA;AAAA,OACK;AACP,SAAS,2BAA2B;AAEpC,SAAS,yBAAyB;AAClC,SAAS,oBAAoB;AAiB7B,MAAM,aAAa,EAAE,MAAM,KAAK;AAEhC,SAAS,yBAAyB;AAChC,QAAM,SAAS,UAAU;AACzB,QAAM,OAAO,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC;AACzC,SAAO,gBAAgB;AAAA,IACrB,OAAO,OAAO,OAAO,IAAI;AAAA,IACzB;AAAA,EACF,CAAC;AACH;AAQO,MAAM,WAAW,CAAC,QAAoB,eAA+B;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useThemeName.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,OAAO,iCAAiC;AACjD,SAAS,YAAY,gBAAgB;AAErC,SAAS,iBAAiB;AAC1B,SAAS,2BAA2B;AAG7B,SAAS,aAAa,MAAqC;AAChE,MAAI,OAAO;AACT,UAAM,SAAS,UAAU;AACzB,WAAO,OAAO,OAAO,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,CAAC;AAAA,EACpD;
|
|
4
|
+
"mappings": "AAAA,SAAS,OAAO,iCAAiC;AACjD,SAAS,YAAY,gBAAgB;AAErC,SAAS,iBAAiB;AAC1B,SAAS,2BAA2B;AAG7B,SAAS,aAAa,MAAqC;AAChE,MAAI,OAAO;AACT,UAAM,SAAS,UAAU;AACzB,WAAO,OAAO,OAAO,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,CAAC;AAAA,EACpD;AAEA,QAAM,UAAU,WAAW,mBAAmB;AAC9C,QAAM,CAAC,MAAM,OAAO,IAAI,UAAS,mCAAS,MAAM,SAAQ,EAAE;AAE1D,4BAA0B,MAAM;AAC9B,QAAI,CAAC;AAAS;AACd,YAAQ,QAAQ,MAAM,IAAI;AAC1B,WAAO,QAAQ,cAAc,CAAC,MAAMA,aAAY;AAC9C,YAAMC,SAAO,6BAAM,UAASD,SAAQ,MAAM,cAAc,OAAO;AAC/D,UAAI,CAACC;AAAM;AACX,cAAQA,KAAI;AAAA,IACd,CAAC;AAAA,EACH,GAAG,CAAC,mCAAS,MAAM,IAAI,CAAC;AAExB,SAAO;AACT;",
|
|
5
5
|
"names": ["manager", "name"]
|
|
6
6
|
}
|
package/dist/esm/views/Theme.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx } from "react/jsx-runtime";
|
|
2
2
|
import { isWeb } from "@tamagui/constants";
|
|
3
|
-
import { Children, cloneElement, isValidElement
|
|
3
|
+
import { Children, cloneElement, isValidElement } from "react";
|
|
4
4
|
import { variableToString } from "../createVariable";
|
|
5
5
|
import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
|
|
6
6
|
import { useServerRef } from "../hooks/useServerHooks";
|
|
@@ -31,42 +31,31 @@ function useThemedChildren(themeState, children, props, isRoot = false) {
|
|
|
31
31
|
hasEverThemed.current = true;
|
|
32
32
|
}
|
|
33
33
|
const shouldRenderChildrenWithTheme = isNewTheme || hasEverThemed.current || forceClassName || isRoot;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
34
|
+
if (!shouldRenderChildrenWithTheme) {
|
|
35
|
+
return children;
|
|
36
|
+
}
|
|
37
|
+
if (shallow && themeManager) {
|
|
38
38
|
let next = Children.toArray(children);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (forceClassName === false) {
|
|
50
|
-
return wrapped;
|
|
51
|
-
}
|
|
52
|
-
if (isWeb && !props.passPropsToChildren) {
|
|
53
|
-
const themeColor = theme && isNewTheme ? variableToString(theme.color) : "";
|
|
54
|
-
const colorStyle = themeColor ? {
|
|
55
|
-
color: themeColor
|
|
56
|
-
} : void 0;
|
|
57
|
-
return /* @__PURE__ */ jsx("span", { className: `${className || ""} _dsp_contents is_Theme`, style: colorStyle, children: wrapped });
|
|
58
|
-
}
|
|
39
|
+
next = next.map((child) => {
|
|
40
|
+
return isValidElement(child) ? cloneElement(
|
|
41
|
+
child,
|
|
42
|
+
void 0,
|
|
43
|
+
/* @__PURE__ */ jsx(Theme, { name: themeManager.state.parentName, children: child.props.children })
|
|
44
|
+
) : child;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
const wrapped = /* @__PURE__ */ jsx(ThemeManagerContext.Provider, { value: themeManager, children });
|
|
48
|
+
if (forceClassName === false) {
|
|
59
49
|
return wrapped;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
]);
|
|
50
|
+
}
|
|
51
|
+
if (isWeb && !props.passPropsToChildren) {
|
|
52
|
+
const themeColor = theme && isNewTheme ? variableToString(theme.color) : "";
|
|
53
|
+
const colorStyle = themeColor ? {
|
|
54
|
+
color: themeColor
|
|
55
|
+
} : void 0;
|
|
56
|
+
return /* @__PURE__ */ jsx("span", { className: `${className || ""} _dsp_contents is_Theme`, style: colorStyle, children: wrapped });
|
|
57
|
+
}
|
|
58
|
+
return wrapped;
|
|
70
59
|
}
|
|
71
60
|
export {
|
|
72
61
|
Theme,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Theme.tsx"],
|
|
4
|
-
"mappings": "AA4BQ;AA5BR,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,
|
|
4
|
+
"mappings": "AA4BQ;AA5BR,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,sBAAiD;AAElF,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAE3D,SAAS,kBAAkB;AAEpB,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM,SAAS;AACjB,WAAO,MAAM;AAAA,EACf;AAEA,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AAErD,MAAI,WAAW,MAAM,qBAAqB,IACtC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,oBAAoB,GAAG,KAAK,CAAC;AAAA,EACtD,IACA,MAAM;AAEV,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,MAAM,UAAU,aAAa;AAC/B,iBACE,oBAAC,cAAW,YAAwB,YAAY,OAC7C,UACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D;AAEO,SAAS,kBACd,YACA,UACA,OAMA,SAAS,OACT;AACA,QAAM,EAAE,cAAc,WAAW,OAAO,WAAW,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,QAAM,gCACJ,cAAc,cAAc,WAAW,kBAAkB;AAE3D,MAAI,CAAC,+BAA+B;AAClC,WAAO;AAAA,EACT;AAKA,MAAI,WAAW,cAAc;AAC3B,QAAI,OAAO,SAAS,QAAQ,QAAQ;AACpC,WAAO,KAAK,IAAI,CAAC,UAAU;AACzB,aAAO,eAAe,KAAK,IACvB;AAAA,QACE;AAAA,QACA;AAAA,QACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,MACF,IACA;AAAA,IACN,CAAC;AAAA,EACH;AAEA,QAAM,UACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,UACH;AAGF,MAAI,mBAAmB,OAAO;AAC5B,WAAO;AAAA,EACT;AAEA,MAAI,SAAS,CAAC,MAAM,qBAAqB;AAEvC,UAAM,aAAa,SAAS,aAAa,iBAAiB,MAAM,KAAK,IAAI;AACzE,UAAM,aAAa,aACf;AAAA,MACE,OAAO;AAAA,IACT,IACA;AAEJ,WACE,oBAAC,UAAK,WAAW,GAAG,aAAa,6BAA6B,OAAO,YAClE,mBACH;AAAA,EAEJ;AAEA,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.29.0",
|
|
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.
|
|
31
|
-
"@tamagui/constants": "1.
|
|
32
|
-
"@tamagui/helpers": "1.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.
|
|
34
|
-
"@tamagui/use-did-finish-ssr": "1.
|
|
35
|
-
"@tamagui/use-event": "1.
|
|
36
|
-
"@tamagui/use-force-update": "1.
|
|
30
|
+
"@tamagui/compose-refs": "1.29.0",
|
|
31
|
+
"@tamagui/constants": "1.29.0",
|
|
32
|
+
"@tamagui/helpers": "1.29.0",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.29.0",
|
|
34
|
+
"@tamagui/use-did-finish-ssr": "1.29.0",
|
|
35
|
+
"@tamagui/use-event": "1.29.0",
|
|
36
|
+
"@tamagui/use-force-update": "1.29.0"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.
|
|
42
|
+
"@tamagui/build": "1.29.0",
|
|
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
|
@@ -171,10 +171,15 @@ export function createComponent<
|
|
|
171
171
|
const contextValue = useContext(context)
|
|
172
172
|
const { inverseShorthands } = getConfig()
|
|
173
173
|
for (const key in context.props) {
|
|
174
|
-
const
|
|
174
|
+
const propVal = propsIn[key] || propsIn[inverseShorthands[key]]
|
|
175
175
|
// if not set, use context
|
|
176
|
-
if (
|
|
177
|
-
if (
|
|
176
|
+
if (propVal == null) {
|
|
177
|
+
if (
|
|
178
|
+
contextValue &&
|
|
179
|
+
// is valid style or variant allow it
|
|
180
|
+
((staticConfig.validStyles && key in staticConfig.validStyles) ||
|
|
181
|
+
(staticConfig.variants && key in staticConfig.variants))
|
|
182
|
+
) {
|
|
178
183
|
contextProps ||= {}
|
|
179
184
|
contextProps[key] = contextValue[key]
|
|
180
185
|
}
|
|
@@ -182,7 +187,7 @@ export function createComponent<
|
|
|
182
187
|
// if set in props, update context
|
|
183
188
|
else {
|
|
184
189
|
overriddenContextProps ||= {}
|
|
185
|
-
overriddenContextProps[key] =
|
|
190
|
+
overriddenContextProps[key] = propVal
|
|
186
191
|
}
|
|
187
192
|
}
|
|
188
193
|
}
|
|
@@ -336,10 +341,7 @@ export function createComponent<
|
|
|
336
341
|
// @ts-ignore this is internal use only
|
|
337
342
|
disable: disableTheme,
|
|
338
343
|
shouldUpdate: () => !!stateRef.current.didAccessThemeVariableValue,
|
|
339
|
-
|
|
340
|
-
if (process.env.NODE_ENV === 'development') {
|
|
341
|
-
// @ts-expect-error
|
|
342
|
-
themeStateProps.debug = props.debug
|
|
344
|
+
debug: debugProp,
|
|
343
345
|
}
|
|
344
346
|
const themeState = useThemeWithState(themeStateProps)!
|
|
345
347
|
|
package/src/createTamagui.ts
CHANGED
|
@@ -211,7 +211,7 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
211
211
|
|
|
212
212
|
let lastCSSInsertedRulesIndex = -1
|
|
213
213
|
|
|
214
|
-
const getCSS: GetCSS = ({ separator = '\n', sinceLastCall,
|
|
214
|
+
const getCSS: GetCSS = ({ separator = '\n', sinceLastCall, exclude } = {}) => {
|
|
215
215
|
if (sinceLastCall && lastCSSInsertedRulesIndex >= 0) {
|
|
216
216
|
// after first run with sinceLastCall
|
|
217
217
|
const rules = getAllRules()
|
|
@@ -222,14 +222,21 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
222
222
|
// set so next time getNewCSS will trigger only new rules
|
|
223
223
|
lastCSSInsertedRulesIndex = 0
|
|
224
224
|
|
|
225
|
-
|
|
226
|
-
|
|
225
|
+
const runtimeStyles = getAllRules().join(separator)
|
|
226
|
+
|
|
227
|
+
if (exclude === 'design-system') {
|
|
228
|
+
return runtimeStyles
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
const designSystem = `._ovs-contain {overscroll-behavior:contain;}
|
|
227
232
|
.t_unmounted .t_will-mount {opacity:0;visibility:hidden;}
|
|
228
233
|
.is_Text .is_Text {display:inline-flex;}
|
|
229
234
|
._dsp_contents {display:contents;}
|
|
230
|
-
${themeConfig.cssRuleSets.join(separator)}
|
|
231
|
-
|
|
232
|
-
|
|
235
|
+
${themeConfig.cssRuleSets.join(separator)}`
|
|
236
|
+
|
|
237
|
+
return `${designSystem}
|
|
238
|
+
${exclude ? '' : themeConfig.getThemeRulesSets().join(separator)}
|
|
239
|
+
${runtimeStyles}`
|
|
233
240
|
}
|
|
234
241
|
|
|
235
242
|
const getNewCSS: GetCSS = (opts) => getCSS({ ...opts, sinceLastCall: true })
|
|
@@ -151,13 +151,15 @@ export function getThemeCSSRules({
|
|
|
151
151
|
if (config.selectionStyles) {
|
|
152
152
|
const selectionSelectors = baseSelectors.map((s) => `${s} ::selection`).join(', ')
|
|
153
153
|
const rules = config.selectionStyles(theme)
|
|
154
|
-
|
|
155
|
-
.
|
|
156
|
-
([k, v]) =>
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
154
|
+
if (rules) {
|
|
155
|
+
const styles = Object.entries(rules)
|
|
156
|
+
.flatMap(([k, v]) =>
|
|
157
|
+
v ? `${k === 'backgroundColor' ? 'background' : k}:${variableToString(v)}` : []
|
|
158
|
+
)
|
|
159
|
+
.join(';')
|
|
160
|
+
const css = `${selectionSelectors} {${styles}}`
|
|
161
|
+
cssRuleSets.push(css)
|
|
162
|
+
}
|
|
161
163
|
}
|
|
162
164
|
|
|
163
165
|
return cssRuleSets
|
|
@@ -20,9 +20,8 @@ export function themeable<Component extends (props: any) => any>(
|
|
|
20
20
|
|
|
21
21
|
const element = React.createElement(component, { ...rest, ref } as any)
|
|
22
22
|
|
|
23
|
-
|
|
23
|
+
let contents = (
|
|
24
24
|
<Theme
|
|
25
|
-
inverse={themeInverse}
|
|
26
25
|
componentName={componentName || staticConfig?.componentName}
|
|
27
26
|
name={(theme as any) || null}
|
|
28
27
|
disable-child-theme
|
|
@@ -32,6 +31,13 @@ export function themeable<Component extends (props: any) => any>(
|
|
|
32
31
|
{element}
|
|
33
32
|
</Theme>
|
|
34
33
|
)
|
|
34
|
+
|
|
35
|
+
// fixes components needing to inverse before changing to component theme
|
|
36
|
+
if (themeInverse) {
|
|
37
|
+
contents = <Theme inverse>{contents}</Theme>
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
return contents
|
|
35
41
|
})
|
|
36
42
|
|
|
37
43
|
const withTheme: any = withThemeComponent
|