@tamagui/web 1.88.18 → 1.88.20
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 +2 -1
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/createComponent.native.js +2 -1
- package/dist/cjs/createComponent.native.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.js +189 -221
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.native.js +187 -206
- package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/cjs/helpers/propMapper.js +37 -35
- package/dist/cjs/helpers/propMapper.js.map +1 -1
- package/dist/cjs/helpers/propMapper.native.js +37 -35
- package/dist/cjs/helpers/propMapper.native.js.map +1 -1
- package/dist/cjs/helpers/skipProps.js +61 -0
- package/dist/cjs/helpers/skipProps.js.map +6 -0
- package/dist/cjs/helpers/skipProps.native.js +54 -0
- package/dist/cjs/helpers/skipProps.native.js.map +6 -0
- package/dist/esm/createComponent.js +2 -1
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/createComponent.mjs +3 -2
- package/dist/esm/createComponent.native.js +2 -1
- package/dist/esm/createComponent.native.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.js +185 -216
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +181 -212
- package/dist/esm/helpers/getSplitStyles.native.js +187 -206
- package/dist/esm/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/esm/helpers/propMapper.js +37 -34
- package/dist/esm/helpers/propMapper.js.map +1 -1
- package/dist/esm/helpers/propMapper.mjs +26 -23
- package/dist/esm/helpers/propMapper.native.js +37 -35
- package/dist/esm/helpers/propMapper.native.js.map +1 -1
- package/dist/esm/helpers/skipProps.js +45 -0
- package/dist/esm/helpers/skipProps.js.map +6 -0
- package/dist/esm/helpers/skipProps.mjs +42 -0
- package/dist/esm/helpers/skipProps.native.js +54 -0
- package/dist/esm/helpers/skipProps.native.js.map +6 -0
- package/package.json +10 -10
- package/src/createComponent.tsx +2 -1
- package/src/helpers/getSplitStyles.tsx +24 -82
- package/src/helpers/propMapper.ts +5 -0
- package/src/helpers/skipProps.ts +69 -0
- package/types/createComponent.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/propMapper.d.ts.map +1 -1
- package/types/helpers/skipProps.d.ts +17 -0
- package/types/helpers/skipProps.d.ts.map +1 -0
- package/dist/cjs/hooks/getThemeProxied.js +0 -66
- package/dist/cjs/hooks/getThemeProxied.js.map +0 -6
- package/dist/cjs/hooks/getThemeProxied.native.js +0 -100
- package/dist/cjs/hooks/getThemeProxied.native.js.map +0 -6
- package/dist/esm/hooks/getThemeProxied.js +0 -52
- package/dist/esm/hooks/getThemeProxied.js.map +0 -6
- package/dist/esm/hooks/getThemeProxied.mjs +0 -41
- package/dist/esm/hooks/getThemeProxied.native.js +0 -100
- package/dist/esm/hooks/getThemeProxied.native.js.map +0 -6
- package/types/hooks/getThemeProxied.d.ts.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/propMapper.ts"],
|
|
4
|
-
"mappings": "AAAA,OAA0B;AAC1B,SAAS,uBAAuB;AAEhC,SAAS,iBAAiB;AAG1B,SAAS,kBAAkB,kBAAkB;AAS7C,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,qBAAqB,wBAAwB;AACtD,SAAS,aAAa;AACtB,SAAS,yBAAyB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["key", "val"]
|
|
6
6
|
}
|
|
@@ -7,6 +7,7 @@ import { normalizeStyle } from "./normalizeStyle.mjs";
|
|
|
7
7
|
import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras.mjs";
|
|
8
8
|
import { isObj } from "./isObj.mjs";
|
|
9
9
|
import { pseudoDescriptors } from "./pseudoDescriptors.mjs";
|
|
10
|
+
import { skipProps } from "./skipProps.mjs";
|
|
10
11
|
const propMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
11
12
|
if (lastFontFamilyToken = null, key === "elevationAndroid") return;
|
|
12
13
|
if (value === "unset") {
|
|
@@ -114,31 +115,33 @@ const variableToFontNameCache = /* @__PURE__ */new WeakMap(),
|
|
|
114
115
|
for (const _key in value) {
|
|
115
116
|
const subKey = conf.shorthands[_key] || _key,
|
|
116
117
|
val = value[_key];
|
|
117
|
-
if (styleProps.
|
|
118
|
-
if (
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
118
|
+
if (!(!styleProps.noSkip && subKey in skipProps)) {
|
|
119
|
+
if (styleProps.noExpand) res[subKey] = val;else if (variants && subKey in variants) {
|
|
120
|
+
if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key) res[subKey] =
|
|
121
|
+
// SYNC WITH *1
|
|
122
|
+
val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;else {
|
|
123
|
+
const variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
|
|
124
|
+
if (variantOut) for (const [key2, val2] of variantOut) val2 != null && (key2 in pseudoDescriptors ? (res[key2] ??= {}, Object.assign(res[key2], val2)) : res[key2] = val2);
|
|
125
|
+
}
|
|
126
|
+
continue;
|
|
123
127
|
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
128
|
+
if (isVariable(val)) {
|
|
129
|
+
res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues), process.env.NODE_ENV === "development" && debug === "verbose" && console.info("variable", subKey, res[subKey]);
|
|
130
|
+
continue;
|
|
131
|
+
}
|
|
132
|
+
if (typeof val == "string") {
|
|
133
|
+
const fVal =
|
|
134
|
+
// SYNC WITH *1
|
|
135
|
+
val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
|
|
136
|
+
res[subKey] = fVal;
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
139
|
+
if (isObj(val)) {
|
|
140
|
+
const subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
|
|
141
|
+
process.env.NODE_ENV === "development" && debug === "verbose" && console.info("object", subKey, subObject), res[subKey] ??= {}, Object.assign(res[subKey], subObject);
|
|
142
|
+
} else res[subKey] = val;
|
|
143
|
+
process.env.NODE_ENV === "development" && debug && res[subKey]?.[0] === "$" && console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, subKey, res[subKey], theme);
|
|
136
144
|
}
|
|
137
|
-
if (isObj(val)) {
|
|
138
|
-
const subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
|
|
139
|
-
process.env.NODE_ENV === "development" && debug === "verbose" && console.info("object", subKey, subObject), res[subKey] ??= {}, Object.assign(res[subKey], subObject);
|
|
140
|
-
} else res[subKey] = val;
|
|
141
|
-
process.env.NODE_ENV === "development" && debug && res[subKey]?.[0] === "$" && console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, subKey, res[subKey], theme);
|
|
142
145
|
}
|
|
143
146
|
return res;
|
|
144
147
|
},
|
|
@@ -21,7 +21,7 @@ __export(propMapper_exports, {
|
|
|
21
21
|
propMapper: () => propMapper
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(propMapper_exports);
|
|
24
|
-
var import_constants = require("@tamagui/constants"), import_helpers = require("@tamagui/helpers"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_expandStyle = require("./expandStyle"), import_normalizeStyle = require("./normalizeStyle"), import_getVariantExtras = require("./getVariantExtras"), import_isObj = require("./isObj"), import_pseudoDescriptors = require("./pseudoDescriptors");
|
|
24
|
+
var import_constants = require("@tamagui/constants"), import_helpers = require("@tamagui/helpers"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_expandStyle = require("./expandStyle"), import_normalizeStyle = require("./normalizeStyle"), import_getVariantExtras = require("./getVariantExtras"), import_isObj = require("./isObj"), import_pseudoDescriptors = require("./pseudoDescriptors"), import_skipProps = require("./skipProps");
|
|
25
25
|
const propMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
26
26
|
var _a;
|
|
27
27
|
if (lastFontFamilyToken = null, !import_constants.isAndroid && key === "elevationAndroid")
|
|
@@ -116,43 +116,45 @@ const variableToFontNameCache = /* @__PURE__ */ new WeakMap(), fontFamilyCache =
|
|
|
116
116
|
process.env.NODE_ENV === "development" && debug === "verbose" && console.info(" - resolveTokensAndVariants", key, value);
|
|
117
117
|
for (const _key in value) {
|
|
118
118
|
const subKey = conf.shorthands[_key] || _key, val = value[_key];
|
|
119
|
-
if (styleProps.
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
if (
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
119
|
+
if (!(!styleProps.noSkip && subKey in import_skipProps.skipProps)) {
|
|
120
|
+
if (styleProps.noExpand)
|
|
121
|
+
res[subKey] = val;
|
|
122
|
+
else if (variants && subKey in variants) {
|
|
123
|
+
if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key)
|
|
124
|
+
res[subKey] = // SYNC WITH *1
|
|
125
|
+
val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
|
|
126
|
+
else {
|
|
127
|
+
const variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
|
|
128
|
+
if (variantOut)
|
|
129
|
+
for (const [key2, val2] of variantOut)
|
|
130
|
+
val2 != null && (key2 in import_pseudoDescriptors.pseudoDescriptors ? (res[key2] ?? (res[key2] = {}), Object.assign(res[key2], val2)) : res[key2] = val2);
|
|
131
|
+
}
|
|
132
|
+
continue;
|
|
130
133
|
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
134
|
+
if ((0, import_createVariable.isVariable)(val)) {
|
|
135
|
+
res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues), process.env.NODE_ENV === "development" && debug === "verbose" && console.info("variable", subKey, res[subKey]);
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
if (typeof val == "string") {
|
|
139
|
+
const fVal = (
|
|
140
|
+
// SYNC WITH *1
|
|
141
|
+
val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val
|
|
142
|
+
);
|
|
143
|
+
res[subKey] = fVal;
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
if ((0, import_isObj.isObj)(val)) {
|
|
147
|
+
const subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
|
|
148
|
+
process.env.NODE_ENV === "development" && debug === "verbose" && console.info("object", subKey, subObject), res[subKey] ?? (res[subKey] = {}), Object.assign(res[subKey], subObject);
|
|
149
|
+
} else
|
|
150
|
+
res[subKey] = val;
|
|
151
|
+
process.env.NODE_ENV === "development" && debug && ((_a = res[subKey]) == null ? void 0 : _a[0]) === "$" && console.warn(
|
|
152
|
+
`\u26A0\uFE0F Missing token in theme ${theme.name}:`,
|
|
153
|
+
subKey,
|
|
154
|
+
res[subKey],
|
|
155
|
+
theme
|
|
141
156
|
);
|
|
142
|
-
res[subKey] = fVal;
|
|
143
|
-
continue;
|
|
144
157
|
}
|
|
145
|
-
if ((0, import_isObj.isObj)(val)) {
|
|
146
|
-
const subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
|
|
147
|
-
process.env.NODE_ENV === "development" && debug === "verbose" && console.info("object", subKey, subObject), res[subKey] ?? (res[subKey] = {}), Object.assign(res[subKey], subObject);
|
|
148
|
-
} else
|
|
149
|
-
res[subKey] = val;
|
|
150
|
-
process.env.NODE_ENV === "development" && debug && ((_a = res[subKey]) == null ? void 0 : _a[0]) === "$" && console.warn(
|
|
151
|
-
`\u26A0\uFE0F Missing token in theme ${theme.name}:`,
|
|
152
|
-
subKey,
|
|
153
|
-
res[subKey],
|
|
154
|
-
theme
|
|
155
|
-
);
|
|
156
158
|
}
|
|
157
159
|
return res;
|
|
158
160
|
}, tokenCats = ["size", "color", "radius", "space", "zIndex"].map((name) => ({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/propMapper.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B,+BAC1B,iBAAgC,6BAEhC,gBAA0B,sBAG1B,wBAA6C,8BAS7C,qBAA4B,0BAC5B,wBAA+B,6BAC/B,0BAAsD,+BACtD,eAAsB,oBACtB,2BAAkC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["key", "val"]
|
|
6
6
|
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
const skipProps = {
|
|
2
|
+
untilMeasured: 1,
|
|
3
|
+
animation: 1,
|
|
4
|
+
space: 1,
|
|
5
|
+
animateOnly: 1,
|
|
6
|
+
disableClassName: 1,
|
|
7
|
+
debug: 1,
|
|
8
|
+
componentName: 1,
|
|
9
|
+
disableOptimization: 1,
|
|
10
|
+
tag: 1,
|
|
11
|
+
style: 1,
|
|
12
|
+
// handled after loop so pseudos set usedKeys and override it if necessary
|
|
13
|
+
group: 1
|
|
14
|
+
};
|
|
15
|
+
process.env.NODE_ENV === "test" && (skipProps["data-test-renders"] = 1);
|
|
16
|
+
process.env.NODE_ENV !== "production" && Object.assign(skipProps, {
|
|
17
|
+
accessibilityElementsHidden: 1,
|
|
18
|
+
accessibilityIgnoresInvertColors: 1,
|
|
19
|
+
accessibilityLanguage: 1,
|
|
20
|
+
adjustsFontSizeToFit: 1,
|
|
21
|
+
allowFontScaling: 1,
|
|
22
|
+
dataDetectorType: 1,
|
|
23
|
+
dynamicTypeRamp: 1,
|
|
24
|
+
elevationAndroid: 1,
|
|
25
|
+
hapticFeedback: 1,
|
|
26
|
+
importantForAccessibility: 1,
|
|
27
|
+
lineBreakStrategyIOS: 1,
|
|
28
|
+
maxFontSizeMultiplier: 1,
|
|
29
|
+
minimumFontScale: 1,
|
|
30
|
+
needsOffscreenAlphaCompositing: 1,
|
|
31
|
+
nextFocusDown: 1,
|
|
32
|
+
nextFocusForward: 1,
|
|
33
|
+
nextFocusLeft: 1,
|
|
34
|
+
nextFocusRight: 1,
|
|
35
|
+
nextFocusUp: 1,
|
|
36
|
+
onMagicTap: 1,
|
|
37
|
+
selectionColor: 1,
|
|
38
|
+
shouldRasterizeIOS: 1,
|
|
39
|
+
suppressHighlighting: 1,
|
|
40
|
+
textBreakStrategy: 1
|
|
41
|
+
});
|
|
42
|
+
export {
|
|
43
|
+
skipProps
|
|
44
|
+
};
|
|
45
|
+
//# sourceMappingURL=skipProps.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/helpers/skipProps.ts"],
|
|
4
|
+
"mappings": "AAGO,MAAM,YAAY;AAAA,EACvB,eAAe;AAAA,EACf,WAAW;AAAA,EACX,OAAO;AAAA,EACP,aAAa;AAAA,EACb,kBAAkB;AAAA,EAClB,OAAO;AAAA,EACP,eAAe;AAAA,EACf,qBAAqB;AAAA,EACrB,KAAK;AAAA,EACL,OAAO;AAAA;AAAA,EACP,OAAO;AACT;AAEI,QAAQ,IAAI,aAAa,WAC3B,UAAU,mBAAmB,IAAI;AAoB7B,QAAQ,IAAI,aAAa,gBAG3B,OAAO,OAAO,WAAW;AAAA,EACvB,6BAA6B;AAAA,EAC7B,kCAAkC;AAAA,EAClC,uBAAuB;AAAA,EACvB,sBAAsB;AAAA,EACtB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,iBAAiB;AAAA,EACjB,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,2BAA2B;AAAA,EAC3B,sBAAsB;AAAA,EACtB,uBAAuB;AAAA,EACvB,kBAAkB;AAAA,EAClB,gCAAgC;AAAA,EAChC,eAAe;AAAA,EACf,kBAAkB;AAAA,EAClB,eAAe;AAAA,EACf,gBAAgB;AAAA,EAChB,aAAa;AAAA,EACb,YAAY;AAAA,EACZ,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,sBAAsB;AAAA,EACtB,mBAAmB;AACrB,CAAC;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
const skipProps = {
|
|
2
|
+
untilMeasured: 1,
|
|
3
|
+
animation: 1,
|
|
4
|
+
space: 1,
|
|
5
|
+
animateOnly: 1,
|
|
6
|
+
disableClassName: 1,
|
|
7
|
+
debug: 1,
|
|
8
|
+
componentName: 1,
|
|
9
|
+
disableOptimization: 1,
|
|
10
|
+
tag: 1,
|
|
11
|
+
style: 1,
|
|
12
|
+
// handled after loop so pseudos set usedKeys and override it if necessary
|
|
13
|
+
group: 1
|
|
14
|
+
};
|
|
15
|
+
process.env.NODE_ENV === "test" && (skipProps["data-test-renders"] = 1);
|
|
16
|
+
process.env.NODE_ENV !== "production" && Object.assign(skipProps, {
|
|
17
|
+
accessibilityElementsHidden: 1,
|
|
18
|
+
accessibilityIgnoresInvertColors: 1,
|
|
19
|
+
accessibilityLanguage: 1,
|
|
20
|
+
adjustsFontSizeToFit: 1,
|
|
21
|
+
allowFontScaling: 1,
|
|
22
|
+
dataDetectorType: 1,
|
|
23
|
+
dynamicTypeRamp: 1,
|
|
24
|
+
elevationAndroid: 1,
|
|
25
|
+
hapticFeedback: 1,
|
|
26
|
+
importantForAccessibility: 1,
|
|
27
|
+
lineBreakStrategyIOS: 1,
|
|
28
|
+
maxFontSizeMultiplier: 1,
|
|
29
|
+
minimumFontScale: 1,
|
|
30
|
+
needsOffscreenAlphaCompositing: 1,
|
|
31
|
+
nextFocusDown: 1,
|
|
32
|
+
nextFocusForward: 1,
|
|
33
|
+
nextFocusLeft: 1,
|
|
34
|
+
nextFocusRight: 1,
|
|
35
|
+
nextFocusUp: 1,
|
|
36
|
+
onMagicTap: 1,
|
|
37
|
+
selectionColor: 1,
|
|
38
|
+
shouldRasterizeIOS: 1,
|
|
39
|
+
suppressHighlighting: 1,
|
|
40
|
+
textBreakStrategy: 1
|
|
41
|
+
});
|
|
42
|
+
export { skipProps };
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: !0 });
|
|
9
|
+
}, __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from == "object" || typeof from == "function")
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
13
|
+
return to;
|
|
14
|
+
};
|
|
15
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
16
|
+
var skipProps_exports = {};
|
|
17
|
+
__export(skipProps_exports, {
|
|
18
|
+
skipProps: () => skipProps
|
|
19
|
+
});
|
|
20
|
+
module.exports = __toCommonJS(skipProps_exports);
|
|
21
|
+
const skipProps = {
|
|
22
|
+
untilMeasured: 1,
|
|
23
|
+
animation: 1,
|
|
24
|
+
space: 1,
|
|
25
|
+
animateOnly: 1,
|
|
26
|
+
disableClassName: 1,
|
|
27
|
+
debug: 1,
|
|
28
|
+
componentName: 1,
|
|
29
|
+
disableOptimization: 1,
|
|
30
|
+
tag: 1,
|
|
31
|
+
style: 1,
|
|
32
|
+
// handled after loop so pseudos set usedKeys and override it if necessary
|
|
33
|
+
group: 1
|
|
34
|
+
};
|
|
35
|
+
process.env.NODE_ENV === "test" && (skipProps["data-test-renders"] = 1);
|
|
36
|
+
Object.assign(skipProps, {
|
|
37
|
+
whiteSpace: 1,
|
|
38
|
+
wordWrap: 1,
|
|
39
|
+
textOverflow: 1,
|
|
40
|
+
textDecorationDistance: 1,
|
|
41
|
+
cursor: 1,
|
|
42
|
+
contain: 1,
|
|
43
|
+
boxSizing: 1,
|
|
44
|
+
boxShadow: 1,
|
|
45
|
+
outlineStyle: 1,
|
|
46
|
+
outlineOffset: 1,
|
|
47
|
+
outlineWidth: 1,
|
|
48
|
+
outlineColor: 1
|
|
49
|
+
});
|
|
50
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
51
|
+
0 && (module.exports = {
|
|
52
|
+
skipProps
|
|
53
|
+
});
|
|
54
|
+
//# sourceMappingURL=skipProps.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/helpers/skipProps.ts"],
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,YAAY;AAAA,EACvB,eAAe;AAAA,EACf,WAAW;AAAA,EACX,OAAO;AAAA,EACP,aAAa;AAAA,EACb,kBAAkB;AAAA,EAClB,OAAO;AAAA,EACP,eAAe;AAAA,EACf,qBAAqB;AAAA,EACrB,KAAK;AAAA,EACL,OAAO;AAAA;AAAA,EACP,OAAO;AACT;AAEI,QAAQ,IAAI,aAAa,WAC3B,UAAU,mBAAmB,IAAI;AAKjC,OAAO,OAAO,WAAW;AAAA,EACvB,YAAY;AAAA,EACZ,UAAU;AAAA,EACV,cAAc;AAAA,EACd,wBAAwB;AAAA,EACxB,QAAQ;AAAA,EACR,SAAS;AAAA,EACT,WAAW;AAAA,EACX,WAAW;AAAA,EACX,cAAc;AAAA,EACd,eAAe;AAAA,EACf,cAAc;AAAA,EACd,cAAc;AAChB,CAAC;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.88.
|
|
3
|
+
"version": "1.88.20",
|
|
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.88.
|
|
31
|
-
"@tamagui/constants": "1.88.
|
|
32
|
-
"@tamagui/helpers": "1.88.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.88.
|
|
34
|
-
"@tamagui/timer": "1.88.
|
|
35
|
-
"@tamagui/use-did-finish-ssr": "1.88.
|
|
36
|
-
"@tamagui/use-event": "1.88.
|
|
37
|
-
"@tamagui/use-force-update": "1.88.
|
|
30
|
+
"@tamagui/compose-refs": "1.88.20",
|
|
31
|
+
"@tamagui/constants": "1.88.20",
|
|
32
|
+
"@tamagui/helpers": "1.88.20",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.88.20",
|
|
34
|
+
"@tamagui/timer": "1.88.20",
|
|
35
|
+
"@tamagui/use-did-finish-ssr": "1.88.20",
|
|
36
|
+
"@tamagui/use-event": "1.88.20",
|
|
37
|
+
"@tamagui/use-force-update": "1.88.20",
|
|
38
38
|
"react": "^18.2.0",
|
|
39
39
|
"react-dom": "^18.2.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.88.
|
|
42
|
+
"@tamagui/build": "1.88.20",
|
|
43
43
|
"@testing-library/react": "^14.0.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"typescript": "^5.3.3",
|
package/src/createComponent.tsx
CHANGED
|
@@ -1280,8 +1280,9 @@ export function createComponent<
|
|
|
1280
1280
|
}
|
|
1281
1281
|
} catch {
|
|
1282
1282
|
// RN can run into PayloadTooLargeError: request entity too large
|
|
1283
|
+
} finally {
|
|
1284
|
+
console.groupEnd()
|
|
1283
1285
|
}
|
|
1284
|
-
console.groupEnd()
|
|
1285
1286
|
}
|
|
1286
1287
|
if (debugProp === 'break') {
|
|
1287
1288
|
// biome-ignore lint/suspicious/noDebugger: ok
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
import { useInsertionEffect } from 'react'
|
|
17
17
|
|
|
18
18
|
import { getConfig, getFont } from '../config'
|
|
19
|
+
import { skipProps } from './skipProps'
|
|
19
20
|
import {
|
|
20
21
|
accessibilityDirectMap,
|
|
21
22
|
accessibilityWebRoleToNativeRole,
|
|
@@ -300,6 +301,9 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
300
301
|
}
|
|
301
302
|
|
|
302
303
|
if (valInit !== props[keyInit]) {
|
|
304
|
+
// we collect updated props as we go, for functional variants later
|
|
305
|
+
// functional variants receive a prop object that represents the current
|
|
306
|
+
// props at that point in the loop
|
|
303
307
|
styleState.curProps[keyInit] = valInit
|
|
304
308
|
}
|
|
305
309
|
|
|
@@ -608,14 +612,14 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
608
612
|
}
|
|
609
613
|
|
|
610
614
|
const avoidPropMap = isMediaOrPseudo || (!isVariant && !isValidStyleKeyInit)
|
|
615
|
+
const expanded = avoidPropMap ? null : propMapper(keyInit, valInit, styleState)
|
|
611
616
|
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
styleState.fontFamily = next
|
|
617
|
+
if (!avoidPropMap) {
|
|
618
|
+
if (!expanded) continue
|
|
619
|
+
const next = getPropMappedFontFamily(expanded)
|
|
620
|
+
if (next) {
|
|
621
|
+
styleState.fontFamily = next
|
|
622
|
+
}
|
|
619
623
|
}
|
|
620
624
|
|
|
621
625
|
if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
|
|
@@ -644,9 +648,19 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
644
648
|
console.groupEnd()
|
|
645
649
|
}
|
|
646
650
|
|
|
647
|
-
|
|
651
|
+
let key = keyInit
|
|
652
|
+
let val = valInit
|
|
653
|
+
const max = expanded ? expanded.length : 1
|
|
654
|
+
|
|
655
|
+
// before we just made an array if avoidPropMap, but to avoid making extra arrays in a perf sensitive area
|
|
656
|
+
// now we do this part more imperatively. saves making a nested array for each prop key on every component
|
|
657
|
+
for (let i = 0; i < max; i++) {
|
|
658
|
+
if (expanded) {
|
|
659
|
+
const [k, v] = expanded[i]
|
|
660
|
+
key = k
|
|
661
|
+
val = v
|
|
662
|
+
}
|
|
648
663
|
|
|
649
|
-
for (const [key, val] of expanded) {
|
|
650
664
|
if (val == null) continue
|
|
651
665
|
if (key in usedKeys) continue
|
|
652
666
|
|
|
@@ -1017,8 +1031,8 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
1017
1031
|
}
|
|
1018
1032
|
|
|
1019
1033
|
if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
|
|
1020
|
-
console.groupCollapsed(` ✔️ expand complete`, keyInit)
|
|
1021
1034
|
try {
|
|
1035
|
+
log(` ✔️ expand complete`, keyInit)
|
|
1022
1036
|
log('style', { ...style })
|
|
1023
1037
|
log('transforms', { ...transforms })
|
|
1024
1038
|
log('viewProps', { ...viewProps })
|
|
@@ -1029,11 +1043,6 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
1029
1043
|
}
|
|
1030
1044
|
} // end prop loop
|
|
1031
1045
|
|
|
1032
|
-
if (process.env.NODE_ENV === 'development') {
|
|
1033
|
-
// we leave open some verbose logs to log each prop details
|
|
1034
|
-
console.groupEnd()
|
|
1035
|
-
}
|
|
1036
|
-
|
|
1037
1046
|
// style prop after:
|
|
1038
1047
|
|
|
1039
1048
|
// merge after the prop loop - this way pseudos apply and set usedKeys and then this wont clobber them
|
|
@@ -1468,73 +1477,6 @@ const mapTransformKeys = {
|
|
|
1468
1477
|
y: 'translateY',
|
|
1469
1478
|
}
|
|
1470
1479
|
|
|
1471
|
-
const skipProps = {
|
|
1472
|
-
untilMeasured: 1,
|
|
1473
|
-
animation: 1,
|
|
1474
|
-
space: 1,
|
|
1475
|
-
animateOnly: 1,
|
|
1476
|
-
disableClassName: 1,
|
|
1477
|
-
debug: 1,
|
|
1478
|
-
componentName: 1,
|
|
1479
|
-
disableOptimization: 1,
|
|
1480
|
-
tag: 1,
|
|
1481
|
-
style: 1, // handled after loop so pseudos set usedKeys and override it if necessary
|
|
1482
|
-
group: 1,
|
|
1483
|
-
}
|
|
1484
|
-
|
|
1485
|
-
if (process.env.NODE_ENV === 'test') {
|
|
1486
|
-
skipProps['data-test-renders'] = 1
|
|
1487
|
-
}
|
|
1488
|
-
|
|
1489
|
-
// native only skips
|
|
1490
|
-
if (process.env.TAMAGUI_TARGET === 'native') {
|
|
1491
|
-
Object.assign(skipProps, {
|
|
1492
|
-
whiteSpace: 1,
|
|
1493
|
-
wordWrap: 1,
|
|
1494
|
-
textOverflow: 1,
|
|
1495
|
-
textDecorationDistance: 1,
|
|
1496
|
-
cursor: 1,
|
|
1497
|
-
contain: 1,
|
|
1498
|
-
boxSizing: 1,
|
|
1499
|
-
boxShadow: 1,
|
|
1500
|
-
outlineStyle: 1,
|
|
1501
|
-
outlineOffset: 1,
|
|
1502
|
-
outlineWidth: 1,
|
|
1503
|
-
outlineColor: 1,
|
|
1504
|
-
})
|
|
1505
|
-
} else {
|
|
1506
|
-
if (process.env.NODE_ENV !== 'production') {
|
|
1507
|
-
// native only, not web props
|
|
1508
|
-
// we only skip them in dev to avoid warnings, in prod they silently drop
|
|
1509
|
-
Object.assign(skipProps, {
|
|
1510
|
-
accessibilityElementsHidden: 1,
|
|
1511
|
-
accessibilityIgnoresInvertColors: 1,
|
|
1512
|
-
accessibilityLanguage: 1,
|
|
1513
|
-
adjustsFontSizeToFit: 1,
|
|
1514
|
-
allowFontScaling: 1,
|
|
1515
|
-
dataDetectorType: 1,
|
|
1516
|
-
dynamicTypeRamp: 1,
|
|
1517
|
-
elevationAndroid: 1,
|
|
1518
|
-
hapticFeedback: 1,
|
|
1519
|
-
importantForAccessibility: 1,
|
|
1520
|
-
lineBreakStrategyIOS: 1,
|
|
1521
|
-
maxFontSizeMultiplier: 1,
|
|
1522
|
-
minimumFontScale: 1,
|
|
1523
|
-
needsOffscreenAlphaCompositing: 1,
|
|
1524
|
-
nextFocusDown: 1,
|
|
1525
|
-
nextFocusForward: 1,
|
|
1526
|
-
nextFocusLeft: 1,
|
|
1527
|
-
nextFocusRight: 1,
|
|
1528
|
-
nextFocusUp: 1,
|
|
1529
|
-
onMagicTap: 1,
|
|
1530
|
-
selectionColor: 1,
|
|
1531
|
-
shouldRasterizeIOS: 1,
|
|
1532
|
-
suppressHighlighting: 1,
|
|
1533
|
-
textBreakStrategy: 1,
|
|
1534
|
-
})
|
|
1535
|
-
}
|
|
1536
|
-
}
|
|
1537
|
-
|
|
1538
1480
|
const accessibilityRoleToWebRole = {
|
|
1539
1481
|
adjustable: 'slider',
|
|
1540
1482
|
header: 'heading',
|
|
@@ -18,6 +18,7 @@ import { normalizeStyle } from './normalizeStyle'
|
|
|
18
18
|
import { getFontsForLanguage, getVariantExtras } from './getVariantExtras'
|
|
19
19
|
import { isObj } from './isObj'
|
|
20
20
|
import { pseudoDescriptors } from './pseudoDescriptors'
|
|
21
|
+
import { skipProps } from './skipProps'
|
|
21
22
|
|
|
22
23
|
export const propMapper: PropMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
23
24
|
lastFontFamilyToken = null
|
|
@@ -251,6 +252,10 @@ const resolveTokensAndVariants: StyleResolver<Object> = (
|
|
|
251
252
|
const subKey = conf.shorthands[_key] || _key
|
|
252
253
|
const val = value[_key]
|
|
253
254
|
|
|
255
|
+
if (!styleProps.noSkip && subKey in skipProps) {
|
|
256
|
+
continue
|
|
257
|
+
}
|
|
258
|
+
|
|
254
259
|
if (styleProps.noExpand) {
|
|
255
260
|
res[subKey] = val
|
|
256
261
|
} else {
|