@tamagui/web 1.21.4 → 1.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/helpers/getSplitStyles.js +2 -2
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/getStylesAtomic.js +35 -43
- package/dist/cjs/helpers/getStylesAtomic.js.map +1 -1
- package/dist/cjs/helpers/normalizeValueWithProperty.js +9 -6
- package/dist/cjs/helpers/normalizeValueWithProperty.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.js +3 -3
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +3 -3
- package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
- package/dist/esm/helpers/getStylesAtomic.js +34 -42
- package/dist/esm/helpers/getStylesAtomic.js.map +1 -1
- package/dist/esm/helpers/getStylesAtomic.mjs +34 -42
- package/dist/esm/helpers/getStylesAtomic.mjs.map +1 -1
- package/dist/esm/helpers/normalizeValueWithProperty.js +9 -6
- package/dist/esm/helpers/normalizeValueWithProperty.js.map +1 -1
- package/dist/esm/helpers/normalizeValueWithProperty.mjs +9 -6
- package/dist/esm/helpers/normalizeValueWithProperty.mjs.map +1 -1
- package/package.json +9 -9
- package/src/helpers/getSplitStyles.tsx +3 -3
- package/src/helpers/getStylesAtomic.ts +38 -51
- package/src/helpers/normalizeValueWithProperty.ts +10 -6
- package/types/createVariable.d.ts +1 -1
- package/types/createVariable.d.ts.map +1 -1
- package/types/helpers/getStylesAtomic.d.ts +1 -1
- package/types/helpers/getStylesAtomic.d.ts.map +1 -1
- package/types/helpers/normalizeValueWithProperty.d.ts.map +1 -1
|
@@ -10,7 +10,7 @@ const pseudosOrdered = [
|
|
|
10
10
|
];
|
|
11
11
|
function getStylesAtomic(stylesIn) {
|
|
12
12
|
if (!(stylesIn.hoverStyle || stylesIn.pressStyle || stylesIn.focusStyle)) {
|
|
13
|
-
return
|
|
13
|
+
return generateAtomicStyles(stylesIn);
|
|
14
14
|
}
|
|
15
15
|
const { hoverStyle, pressStyle, focusStyle, ...base } = stylesIn;
|
|
16
16
|
let res = [];
|
|
@@ -18,25 +18,17 @@ function getStylesAtomic(stylesIn) {
|
|
|
18
18
|
if (!style)
|
|
19
19
|
continue;
|
|
20
20
|
const pseudo = pseudosOrdered[index];
|
|
21
|
-
res = [...res, ...
|
|
21
|
+
res = [...res, ...generateAtomicStyles(style, pseudo)];
|
|
22
22
|
}
|
|
23
23
|
return res;
|
|
24
24
|
}
|
|
25
|
-
function getAtomicStyle(style, pseudo) {
|
|
26
|
-
if (!style)
|
|
27
|
-
return [];
|
|
28
|
-
if (process.env.NODE_ENV === "development") {
|
|
29
|
-
if (!style || typeof style !== "object") {
|
|
30
|
-
throw new Error(`Wrong style type: "${typeof style}": ${style}`);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
return generateAtomicStyles(style, pseudo);
|
|
34
|
-
}
|
|
35
25
|
let conf;
|
|
36
26
|
const generateAtomicStyles = (styleIn, pseudo) => {
|
|
27
|
+
if (!styleIn)
|
|
28
|
+
return [];
|
|
37
29
|
conf = conf || getConfig();
|
|
38
30
|
const style = styleIn;
|
|
39
|
-
if (
|
|
31
|
+
if ("transform" in style && Array.isArray(style.transform)) {
|
|
40
32
|
style.transform = style.transform.map(
|
|
41
33
|
// { scale: 2 } => 'scale(2)'
|
|
42
34
|
// { translateX: 20 } => 'translateX(20px)'
|
|
@@ -57,12 +49,7 @@ const generateAtomicStyles = (styleIn, pseudo) => {
|
|
|
57
49
|
const value = normalizeValueWithProperty(style[key], key);
|
|
58
50
|
if (value == null || value == void 0)
|
|
59
51
|
continue;
|
|
60
|
-
|
|
61
|
-
if (presetHashes[value]) {
|
|
62
|
-
hash = value;
|
|
63
|
-
} else {
|
|
64
|
-
hash = simpleHash(`${value}`);
|
|
65
|
-
}
|
|
52
|
+
const hash = simpleHash(`${value}`);
|
|
66
53
|
const pseudoPrefix = pseudo ? `0${pseudo.name}-` : "";
|
|
67
54
|
const shortProp = conf.inverseShorthands[key] || key;
|
|
68
55
|
const identifier = `_${shortProp}-${pseudoPrefix}${hash}`;
|
|
@@ -70,16 +57,13 @@ const generateAtomicStyles = (styleIn, pseudo) => {
|
|
|
70
57
|
const styleObject = {
|
|
71
58
|
property: key,
|
|
72
59
|
pseudo: pseudo == null ? void 0 : pseudo.name,
|
|
73
|
-
value,
|
|
74
60
|
identifier,
|
|
75
61
|
rules
|
|
76
62
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (process.env.NODE_ENV === "development" && process.env.TAMAGUI_DEBUG) {
|
|
80
|
-
if (out.find((x) => x.property === "transform" && x.value.includes(`[object Object]`))) {
|
|
81
|
-
debugger;
|
|
63
|
+
if (process.env.NODE_ENV === "test") {
|
|
64
|
+
styleObject.value = value;
|
|
82
65
|
}
|
|
66
|
+
out.push(styleObject);
|
|
83
67
|
}
|
|
84
68
|
return out;
|
|
85
69
|
};
|
|
@@ -87,8 +71,8 @@ const presetHashes = {
|
|
|
87
71
|
none: true
|
|
88
72
|
};
|
|
89
73
|
function styleToCSS(style) {
|
|
90
|
-
|
|
91
|
-
|
|
74
|
+
if ("shadowRadius" in style) {
|
|
75
|
+
const { shadowOffset, shadowRadius, shadowColor } = style;
|
|
92
76
|
const offset = shadowOffset || defaultOffset;
|
|
93
77
|
const shadow = `${normalizeValueWithProperty(
|
|
94
78
|
offset.width
|
|
@@ -100,8 +84,8 @@ function styleToCSS(style) {
|
|
|
100
84
|
style.shadowRadius = void 0;
|
|
101
85
|
style.shadowColor = void 0;
|
|
102
86
|
}
|
|
103
|
-
|
|
104
|
-
|
|
87
|
+
if ("textShadowColor" in style || "textShadowOffset" in style || "textShadowRadius" in style) {
|
|
88
|
+
const { textShadowColor, textShadowOffset, textShadowRadius } = style;
|
|
105
89
|
const { height, width } = textShadowOffset || defaultOffset;
|
|
106
90
|
const radius = textShadowRadius || 0;
|
|
107
91
|
const color = normalizeValueWithProperty(textShadowColor, "textShadowColor");
|
|
@@ -118,9 +102,8 @@ function styleToCSS(style) {
|
|
|
118
102
|
}
|
|
119
103
|
function createDeclarationBlock(style, important = false) {
|
|
120
104
|
let next = "";
|
|
121
|
-
for (const key
|
|
105
|
+
for (const [key, value] of style) {
|
|
122
106
|
const prop = hyphenateStyleName(key);
|
|
123
|
-
const value = style[key];
|
|
124
107
|
next += `${prop}:${value}${important ? " !important" : ""};`;
|
|
125
108
|
}
|
|
126
109
|
return `{${next}}`;
|
|
@@ -128,10 +111,10 @@ function createDeclarationBlock(style, important = false) {
|
|
|
128
111
|
const hcache = {};
|
|
129
112
|
const toHyphenLower = (match) => `-${match.toLowerCase()}`;
|
|
130
113
|
const hyphenateStyleName = (key) => {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
hcache[key] = val
|
|
114
|
+
if (key in hcache)
|
|
115
|
+
return hcache[key];
|
|
116
|
+
const val = key.replace(/[A-Z]/g, toHyphenLower);
|
|
117
|
+
hcache[key] = val;
|
|
135
118
|
return val;
|
|
136
119
|
};
|
|
137
120
|
const pseudoSelectorPrefixes = (() => {
|
|
@@ -148,7 +131,13 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
148
131
|
let rules = [];
|
|
149
132
|
switch (property) {
|
|
150
133
|
case "placeholderTextColor": {
|
|
151
|
-
const block = createDeclarationBlock(
|
|
134
|
+
const block = createDeclarationBlock(
|
|
135
|
+
[
|
|
136
|
+
["color", value],
|
|
137
|
+
["opacity", 1]
|
|
138
|
+
],
|
|
139
|
+
important
|
|
140
|
+
);
|
|
152
141
|
rules.push(`${selector}::placeholder${block}`);
|
|
153
142
|
break;
|
|
154
143
|
}
|
|
@@ -157,7 +146,10 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
157
146
|
const propertyCapitalized = `${property[0].toUpperCase()}${property.slice(1)}`;
|
|
158
147
|
const webkitProperty = `Webkit${propertyCapitalized}`;
|
|
159
148
|
const block = createDeclarationBlock(
|
|
160
|
-
|
|
149
|
+
[
|
|
150
|
+
[property, value],
|
|
151
|
+
[webkitProperty, value]
|
|
152
|
+
],
|
|
161
153
|
important
|
|
162
154
|
);
|
|
163
155
|
rules.push(`${selector}${block}`);
|
|
@@ -176,12 +168,12 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
176
168
|
rules.push(`${selector}>*${boxNone}`);
|
|
177
169
|
}
|
|
178
170
|
}
|
|
179
|
-
const block = createDeclarationBlock(
|
|
171
|
+
const block = createDeclarationBlock([["pointerEvents", finalValue]], true);
|
|
180
172
|
rules.push(`${selector}${block}`);
|
|
181
173
|
break;
|
|
182
174
|
}
|
|
183
175
|
default: {
|
|
184
|
-
const block = createDeclarationBlock(
|
|
176
|
+
const block = createDeclarationBlock([[property, value]], important);
|
|
185
177
|
rules.push(`${selector}${block}`);
|
|
186
178
|
break;
|
|
187
179
|
}
|
|
@@ -191,10 +183,10 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
191
183
|
}
|
|
192
184
|
return rules;
|
|
193
185
|
}
|
|
194
|
-
const boxNone = createDeclarationBlock(
|
|
195
|
-
const boxOnly = createDeclarationBlock(
|
|
186
|
+
const boxNone = createDeclarationBlock([["pointerEvents", "auto"]], true);
|
|
187
|
+
const boxOnly = createDeclarationBlock([["pointerEvents", "none"]], true);
|
|
196
188
|
export {
|
|
197
|
-
|
|
189
|
+
generateAtomicStyles,
|
|
198
190
|
getStylesAtomic,
|
|
199
191
|
styleToCSS
|
|
200
192
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getStylesAtomic.ts"],
|
|
4
|
-
"mappings": "AAKA,SAAsB,kBAAkB;AAExC,SAAS,iBAAiB;AAE1B,SAAS,qBAAqB;AAC9B,SAAS,kCAAkC;AAC3C,SAA2B,yBAAyB;AAKpD,MAAM,iBAAiB;AAAA,EACrB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,kBAAkB;AACpB;AAEO,SAAS,gBAAgB,UAAgC;AAE9D,MAAI,EAAE,SAAS,cAAc,SAAS,cAAc,SAAS,aAAa;AACxE,WAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -10,7 +10,7 @@ const pseudosOrdered = [
|
|
|
10
10
|
];
|
|
11
11
|
function getStylesAtomic(stylesIn) {
|
|
12
12
|
if (!(stylesIn.hoverStyle || stylesIn.pressStyle || stylesIn.focusStyle)) {
|
|
13
|
-
return
|
|
13
|
+
return generateAtomicStyles(stylesIn);
|
|
14
14
|
}
|
|
15
15
|
const { hoverStyle, pressStyle, focusStyle, ...base } = stylesIn;
|
|
16
16
|
let res = [];
|
|
@@ -18,25 +18,17 @@ function getStylesAtomic(stylesIn) {
|
|
|
18
18
|
if (!style)
|
|
19
19
|
continue;
|
|
20
20
|
const pseudo = pseudosOrdered[index];
|
|
21
|
-
res = [...res, ...
|
|
21
|
+
res = [...res, ...generateAtomicStyles(style, pseudo)];
|
|
22
22
|
}
|
|
23
23
|
return res;
|
|
24
24
|
}
|
|
25
|
-
function getAtomicStyle(style, pseudo) {
|
|
26
|
-
if (!style)
|
|
27
|
-
return [];
|
|
28
|
-
if (process.env.NODE_ENV === "development") {
|
|
29
|
-
if (!style || typeof style !== "object") {
|
|
30
|
-
throw new Error(`Wrong style type: "${typeof style}": ${style}`);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
return generateAtomicStyles(style, pseudo);
|
|
34
|
-
}
|
|
35
25
|
let conf;
|
|
36
26
|
const generateAtomicStyles = (styleIn, pseudo) => {
|
|
27
|
+
if (!styleIn)
|
|
28
|
+
return [];
|
|
37
29
|
conf = conf || getConfig();
|
|
38
30
|
const style = styleIn;
|
|
39
|
-
if (
|
|
31
|
+
if ("transform" in style && Array.isArray(style.transform)) {
|
|
40
32
|
style.transform = style.transform.map(
|
|
41
33
|
// { scale: 2 } => 'scale(2)'
|
|
42
34
|
// { translateX: 20 } => 'translateX(20px)'
|
|
@@ -57,12 +49,7 @@ const generateAtomicStyles = (styleIn, pseudo) => {
|
|
|
57
49
|
const value = normalizeValueWithProperty(style[key], key);
|
|
58
50
|
if (value == null || value == void 0)
|
|
59
51
|
continue;
|
|
60
|
-
|
|
61
|
-
if (presetHashes[value]) {
|
|
62
|
-
hash = value;
|
|
63
|
-
} else {
|
|
64
|
-
hash = simpleHash(`${value}`);
|
|
65
|
-
}
|
|
52
|
+
const hash = simpleHash(`${value}`);
|
|
66
53
|
const pseudoPrefix = pseudo ? `0${pseudo.name}-` : "";
|
|
67
54
|
const shortProp = conf.inverseShorthands[key] || key;
|
|
68
55
|
const identifier = `_${shortProp}-${pseudoPrefix}${hash}`;
|
|
@@ -70,16 +57,13 @@ const generateAtomicStyles = (styleIn, pseudo) => {
|
|
|
70
57
|
const styleObject = {
|
|
71
58
|
property: key,
|
|
72
59
|
pseudo: pseudo == null ? void 0 : pseudo.name,
|
|
73
|
-
value,
|
|
74
60
|
identifier,
|
|
75
61
|
rules
|
|
76
62
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (process.env.NODE_ENV === "development" && process.env.TAMAGUI_DEBUG) {
|
|
80
|
-
if (out.find((x) => x.property === "transform" && x.value.includes(`[object Object]`))) {
|
|
81
|
-
debugger;
|
|
63
|
+
if (process.env.NODE_ENV === "test") {
|
|
64
|
+
styleObject.value = value;
|
|
82
65
|
}
|
|
66
|
+
out.push(styleObject);
|
|
83
67
|
}
|
|
84
68
|
return out;
|
|
85
69
|
};
|
|
@@ -87,8 +71,8 @@ const presetHashes = {
|
|
|
87
71
|
none: true
|
|
88
72
|
};
|
|
89
73
|
function styleToCSS(style) {
|
|
90
|
-
|
|
91
|
-
|
|
74
|
+
if ("shadowRadius" in style) {
|
|
75
|
+
const { shadowOffset, shadowRadius, shadowColor } = style;
|
|
92
76
|
const offset = shadowOffset || defaultOffset;
|
|
93
77
|
const shadow = `${normalizeValueWithProperty(
|
|
94
78
|
offset.width
|
|
@@ -100,8 +84,8 @@ function styleToCSS(style) {
|
|
|
100
84
|
style.shadowRadius = void 0;
|
|
101
85
|
style.shadowColor = void 0;
|
|
102
86
|
}
|
|
103
|
-
|
|
104
|
-
|
|
87
|
+
if ("textShadowColor" in style || "textShadowOffset" in style || "textShadowRadius" in style) {
|
|
88
|
+
const { textShadowColor, textShadowOffset, textShadowRadius } = style;
|
|
105
89
|
const { height, width } = textShadowOffset || defaultOffset;
|
|
106
90
|
const radius = textShadowRadius || 0;
|
|
107
91
|
const color = normalizeValueWithProperty(textShadowColor, "textShadowColor");
|
|
@@ -118,9 +102,8 @@ function styleToCSS(style) {
|
|
|
118
102
|
}
|
|
119
103
|
function createDeclarationBlock(style, important = false) {
|
|
120
104
|
let next = "";
|
|
121
|
-
for (const key
|
|
105
|
+
for (const [key, value] of style) {
|
|
122
106
|
const prop = hyphenateStyleName(key);
|
|
123
|
-
const value = style[key];
|
|
124
107
|
next += `${prop}:${value}${important ? " !important" : ""};`;
|
|
125
108
|
}
|
|
126
109
|
return `{${next}}`;
|
|
@@ -128,10 +111,10 @@ function createDeclarationBlock(style, important = false) {
|
|
|
128
111
|
const hcache = {};
|
|
129
112
|
const toHyphenLower = (match) => `-${match.toLowerCase()}`;
|
|
130
113
|
const hyphenateStyleName = (key) => {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
hcache[key] = val
|
|
114
|
+
if (key in hcache)
|
|
115
|
+
return hcache[key];
|
|
116
|
+
const val = key.replace(/[A-Z]/g, toHyphenLower);
|
|
117
|
+
hcache[key] = val;
|
|
135
118
|
return val;
|
|
136
119
|
};
|
|
137
120
|
const pseudoSelectorPrefixes = (() => {
|
|
@@ -148,7 +131,13 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
148
131
|
let rules = [];
|
|
149
132
|
switch (property) {
|
|
150
133
|
case "placeholderTextColor": {
|
|
151
|
-
const block = createDeclarationBlock(
|
|
134
|
+
const block = createDeclarationBlock(
|
|
135
|
+
[
|
|
136
|
+
["color", value],
|
|
137
|
+
["opacity", 1]
|
|
138
|
+
],
|
|
139
|
+
important
|
|
140
|
+
);
|
|
152
141
|
rules.push(`${selector}::placeholder${block}`);
|
|
153
142
|
break;
|
|
154
143
|
}
|
|
@@ -157,7 +146,10 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
157
146
|
const propertyCapitalized = `${property[0].toUpperCase()}${property.slice(1)}`;
|
|
158
147
|
const webkitProperty = `Webkit${propertyCapitalized}`;
|
|
159
148
|
const block = createDeclarationBlock(
|
|
160
|
-
|
|
149
|
+
[
|
|
150
|
+
[property, value],
|
|
151
|
+
[webkitProperty, value]
|
|
152
|
+
],
|
|
161
153
|
important
|
|
162
154
|
);
|
|
163
155
|
rules.push(`${selector}${block}`);
|
|
@@ -176,12 +168,12 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
176
168
|
rules.push(`${selector}>*${boxNone}`);
|
|
177
169
|
}
|
|
178
170
|
}
|
|
179
|
-
const block = createDeclarationBlock(
|
|
171
|
+
const block = createDeclarationBlock([["pointerEvents", finalValue]], true);
|
|
180
172
|
rules.push(`${selector}${block}`);
|
|
181
173
|
break;
|
|
182
174
|
}
|
|
183
175
|
default: {
|
|
184
|
-
const block = createDeclarationBlock(
|
|
176
|
+
const block = createDeclarationBlock([[property, value]], important);
|
|
185
177
|
rules.push(`${selector}${block}`);
|
|
186
178
|
break;
|
|
187
179
|
}
|
|
@@ -191,10 +183,10 @@ function createAtomicRules(identifier, property, value, pseudo) {
|
|
|
191
183
|
}
|
|
192
184
|
return rules;
|
|
193
185
|
}
|
|
194
|
-
const boxNone = createDeclarationBlock(
|
|
195
|
-
const boxOnly = createDeclarationBlock(
|
|
186
|
+
const boxNone = createDeclarationBlock([["pointerEvents", "auto"]], true);
|
|
187
|
+
const boxOnly = createDeclarationBlock([["pointerEvents", "none"]], true);
|
|
196
188
|
export {
|
|
197
|
-
|
|
189
|
+
generateAtomicStyles,
|
|
198
190
|
getStylesAtomic,
|
|
199
191
|
styleToCSS
|
|
200
192
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getStylesAtomic.ts"],
|
|
4
|
-
"mappings": "AAKA,SAAsB,kBAAkB;AAExC,SAAS,iBAAiB;AAE1B,SAAS,qBAAqB;AAC9B,SAAS,kCAAkC;AAC3C,SAA2B,yBAAyB;AAKpD,MAAM,iBAAiB;AAAA,EACrB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,kBAAkB;AACpB;AAEO,SAAS,gBAAgB,UAAgC;AAE9D,MAAI,EAAE,SAAS,cAAc,SAAS,cAAc,SAAS,aAAa;AACxE,WAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -2,19 +2,22 @@ import { isWeb } from "@tamagui/constants";
|
|
|
2
2
|
import { getAllSelectors } from "./insertStyleRule.js";
|
|
3
3
|
import { names, normalizeColor } from "./normalizeColor.js";
|
|
4
4
|
import { normalizeStylePropKeys } from "./normalizeStylePropKeys";
|
|
5
|
-
const colorCache =
|
|
5
|
+
const colorCache = /* @__PURE__ */ new Map();
|
|
6
6
|
function normalizeValueWithProperty(value, property) {
|
|
7
|
-
if (value in colorCache) {
|
|
8
|
-
return colorCache[value];
|
|
9
|
-
}
|
|
10
7
|
if (property && property in unitlessNumbers) {
|
|
11
8
|
return value;
|
|
12
9
|
}
|
|
13
10
|
let res = value;
|
|
14
11
|
if (property && (property in normalizeStylePropKeys || value in names)) {
|
|
12
|
+
if (colorCache.has(value)) {
|
|
13
|
+
return colorCache.get(value);
|
|
14
|
+
}
|
|
15
15
|
res = normalizeColor(value);
|
|
16
|
-
colorCache
|
|
17
|
-
|
|
16
|
+
if (colorCache.size > 1e3) {
|
|
17
|
+
colorCache.clear();
|
|
18
|
+
}
|
|
19
|
+
colorCache.set(value, res);
|
|
20
|
+
} else if (isWeb && typeof value === "number" && (property === void 0 || !(property in unitlessNumbers || property in stringNumbers))) {
|
|
18
21
|
res = `${value}px`;
|
|
19
22
|
} else if (isWeb && property !== void 0 && property in stringNumbers) {
|
|
20
23
|
res = `${res}`;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
|
|
4
|
-
"mappings": "AAKA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAChC,SAAS,OAAO,sBAAsB;AACtC,SAAS,8BAA8B;AAEvC,MAAM,aAAa,
|
|
4
|
+
"mappings": "AAKA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAChC,SAAS,OAAO,sBAAsB;AACtC,SAAS,8BAA8B;AAEvC,MAAM,aAAa,oBAAI,IAAI;AAEpB,SAAS,2BAA2B,OAAY,UAAwB;AAC7E,MAAI,YAAY,YAAY,iBAAiB;AAC3C,WAAO;AAAA,EACT;AACA,MAAI,MAAM;AACV,MAAI,aAAa,YAAY,0BAA0B,SAAS,QAAQ;AACtE,QAAI,WAAW,IAAI,KAAK,GAAG;AACzB,aAAO,WAAW,IAAI,KAAK;AAAA,IAC7B;AACA,UAAM,eAAe,KAAK;AAE1B,QAAI,WAAW,OAAO,KAAM;AAC1B,iBAAW,MAAM;AAAA,IACnB;AACA,eAAW,IAAI,OAAO,GAAG;AAAA,EAC3B,WACE,SACA,OAAO,UAAU,aAChB,aAAa,UACZ,EAAE,YAAY,mBAAmB,YAAY,iBAC/C;AACA,UAAM,GAAG;AAAA,EACX,WAAW,SAAS,aAAa,UAAa,YAAY,eAAe;AACvE,UAAM,GAAG;AAAA,EACX;AACA,SAAO;AACT;AAEA,MAAM,gBAAgB;AAAA,EACpB,QAAQ;AACV;AAEA,MAAM,kBAAkB;AAAA,EACtB,iBAAiB;AAAA,EACjB,yBAAyB;AAAA,EACzB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,aAAa;AAAA,EACb,MAAM;AAAA,EACN,UAAU;AAAA,EACV,WAAW;AAAA,EACX,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,YAAY;AAAA,EACZ,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,eAAe;AAAA,EACf,iBAAiB;AAAA,EACjB,WAAW;AAAA,EACX,SAAS;AAAA,EACT,OAAO;AAAA,EACP,SAAS;AAAA,EACT,SAAS;AAAA,EACT,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,eAAe;AACjB;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AACzE,QAAM,YAAY,gBAAgB;AAClC,QAAM,UAAU,UAAU,SAAS;AACnC,MAAI,OAAO,OAAO,GAAG;AACnB,WAAO,OAAO,OAAO;AAAA,EACvB;AAEA,MAAI,CAAC,SAAS;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ;AAAA,QACN,yBAAyB,8BAA8B;AAAA,MACzD;AAAA,IACF;AACA;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,MAAI,OAAO,WAAW,MAAM,GAAG;AAC7B,UAAM;AAAA,EACR,WAAW,gBAAgB,GAAG,GAAG;AAC/B,UAAM,CAAC;AAAA,EACT,WAAW,OAAO,SAAS,IAAI,GAAG;AAChC,UAAM,CAAC,OAAO,QAAQ,MAAM,EAAE;AAAA,EAChC,OAAO;AACL,UAAM;AAAA,EACR;AACA,SAAO,OAAO,IAAI;AAClB,MAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,QAAI,OAAO,QAAQ,YAAY,MAAM,GAAG,GAAG;AAEzC,cAAQ,IAAI,sCAAsC;AAAA,QAChD;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACA,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -2,19 +2,22 @@ import { isWeb } from "@tamagui/constants";
|
|
|
2
2
|
import { getAllSelectors } from "./insertStyleRule.js";
|
|
3
3
|
import { names, normalizeColor } from "./normalizeColor.js";
|
|
4
4
|
import { normalizeStylePropKeys } from "./normalizeStylePropKeys";
|
|
5
|
-
const colorCache =
|
|
5
|
+
const colorCache = /* @__PURE__ */ new Map();
|
|
6
6
|
function normalizeValueWithProperty(value, property) {
|
|
7
|
-
if (value in colorCache) {
|
|
8
|
-
return colorCache[value];
|
|
9
|
-
}
|
|
10
7
|
if (property && property in unitlessNumbers) {
|
|
11
8
|
return value;
|
|
12
9
|
}
|
|
13
10
|
let res = value;
|
|
14
11
|
if (property && (property in normalizeStylePropKeys || value in names)) {
|
|
12
|
+
if (colorCache.has(value)) {
|
|
13
|
+
return colorCache.get(value);
|
|
14
|
+
}
|
|
15
15
|
res = normalizeColor(value);
|
|
16
|
-
colorCache
|
|
17
|
-
|
|
16
|
+
if (colorCache.size > 1e3) {
|
|
17
|
+
colorCache.clear();
|
|
18
|
+
}
|
|
19
|
+
colorCache.set(value, res);
|
|
20
|
+
} else if (isWeb && typeof value === "number" && (property === void 0 || !(property in unitlessNumbers || property in stringNumbers))) {
|
|
18
21
|
res = `${value}px`;
|
|
19
22
|
} else if (isWeb && property !== void 0 && property in stringNumbers) {
|
|
20
23
|
res = `${res}`;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
|
|
4
|
-
"mappings": "AAKA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAChC,SAAS,OAAO,sBAAsB;AACtC,SAAS,8BAA8B;AAEvC,MAAM,aAAa,
|
|
4
|
+
"mappings": "AAKA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAChC,SAAS,OAAO,sBAAsB;AACtC,SAAS,8BAA8B;AAEvC,MAAM,aAAa,oBAAI,IAAI;AAEpB,SAAS,2BAA2B,OAAY,UAAwB;AAC7E,MAAI,YAAY,YAAY,iBAAiB;AAC3C,WAAO;AAAA,EACT;AACA,MAAI,MAAM;AACV,MAAI,aAAa,YAAY,0BAA0B,SAAS,QAAQ;AACtE,QAAI,WAAW,IAAI,KAAK,GAAG;AACzB,aAAO,WAAW,IAAI,KAAK;AAAA,IAC7B;AACA,UAAM,eAAe,KAAK;AAE1B,QAAI,WAAW,OAAO,KAAM;AAC1B,iBAAW,MAAM;AAAA,IACnB;AACA,eAAW,IAAI,OAAO,GAAG;AAAA,EAC3B,WACE,SACA,OAAO,UAAU,aAChB,aAAa,UACZ,EAAE,YAAY,mBAAmB,YAAY,iBAC/C;AACA,UAAM,GAAG;AAAA,EACX,WAAW,SAAS,aAAa,UAAa,YAAY,eAAe;AACvE,UAAM,GAAG;AAAA,EACX;AACA,SAAO;AACT;AAEA,MAAM,gBAAgB;AAAA,EACpB,QAAQ;AACV;AAEA,MAAM,kBAAkB;AAAA,EACtB,iBAAiB;AAAA,EACjB,yBAAyB;AAAA,EACzB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,aAAa;AAAA,EACb,MAAM;AAAA,EACN,UAAU;AAAA,EACV,WAAW;AAAA,EACX,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,YAAY;AAAA,EACZ,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,eAAe;AAAA,EACf,iBAAiB;AAAA,EACjB,WAAW;AAAA,EACX,SAAS;AAAA,EACT,OAAO;AAAA,EACP,SAAS;AAAA,EACT,SAAS;AAAA,EACT,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,eAAe;AACjB;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AACzE,QAAM,YAAY,gBAAgB;AAClC,QAAM,UAAU,UAAU,SAAS;AACnC,MAAI,OAAO,OAAO,GAAG;AACnB,WAAO,OAAO,OAAO;AAAA,EACvB;AAEA,MAAI,CAAC,SAAS;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ;AAAA,QACN,yBAAyB,8BAA8B;AAAA,MACzD;AAAA,IACF;AACA;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,MAAI,OAAO,WAAW,MAAM,GAAG;AAC7B,UAAM;AAAA,EACR,WAAW,gBAAgB,GAAG,GAAG;AAC/B,UAAM,CAAC;AAAA,EACT,WAAW,OAAO,SAAS,IAAI,GAAG;AAChC,UAAM,CAAC,OAAO,QAAQ,MAAM,EAAE;AAAA,EAChC,OAAO;AACL,UAAM;AAAA,EACR;AACA,SAAO,OAAO,IAAI;AAClB,MAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,QAAI,OAAO,QAAQ,YAAY,MAAM,GAAG,GAAG;AAEzC,cAAQ,IAAI,sCAAsC;AAAA,QAChD;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACA,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.22.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.22.0",
|
|
31
|
+
"@tamagui/constants": "1.22.0",
|
|
32
|
+
"@tamagui/helpers": "1.22.0",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.22.0",
|
|
34
|
+
"@tamagui/use-did-finish-ssr": "1.22.0",
|
|
35
|
+
"@tamagui/use-event": "1.22.0",
|
|
36
|
+
"@tamagui/use-force-update": "1.22.0"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.
|
|
42
|
+
"@tamagui/build": "1.22.0",
|
|
43
43
|
"@testing-library/react": "^13.4.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"react": "^18.2.0",
|
|
@@ -49,7 +49,7 @@ import type {
|
|
|
49
49
|
import { createMediaStyle } from './createMediaStyle.js'
|
|
50
50
|
import { getPropMappedFontFamily } from './createPropMapper.js'
|
|
51
51
|
import { fixStyles } from './expandStyles.js'
|
|
52
|
-
import {
|
|
52
|
+
import { generateAtomicStyles, getStylesAtomic, styleToCSS } from './getStylesAtomic'
|
|
53
53
|
import {
|
|
54
54
|
insertStyleRules,
|
|
55
55
|
insertedTransforms,
|
|
@@ -708,7 +708,7 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
708
708
|
}
|
|
709
709
|
|
|
710
710
|
if (shouldDoClasses && !isEnter && !isExit) {
|
|
711
|
-
const pseudoStyles =
|
|
711
|
+
const pseudoStyles = generateAtomicStyles(pseudoStyleObject, descriptor)
|
|
712
712
|
for (const psuedoStyle of pseudoStyles) {
|
|
713
713
|
const fullKey = `${psuedoStyle.property}${PROP_SPLIT}${descriptor.name}`
|
|
714
714
|
|
|
@@ -995,7 +995,7 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
995
995
|
for (const atomicStyle of atomic) {
|
|
996
996
|
const key = atomicStyle.property
|
|
997
997
|
if (props.animateOnly && props.animateOnly.includes(key)) {
|
|
998
|
-
retainedStyles[key] =
|
|
998
|
+
retainedStyles[key] = style[key]
|
|
999
999
|
} else {
|
|
1000
1000
|
addStyleToInsertRules(rulesToInsert, atomicStyle)
|
|
1001
1001
|
mergeClassName(transforms, classNames, key, atomicStyle.identifier)
|