@tamagui/web 1.45.11 → 1.46.0-1690529497942
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 +42 -80
- package/dist/cjs/createComponent.js.map +2 -2
- package/dist/cjs/createTamagui.js +45 -43
- package/dist/cjs/createTamagui.js.map +1 -1
- package/dist/cjs/helpers/ThemeManager.js +5 -4
- package/dist/cjs/helpers/ThemeManager.js.map +1 -1
- package/dist/cjs/helpers/createPropMapper.js +55 -74
- package/dist/cjs/helpers/createPropMapper.js.map +2 -2
- package/dist/cjs/helpers/expandStyles.js +8 -5
- package/dist/cjs/helpers/expandStyles.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.js +62 -97
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/getThemeCSSRules.js +89 -91
- package/dist/cjs/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/cjs/helpers/getVariantExtras.js +2 -10
- package/dist/cjs/helpers/getVariantExtras.js.map +1 -1
- package/dist/cjs/helpers/isTamaguiComponent.js +1 -1
- package/dist/cjs/helpers/isTamaguiComponent.js.map +1 -1
- package/dist/cjs/helpers/mergeProps.js +6 -14
- package/dist/cjs/helpers/mergeProps.js.map +1 -1
- package/dist/cjs/helpers/normalizeValueWithProperty.js +2 -14
- package/dist/cjs/helpers/normalizeValueWithProperty.js.map +1 -1
- package/dist/cjs/helpers/propMapper.js +378 -0
- package/dist/cjs/helpers/propMapper.js.map +6 -0
- package/dist/cjs/helpers/swapFontFaceOnWeight.js +63 -0
- package/dist/cjs/helpers/swapFontFaceOnWeight.js.map +6 -0
- package/dist/cjs/helpers/useShallowSetState.js +1 -1
- package/dist/cjs/helpers/useShallowSetState.js.map +1 -1
- package/dist/cjs/hooks/useMedia.js +6 -4
- package/dist/cjs/hooks/useMedia.js.map +1 -1
- package/dist/cjs/hooks/useStyle.js +1 -1
- package/dist/cjs/hooks/useStyle.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js +34 -85
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/index.js +2 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/views/Theme.js +2 -2
- package/dist/cjs/views/Theme.js.map +1 -1
- package/dist/cjs/views/ThemeDebug.js +2 -2
- package/dist/cjs/views/ThemeDebug.js.map +1 -1
- package/dist/esm/createComponent.js +42 -80
- package/dist/esm/createComponent.js.map +2 -2
- package/dist/esm/createTamagui.js +45 -43
- package/dist/esm/createTamagui.js.map +1 -1
- package/dist/esm/helpers/ThemeManager.js +5 -4
- package/dist/esm/helpers/ThemeManager.js.map +1 -1
- package/dist/esm/helpers/createPropMapper.js +53 -72
- package/dist/esm/helpers/createPropMapper.js.map +2 -2
- package/dist/esm/helpers/expandStyles.js +8 -5
- package/dist/esm/helpers/expandStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.js +61 -96
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getThemeCSSRules.js +89 -91
- package/dist/esm/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/esm/helpers/getVariantExtras.js +2 -10
- package/dist/esm/helpers/getVariantExtras.js.map +1 -1
- package/dist/esm/helpers/isTamaguiComponent.js +1 -1
- package/dist/esm/helpers/isTamaguiComponent.js.map +1 -1
- package/dist/esm/helpers/mergeProps.js +6 -14
- package/dist/esm/helpers/mergeProps.js.map +1 -1
- package/dist/esm/helpers/normalizeValueWithProperty.js +2 -14
- package/dist/esm/helpers/normalizeValueWithProperty.js.map +1 -1
- package/dist/esm/helpers/propMapper.js +352 -0
- package/dist/esm/helpers/propMapper.js.map +6 -0
- package/dist/esm/helpers/swapFontFaceOnWeight.js +39 -0
- package/dist/esm/helpers/swapFontFaceOnWeight.js.map +6 -0
- package/dist/esm/helpers/useShallowSetState.js +1 -1
- package/dist/esm/helpers/useShallowSetState.js.map +1 -1
- package/dist/esm/hooks/useMedia.js +7 -5
- package/dist/esm/hooks/useMedia.js.map +1 -1
- package/dist/esm/hooks/useStyle.js +1 -1
- package/dist/esm/hooks/useStyle.js.map +1 -1
- package/dist/esm/hooks/useTheme.js +35 -86
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/views/Theme.js +2 -2
- package/dist/esm/views/Theme.js.map +1 -1
- package/dist/esm/views/ThemeDebug.js +2 -2
- package/dist/esm/views/ThemeDebug.js.map +1 -1
- package/package.json +9 -9
- package/src/createComponent.tsx +75 -98
- package/src/createTamagui.ts +56 -54
- package/src/helpers/ThemeManager.tsx +5 -5
- package/src/helpers/expandStyles.ts +11 -9
- package/src/helpers/getSplitStyles.tsx +104 -164
- package/src/helpers/getThemeCSSRules.ts +127 -126
- package/src/helpers/getVariantExtras.tsx +15 -31
- package/src/helpers/isTamaguiComponent.tsx +3 -3
- package/src/helpers/mergeProps.ts +5 -20
- package/src/helpers/normalizeValueWithProperty.ts +2 -16
- package/src/helpers/{createPropMapper.ts → propMapper.ts} +51 -110
- package/src/helpers/useShallowSetState.tsx +1 -1
- package/src/hooks/useMedia.tsx +11 -5
- package/src/hooks/useStyle.tsx +5 -1
- package/src/hooks/useTheme.tsx +113 -121
- package/src/index.ts +1 -1
- package/src/types.tsx +15 -29
- package/src/views/Theme.tsx +3 -3
- package/src/views/ThemeDebug.tsx +2 -2
- package/types/createComponent.d.ts +2 -2
- package/types/createComponent.d.ts.map +1 -1
- package/types/createTamagui.d.ts.map +1 -1
- package/types/helpers/ThemeManager.d.ts +1 -1
- package/types/helpers/ThemeManager.d.ts.map +1 -1
- package/types/helpers/createPropMapper.d.ts +3 -3
- package/types/helpers/createPropMapper.d.ts.map +1 -1
- package/types/helpers/expandStyles.d.ts +1 -1
- package/types/helpers/expandStyles.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts +3 -4
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/getThemeCSSRules.d.ts +1 -1
- package/types/helpers/getThemeCSSRules.d.ts.map +1 -1
- package/types/helpers/getVariantExtras.d.ts +1 -1
- package/types/helpers/getVariantExtras.d.ts.map +1 -1
- package/types/helpers/isTamaguiComponent.d.ts.map +1 -1
- package/types/helpers/mergeProps.d.ts +1 -1
- package/types/helpers/mergeProps.d.ts.map +1 -1
- package/types/helpers/normalizeValueWithProperty.d.ts.map +1 -1
- package/types/helpers/parseStaticConfig.d.ts.map +1 -1
- package/types/helpers/propMapper.d.ts +6 -0
- package/types/helpers/propMapper.d.ts.map +1 -0
- package/types/helpers/swapFontFaceOnWeight.d.ts +4 -0
- package/types/helpers/swapFontFaceOnWeight.d.ts.map +1 -0
- package/types/hooks/useMedia.d.ts.map +1 -1
- package/types/hooks/useStyle.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts +7 -13
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/index.d.ts +1 -1
- package/types/index.d.ts.map +1 -1
- package/types/styled.d.ts +1 -1
- package/types/types.d.ts +12 -22
- package/types/types.d.ts.map +1 -1
- package/src/helpers/parseStaticConfig.ts +0 -14
- package/src/hooks/useSafeRef.ts +0 -45
|
@@ -18,9 +18,9 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var createPropMapper_exports = {};
|
|
20
20
|
__export(createPropMapper_exports, {
|
|
21
|
-
createPropMapper: () => createPropMapper,
|
|
22
21
|
getFontFamilyFromNameOrVariable: () => getFontFamilyFromNameOrVariable,
|
|
23
|
-
getPropMappedFontFamily: () => getPropMappedFontFamily
|
|
22
|
+
getPropMappedFontFamily: () => getPropMappedFontFamily,
|
|
23
|
+
propMapper: () => propMapper
|
|
24
24
|
});
|
|
25
25
|
module.exports = __toCommonJS(createPropMapper_exports);
|
|
26
26
|
var import_constants = require("@tamagui/constants");
|
|
@@ -30,56 +30,51 @@ var import_expandStyle = require("./expandStyle");
|
|
|
30
30
|
var import_expandStyles = require("./expandStyles");
|
|
31
31
|
var import_getVariantExtras = require("./getVariantExtras");
|
|
32
32
|
var import_isObj = require("./isObj");
|
|
33
|
-
var import_mergeProps = require("./mergeProps");
|
|
34
33
|
var import_pseudoDescriptors = require("./pseudoDescriptors");
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
} else if ((0, import_createVariable.isVariable)(value)) {
|
|
73
|
-
value = resolveVariableValue(key, value, returnVariablesAs);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
if (shouldReturn || value != null) {
|
|
77
|
-
return (0, import_expandStyle.expandStyle)(key, value) || [[key, value]];
|
|
34
|
+
const propMapper = (key, value, styleStateIn, subPropsIn, avoidDefaultProps = false) => {
|
|
35
|
+
if (!(process.env.TAMAGUI_TARGET === "native" && import_constants.isAndroid)) {
|
|
36
|
+
if (key === "elevationAndroid")
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
const subProps = styleStateIn.state.fallbackProps || subPropsIn;
|
|
40
|
+
const styleState = subProps ? {
|
|
41
|
+
...styleStateIn,
|
|
42
|
+
curProps: subProps
|
|
43
|
+
} : styleStateIn;
|
|
44
|
+
const { conf, state, fontFamily } = styleState;
|
|
45
|
+
const returnVariablesAs = state.resolveVariablesAs === "value" ? "value" : "auto";
|
|
46
|
+
if (process.env.NODE_ENV === "development" && fontFamily && fontFamily[0] === "$" && !(fontFamily in conf.fontsParsed)) {
|
|
47
|
+
console.warn(`Warning: no fontFamily "${fontFamily}" found in config: ${Object.keys(conf.fontsParsed).join(", ")}`);
|
|
48
|
+
}
|
|
49
|
+
const variantValue = resolveVariants(
|
|
50
|
+
key,
|
|
51
|
+
value,
|
|
52
|
+
styleState,
|
|
53
|
+
defaultProps,
|
|
54
|
+
returnVariablesAs,
|
|
55
|
+
"",
|
|
56
|
+
avoidDefaultProps
|
|
57
|
+
);
|
|
58
|
+
if (variantValue) {
|
|
59
|
+
return variantValue;
|
|
60
|
+
}
|
|
61
|
+
let shouldReturn = false;
|
|
62
|
+
if (key in conf.shorthands) {
|
|
63
|
+
shouldReturn = true;
|
|
64
|
+
key = conf.shorthands[key];
|
|
65
|
+
}
|
|
66
|
+
if (value) {
|
|
67
|
+
if (value[0] === "$") {
|
|
68
|
+
value = getToken(key, value, styleState, returnVariablesAs);
|
|
69
|
+
} else if ((0, import_createVariable.isVariable)(value)) {
|
|
70
|
+
value = resolveVariableValue(key, value, returnVariablesAs);
|
|
78
71
|
}
|
|
79
|
-
}
|
|
80
|
-
|
|
72
|
+
}
|
|
73
|
+
if (shouldReturn || value != null) {
|
|
74
|
+
return (0, import_expandStyle.expandStyle)(key, value) || [[key, value]];
|
|
75
|
+
}
|
|
81
76
|
};
|
|
82
|
-
const resolveVariants = (key, value, styleState,
|
|
77
|
+
const resolveVariants = (key, value, styleState, defaultProps2, returnVariablesAs, parentVariantKey, avoidDefaultProps = false) => {
|
|
83
78
|
const { staticConfig, conf, debug } = styleState;
|
|
84
79
|
const { variants } = staticConfig;
|
|
85
80
|
if (!variants || !(key in variants) || value == null) {
|
|
@@ -112,7 +107,7 @@ const resolveVariants = (key, value, styleState, defaultProps, returnVariablesAs
|
|
|
112
107
|
const fn = variantValue;
|
|
113
108
|
variantValue = fn(
|
|
114
109
|
value,
|
|
115
|
-
(0, import_getVariantExtras.getVariantExtras)(styleState,
|
|
110
|
+
(0, import_getVariantExtras.getVariantExtras)(styleState, defaultProps2, avoidDefaultProps)
|
|
116
111
|
);
|
|
117
112
|
if (process.env.NODE_ENV === "development" && debug === "verbose") {
|
|
118
113
|
console.groupCollapsed(" expanded functional variant", key);
|
|
@@ -124,16 +119,10 @@ const resolveVariants = (key, value, styleState, defaultProps, returnVariablesAs
|
|
|
124
119
|
console.log(` attaching updated curProps`, {
|
|
125
120
|
new: variantValue,
|
|
126
121
|
before: styleState.curProps,
|
|
127
|
-
after:
|
|
128
|
-
...styleState.curProps,
|
|
129
|
-
...variantValue
|
|
130
|
-
}
|
|
122
|
+
after: Object.assign(styleState.curProps, variantValue)
|
|
131
123
|
});
|
|
132
124
|
}
|
|
133
|
-
styleState.curProps
|
|
134
|
-
...styleState.curProps,
|
|
135
|
-
...variantValue
|
|
136
|
-
};
|
|
125
|
+
Object.assign(styleState.curProps, variantValue);
|
|
137
126
|
let fontFamilyResult;
|
|
138
127
|
if ((0, import_isObj.isObj)(variantValue)) {
|
|
139
128
|
const fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
|
|
@@ -148,7 +137,7 @@ const resolveVariants = (key, value, styleState, defaultProps, returnVariablesAs
|
|
|
148
137
|
key,
|
|
149
138
|
variantValue,
|
|
150
139
|
styleState,
|
|
151
|
-
|
|
140
|
+
defaultProps2,
|
|
152
141
|
returnVariablesAs,
|
|
153
142
|
parentVariantKey,
|
|
154
143
|
avoidDefaultProps
|
|
@@ -188,7 +177,7 @@ const fontFamilyCache = /* @__PURE__ */ new WeakMap();
|
|
|
188
177
|
const getPropMappedFontFamily = (expanded) => {
|
|
189
178
|
return expanded && fontFamilyCache.get(expanded);
|
|
190
179
|
};
|
|
191
|
-
const resolveTokensAndVariants = (key, value, styleState,
|
|
180
|
+
const resolveTokensAndVariants = (key, value, styleState, defaultProps2, returnVariablesAs, parentVariantKey, avoidDefaultProps) => {
|
|
192
181
|
var _a;
|
|
193
182
|
const { conf, staticConfig, debug, theme } = styleState;
|
|
194
183
|
const { variants } = staticConfig;
|
|
@@ -208,7 +197,7 @@ const resolveTokensAndVariants = (key, value, styleState, defaultProps, returnVa
|
|
|
208
197
|
fKey,
|
|
209
198
|
val,
|
|
210
199
|
styleState,
|
|
211
|
-
|
|
200
|
+
defaultProps2,
|
|
212
201
|
returnVariablesAs,
|
|
213
202
|
key,
|
|
214
203
|
avoidDefaultProps
|
|
@@ -245,7 +234,7 @@ const resolveTokensAndVariants = (key, value, styleState, defaultProps, returnVa
|
|
|
245
234
|
fKey,
|
|
246
235
|
val,
|
|
247
236
|
styleState,
|
|
248
|
-
|
|
237
|
+
defaultProps2,
|
|
249
238
|
returnVariablesAs,
|
|
250
239
|
key,
|
|
251
240
|
avoidDefaultProps
|
|
@@ -336,7 +325,7 @@ const getToken = (key, value, styleState, resolveAs, debug) => {
|
|
|
336
325
|
for (const cat in tokenCategories) {
|
|
337
326
|
if (key in tokenCategories[cat]) {
|
|
338
327
|
const res = tokensParsed[cat][value];
|
|
339
|
-
if (res) {
|
|
328
|
+
if (res != null) {
|
|
340
329
|
valOrVar = res;
|
|
341
330
|
hasSet = true;
|
|
342
331
|
}
|
|
@@ -344,7 +333,7 @@ const getToken = (key, value, styleState, resolveAs, debug) => {
|
|
|
344
333
|
}
|
|
345
334
|
if (!hasSet) {
|
|
346
335
|
const spaceVar = tokensParsed.space[value];
|
|
347
|
-
if (spaceVar) {
|
|
336
|
+
if (spaceVar != null) {
|
|
348
337
|
valOrVar = spaceVar;
|
|
349
338
|
hasSet = true;
|
|
350
339
|
}
|
|
@@ -367,14 +356,6 @@ function resolveVariableValue(key, valOrVar, resolveAs = "auto") {
|
|
|
367
356
|
if (resolveAs === "variable") {
|
|
368
357
|
return valOrVar;
|
|
369
358
|
}
|
|
370
|
-
if (resolveAs === "non-color-value") {
|
|
371
|
-
if (import_constants.isWeb) {
|
|
372
|
-
if (key in tokenCategories.color) {
|
|
373
|
-
return valOrVar.variable;
|
|
374
|
-
}
|
|
375
|
-
}
|
|
376
|
-
return valOrVar.val;
|
|
377
|
-
}
|
|
378
359
|
if (!import_constants.isWeb || resolveAs === "value") {
|
|
379
360
|
return valOrVar.val;
|
|
380
361
|
}
|
|
@@ -413,8 +394,8 @@ const tokenCategories = {
|
|
|
413
394
|
};
|
|
414
395
|
// Annotate the CommonJS export names for ESM import in node:
|
|
415
396
|
0 && (module.exports = {
|
|
416
|
-
createPropMapper,
|
|
417
397
|
getFontFamilyFromNameOrVariable,
|
|
418
|
-
getPropMappedFontFamily
|
|
398
|
+
getPropMappedFontFamily,
|
|
399
|
+
propMapper
|
|
419
400
|
});
|
|
420
401
|
//# sourceMappingURL=createPropMapper.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/createPropMapper.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAiC;AAEjC,wBAA2B;AAC3B,4BAAuD;AAUvD,yBAA4B;AAC5B,0BAAmD;AACnD,8BAAsD;AACtD,mBAAsB;
|
|
5
|
-
"names": ["key", "val"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["defaultProps", "key", "val"]
|
|
6
6
|
}
|
|
@@ -23,19 +23,16 @@ __export(expandStyles_exports, {
|
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(expandStyles_exports);
|
|
25
25
|
var import_constants = require("@tamagui/constants");
|
|
26
|
-
var import_config = require("../config");
|
|
27
26
|
var import_expandStyle = require("./expandStyle");
|
|
28
27
|
var import_normalizeShadow = require("./normalizeShadow");
|
|
29
28
|
var import_normalizeValueWithProperty = require("./normalizeValueWithProperty");
|
|
30
29
|
var import_pseudoDescriptors = require("./pseudoDescriptors");
|
|
31
|
-
function expandStylesAndRemoveNullishValues(style
|
|
30
|
+
function expandStylesAndRemoveNullishValues(style) {
|
|
32
31
|
const res = {};
|
|
33
32
|
for (let key in style) {
|
|
34
33
|
const valIn = style[key];
|
|
35
|
-
if (valIn == null)
|
|
34
|
+
if (valIn == null)
|
|
36
35
|
continue;
|
|
37
|
-
}
|
|
38
|
-
key = (shorthands == null ? void 0 : shorthands[key]) || key;
|
|
39
36
|
if (key in import_pseudoDescriptors.pseudoDescriptors) {
|
|
40
37
|
res[key] = expandStylesAndRemoveNullishValues(valIn);
|
|
41
38
|
continue;
|
|
@@ -52,6 +49,12 @@ function expandStylesAndRemoveNullishValues(style, { shorthands } = (0, import_c
|
|
|
52
49
|
return res;
|
|
53
50
|
}
|
|
54
51
|
function fixStyles(style) {
|
|
52
|
+
if (process.env.TAMAGUI_TARGET === "native") {
|
|
53
|
+
if ("elevationAndroid" in style) {
|
|
54
|
+
style["elevation"] = style.elevationAndroid;
|
|
55
|
+
delete style.elevationAndroid;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
55
58
|
if (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) {
|
|
56
59
|
Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
|
|
57
60
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/expandStyles.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AAEtB,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AAEtB,yBAA4B;AAC5B,6BAAgC;AAChC,wCAA2C;AAC3C,+BAAkC;AAU3B,SAAS,mCAAmC,OAA4B;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,UAAM,QAAQ,MAAM,GAAG;AACvB,QAAI,SAAS;AAAM;AACnB,QAAI,OAAO,4CAAmB;AAC5B,UAAI,GAAG,IAAI,mCAAmC,KAAK;AACnD;AAAA,IACF;AACA,UAAM,UAAM,8DAA2B,OAAO,GAAG;AAEjD,UAAM,UAAM,gCAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MAAI,QAAQ,IAAI,mBAAmB,UAAU;AAC3C,QAAI,sBAAsB,OAAO;AAE/B,YAAM,WAAW,IAAI,MAAM;AAE3B,aAAO,MAAM;AAAA,IACf;AAAA,EACF;AAEA,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAGA,MAAM,cAAc,yBAAQ,OAAO;AACnC,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -32,42 +32,32 @@ var import_accessibilityDirectMap = require("../constants/accessibilityDirectMap
|
|
|
32
32
|
var import_isDevTools = require("../constants/isDevTools");
|
|
33
33
|
var import_useMedia = require("../hooks/useMedia");
|
|
34
34
|
var import_createMediaStyle = require("./createMediaStyle");
|
|
35
|
-
var import_createPropMapper = require("./createPropMapper");
|
|
36
35
|
var import_expandStyles = require("./expandStyles");
|
|
37
36
|
var import_getStylesAtomic = require("./getStylesAtomic");
|
|
38
37
|
var import_insertStyleRule = require("./insertStyleRule");
|
|
39
38
|
var import_normalizeValueWithProperty = require("./normalizeValueWithProperty");
|
|
39
|
+
var import_propMapper = require("./propMapper");
|
|
40
40
|
var import_pseudoDescriptors = require("./pseudoDescriptors");
|
|
41
41
|
const fontFamilyKey = "fontFamily";
|
|
42
42
|
const IS_STATIC = process.env.IS_STATIC === "is_static";
|
|
43
43
|
let conf;
|
|
44
44
|
const PROP_SPLIT = "-";
|
|
45
45
|
const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyles, languageContext, elementType, debug) => {
|
|
46
|
-
var _a, _b, _c, _d, _e
|
|
46
|
+
var _a, _b, _c, _d, _e;
|
|
47
47
|
conf = conf || (0, import_config.getConfig)();
|
|
48
48
|
const { shorthands } = conf;
|
|
49
49
|
const { theme, name: themeName } = themeState;
|
|
50
|
-
const {
|
|
51
|
-
|
|
52
|
-
variants,
|
|
53
|
-
propMapper,
|
|
54
|
-
isReactNative,
|
|
55
|
-
inlineProps,
|
|
56
|
-
inlineWhenUnflattened
|
|
57
|
-
} = staticConfig;
|
|
58
|
-
const validStyleProps = staticConfig.isText ? import_helpers.stylePropsText : import_helpers.validStyles;
|
|
50
|
+
const { isHOC, isText, variants, isReactNative, inlineProps, inlineWhenUnflattened } = staticConfig;
|
|
51
|
+
const validStyleProps = isText ? import_helpers.stylePropsText : import_helpers.validStyles;
|
|
59
52
|
const viewProps = {};
|
|
60
53
|
let pseudos = null;
|
|
61
54
|
const mediaState = state.mediaState || import_useMedia.mediaState;
|
|
62
55
|
const usedKeys = {};
|
|
63
|
-
const propKeys = Object.keys(props);
|
|
64
|
-
const numProps = propKeys.length;
|
|
65
56
|
let space = props.space;
|
|
66
57
|
let hasMedia = false;
|
|
67
58
|
let dynamicThemeAccess;
|
|
68
|
-
const shouldDoClasses = staticConfig.acceptsClassName &&
|
|
59
|
+
const shouldDoClasses = staticConfig.acceptsClassName && import_constants.isWeb && !state.noClassNames;
|
|
69
60
|
let style = {};
|
|
70
|
-
const flatTransforms = {};
|
|
71
61
|
const rulesToInsert = [];
|
|
72
62
|
const classNames = {};
|
|
73
63
|
let className = "";
|
|
@@ -89,10 +79,10 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
89
79
|
};
|
|
90
80
|
if (process.env.NODE_ENV === "development" && debug && import_constants.isClient) {
|
|
91
81
|
console.groupCollapsed("getSplitStyles (collapsed)");
|
|
92
|
-
console.log({ props, staticConfig, shouldDoClasses, state,
|
|
82
|
+
console.log({ props, staticConfig, shouldDoClasses, state, styleState, theme: { ...theme } });
|
|
93
83
|
console.groupEnd();
|
|
94
84
|
}
|
|
95
|
-
if (typeof props.className === "string") {
|
|
85
|
+
if (process.env.TAMAGUI_TARGET === "web" && typeof props.className === "string") {
|
|
96
86
|
for (const cn of props.className.split(" ")) {
|
|
97
87
|
if (cn[0] === "_") {
|
|
98
88
|
const [shorthand, mediaOrPseudo] = cn.slice(1).split("-");
|
|
@@ -115,10 +105,9 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
115
105
|
}
|
|
116
106
|
}
|
|
117
107
|
}
|
|
118
|
-
for (
|
|
119
|
-
const keyOg = propKeys[i];
|
|
108
|
+
for (const keyOg in props) {
|
|
120
109
|
let keyInit = keyOg;
|
|
121
|
-
let valInit = props[
|
|
110
|
+
let valInit = props[keyOg];
|
|
122
111
|
if (keyInit in shorthands) {
|
|
123
112
|
keyInit = shorthands[keyInit];
|
|
124
113
|
}
|
|
@@ -200,7 +189,7 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
200
189
|
continue;
|
|
201
190
|
}
|
|
202
191
|
const isMainStyle = keyInit === "style";
|
|
203
|
-
if (isMainStyle || keyInit.startsWith("_style")) {
|
|
192
|
+
if (isMainStyle || keyInit[0] === "_" && keyInit.startsWith("_style")) {
|
|
204
193
|
if (!valInit)
|
|
205
194
|
continue;
|
|
206
195
|
const styles = [].concat(valInit).flat();
|
|
@@ -328,10 +317,11 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
328
317
|
if (isStyleProp && props.asChild === "except-style") {
|
|
329
318
|
continue;
|
|
330
319
|
}
|
|
320
|
+
const parentStaticConfig = staticConfig.parentStaticConfig;
|
|
331
321
|
const shouldPassProp = !isStyleProp || // is in parent variants
|
|
332
|
-
isHOC && (
|
|
322
|
+
isHOC && (parentStaticConfig == null ? void 0 : parentStaticConfig.variants) && keyInit in parentStaticConfig.variants;
|
|
333
323
|
const isHOCShouldPassThrough = Boolean(
|
|
334
|
-
isHOC && (isMediaOrPseudo || ((
|
|
324
|
+
isHOC && (isMediaOrPseudo || ((_a = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _a[keyInit]) || keyInit in skipProps)
|
|
335
325
|
);
|
|
336
326
|
const shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
|
|
337
327
|
if (process.env.NODE_ENV === "development" && debug === "verbose") {
|
|
@@ -349,11 +339,14 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
349
339
|
}
|
|
350
340
|
if (keyInit in skipProps)
|
|
351
341
|
continue;
|
|
352
|
-
if (
|
|
353
|
-
|
|
342
|
+
if (isText) {
|
|
343
|
+
if (valInit && (keyInit === fontFamilyKey || keyInit === shorthands[fontFamilyKey]) && valInit in conf.fontsParsed) {
|
|
344
|
+
styleState.fontFamily = valInit;
|
|
345
|
+
}
|
|
354
346
|
}
|
|
355
|
-
const
|
|
356
|
-
const
|
|
347
|
+
const avoidPropMap = isMediaOrPseudo || keyInit in validStyleProps && !isVariant;
|
|
348
|
+
const expanded = avoidPropMap ? [[keyInit, valInit]] : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
|
|
349
|
+
const next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
|
|
357
350
|
if (next) {
|
|
358
351
|
styleState.fontFamily = next;
|
|
359
352
|
}
|
|
@@ -374,10 +367,12 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
374
367
|
continue;
|
|
375
368
|
if (key in usedKeys)
|
|
376
369
|
continue;
|
|
377
|
-
if (
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
370
|
+
if (isText) {
|
|
371
|
+
if (key === fontFamilyKey && valInit && val) {
|
|
372
|
+
const fam = valInit[0] === "$" ? valInit : val;
|
|
373
|
+
if (fam in conf.fontsParsed) {
|
|
374
|
+
styleState.fontFamily = fam;
|
|
375
|
+
}
|
|
381
376
|
}
|
|
382
377
|
}
|
|
383
378
|
isMedia = (0, import_useMedia.isMediaKey)(key);
|
|
@@ -386,7 +381,7 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
386
381
|
if ((inlineProps == null ? void 0 : inlineProps.has(key)) || IS_STATIC && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key))) {
|
|
387
382
|
viewProps[key] = props[key] ?? val;
|
|
388
383
|
}
|
|
389
|
-
const isHOCShouldPassThrough2 = isHOC && (isMediaOrPseudo || ((
|
|
384
|
+
const isHOCShouldPassThrough2 = isHOC && (isMediaOrPseudo || ((_b = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _b[keyInit]));
|
|
390
385
|
if (isHOCShouldPassThrough2) {
|
|
391
386
|
isVariant = variants && key in variants;
|
|
392
387
|
passDownProp(viewProps, key, val, isMediaOrPseudo);
|
|
@@ -402,16 +397,10 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
402
397
|
if (isPseudo) {
|
|
403
398
|
if (!val)
|
|
404
399
|
continue;
|
|
405
|
-
const pseudoStyleObject = getSubStyle(
|
|
406
|
-
styleState,
|
|
407
|
-
key,
|
|
408
|
-
val,
|
|
409
|
-
true,
|
|
410
|
-
state.noClassNames
|
|
411
|
-
);
|
|
400
|
+
const pseudoStyleObject = getSubStyle(styleState, key, val, state.noClassNames);
|
|
412
401
|
const descriptor = import_pseudoDescriptors.pseudoDescriptors[key];
|
|
413
|
-
const isEnter =
|
|
414
|
-
const isExit =
|
|
402
|
+
const isEnter = key === "enterStyle";
|
|
403
|
+
const isExit = key === "exitStyle";
|
|
415
404
|
if (process.env.NODE_ENV === "development" && !state.isAnimated && !state.unmounted && (isEnter || isExit)) {
|
|
416
405
|
console.warn(
|
|
417
406
|
`No animation prop given to component ${staticConfig.componentName || ""} with enterStyle / exitStyle, these styles will be ignore.`
|
|
@@ -474,7 +463,7 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
474
463
|
if (isDisabled) {
|
|
475
464
|
if (pkey in animatableDefaults && !(pkey in usedKeys)) {
|
|
476
465
|
const defaultVal = animatableDefaults[pkey];
|
|
477
|
-
mergeStyle(styleState,
|
|
466
|
+
mergeStyle(styleState, pkey, defaultVal);
|
|
478
467
|
}
|
|
479
468
|
} else {
|
|
480
469
|
const curImportance = usedKeys[importance] || 0;
|
|
@@ -483,7 +472,7 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
483
472
|
pseudos || (pseudos = {});
|
|
484
473
|
pseudos[key] || (pseudos[key] = {});
|
|
485
474
|
pseudos[key][pkey] = val2;
|
|
486
|
-
mergeStyle(styleState,
|
|
475
|
+
mergeStyle(styleState, pkey, val2);
|
|
487
476
|
usedKeys[pkey] || (usedKeys[pkey] = 1);
|
|
488
477
|
}
|
|
489
478
|
if (process.env.NODE_ENV === "development" && debug === "verbose") {
|
|
@@ -493,8 +482,7 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
493
482
|
}
|
|
494
483
|
}
|
|
495
484
|
continue;
|
|
496
|
-
}
|
|
497
|
-
if (isMedia) {
|
|
485
|
+
} else if (isMedia) {
|
|
498
486
|
if (!val)
|
|
499
487
|
continue;
|
|
500
488
|
const isPlatformMedia = key.startsWith("$platform-");
|
|
@@ -611,7 +599,7 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
611
599
|
}
|
|
612
600
|
}
|
|
613
601
|
if (key in validStyleProps || process.env.TAMAGUI_TARGET === "native" && import_constants.isAndroid && key === "elevation") {
|
|
614
|
-
mergeStyle(styleState,
|
|
602
|
+
mergeStyle(styleState, key, val);
|
|
615
603
|
continue;
|
|
616
604
|
}
|
|
617
605
|
if (!isVariant) {
|
|
@@ -629,31 +617,10 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
629
617
|
if (import_constants.isWeb) {
|
|
630
618
|
(0, import_getStylesAtomic.styleToCSS)(style);
|
|
631
619
|
}
|
|
632
|
-
if (
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
const overrideFace = (_h = (_g = faceInfo[style.fontWeight]) == null ? void 0 : _g[style.fontStyle || "normal"]) == null ? void 0 : _h.val;
|
|
637
|
-
if (overrideFace) {
|
|
638
|
-
style.fontFamily = overrideFace;
|
|
639
|
-
styleState.fontFamily = overrideFace;
|
|
640
|
-
delete style.fontWeight;
|
|
641
|
-
delete style.fontStyle;
|
|
642
|
-
}
|
|
643
|
-
}
|
|
644
|
-
if (process.env.NODE_ENV === "development") {
|
|
645
|
-
if (debug) {
|
|
646
|
-
console.log(`Found fontFamily native: ${style.fontFamily}`, faceInfo);
|
|
647
|
-
}
|
|
648
|
-
}
|
|
649
|
-
}
|
|
650
|
-
if ("elevationAndroid" in style) {
|
|
651
|
-
style["elevation"] = style.elevationAndroid;
|
|
652
|
-
delete style.elevationAndroid;
|
|
653
|
-
}
|
|
654
|
-
}
|
|
655
|
-
if (flatTransforms) {
|
|
656
|
-
mergeFlatTransforms(style, flatTransforms, true);
|
|
620
|
+
if (styleState.transforms) {
|
|
621
|
+
Object.entries(styleState.transforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
|
|
622
|
+
mergeTransform(style, key, val, true);
|
|
623
|
+
});
|
|
657
624
|
}
|
|
658
625
|
if (parentSplitStyles) {
|
|
659
626
|
if (process.env.TAMAGUI_TARGET === "web") {
|
|
@@ -758,13 +725,28 @@ const getSplitStyles = (props, staticConfig, themeState, state, parentSplitStyle
|
|
|
758
725
|
rulesToInsert,
|
|
759
726
|
dynamicThemeAccess
|
|
760
727
|
};
|
|
728
|
+
if (process.env.TAMAGUI_TARGET === "native") {
|
|
729
|
+
if (style.fontFamily) {
|
|
730
|
+
const faceInfo = (_c = (0, import_config.getFont)(style.fontFamily)) == null ? void 0 : _c.face;
|
|
731
|
+
if (faceInfo) {
|
|
732
|
+
const overrideFace = (_e = (_d = faceInfo[style.fontWeight]) == null ? void 0 : _d[style.fontStyle || "normal"]) == null ? void 0 : _e.val;
|
|
733
|
+
if (overrideFace) {
|
|
734
|
+
style.fontFamily = overrideFace;
|
|
735
|
+
styleState.fontFamily = overrideFace;
|
|
736
|
+
}
|
|
737
|
+
}
|
|
738
|
+
if (process.env.NODE_ENV === "development" && debug) {
|
|
739
|
+
console.log(`Found fontFamily native: ${style.fontFamily}`, faceInfo);
|
|
740
|
+
}
|
|
741
|
+
}
|
|
742
|
+
}
|
|
761
743
|
if (className) {
|
|
762
744
|
classNames.className = className;
|
|
763
745
|
}
|
|
764
746
|
if (process.env.NODE_ENV === "development" && debug === "verbose") {
|
|
765
747
|
if (import_isDevTools.isDevTools) {
|
|
766
748
|
console.groupCollapsed(" \u{1F539} ===>");
|
|
767
|
-
const logs = { ...result, state, transforms, viewProps, viewPropsOrder: Object.keys(viewProps), rulesToInsert, parentSplitStyles
|
|
749
|
+
const logs = { ...result, state, transforms, viewProps, viewPropsOrder: Object.keys(viewProps), rulesToInsert, parentSplitStyles };
|
|
768
750
|
for (const key in logs) {
|
|
769
751
|
console.log(key, logs[key]);
|
|
770
752
|
}
|
|
@@ -797,22 +779,16 @@ function mergeClassName(transforms, classNames, key, val, isMediaOrPseudo = fals
|
|
|
797
779
|
}
|
|
798
780
|
}
|
|
799
781
|
}
|
|
800
|
-
function
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
...baseProps,
|
|
804
|
-
...specificProps
|
|
805
|
-
};
|
|
806
|
-
}
|
|
807
|
-
function mergeStyle({ classNames, viewProps, style, usedKeys }, flatTransforms, key, val) {
|
|
808
|
-
if ((val == null ? void 0 : val[0]) === "_") {
|
|
782
|
+
function mergeStyle(styleState, key, val) {
|
|
783
|
+
const { classNames, viewProps, style, usedKeys } = styleState;
|
|
784
|
+
if (import_constants.isWeb && (val == null ? void 0 : val[0]) === "_") {
|
|
809
785
|
classNames[key] = val;
|
|
810
786
|
usedKeys[key] || (usedKeys[key] = 1);
|
|
811
787
|
} else if (key in import_helpers.stylePropsTransform) {
|
|
812
|
-
|
|
813
|
-
|
|
788
|
+
styleState.transforms || (styleState.transforms = {});
|
|
789
|
+
styleState.transforms[key] = val;
|
|
814
790
|
} else {
|
|
815
|
-
const out = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key);
|
|
791
|
+
const out = import_constants.isWeb ? (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key) : val;
|
|
816
792
|
if (key in import_helpers.validStylesOnBaseProps) {
|
|
817
793
|
viewProps[key] = out;
|
|
818
794
|
} else {
|
|
@@ -820,19 +796,13 @@ function mergeStyle({ classNames, viewProps, style, usedKeys }, flatTransforms,
|
|
|
820
796
|
}
|
|
821
797
|
}
|
|
822
798
|
}
|
|
823
|
-
const getSubStyle = (styleState, subKey, styleIn,
|
|
799
|
+
const getSubStyle = (styleState, subKey, styleIn, avoidMergeTransform) => {
|
|
824
800
|
const { staticConfig, props, conf: conf2 } = styleState;
|
|
825
801
|
const styleOut = {};
|
|
826
802
|
for (let key in styleIn) {
|
|
827
803
|
const val = styleIn[key];
|
|
828
804
|
key = conf2.shorthands[key] || key;
|
|
829
|
-
const expanded =
|
|
830
|
-
key,
|
|
831
|
-
val,
|
|
832
|
-
styleState,
|
|
833
|
-
getSubStyleProps(staticConfig.defaultProps, props, props[subKey]),
|
|
834
|
-
avoidDefaultProps
|
|
835
|
-
);
|
|
805
|
+
const expanded = (0, import_propMapper.propMapper)(key, val, styleState, { ...props, ...props[subKey] });
|
|
836
806
|
if (!expanded || !staticConfig.isHOC && key in skipProps) {
|
|
837
807
|
continue;
|
|
838
808
|
}
|
|
@@ -888,11 +858,6 @@ const mergeTransform = (obj, key, val, backwards = false) => {
|
|
|
888
858
|
[mapTransformKeys[key] || key]: val
|
|
889
859
|
});
|
|
890
860
|
};
|
|
891
|
-
const mergeFlatTransforms = (obj, flatTransforms, backwards = false) => {
|
|
892
|
-
Object.entries(flatTransforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
|
|
893
|
-
mergeTransform(obj, key, val, backwards);
|
|
894
|
-
});
|
|
895
|
-
};
|
|
896
861
|
const mapTransformKeys = {
|
|
897
862
|
x: "translateX",
|
|
898
863
|
y: "translateY"
|