@tamagui/web 1.49.5 → 1.49.7
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/normalizeValueWithProperty.js +9 -1
- package/dist/cjs/helpers/normalizeValueWithProperty.js.map +1 -1
- package/dist/esm/helpers/normalizeValueWithProperty.js +9 -1
- package/dist/esm/helpers/normalizeValueWithProperty.js.map +1 -1
- package/package.json +10 -10
- package/src/helpers/normalizeValueWithProperty.ts +10 -1
- package/src/hooks/useMedia.tsx +1 -1
- package/src/styled.tsx +3 -3
- package/types/helpers/normalizeValueWithProperty.d.ts.map +1 -1
|
@@ -25,13 +25,21 @@ module.exports = __toCommonJS(normalizeValueWithProperty_exports);
|
|
|
25
25
|
var import_constants = require("@tamagui/constants");
|
|
26
26
|
var import_helpers = require("@tamagui/helpers");
|
|
27
27
|
var import_insertStyleRule = require("./insertStyleRule");
|
|
28
|
+
const stylePropsAllPlusTransforms = {
|
|
29
|
+
...import_helpers.stylePropsAll,
|
|
30
|
+
translateX: true,
|
|
31
|
+
translateY: true
|
|
32
|
+
};
|
|
28
33
|
function normalizeValueWithProperty(value, property) {
|
|
29
34
|
if (!import_constants.isWeb)
|
|
30
35
|
return value;
|
|
31
36
|
if (typeof value === "boolean") {
|
|
32
37
|
return value;
|
|
33
38
|
}
|
|
34
|
-
if (property &&
|
|
39
|
+
if (property && property in import_helpers.stylePropsUnitless) {
|
|
40
|
+
return value;
|
|
41
|
+
}
|
|
42
|
+
if (property && !(property in stylePropsAllPlusTransforms)) {
|
|
35
43
|
return value;
|
|
36
44
|
}
|
|
37
45
|
let res = value;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAsB;AACtB,qBAA+D;AAE/D,6BAAgC;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAsB;AACtB,qBAA+D;AAE/D,6BAAgC;AAIhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,UAAwB;AAC7E,MAAI,CAAC;AAAO,WAAO;AACnB,MAAI,OAAO,UAAU,WAAW;AAC9B,WAAO;AAAA,EACT;AACA,MAAI,YAAY,YAAY,mCAAoB;AAC9C,WAAO;AAAA,EACT;AACA,MAAI,YAAY,EAAE,YAAY,8BAA8B;AAC1D,WAAO;AAAA,EACT;AACA,MAAI,MAAM;AAEV,MAAI,SAAS,OAAO,UAAU;AAAU,WAAO;AAC/C,MAAI,OAAO,UAAU,UAAU;AAC7B,UAAM,GAAG;AAAA,EACX,WAAW,UAAU;AACnB,UAAM,GAAG;AAAA,EACX;AACA,SAAO;AACT;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AACzE,QAAM,gBAAY,wCAAgB;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,kCAAmB,GAAG,GAAG;AAClC,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
|
}
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
import { isWeb } from "@tamagui/constants";
|
|
2
2
|
import { stylePropsAll, stylePropsUnitless } from "@tamagui/helpers";
|
|
3
3
|
import { getAllSelectors } from "./insertStyleRule";
|
|
4
|
+
const stylePropsAllPlusTransforms = {
|
|
5
|
+
...stylePropsAll,
|
|
6
|
+
translateX: true,
|
|
7
|
+
translateY: true
|
|
8
|
+
};
|
|
4
9
|
function normalizeValueWithProperty(value, property) {
|
|
5
10
|
if (!isWeb)
|
|
6
11
|
return value;
|
|
7
12
|
if (typeof value === "boolean") {
|
|
8
13
|
return value;
|
|
9
14
|
}
|
|
10
|
-
if (property &&
|
|
15
|
+
if (property && property in stylePropsUnitless) {
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
if (property && !(property in stylePropsAllPlusTransforms)) {
|
|
11
19
|
return value;
|
|
12
20
|
}
|
|
13
21
|
let res = value;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
|
|
4
|
-
"mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAAuC;AAE/D,SAAS,uBAAuB;
|
|
4
|
+
"mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAAuC;AAE/D,SAAS,uBAAuB;AAIhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,UAAwB;AAC7E,MAAI,CAAC;AAAO,WAAO;AACnB,MAAI,OAAO,UAAU,WAAW;AAC9B,WAAO;AAAA,EACT;AACA,MAAI,YAAY,YAAY,oBAAoB;AAC9C,WAAO;AAAA,EACT;AACA,MAAI,YAAY,EAAE,YAAY,8BAA8B;AAC1D,WAAO;AAAA,EACT;AACA,MAAI,MAAM;AAEV,MAAI,SAAS,OAAO,UAAU;AAAU,WAAO;AAC/C,MAAI,OAAO,UAAU,UAAU;AAC7B,UAAM,GAAG;AAAA,EACX,WAAW,UAAU;AACnB,UAAM,GAAG;AAAA,EACX;AACA,SAAO;AACT;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,mBAAmB,GAAG,GAAG;AAClC,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.49.
|
|
3
|
+
"version": "1.49.7",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,20 +27,20 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.49.
|
|
31
|
-
"@tamagui/constants": "1.49.
|
|
32
|
-
"@tamagui/helpers": "1.49.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.49.
|
|
34
|
-
"@tamagui/timer": "1.49.
|
|
35
|
-
"@tamagui/use-did-finish-ssr": "1.49.
|
|
36
|
-
"@tamagui/use-event": "1.49.
|
|
37
|
-
"@tamagui/use-force-update": "1.49.
|
|
30
|
+
"@tamagui/compose-refs": "1.49.7",
|
|
31
|
+
"@tamagui/constants": "1.49.7",
|
|
32
|
+
"@tamagui/helpers": "1.49.7",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.49.7",
|
|
34
|
+
"@tamagui/timer": "1.49.7",
|
|
35
|
+
"@tamagui/use-did-finish-ssr": "1.49.7",
|
|
36
|
+
"@tamagui/use-event": "1.49.7",
|
|
37
|
+
"@tamagui/use-force-update": "1.49.7"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"react": "*"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@tamagui/build": "1.49.
|
|
43
|
+
"@tamagui/build": "1.49.7",
|
|
44
44
|
"@testing-library/react": "^13.4.0",
|
|
45
45
|
"csstype": "^3.0.10",
|
|
46
46
|
"react": "^18.2.0",
|
|
@@ -10,12 +10,21 @@ import { getAllSelectors } from './insertStyleRule'
|
|
|
10
10
|
|
|
11
11
|
// only doing this on web on native it accepts pixel values
|
|
12
12
|
|
|
13
|
+
const stylePropsAllPlusTransforms = {
|
|
14
|
+
...stylePropsAll,
|
|
15
|
+
translateX: true,
|
|
16
|
+
translateY: true,
|
|
17
|
+
}
|
|
18
|
+
|
|
13
19
|
export function normalizeValueWithProperty(value: any, property?: string): any {
|
|
14
20
|
if (!isWeb) return value
|
|
15
21
|
if (typeof value === 'boolean') {
|
|
16
22
|
return value
|
|
17
23
|
}
|
|
18
|
-
if (property &&
|
|
24
|
+
if (property && property in stylePropsUnitless) {
|
|
25
|
+
return value
|
|
26
|
+
}
|
|
27
|
+
if (property && !(property in stylePropsAllPlusTransforms)) {
|
|
19
28
|
return value
|
|
20
29
|
}
|
|
21
30
|
let res = value
|
package/src/hooks/useMedia.tsx
CHANGED
|
@@ -65,7 +65,7 @@ export const getMediaKeyImportance = (key: string) => {
|
|
|
65
65
|
return defaultMediaImportance
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
// + 100 because we set base usedKeys=1,
|
|
68
|
+
// + 100 because we set base usedKeys=1, pseudos are 2-N (however many we have)
|
|
69
69
|
// all media go above all pseudos so we need to pad it based on that
|
|
70
70
|
// right now theres 5 pseudos but in the future could be a few more
|
|
71
71
|
return mediaKeysOrdered.indexOf(key) + 100
|
package/src/styled.tsx
CHANGED
|
@@ -190,8 +190,8 @@ export function styled<
|
|
|
190
190
|
*
|
|
191
191
|
* type OurPropsBase = OurPropsBaseBase & PseudoProps<Partial<OurPropsBaseBase>>
|
|
192
192
|
* and then below in type Props you would remove the PseudoProps line
|
|
193
|
-
* that would give you nicely merged
|
|
194
|
-
* so now
|
|
193
|
+
* that would give you nicely merged pseudo sub-styles but its just too much for TS
|
|
194
|
+
* so now pseudos wont be nicely typed inside media queries, but at least we can nest
|
|
195
195
|
*/
|
|
196
196
|
|
|
197
197
|
type OurPropsBase = OurPropsBaseBase
|
|
@@ -200,7 +200,7 @@ export function styled<
|
|
|
200
200
|
? GetProps<ParentComponent>
|
|
201
201
|
: // start with base props
|
|
202
202
|
OurPropsBase &
|
|
203
|
-
// add in
|
|
203
|
+
// add in pseudo
|
|
204
204
|
PseudoProps<Partial<OurPropsBaseBase>> &
|
|
205
205
|
// add in media
|
|
206
206
|
MediaProps<Partial<OurPropsBase>>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalizeValueWithProperty.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeValueWithProperty.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"normalizeValueWithProperty.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeValueWithProperty.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,CAoB7E;AAKD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAyCxE"}
|