@tamagui/web 1.33.1 → 1.33.2
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/getStylesAtomic.js +5 -5
- package/dist/cjs/helpers/getStylesAtomic.js.map +1 -1
- package/dist/cjs/helpers/normalizeShadow.js +2 -2
- package/dist/cjs/helpers/normalizeShadow.js.map +1 -1
- package/dist/esm/helpers/getStylesAtomic.js +5 -5
- package/dist/esm/helpers/getStylesAtomic.js.map +1 -1
- package/dist/esm/helpers/normalizeShadow.js +2 -2
- package/dist/esm/helpers/normalizeShadow.js.map +1 -1
- package/package.json +9 -9
- package/src/helpers/getStylesAtomic.ts +5 -5
- package/src/helpers/normalizeShadow.ts +2 -2
- package/types/helpers/normalizeShadow.d.ts +1 -2
- package/types/helpers/normalizeShadow.d.ts.map +1 -1
|
@@ -96,15 +96,15 @@ function styleToCSS(style) {
|
|
|
96
96
|
const { shadowOffset, shadowRadius, shadowColor } = style;
|
|
97
97
|
if (style.shadowRadius) {
|
|
98
98
|
const offset = shadowOffset || import_defaultOffset.defaultOffset;
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
)} ${shadowColor}`;
|
|
99
|
+
const width = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(offset.width);
|
|
100
|
+
const height = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(offset.height);
|
|
101
|
+
const radius = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(shadowRadius);
|
|
102
|
+
const shadow = `${width} ${height} ${radius} ${shadowColor}`;
|
|
104
103
|
style.boxShadow = style.boxShadow ? `${style.boxShadow}, ${shadow}` : shadow;
|
|
105
104
|
style.shadowOffset = void 0;
|
|
106
105
|
style.shadowRadius = void 0;
|
|
107
106
|
style.shadowColor = void 0;
|
|
107
|
+
style.shadowOpacity = void 0;
|
|
108
108
|
}
|
|
109
109
|
const { textShadowColor, textShadowOffset, textShadowRadius } = style;
|
|
110
110
|
if (textShadowColor || textShadowOffset || textShadowRadius) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getStylesAtomic.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,qBAAwC;AAExC,oBAA0B;AAE1B,2BAA8B;AAC9B,wCAA2C;AAC3C,+BAAoD;AAKpD,MAAM,iBAAiB;AAAA,EACrB,2CAAkB;AAAA,EAClB,2CAAkB;AAAA,EAClB,2CAAkB;AACpB;AAEO,SAAS,gBAAgB,UAAgC;AAE9D,MAAI,EAAE,SAAS,cAAc,SAAS,cAAc,SAAS,aAAa;AACxE,WAAO,qBAAqB,QAAQ;AAAA,EACtC;AAGA,QAAM,EAAE,YAAY,YAAY,YAAY,GAAG,KAAK,IAAI;AACxD,MAAI,MAAqB,CAAC;AAE1B,aAAW,CAAC,OAAO,KAAK,KAAK,CAAC,YAAY,YAAY,YAAY,IAAI,EAAE,QAAQ,GAAG;AACjF,QAAI,CAAC;AAAO;AACZ,UAAM,SAAS,eAAe,KAAK;AACnC,UAAM,CAAC,GAAG,KAAK,GAAG,qBAAqB,OAAO,MAAM,CAAC;AAAA,EACvD;AACA,SAAO;AACT;AAEA,IAAI;AAEG,MAAM,uBAAuB,CAClC,SACA,WACkB;AAClB,MAAI,CAAC;AAAS,WAAO,CAAC;AAEtB,SAAO,YAAQ,yBAAU;AAGzB,QAAM,QAAQ;AAGd,MAAI,eAAe,SAAS,MAAM,QAAQ,MAAM,SAAS,GAAG;AAC1D,UAAM,YAAY,MAAM,UACrB;AAAA;AAAA;AAAA;AAAA,MAIC,CAAC,cAAc;AACb,cAAM,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;AACrC,cAAM,QAAQ,UAAU,IAAI;AAC5B,YAAI,SAAS,YAAY,SAAS,YAAY;AAC5C,iBAAO,GAAG,QAAQ,MAAM,KAAK,GAAG;AAAA,QAClC;AACA,eAAO,GAAG,YAAQ,8DAA2B,OAAO,IAAI;AAAA,MAC1D;AAAA,IACF,EACC,KAAK,GAAG;AAAA,EACb;AAEA,aAAW,KAAK;AAEhB,QAAM,MAAqB,CAAC;AAC5B,aAAW,OAAO,OAAO;AACvB,UAAM,YAAQ,8DAA2B,MAAM,GAAG,GAAG,GAAG;AACxD,QAAI,SAAS,QAAQ,SAAS;AAAW;AAEzC,UAAM,WAAO,2BAAW,GAAG,OAAO;AAClC,UAAM,eAAe,SAAS,IAAI,OAAO,UAAU;AACnD,UAAM,YAAY,KAAK,kBAAkB,GAAG,KAAK;AACjD,UAAM,aAAa,IAAI,aAAa,eAAe;AACnD,UAAM,QAAQ,kBAAkB,YAAY,KAAK,OAAO,MAAM;AAC9D,UAAM,cAA2B;AAAA,MAC/B,UAAU;AAAA,MACV,QAAQ,iCAAQ;AAAA,MAChB;AAAA,MACA;AAAA,IACF;AACA,QAAI,QAAQ,IAAI,aAAa,QAAQ;AACnC,kBAAY,QAAQ;AAAA,IACtB;AACA,QAAI,KAAK,WAAW;AAAA,EACtB;AAEA,SAAO;AACT;AAEO,SAAS,WAAW,OAA4B;AAErD,QAAM,EAAE,cAAc,cAAc,YAAY,IAAI;AACpD,MAAI,MAAM,cAAc;AACtB,UAAM,SAAS,gBAAgB;AAC/B,UAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -22,6 +22,7 @@ __export(normalizeShadow_exports, {
|
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(normalizeShadow_exports);
|
|
24
24
|
var import_defaultOffset = require("./defaultOffset");
|
|
25
|
+
var import_normalizeColor = require("./normalizeColor");
|
|
25
26
|
var import_normalizeValueWithProperty = require("./normalizeValueWithProperty");
|
|
26
27
|
function normalizeShadow({
|
|
27
28
|
shadowColor,
|
|
@@ -36,8 +37,7 @@ function normalizeShadow({
|
|
|
36
37
|
height: (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(height || 0)
|
|
37
38
|
},
|
|
38
39
|
shadowRadius: (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(shadowRadius || 0),
|
|
39
|
-
shadowColor,
|
|
40
|
-
shadowOpacity
|
|
40
|
+
shadowColor: (0, import_normalizeColor.normalizeColor)(shadowColor, shadowOpacity)
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeShadow.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAA8B;AAC9B,wCAA2C;AAEpC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA,gBAAgB;AAAA,EAChB;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,gBAAgB;AAC1C,SAAO;AAAA,IACL,cAAc;AAAA,MACZ,WAAO,8DAA2B,SAAS,CAAC;AAAA,MAC5C,YAAQ,8DAA2B,UAAU,CAAC;AAAA,IAChD;AAAA,IACA,kBAAc,8DAA2B,gBAAgB,CAAC;AAAA,IAC1D
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAA8B;AAC9B,4BAA+B;AAC/B,wCAA2C;AAEpC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA,gBAAgB;AAAA,EAChB;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,gBAAgB;AAC1C,SAAO;AAAA,IACL,cAAc;AAAA,MACZ,WAAO,8DAA2B,SAAS,CAAC;AAAA,MAC5C,YAAQ,8DAA2B,UAAU,CAAC;AAAA,IAChD;AAAA,IACA,kBAAc,8DAA2B,gBAAgB,CAAC;AAAA,IAC1D,iBAAa,sCAAe,aAAa,aAAa;AAAA,EACxD;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -71,15 +71,15 @@ function styleToCSS(style) {
|
|
|
71
71
|
const { shadowOffset, shadowRadius, shadowColor } = style;
|
|
72
72
|
if (style.shadowRadius) {
|
|
73
73
|
const offset = shadowOffset || defaultOffset;
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
)} ${shadowColor}`;
|
|
74
|
+
const width = normalizeValueWithProperty(offset.width);
|
|
75
|
+
const height = normalizeValueWithProperty(offset.height);
|
|
76
|
+
const radius = normalizeValueWithProperty(shadowRadius);
|
|
77
|
+
const shadow = `${width} ${height} ${radius} ${shadowColor}`;
|
|
79
78
|
style.boxShadow = style.boxShadow ? `${style.boxShadow}, ${shadow}` : shadow;
|
|
80
79
|
style.shadowOffset = void 0;
|
|
81
80
|
style.shadowRadius = void 0;
|
|
82
81
|
style.shadowColor = void 0;
|
|
82
|
+
style.shadowOpacity = void 0;
|
|
83
83
|
}
|
|
84
84
|
const { textShadowColor, textShadowOffset, textShadowRadius } = style;
|
|
85
85
|
if (textShadowColor || textShadowOffset || textShadowRadius) {
|
|
@@ -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,qBAAqB,QAAQ;AAAA,EACtC;AAGA,QAAM,EAAE,YAAY,YAAY,YAAY,GAAG,KAAK,IAAI;AACxD,MAAI,MAAqB,CAAC;AAE1B,aAAW,CAAC,OAAO,KAAK,KAAK,CAAC,YAAY,YAAY,YAAY,IAAI,EAAE,QAAQ,GAAG;AACjF,QAAI,CAAC;AAAO;AACZ,UAAM,SAAS,eAAe,KAAK;AACnC,UAAM,CAAC,GAAG,KAAK,GAAG,qBAAqB,OAAO,MAAM,CAAC;AAAA,EACvD;AACA,SAAO;AACT;AAEA,IAAI;AAEG,MAAM,uBAAuB,CAClC,SACA,WACkB;AAClB,MAAI,CAAC;AAAS,WAAO,CAAC;AAEtB,SAAO,QAAQ,UAAU;AAGzB,QAAM,QAAQ;AAGd,MAAI,eAAe,SAAS,MAAM,QAAQ,MAAM,SAAS,GAAG;AAC1D,UAAM,YAAY,MAAM,UACrB;AAAA;AAAA;AAAA;AAAA,MAIC,CAAC,cAAc;AACb,cAAM,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;AACrC,cAAM,QAAQ,UAAU,IAAI;AAC5B,YAAI,SAAS,YAAY,SAAS,YAAY;AAC5C,iBAAO,GAAG,QAAQ,MAAM,KAAK,GAAG;AAAA,QAClC;AACA,eAAO,GAAG,QAAQ,2BAA2B,OAAO,IAAI;AAAA,MAC1D;AAAA,IACF,EACC,KAAK,GAAG;AAAA,EACb;AAEA,aAAW,KAAK;AAEhB,QAAM,MAAqB,CAAC;AAC5B,aAAW,OAAO,OAAO;AACvB,UAAM,QAAQ,2BAA2B,MAAM,GAAG,GAAG,GAAG;AACxD,QAAI,SAAS,QAAQ,SAAS;AAAW;AAEzC,UAAM,OAAO,WAAW,GAAG,OAAO;AAClC,UAAM,eAAe,SAAS,IAAI,OAAO,UAAU;AACnD,UAAM,YAAY,KAAK,kBAAkB,GAAG,KAAK;AACjD,UAAM,aAAa,IAAI,aAAa,eAAe;AACnD,UAAM,QAAQ,kBAAkB,YAAY,KAAK,OAAO,MAAM;AAC9D,UAAM,cAA2B;AAAA,MAC/B,UAAU;AAAA,MACV,QAAQ,iCAAQ;AAAA,MAChB;AAAA,MACA;AAAA,IACF;AACA,QAAI,QAAQ,IAAI,aAAa,QAAQ;AACnC,kBAAY,QAAQ;AAAA,IACtB;AACA,QAAI,KAAK,WAAW;AAAA,EACtB;AAEA,SAAO;AACT;AAEO,SAAS,WAAW,OAA4B;AAErD,QAAM,EAAE,cAAc,cAAc,YAAY,IAAI;AACpD,MAAI,MAAM,cAAc;AACtB,UAAM,SAAS,gBAAgB;AAC/B,UAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { defaultOffset } from "./defaultOffset";
|
|
2
|
+
import { normalizeColor } from "./normalizeColor";
|
|
2
3
|
import { normalizeValueWithProperty } from "./normalizeValueWithProperty";
|
|
3
4
|
function normalizeShadow({
|
|
4
5
|
shadowColor,
|
|
@@ -13,8 +14,7 @@ function normalizeShadow({
|
|
|
13
14
|
height: normalizeValueWithProperty(height || 0)
|
|
14
15
|
},
|
|
15
16
|
shadowRadius: normalizeValueWithProperty(shadowRadius || 0),
|
|
16
|
-
shadowColor,
|
|
17
|
-
shadowOpacity
|
|
17
|
+
shadowColor: normalizeColor(shadowColor, shadowOpacity)
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeShadow.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,qBAAqB;AAC9B,SAAS,kCAAkC;AAEpC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA,gBAAgB;AAAA,EAChB;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,gBAAgB;AAC1C,SAAO;AAAA,IACL,cAAc;AAAA,MACZ,OAAO,2BAA2B,SAAS,CAAC;AAAA,MAC5C,QAAQ,2BAA2B,UAAU,CAAC;AAAA,IAChD;AAAA,IACA,cAAc,2BAA2B,gBAAgB,CAAC;AAAA,IAC1D
|
|
4
|
+
"mappings": "AAAA,SAAS,qBAAqB;AAC9B,SAAS,sBAAsB;AAC/B,SAAS,kCAAkC;AAEpC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA,gBAAgB;AAAA,EAChB;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,gBAAgB;AAC1C,SAAO;AAAA,IACL,cAAc;AAAA,MACZ,OAAO,2BAA2B,SAAS,CAAC;AAAA,MAC5C,QAAQ,2BAA2B,UAAU,CAAC;AAAA,IAChD;AAAA,IACA,cAAc,2BAA2B,gBAAgB,CAAC;AAAA,IAC1D,aAAa,eAAe,aAAa,aAAa;AAAA,EACxD;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.33.
|
|
3
|
+
"version": "1.33.2",
|
|
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.33.
|
|
31
|
-
"@tamagui/constants": "1.33.
|
|
32
|
-
"@tamagui/helpers": "1.33.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.33.
|
|
34
|
-
"@tamagui/use-did-finish-ssr": "1.33.
|
|
35
|
-
"@tamagui/use-event": "1.33.
|
|
36
|
-
"@tamagui/use-force-update": "1.33.
|
|
30
|
+
"@tamagui/compose-refs": "1.33.2",
|
|
31
|
+
"@tamagui/constants": "1.33.2",
|
|
32
|
+
"@tamagui/helpers": "1.33.2",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.33.2",
|
|
34
|
+
"@tamagui/use-did-finish-ssr": "1.33.2",
|
|
35
|
+
"@tamagui/use-event": "1.33.2",
|
|
36
|
+
"@tamagui/use-force-update": "1.33.2"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.33.
|
|
42
|
+
"@tamagui/build": "1.33.2",
|
|
43
43
|
"@testing-library/react": "^13.4.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"react": "^18.2.0",
|
|
@@ -102,15 +102,15 @@ export function styleToCSS(style: Record<string, any>) {
|
|
|
102
102
|
const { shadowOffset, shadowRadius, shadowColor } = style
|
|
103
103
|
if (style.shadowRadius) {
|
|
104
104
|
const offset = shadowOffset || defaultOffset
|
|
105
|
-
const
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
)} ${shadowColor}`
|
|
105
|
+
const width = normalizeValueWithProperty(offset.width)
|
|
106
|
+
const height = normalizeValueWithProperty(offset.height)
|
|
107
|
+
const radius = normalizeValueWithProperty(shadowRadius)
|
|
108
|
+
const shadow = `${width} ${height} ${radius} ${shadowColor}`
|
|
110
109
|
style.boxShadow = style.boxShadow ? `${style.boxShadow}, ${shadow}` : shadow
|
|
111
110
|
style.shadowOffset = undefined
|
|
112
111
|
style.shadowRadius = undefined
|
|
113
112
|
style.shadowColor = undefined
|
|
113
|
+
style.shadowOpacity = undefined
|
|
114
114
|
}
|
|
115
115
|
|
|
116
116
|
// text-shadow
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { defaultOffset } from './defaultOffset'
|
|
2
|
+
import { normalizeColor } from './normalizeColor'
|
|
2
3
|
import { normalizeValueWithProperty } from './normalizeValueWithProperty'
|
|
3
4
|
|
|
4
5
|
export function normalizeShadow({
|
|
@@ -14,7 +15,6 @@ export function normalizeShadow({
|
|
|
14
15
|
height: normalizeValueWithProperty(height || 0),
|
|
15
16
|
},
|
|
16
17
|
shadowRadius: normalizeValueWithProperty(shadowRadius || 0),
|
|
17
|
-
shadowColor,
|
|
18
|
-
shadowOpacity,
|
|
18
|
+
shadowColor: normalizeColor(shadowColor, shadowOpacity),
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeShadow.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeShadow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalizeShadow.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeShadow.ts"],"names":[],"mappings":"AAIA,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,YAAY,EACZ,aAAiB,EACjB,YAAY,GACb,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;;;EAUrB"}
|