@tamagui/web 2.0.0-1768992908401 → 2.0.0-1769035103261

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.
Files changed (37) hide show
  1. package/dist/cjs/helpers/expandStyle.cjs +4 -7
  2. package/dist/cjs/helpers/expandStyle.js +4 -8
  3. package/dist/cjs/helpers/expandStyle.js.map +2 -2
  4. package/dist/cjs/helpers/expandStyle.native.js +90 -11
  5. package/dist/cjs/helpers/expandStyle.native.js.map +1 -1
  6. package/dist/esm/helpers/expandStyle.js +3 -11
  7. package/dist/esm/helpers/expandStyle.js.map +2 -2
  8. package/dist/esm/helpers/expandStyle.mjs +3 -6
  9. package/dist/esm/helpers/expandStyle.mjs.map +1 -1
  10. package/dist/esm/helpers/expandStyle.native.js +88 -9
  11. package/dist/esm/helpers/expandStyle.native.js.map +1 -1
  12. package/package.json +12 -12
  13. package/src/helpers/expandStyle.ts +97 -18
  14. package/src/types.tsx +3 -1
  15. package/types/helpers/expandStyle.d.ts.map +1 -1
  16. package/types/types.d.ts +2 -1
  17. package/types/types.d.ts.map +1 -1
  18. package/dist/cjs/constants/webToNativeProps.cjs +0 -28
  19. package/dist/cjs/constants/webToNativeProps.js +0 -22
  20. package/dist/cjs/constants/webToNativeProps.js.map +0 -6
  21. package/dist/cjs/constants/webToNativeProps.native.js +0 -115
  22. package/dist/cjs/constants/webToNativeProps.native.js.map +0 -1
  23. package/dist/esm/constants/webToNativeProps.js +0 -6
  24. package/dist/esm/constants/webToNativeProps.js.map +0 -6
  25. package/dist/esm/constants/webToNativeProps.mjs +0 -4
  26. package/dist/esm/constants/webToNativeProps.mjs.map +0 -1
  27. package/dist/esm/constants/webToNativeProps.native.js +0 -88
  28. package/dist/esm/constants/webToNativeProps.native.js.map +0 -1
  29. package/src/constants/webToNativeProps.native.tsx +0 -88
  30. package/src/constants/webToNativeProps.tsx +0 -3
  31. package/src/helpers/expandStyle.native.ts +0 -62
  32. package/types/constants/webToNativeProps.d.ts +0 -3
  33. package/types/constants/webToNativeProps.d.ts.map +0 -1
  34. package/types/constants/webToNativeProps.native.d.ts +0 -3
  35. package/types/constants/webToNativeProps.native.d.ts.map +0 -1
  36. package/types/helpers/expandStyle.native.d.ts +0 -7
  37. package/types/helpers/expandStyle.native.d.ts.map +0 -1
@@ -24,8 +24,7 @@ __export(expandStyle_exports, {
24
24
  });
25
25
  module.exports = __toCommonJS(expandStyle_exports);
26
26
  var import_constants = require("@tamagui/constants"),
27
- import_config = require("../config.cjs"),
28
- import_webToNativeProps = require("../constants/webToNativeProps.cjs");
27
+ import_config = require("../config.cjs");
29
28
  const neg1Flex = [["flexGrow", 0], ["flexShrink", 1], ["flexBasis", "auto"]];
30
29
  function expandStyle(key, value) {
31
30
  if (key === "flex") return value === -1 ? neg1Flex : [["flexGrow", value], ["flexShrink", 1], ["flexBasis", (0, import_config.getSetting)("styleCompat") === "legacy" ? "auto" : 0]];
@@ -36,9 +35,7 @@ function expandStyle(key, value) {
36
35
  case "backdropFilter":
37
36
  return [["backdropFilter", value], ["WebkitBackdropFilter", value]];
38
37
  }
39
- if (key in EXPANSIONS) return EXPANSIONS[key].map(key2 => [key2, value]);
40
- if (key in import_webToNativeProps.webToNativeExpansion) return import_webToNativeProps.webToNativeExpansion[key].map(key2 => [key2, value]);
41
- if (key in import_webToNativeProps.webToNativeDynamicExpansion) return import_webToNativeProps.webToNativeDynamicExpansion[key](value);
38
+ if (key in EXPANSIONS) return EXPANSIONS[key].map(k => [k, value]);
42
39
  }
43
40
  const all = ["Top", "Right", "Bottom", "Left"],
44
41
  horiz = ["Right", "Left"],
@@ -51,7 +48,6 @@ const all = ["Top", "Right", "Bottom", "Left"],
51
48
  margin: all,
52
49
  marginHorizontal: horiz,
53
50
  marginVertical: vert,
54
- overscrollBehavior: xy,
55
51
  padding: all,
56
52
  paddingHorizontal: horiz,
57
53
  paddingVertical: vert,
@@ -59,7 +55,8 @@ const all = ["Top", "Right", "Bottom", "Left"],
59
55
  // react-native only supports borderStyle
60
56
  borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
61
57
  // react-native doesn't support X / Y
62
- overflow: xy
58
+ overflow: xy,
59
+ overscrollBehavior: xy
63
60
  })
64
61
  };
65
62
  for (const parent in EXPANSIONS) {
@@ -17,7 +17,7 @@ __export(expandStyle_exports, {
17
17
  expandStyle: () => expandStyle
18
18
  });
19
19
  module.exports = __toCommonJS(expandStyle_exports);
20
- var import_constants = require("@tamagui/constants"), import_config = require("../config"), import_webToNativeProps = require("../constants/webToNativeProps");
20
+ var import_constants = require("@tamagui/constants"), import_config = require("../config");
21
21
  const neg1Flex = [
22
22
  ["flexGrow", 0],
23
23
  ["flexShrink", 1],
@@ -41,11 +41,7 @@ function expandStyle(key, value) {
41
41
  ];
42
42
  }
43
43
  if (key in EXPANSIONS)
44
- return EXPANSIONS[key].map((key2) => [key2, value]);
45
- if (key in import_webToNativeProps.webToNativeExpansion)
46
- return import_webToNativeProps.webToNativeExpansion[key].map((key2) => [key2, value]);
47
- if (key in import_webToNativeProps.webToNativeDynamicExpansion)
48
- return import_webToNativeProps.webToNativeDynamicExpansion[key](value);
44
+ return EXPANSIONS[key].map((k) => [k, value]);
49
45
  }
50
46
  const all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert = ["Top", "Bottom"], xy = ["X", "Y"], EXPANSIONS = {
51
47
  borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
@@ -59,7 +55,6 @@ const all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert
59
55
  margin: all,
60
56
  marginHorizontal: horiz,
61
57
  marginVertical: vert,
62
- overscrollBehavior: xy,
63
58
  padding: all,
64
59
  paddingHorizontal: horiz,
65
60
  paddingVertical: vert,
@@ -67,7 +62,8 @@ const all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert
67
62
  // react-native only supports borderStyle
68
63
  borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
69
64
  // react-native doesn't support X / Y
70
- overflow: xy
65
+ overflow: xy,
66
+ overscrollBehavior: xy
71
67
  }
72
68
  };
73
69
  for (const parent in EXPANSIONS) {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/expandStyle.ts"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAsB,+BAEtB,gBAA2B,sBAC3B,0BAGO;AAGP,MAAM,WAAW;AAAA,EACf,CAAC,YAAY,CAAC;AAAA,EACd,CAAC,cAAc,CAAC;AAAA,EAChB,CAAC,aAAa,MAAM;AACtB;AAEO,SAAS,YAAY,KAAa,OAA6B;AAElE,MAAI,QAAQ;AACV,WAAI,UAAU,KACL,WAEF;AAAA,MACL,CAAC,YAAY,KAAK;AAAA,MAClB,CAAC,cAAc,CAAC;AAAA,MAChB,CAAC,iBAAa,0BAAW,aAAa,MAAM,WAAW,SAAS,CAAC;AAAA,IACnE;AAIF,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,aAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA;AAAA,IAG9B,KAAK;AACH,aAAO;AAAA,QACL,CAAC,kBAAkB,KAAK;AAAA,QACxB,CAAC,wBAAwB,KAAK;AAAA,MAChC;AAAA,EAEJ;AAGF,MAAI,OAAO;AACT,WAAO,WAAW,GAAG,EAAE,IAAI,CAACA,SACnB,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,6CAAqB,GAAG,EAAE,IAAI,CAACA,SAC7B,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,oDAA4B,GAAG,EAAE,KAAK;AAEjD;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM,GACvC,QAAQ,CAAC,SAAS,MAAM,GACxB,OAAO,CAAC,OAAO,QAAQ,GACvB,KAAK,CAAC,KAAK,GAAG,GAEd,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,0BAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,GAAG,QAAQ,KAAK,MAAM,GAAG,SAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;AACpE;",
5
- "names": ["key"]
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAiC,+BAEjC,gBAA2B;AAG3B,MAAM,WAAW;AAAA,EACf,CAAC,YAAY,CAAC;AAAA,EACd,CAAC,cAAc,CAAC;AAAA,EAChB,CAAC,aAAa,MAAM;AACtB;AAEO,SAAS,YAAY,KAAa,OAA6B;AAElE,MAAI,QAAQ;AACV,WAAI,UAAU,KACL,WAEF;AAAA,MACL,CAAC,YAAY,KAAK;AAAA,MAClB,CAAC,cAAc,CAAC;AAAA,MAChB,CAAC,iBAAa,0BAAW,aAAa,MAAM,WAAW,SAAS,CAAC;AAAA,IACnE;AAGF,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,aAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA;AAAA,IAG9B,KAAK;AACH,aAAO;AAAA,QACL,CAAC,kBAAkB,KAAK;AAAA,QACxB,CAAC,wBAAwB,KAAK;AAAA,MAChC;AAAA,EAEJ;AAgCF,MAAI,OAAO;AACT,WAAO,WAAW,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;AAEhD;AAmBA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM,GACvC,QAAQ,CAAC,SAAS,MAAM,GACxB,OAAO,CAAC,OAAO,QAAQ,GACvB,KAAK,CAAC,KAAK,GAAG,GAEd,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,0BAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,IACV,oBAAoB;AAAA,EACtB;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,GAAG,QAAQ,KAAK,MAAM,GAAG,SAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;AACpE;",
5
+ "names": []
6
6
  }
@@ -20,13 +20,13 @@ var __export = (target, all2) => {
20
20
  var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
21
21
  value: !0
22
22
  }), mod);
23
- var expandStyle_native_exports = {};
24
- __export(expandStyle_native_exports, {
23
+ var expandStyle_exports = {};
24
+ __export(expandStyle_exports, {
25
25
  expandStyle: () => expandStyle
26
26
  });
27
- module.exports = __toCommonJS(expandStyle_native_exports);
27
+ module.exports = __toCommonJS(expandStyle_exports);
28
28
  var import_constants = require("@tamagui/constants"),
29
- import_webToNativeProps = require("../constants/webToNativeProps.native.js"),
29
+ import_config = require("../config.native.js"),
30
30
  _loop = function (parent) {
31
31
  var _exec,
32
32
  _exec_index,
@@ -37,17 +37,41 @@ var import_constants = require("@tamagui/constants"),
37
37
  };
38
38
  function expandStyle(key, value) {
39
39
  if (import_constants.isAndroid && key === "elevationAndroid") return [["elevation", value]];
40
- if (key in EXPANSIONS) return EXPANSIONS[key].map(function (key2) {
41
- return [key2, value];
40
+ switch (key) {
41
+ case "objectFit":
42
+ {
43
+ var resizeMode = resizeModeMap[value] || "cover";
44
+ return [["resizeMode", resizeMode]];
45
+ }
46
+ case "verticalAlign":
47
+ return [["textAlignVertical", verticalAlignMap[value] || "auto"]];
48
+ case "position":
49
+ return value === "fixed" || value === "sticky" ? [["position", "absolute"]] : void 0;
50
+ }
51
+ if (key in nativeExpansions) return nativeExpansions[key].map(function (k) {
52
+ return [k, value];
42
53
  });
43
- if (key in import_webToNativeProps.webToNativeExpansion) return import_webToNativeProps.webToNativeExpansion[key].map(function (key2) {
44
- return [key2, value];
54
+ if (key in EXPANSIONS) return EXPANSIONS[key].map(function (k) {
55
+ return [k, value];
45
56
  });
46
- if (key in import_webToNativeProps.webToNativeDynamicExpansion) return import_webToNativeProps.webToNativeDynamicExpansion[key](value);
47
57
  }
48
- var all = ["Top", "Right", "Bottom", "Left"],
58
+ var resizeModeMap = {
59
+ fill: "stretch",
60
+ none: "center",
61
+ "scale-down": "contain",
62
+ contain: "contain",
63
+ cover: "cover"
64
+ },
65
+ verticalAlignMap = {
66
+ top: "top",
67
+ middle: "center",
68
+ bottom: "bottom",
69
+ auto: "auto"
70
+ },
71
+ all = ["Top", "Right", "Bottom", "Left"],
49
72
  horiz = ["Right", "Left"],
50
73
  vert = ["Top", "Bottom"],
74
+ xy = ["X", "Y"],
51
75
  EXPANSIONS = {
52
76
  borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
53
77
  borderRadius: ["TopLeftRadius", "TopRightRadius", "BottomRightRadius", "BottomLeftRadius"],
@@ -57,7 +81,62 @@ var all = ["Top", "Right", "Bottom", "Left"],
57
81
  marginVertical: vert,
58
82
  padding: all,
59
83
  paddingHorizontal: horiz,
60
- paddingVertical: vert
84
+ paddingVertical: vert,
85
+ ...(import_constants.isWeb && {
86
+ // react-native only supports borderStyle
87
+ borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
88
+ // react-native doesn't support X / Y
89
+ overflow: xy,
90
+ overscrollBehavior: xy
91
+ })
61
92
  };
62
93
  for (var parent in EXPANSIONS) _loop(parent);
94
+ var nativeExpansions = {
95
+ // logical border properties
96
+ borderBlockColor: ["borderTopColor", "borderBottomColor"],
97
+ borderInlineColor: ["borderEndColor", "borderStartColor"],
98
+ borderBlockWidth: ["borderTopWidth", "borderBottomWidth"],
99
+ borderInlineWidth: ["borderEndWidth", "borderStartWidth"],
100
+ borderBlockStyle: ["borderTopStyle", "borderBottomStyle"],
101
+ borderInlineStyle: ["borderEndStyle", "borderStartStyle"],
102
+ borderBlockStartColor: ["borderTopColor"],
103
+ borderBlockEndColor: ["borderBottomColor"],
104
+ borderInlineStartColor: ["borderStartColor"],
105
+ borderInlineEndColor: ["borderEndColor"],
106
+ borderBlockStartWidth: ["borderTopWidth"],
107
+ borderBlockEndWidth: ["borderBottomWidth"],
108
+ borderInlineStartWidth: ["borderStartWidth"],
109
+ borderInlineEndWidth: ["borderEndWidth"],
110
+ borderBlockStartStyle: ["borderTopStyle"],
111
+ borderBlockEndStyle: ["borderBottomStyle"],
112
+ borderInlineStartStyle: ["borderStartStyle"],
113
+ borderInlineEndStyle: ["borderEndStyle"],
114
+ // logical margin/padding
115
+ marginBlock: ["marginTop", "marginBottom"],
116
+ marginInline: ["marginEnd", "marginStart"],
117
+ paddingBlock: ["paddingTop", "paddingBottom"],
118
+ paddingInline: ["paddingEnd", "paddingStart"],
119
+ marginBlockStart: ["marginTop"],
120
+ marginBlockEnd: ["marginBottom"],
121
+ marginInlineStart: ["marginStart"],
122
+ marginInlineEnd: ["marginEnd"],
123
+ paddingBlockStart: ["paddingTop"],
124
+ paddingBlockEnd: ["paddingBottom"],
125
+ paddingInlineStart: ["paddingStart"],
126
+ paddingInlineEnd: ["paddingEnd"],
127
+ // logical sizing
128
+ minBlockSize: ["minHeight"],
129
+ maxBlockSize: ["maxHeight"],
130
+ minInlineSize: ["minWidth"],
131
+ maxInlineSize: ["maxWidth"],
132
+ blockSize: ["height"],
133
+ inlineSize: ["width"],
134
+ // inset
135
+ inset: ["top", "right", "bottom", "left"],
136
+ insetBlock: ["top", "bottom"],
137
+ insetBlockStart: ["top"],
138
+ insetBlockEnd: ["bottom"],
139
+ insetInlineStart: ["left"],
140
+ insetInlineEnd: ["right"]
141
+ };
63
142
  //# sourceMappingURL=expandStyle.native.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["expandStyle_native_exports","__export","expandStyle","module","exports","__toCommonJS","import_constants","require","import_webToNativeProps","_loop","parent","_exec","_exec_index","prefix","slice","exec","index","length","EXPANSIONS","map","k","key","value","isAndroid","key2","webToNativeExpansion","webToNativeDynamicExpansion","all","horiz","vert","borderColor","borderRadius","borderWidth","margin","marginHorizontal","marginVertical","padding","paddingHorizontal","paddingVertical"],"sources":["../../../src/helpers/expandStyle.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,0BAAA;AAAAC,QAAA,CAAAD,0BAAA;EAAAE,WAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,0BAAA;AAWA,IAAAM,gBAAA,GAA0BC,OAAA;EAC1BC,uBAAA,GAAkED,OAAA;EAT1DE,KAAA,GAAQ,SAAAA,CAASC,MAAA,EAAQ;IAC7B,IAAIC,KAAA;MACAC,WAAA;MACAC,MAAA,GAASH,MAAA,CAAOI,KAAA,CAAM,IAAIF,WAAA,IAAeD,KAAA,GAAQ,QAAQI,IAAA,CAAKL,MAAM,OAAO,QAAQC,KAAA,KAAU,SAAS,SAASA,KAAA,CAAMK,KAAA,MAAW,QAAQJ,WAAA,KAAgB,SAASA,WAAA,GAAcF,MAAA,CAAOO,MAAM;IAChMC,UAAA,CAAWR,MAAM,IAAIQ,UAAA,CAAWR,MAAM,EAAES,GAAA,CAAI,UAASC,CAAA,EAAG;MACpD,OAAO,GAAGP,MAAM,GAAGO,CAAC;IACxB,CAAC;EACL;AAGO,SAASlB,YAAYmB,GAAA,EAAKC,KAAA,EAAO;EACpC,IAAIhB,gBAAA,CAAAiB,SAAA,IAAaF,GAAA,KAAQ,oBACrB,OAAO,CACH,CACI,aACAC,KAAA,CACJ,CACJ;EAGJ,IAAID,GAAA,IAAOH,UAAA,EACP,OAAOA,UAAA,CAAWG,GAAG,EAAEF,GAAA,CAAI,UAASK,IAAA,EAAK;IACrC,OAAO,CACHA,IAAA,EACAF,KAAA,CACJ;EACJ,CAAC;EAEL,IAAID,GAAA,IAAOb,uBAAA,CAAAiB,oBAAA,EACP,OAAOjB,uBAAA,CAAAiB,oBAAA,CAAqBJ,GAAG,EAAEF,GAAA,CAAI,UAASK,IAAA,EAAK;IAC/C,OAAO,CACHA,IAAA,EACAF,KAAA,CACJ;EACJ,CAAC;EAEL,IAAID,GAAA,IAAOb,uBAAA,CAAAkB,2BAAA,EACP,OAAOlB,uBAAA,CAAAkB,2BAAA,CAA4BL,GAAG,EAAEC,KAAK;AAErD;AACA,IAAIK,GAAA,GAAM,CACN,OACA,SACA,UACA,OACJ;EACIC,KAAA,GAAQ,CACR,SACA,OACJ;EACIC,IAAA,GAAO,CACP,OACA,SACJ;EACIX,UAAA,GAAa;IACbY,WAAA,EAAa,CACT,YACA,cACA,eACA,YACJ;IACAC,YAAA,EAAc,CACV,iBACA,kBACA,qBACA,mBACJ;IACAC,WAAA,EAAa,CACT,YACA,cACA,eACA,YACJ;IACAC,MAAA,EAAQN,GAAA;IACRO,gBAAA,EAAkBN,KAAA;IAClBO,cAAA,EAAgBN,IAAA;IAChBO,OAAA,EAAST,GAAA;IACTU,iBAAA,EAAmBT,KAAA;IACnBU,eAAA,EAAiBT;EACrB;AACA,SAAQnB,MAAA,IAAUQ,UAAA,EAAWT,KAAA,CAAMC,MAAM","ignoreList":[]}
1
+ {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","expandStyle_exports","__export","expandStyle","module","exports","import_constants","require","import_config","_loop","parent","_exec","_exec_index","prefix","slice","exec","index","length","EXPANSIONS","map","k","key","isAndroid","resizeMode","resizeModeMap","verticalAlignMap","nativeExpansions"],"sources":["../../../src/helpers/expandStyle.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,mBAAA;AAAAC,QAAA,CAAAD,mBAAA;EAAAE,WAAA,EAAAA,CAAA,KAAAA;AAAA;AAKAC,MAAA,CAAAC,OAAA,GAAAT,YAAiC,CAAAK,mBAAA;AAKjC,IAAAK,gBAAiB,GAAAC,OAAA;EAAAC,aAAA,GAAAD,OAAA;EAAAE,KAAA,YAAAA,CAAAC,MAAA;IACf,IAACC,KAAA;MAAAC,WAAa;MAAAC,MAAA,GAAAH,MAAA,CAAAI,KAAA,KAAAF,WAAA,IAAAD,KAAA,WAAAI,IAAA,CAAAL,MAAA,eAAAC,KAAA,uBAAAA,KAAA,CAAAK,KAAA,cAAAJ,WAAA,cAAAA,WAAA,GAAAF,MAAA,CAAAO,MAAA;IACdC,UAAC,CAAAR,MAAe,IAAAQ,UAAA,CAAAR,MAAA,EAAAS,GAAA,WAAAC,CAAA;MACf,UAAAP,MAAa,GAAMO,CAAA;IACtB;EAEO;AAEH,SAAIjB,WAAQA,CAAAkB,GAAA,EAAArB,KAAA;EACV,IAAAM,gBAAc,CAAAgB,SACL,IAAAD,GAEF,gCACJ,CACD,CACC,aACHrB,KAAA,CAGF,CACE;EACE,QAAAqB,GAAO;IAAqB;MAAA;QAG9B,IAAKE,UAAA,GAAAC,aAAA,CAAAxB,KAAA;QACH,OAAO,CACL,CACC,cACHuB,UAAA,CAEJ,CAgCE;MACF;IAEJ;MAmBM,OAAO,CAMX,CACA,mBAAc,EACZE,gBAAA,CAAAzB,KAAA,YACA,CACA;IACA;MACF,OAAAA,KAAA,gBAAAA,KAAA,iBACA,CACQ,YACR,UAAkB,CAClB,CACA,QAAS;EACT;EACA,IAAAqB,GAAA,IAAAK,gBAAiB,EACjB,OAAIA,gBAAA,CAAAL,GAAS,EAAAF,GAAA,WAAAC,CAAA;IAAA,QAEXA,CAAA,EAAkEpB,KAAA,CAElE;EACA;EACF,IAAAqB,GAAA,IAAAH,UAAA,EACF,OAAAA,UAAA,CAAAG,GAAA,EAAAF,GAAA,WAAAC,CAAA;IAEA,OAAW,CACHA,CAAA,EACNpB,KAAW,CACb","ignoreList":[]}
@@ -1,9 +1,5 @@
1
1
  import { isWeb } from "@tamagui/constants";
2
2
  import { getSetting } from "../config";
3
- import {
4
- webToNativeDynamicExpansion,
5
- webToNativeExpansion
6
- } from "../constants/webToNativeProps";
7
3
  const neg1Flex = [
8
4
  ["flexGrow", 0],
9
5
  ["flexShrink", 1],
@@ -27,11 +23,7 @@ function expandStyle(key, value) {
27
23
  ];
28
24
  }
29
25
  if (key in EXPANSIONS)
30
- return EXPANSIONS[key].map((key2) => [key2, value]);
31
- if (key in webToNativeExpansion)
32
- return webToNativeExpansion[key].map((key2) => [key2, value]);
33
- if (key in webToNativeDynamicExpansion)
34
- return webToNativeDynamicExpansion[key](value);
26
+ return EXPANSIONS[key].map((k) => [k, value]);
35
27
  }
36
28
  const all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert = ["Top", "Bottom"], xy = ["X", "Y"], EXPANSIONS = {
37
29
  borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
@@ -45,7 +37,6 @@ const all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert
45
37
  margin: all,
46
38
  marginHorizontal: horiz,
47
39
  marginVertical: vert,
48
- overscrollBehavior: xy,
49
40
  padding: all,
50
41
  paddingHorizontal: horiz,
51
42
  paddingVertical: vert,
@@ -53,7 +44,8 @@ const all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert
53
44
  // react-native only supports borderStyle
54
45
  borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
55
46
  // react-native doesn't support X / Y
56
- overflow: xy
47
+ overflow: xy,
48
+ overscrollBehavior: xy
57
49
  }
58
50
  };
59
51
  for (const parent in EXPANSIONS) {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/expandStyle.ts"],
4
- "mappings": "AAKA,SAAS,aAAa;AAEtB,SAAS,kBAAkB;AAC3B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAGP,MAAM,WAAW;AAAA,EACf,CAAC,YAAY,CAAC;AAAA,EACd,CAAC,cAAc,CAAC;AAAA,EAChB,CAAC,aAAa,MAAM;AACtB;AAEO,SAAS,YAAY,KAAa,OAA6B;AAElE,MAAI,QAAQ;AACV,WAAI,UAAU,KACL,WAEF;AAAA,MACL,CAAC,YAAY,KAAK;AAAA,MAClB,CAAC,cAAc,CAAC;AAAA,MAChB,CAAC,aAAa,WAAW,aAAa,MAAM,WAAW,SAAS,CAAC;AAAA,IACnE;AAIF,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,aAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA;AAAA,IAG9B,KAAK;AACH,aAAO;AAAA,QACL,CAAC,kBAAkB,KAAK;AAAA,QACxB,CAAC,wBAAwB,KAAK;AAAA,MAChC;AAAA,EAEJ;AAGF,MAAI,OAAO;AACT,WAAO,WAAW,GAAG,EAAE,IAAI,CAACA,SACnB,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,qBAAqB,GAAG,EAAE,IAAI,CAACA,SAC7B,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,4BAA4B,GAAG,EAAE,KAAK;AAEjD;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM,GACvC,QAAQ,CAAC,SAAS,MAAM,GACxB,OAAO,CAAC,OAAO,QAAQ,GACvB,KAAK,CAAC,KAAK,GAAG,GAEd,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,SAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,GAAG,QAAQ,KAAK,MAAM,GAAG,SAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;AACpE;",
5
- "names": ["key"]
4
+ "mappings": "AAKA,SAAoB,aAAa;AAEjC,SAAS,kBAAkB;AAG3B,MAAM,WAAW;AAAA,EACf,CAAC,YAAY,CAAC;AAAA,EACd,CAAC,cAAc,CAAC;AAAA,EAChB,CAAC,aAAa,MAAM;AACtB;AAEO,SAAS,YAAY,KAAa,OAA6B;AAElE,MAAI,QAAQ;AACV,WAAI,UAAU,KACL,WAEF;AAAA,MACL,CAAC,YAAY,KAAK;AAAA,MAClB,CAAC,cAAc,CAAC;AAAA,MAChB,CAAC,aAAa,WAAW,aAAa,MAAM,WAAW,SAAS,CAAC;AAAA,IACnE;AAGF,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,aAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA;AAAA,IAG9B,KAAK;AACH,aAAO;AAAA,QACL,CAAC,kBAAkB,KAAK;AAAA,QACxB,CAAC,wBAAwB,KAAK;AAAA,MAChC;AAAA,EAEJ;AAgCF,MAAI,OAAO;AACT,WAAO,WAAW,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;AAEhD;AAmBA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM,GACvC,QAAQ,CAAC,SAAS,MAAM,GACxB,OAAO,CAAC,OAAO,QAAQ,GACvB,KAAK,CAAC,KAAK,GAAG,GAEd,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,SAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,IACV,oBAAoB;AAAA,EACtB;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,GAAG,QAAQ,KAAK,MAAM,GAAG,SAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;AACpE;",
5
+ "names": []
6
6
  }
@@ -1,6 +1,5 @@
1
1
  import { isWeb } from "@tamagui/constants";
2
2
  import { getSetting } from "../config.mjs";
3
- import { webToNativeDynamicExpansion, webToNativeExpansion } from "../constants/webToNativeProps.mjs";
4
3
  const neg1Flex = [["flexGrow", 0], ["flexShrink", 1], ["flexBasis", "auto"]];
5
4
  function expandStyle(key, value) {
6
5
  if (key === "flex") return value === -1 ? neg1Flex : [["flexGrow", value], ["flexShrink", 1], ["flexBasis", getSetting("styleCompat") === "legacy" ? "auto" : 0]];
@@ -11,9 +10,7 @@ function expandStyle(key, value) {
11
10
  case "backdropFilter":
12
11
  return [["backdropFilter", value], ["WebkitBackdropFilter", value]];
13
12
  }
14
- if (key in EXPANSIONS) return EXPANSIONS[key].map(key2 => [key2, value]);
15
- if (key in webToNativeExpansion) return webToNativeExpansion[key].map(key2 => [key2, value]);
16
- if (key in webToNativeDynamicExpansion) return webToNativeDynamicExpansion[key](value);
13
+ if (key in EXPANSIONS) return EXPANSIONS[key].map(k => [k, value]);
17
14
  }
18
15
  const all = ["Top", "Right", "Bottom", "Left"],
19
16
  horiz = ["Right", "Left"],
@@ -26,7 +23,6 @@ const all = ["Top", "Right", "Bottom", "Left"],
26
23
  margin: all,
27
24
  marginHorizontal: horiz,
28
25
  marginVertical: vert,
29
- overscrollBehavior: xy,
30
26
  padding: all,
31
27
  paddingHorizontal: horiz,
32
28
  paddingVertical: vert,
@@ -34,7 +30,8 @@ const all = ["Top", "Right", "Bottom", "Left"],
34
30
  // react-native only supports borderStyle
35
31
  borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
36
32
  // react-native doesn't support X / Y
37
- overflow: xy
33
+ overflow: xy,
34
+ overscrollBehavior: xy
38
35
  })
39
36
  };
40
37
  for (const parent in EXPANSIONS) {
@@ -1 +1 @@
1
- {"version":3,"names":["isWeb","getSetting","webToNativeDynamicExpansion","webToNativeExpansion","neg1Flex","expandStyle","key","value","EXPANSIONS","map","key2","all","horiz","vert","xy","borderColor","borderRadius","borderWidth","margin","marginHorizontal","marginVertical","overscrollBehavior","padding","paddingHorizontal","paddingVertical","borderStyle","overflow","parent","prefix","slice","exec","index","length","k"],"sources":["../../../src/helpers/expandStyle.ts"],"sourcesContent":[null],"mappings":"AAKA,SAASA,KAAA,QAAa;AAEtB,SAASC,UAAA,QAAkB;AAC3B,SACEC,2BAAA,EACAC,oBAAA,QACK;AAGP,MAAMC,QAAA,GAAW,CACf,CAAC,YAAY,CAAC,GACd,CAAC,cAAc,CAAC,GAChB,CAAC,aAAa,MAAM,EACtB;AAEO,SAASC,YAAYC,GAAA,EAAaC,KAAA,EAA6B;EAElE,IAAID,GAAA,KAAQ,QACV,OAAIC,KAAA,KAAU,KACLH,QAAA,GAEF,CACL,CAAC,YAAYG,KAAK,GAClB,CAAC,cAAc,CAAC,GAChB,CAAC,aAAaN,UAAA,CAAW,aAAa,MAAM,WAAW,SAAS,CAAC,EACnE;EAIF,QAAQK,GAAA;IACN,KAAK;MACH,OAAO,CAAC,CAAC,aAAaC,KAAK,CAAC;IAAA;IAG9B,KAAK;MACH,OAAO,CACL,CAAC,kBAAkBA,KAAK,GACxB,CAAC,wBAAwBA,KAAK,EAChC;EAEJ;EAGF,IAAID,GAAA,IAAOE,UAAA,EACT,OAAOA,UAAA,CAAWF,GAAG,EAAEG,GAAA,CAAKC,IAAA,IACnB,CAACA,IAAA,EAAKH,KAAK,CACnB;EAGH,IAAID,GAAA,IAAOH,oBAAA,EACT,OAAOA,oBAAA,CAAqBG,GAAG,EAAEG,GAAA,CAAKC,IAAA,IAC7B,CAACA,IAAA,EAAKH,KAAK,CACnB;EAGH,IAAID,GAAA,IAAOJ,2BAAA,EACT,OAAOA,2BAAA,CAA4BI,GAAG,EAAEC,KAAK;AAEjD;AAEA,MAAMI,GAAA,GAAM,CAAC,OAAO,SAAS,UAAU,MAAM;EACvCC,KAAA,GAAQ,CAAC,SAAS,MAAM;EACxBC,IAAA,GAAO,CAAC,OAAO,QAAQ;EACvBC,EAAA,GAAK,CAAC,KAAK,GAAG;EAEdN,UAAA,GAAuC;IAC3CO,WAAA,EAAa,CAAC,YAAY,cAAc,eAAe,WAAW;IAClEC,YAAA,EAAc,CACZ,iBACA,kBACA,qBACA,mBACF;IACAC,WAAA,EAAa,CAAC,YAAY,cAAc,eAAe,WAAW;IAClEC,MAAA,EAAQP,GAAA;IACRQ,gBAAA,EAAkBP,KAAA;IAClBQ,cAAA,EAAgBP,IAAA;IAChBQ,kBAAA,EAAoBP,EAAA;IACpBQ,OAAA,EAASX,GAAA;IACTY,iBAAA,EAAmBX,KAAA;IACnBY,eAAA,EAAiBX,IAAA;IACjB,IAAIb,KAAA,IAAS;MAAA;MAEXyB,WAAA,EAAa,CAAC,YAAY,cAAc,eAAe,WAAW;MAAA;MAElEC,QAAA,EAAUZ;IACZ;EACF;AAEA,WAAWa,MAAA,IAAUnB,UAAA,EAAY;EAC/B,MAAMoB,MAAA,GAASD,MAAA,CAAOE,KAAA,CAAM,GAAG,QAAQC,IAAA,CAAKH,MAAM,GAAGI,KAAA,IAASJ,MAAA,CAAOK,MAAM;EAC3ExB,UAAA,CAAWmB,MAAM,IAAInB,UAAA,CAAWmB,MAAM,EAAElB,GAAA,CAAKwB,CAAA,IAAM,GAAGL,MAAM,GAAGK,CAAC,EAAE;AACpE","ignoreList":[]}
1
+ {"version":3,"names":["isWeb","getSetting","neg1Flex","expandStyle","key","value","EXPANSIONS","map","k","all","horiz","vert","xy","borderColor","borderRadius","borderWidth","margin","marginHorizontal","marginVertical","padding","paddingHorizontal","paddingVertical","borderStyle","overflow","overscrollBehavior","parent","prefix","slice","exec","index","length"],"sources":["../../../src/helpers/expandStyle.ts"],"sourcesContent":[null],"mappings":"AAKA,SAAoBA,KAAA,QAAa;AAEjC,SAASC,UAAA,QAAkB;AAG3B,MAAMC,QAAA,GAAW,CACf,CAAC,YAAY,CAAC,GACd,CAAC,cAAc,CAAC,GAChB,CAAC,aAAa,MAAM,EACtB;AAEO,SAASC,YAAYC,GAAA,EAAaC,KAAA,EAA6B;EAElE,IAAID,GAAA,KAAQ,QACV,OAAIC,KAAA,KAAU,KACLH,QAAA,GAEF,CACL,CAAC,YAAYG,KAAK,GAClB,CAAC,cAAc,CAAC,GAChB,CAAC,aAAaJ,UAAA,CAAW,aAAa,MAAM,WAAW,SAAS,CAAC,EACnE;EAGF,QAAQG,GAAA;IACN,KAAK;MACH,OAAO,CAAC,CAAC,aAAaC,KAAK,CAAC;IAAA;IAG9B,KAAK;MACH,OAAO,CACL,CAAC,kBAAkBA,KAAK,GACxB,CAAC,wBAAwBA,KAAK,EAChC;EAEJ;EAgCF,IAAID,GAAA,IAAOE,UAAA,EACT,OAAOA,UAAA,CAAWF,GAAG,EAAEG,GAAA,CAAKC,CAAA,IAAM,CAACA,CAAA,EAAGH,KAAK,CAAC;AAEhD;AAmBA,MAAMI,GAAA,GAAM,CAAC,OAAO,SAAS,UAAU,MAAM;EACvCC,KAAA,GAAQ,CAAC,SAAS,MAAM;EACxBC,IAAA,GAAO,CAAC,OAAO,QAAQ;EACvBC,EAAA,GAAK,CAAC,KAAK,GAAG;EAEdN,UAAA,GAAuC;IAC3CO,WAAA,EAAa,CAAC,YAAY,cAAc,eAAe,WAAW;IAClEC,YAAA,EAAc,CACZ,iBACA,kBACA,qBACA,mBACF;IACAC,WAAA,EAAa,CAAC,YAAY,cAAc,eAAe,WAAW;IAClEC,MAAA,EAAQP,GAAA;IACRQ,gBAAA,EAAkBP,KAAA;IAClBQ,cAAA,EAAgBP,IAAA;IAChBQ,OAAA,EAASV,GAAA;IACTW,iBAAA,EAAmBV,KAAA;IACnBW,eAAA,EAAiBV,IAAA;IACjB,IAAIX,KAAA,IAAS;MAAA;MAEXsB,WAAA,EAAa,CAAC,YAAY,cAAc,eAAe,WAAW;MAAA;MAElEC,QAAA,EAAUX,EAAA;MACVY,kBAAA,EAAoBZ;IACtB;EACF;AAEA,WAAWa,MAAA,IAAUnB,UAAA,EAAY;EAC/B,MAAMoB,MAAA,GAASD,MAAA,CAAOE,KAAA,CAAM,GAAG,QAAQC,IAAA,CAAKH,MAAM,GAAGI,KAAA,IAASJ,MAAA,CAAOK,MAAM;EAC3ExB,UAAA,CAAWmB,MAAM,IAAInB,UAAA,CAAWmB,MAAM,EAAElB,GAAA,CAAKC,CAAA,IAAM,GAAGkB,MAAM,GAAGlB,CAAC,EAAE;AACpE","ignoreList":[]}
@@ -1,5 +1,5 @@
1
- import { isAndroid } from "@tamagui/constants";
2
- import { webToNativeDynamicExpansion, webToNativeExpansion } from "../constants/webToNativeProps.native.js";
1
+ import { isAndroid, isWeb } from "@tamagui/constants";
2
+ import "../config.native.js";
3
3
  var _loop = function (parent) {
4
4
  var _exec,
5
5
  _exec_index,
@@ -10,17 +10,41 @@ var _loop = function (parent) {
10
10
  };
11
11
  function expandStyle(key, value) {
12
12
  if (isAndroid && key === "elevationAndroid") return [["elevation", value]];
13
- if (key in EXPANSIONS) return EXPANSIONS[key].map(function (key2) {
14
- return [key2, value];
13
+ switch (key) {
14
+ case "objectFit":
15
+ {
16
+ var resizeMode = resizeModeMap[value] || "cover";
17
+ return [["resizeMode", resizeMode]];
18
+ }
19
+ case "verticalAlign":
20
+ return [["textAlignVertical", verticalAlignMap[value] || "auto"]];
21
+ case "position":
22
+ return value === "fixed" || value === "sticky" ? [["position", "absolute"]] : void 0;
23
+ }
24
+ if (key in nativeExpansions) return nativeExpansions[key].map(function (k) {
25
+ return [k, value];
15
26
  });
16
- if (key in webToNativeExpansion) return webToNativeExpansion[key].map(function (key2) {
17
- return [key2, value];
27
+ if (key in EXPANSIONS) return EXPANSIONS[key].map(function (k) {
28
+ return [k, value];
18
29
  });
19
- if (key in webToNativeDynamicExpansion) return webToNativeDynamicExpansion[key](value);
20
30
  }
21
- var all = ["Top", "Right", "Bottom", "Left"],
31
+ var resizeModeMap = {
32
+ fill: "stretch",
33
+ none: "center",
34
+ "scale-down": "contain",
35
+ contain: "contain",
36
+ cover: "cover"
37
+ },
38
+ verticalAlignMap = {
39
+ top: "top",
40
+ middle: "center",
41
+ bottom: "bottom",
42
+ auto: "auto"
43
+ },
44
+ all = ["Top", "Right", "Bottom", "Left"],
22
45
  horiz = ["Right", "Left"],
23
46
  vert = ["Top", "Bottom"],
47
+ xy = ["X", "Y"],
24
48
  EXPANSIONS = {
25
49
  borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
26
50
  borderRadius: ["TopLeftRadius", "TopRightRadius", "BottomRightRadius", "BottomLeftRadius"],
@@ -30,8 +54,63 @@ var all = ["Top", "Right", "Bottom", "Left"],
30
54
  marginVertical: vert,
31
55
  padding: all,
32
56
  paddingHorizontal: horiz,
33
- paddingVertical: vert
57
+ paddingVertical: vert,
58
+ ...(isWeb && {
59
+ // react-native only supports borderStyle
60
+ borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
61
+ // react-native doesn't support X / Y
62
+ overflow: xy,
63
+ overscrollBehavior: xy
64
+ })
34
65
  };
35
66
  for (var parent in EXPANSIONS) _loop(parent);
67
+ var nativeExpansions = {
68
+ // logical border properties
69
+ borderBlockColor: ["borderTopColor", "borderBottomColor"],
70
+ borderInlineColor: ["borderEndColor", "borderStartColor"],
71
+ borderBlockWidth: ["borderTopWidth", "borderBottomWidth"],
72
+ borderInlineWidth: ["borderEndWidth", "borderStartWidth"],
73
+ borderBlockStyle: ["borderTopStyle", "borderBottomStyle"],
74
+ borderInlineStyle: ["borderEndStyle", "borderStartStyle"],
75
+ borderBlockStartColor: ["borderTopColor"],
76
+ borderBlockEndColor: ["borderBottomColor"],
77
+ borderInlineStartColor: ["borderStartColor"],
78
+ borderInlineEndColor: ["borderEndColor"],
79
+ borderBlockStartWidth: ["borderTopWidth"],
80
+ borderBlockEndWidth: ["borderBottomWidth"],
81
+ borderInlineStartWidth: ["borderStartWidth"],
82
+ borderInlineEndWidth: ["borderEndWidth"],
83
+ borderBlockStartStyle: ["borderTopStyle"],
84
+ borderBlockEndStyle: ["borderBottomStyle"],
85
+ borderInlineStartStyle: ["borderStartStyle"],
86
+ borderInlineEndStyle: ["borderEndStyle"],
87
+ // logical margin/padding
88
+ marginBlock: ["marginTop", "marginBottom"],
89
+ marginInline: ["marginEnd", "marginStart"],
90
+ paddingBlock: ["paddingTop", "paddingBottom"],
91
+ paddingInline: ["paddingEnd", "paddingStart"],
92
+ marginBlockStart: ["marginTop"],
93
+ marginBlockEnd: ["marginBottom"],
94
+ marginInlineStart: ["marginStart"],
95
+ marginInlineEnd: ["marginEnd"],
96
+ paddingBlockStart: ["paddingTop"],
97
+ paddingBlockEnd: ["paddingBottom"],
98
+ paddingInlineStart: ["paddingStart"],
99
+ paddingInlineEnd: ["paddingEnd"],
100
+ // logical sizing
101
+ minBlockSize: ["minHeight"],
102
+ maxBlockSize: ["maxHeight"],
103
+ minInlineSize: ["minWidth"],
104
+ maxInlineSize: ["maxWidth"],
105
+ blockSize: ["height"],
106
+ inlineSize: ["width"],
107
+ // inset
108
+ inset: ["top", "right", "bottom", "left"],
109
+ insetBlock: ["top", "bottom"],
110
+ insetBlockStart: ["top"],
111
+ insetBlockEnd: ["bottom"],
112
+ insetInlineStart: ["left"],
113
+ insetInlineEnd: ["right"]
114
+ };
36
115
  export { expandStyle };
37
116
  //# sourceMappingURL=expandStyle.native.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["isAndroid","webToNativeDynamicExpansion","webToNativeExpansion","_loop","parent","_exec","_exec_index","prefix","slice","exec","index","length","EXPANSIONS","map","k","expandStyle","key","value","key2","all","horiz","vert","borderColor","borderRadius","borderWidth","margin","marginHorizontal","marginVertical","padding","paddingHorizontal","paddingVertical"],"sources":["../../../src/helpers/expandStyle.native.ts"],"sourcesContent":[null],"mappings":"AAWA,SAASA,SAAA,QAAiB;AAC1B,SAASC,2BAAA,EAA6BC,oBAAA,QAA4B;AAT9D,IAAIC,KAAA,GAAQ,SAAAA,CAASC,MAAA,EAAQ;EAC7B,IAAIC,KAAA;IACAC,WAAA;IACAC,MAAA,GAASH,MAAA,CAAOI,KAAA,CAAM,IAAIF,WAAA,IAAeD,KAAA,GAAQ,QAAQI,IAAA,CAAKL,MAAM,OAAO,QAAQC,KAAA,KAAU,SAAS,SAASA,KAAA,CAAMK,KAAA,MAAW,QAAQJ,WAAA,KAAgB,SAASA,WAAA,GAAcF,MAAA,CAAOO,MAAM;EAChMC,UAAA,CAAWR,MAAM,IAAIQ,UAAA,CAAWR,MAAM,EAAES,GAAA,CAAI,UAASC,CAAA,EAAG;IACpD,OAAO,GAAGP,MAAM,GAAGO,CAAC;EACxB,CAAC;AACL;AAGO,SAASC,YAAYC,GAAA,EAAKC,KAAA,EAAO;EACpC,IAAIjB,SAAA,IAAagB,GAAA,KAAQ,oBACrB,OAAO,CACH,CACI,aACAC,KAAA,CACJ,CACJ;EAGJ,IAAID,GAAA,IAAOJ,UAAA,EACP,OAAOA,UAAA,CAAWI,GAAG,EAAEH,GAAA,CAAI,UAASK,IAAA,EAAK;IACrC,OAAO,CACHA,IAAA,EACAD,KAAA,CACJ;EACJ,CAAC;EAEL,IAAID,GAAA,IAAOd,oBAAA,EACP,OAAOA,oBAAA,CAAqBc,GAAG,EAAEH,GAAA,CAAI,UAASK,IAAA,EAAK;IAC/C,OAAO,CACHA,IAAA,EACAD,KAAA,CACJ;EACJ,CAAC;EAEL,IAAID,GAAA,IAAOf,2BAAA,EACP,OAAOA,2BAAA,CAA4Be,GAAG,EAAEC,KAAK;AAErD;AACA,IAAIE,GAAA,GAAM,CACN,OACA,SACA,UACA,OACJ;EACIC,KAAA,GAAQ,CACR,SACA,OACJ;EACIC,IAAA,GAAO,CACP,OACA,SACJ;EACIT,UAAA,GAAa;IACbU,WAAA,EAAa,CACT,YACA,cACA,eACA,YACJ;IACAC,YAAA,EAAc,CACV,iBACA,kBACA,qBACA,mBACJ;IACAC,WAAA,EAAa,CACT,YACA,cACA,eACA,YACJ;IACAC,MAAA,EAAQN,GAAA;IACRO,gBAAA,EAAkBN,KAAA;IAClBO,cAAA,EAAgBN,IAAA;IAChBO,OAAA,EAAST,GAAA;IACTU,iBAAA,EAAmBT,KAAA;IACnBU,eAAA,EAAiBT;EACrB;AACA,SAAQjB,MAAA,IAAUQ,UAAA,EAAWT,KAAA,CAAMC,MAAM","ignoreList":[]}
1
+ {"version":3,"names":["isAndroid","isWeb","_loop","parent","_exec","_exec_index","prefix","slice","exec","index","length","EXPANSIONS","map","k","expandStyle","key","value","resizeMode","resizeModeMap","verticalAlignMap","nativeExpansions"],"sources":["../../../src/helpers/expandStyle.ts"],"sourcesContent":[null],"mappings":"AAKA,SAAoBA,SAAA,EAAAC,KAAa;AAEjC,4BAAS;AAGT,IAAAC,KAAM,YAAAA,CAAWC,MAAA;EACf,IAACC,KAAA;IAAAC,WAAa;IAAAC,MAAA,GAAAH,MAAA,CAAAI,KAAA,KAAAF,WAAA,IAAAD,KAAA,WAAAI,IAAA,CAAAL,MAAA,eAAAC,KAAA,uBAAAA,KAAA,CAAAK,KAAA,cAAAJ,WAAA,cAAAA,WAAA,GAAAF,MAAA,CAAAO,MAAA;EACdC,UAAC,CAAAR,MAAe,IAAAQ,UAAA,CAAAR,MAAA,EAAAS,GAAA,WAAAC,CAAA;IACf,UAAAP,MAAa,GAAMO,CAAA;EACtB;AAEO;AAEH,SAAIC,WAAQA,CAAAC,GAAA,EAAAC,KAAA;EACV,IAAAhB,SAAI,IAAAe,GAAU,KACL,kBAEF,SACJ,CACD,CACC,aACHC,KAAA,CAGF,CACE;EACE,QAAAD,GAAO;IAAqB;MAAA;QAG9B,IAAKE,UAAA,GAAAC,aAAA,CAAAF,KAAA;QACH,OAAO,CACL,CACC,cACHC,UAAA,CAEJ,CAgCE;MACF;IAEJ;MAmBM,OAAO,CAMX,CACA,mBAAc,EACZE,gBAAA,CAAAH,KAAA,YACA,CACA;IACA;MACF,OAAAA,KAAA,gBAAAA,KAAA,iBACA,CACQ,YACR,UAAkB,CAClB,CACA,QAAS;EACT;EACA,IAAAD,GAAA,IAAAK,gBAAiB,EACjB,OAAIA,gBAAS,CAAAL,GAAA,EAAAH,GAAA,WAAAC,CAAA;IAAA,QAEXA,CAAA,EAAkEG,KAAA,CAElE;EACA;EACF,IAAAD,GAAA,IAAAJ,UAAA,EACF,OAAAA,UAAA,CAAAI,GAAA,EAAAH,GAAA,WAAAC,CAAA;IAEA,OAAW,CACHA,CAAA,EACNG,KAAW,CACb","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/web",
3
- "version": "2.0.0-1768992908401",
3
+ "version": "2.0.0-1769035103261",
4
4
  "type": "module",
5
5
  "source": "src/index.ts",
6
6
  "main": "dist/cjs",
@@ -28,16 +28,16 @@
28
28
  "reset.css"
29
29
  ],
30
30
  "dependencies": {
31
- "@tamagui/compose-refs": "2.0.0-1768992908401",
32
- "@tamagui/constants": "2.0.0-1768992908401",
33
- "@tamagui/helpers": "2.0.0-1768992908401",
34
- "@tamagui/is-equal-shallow": "2.0.0-1768992908401",
35
- "@tamagui/normalize-css-color": "2.0.0-1768992908401",
36
- "@tamagui/timer": "2.0.0-1768992908401",
37
- "@tamagui/types": "2.0.0-1768992908401",
38
- "@tamagui/use-did-finish-ssr": "2.0.0-1768992908401",
39
- "@tamagui/use-event": "2.0.0-1768992908401",
40
- "@tamagui/use-force-update": "2.0.0-1768992908401"
31
+ "@tamagui/compose-refs": "2.0.0-1769035103261",
32
+ "@tamagui/constants": "2.0.0-1769035103261",
33
+ "@tamagui/helpers": "2.0.0-1769035103261",
34
+ "@tamagui/is-equal-shallow": "2.0.0-1769035103261",
35
+ "@tamagui/normalize-css-color": "2.0.0-1769035103261",
36
+ "@tamagui/timer": "2.0.0-1769035103261",
37
+ "@tamagui/types": "2.0.0-1769035103261",
38
+ "@tamagui/use-did-finish-ssr": "2.0.0-1769035103261",
39
+ "@tamagui/use-event": "2.0.0-1769035103261",
40
+ "@tamagui/use-force-update": "2.0.0-1769035103261"
41
41
  },
42
42
  "peerDependencies": {
43
43
  "react": "*",
@@ -45,7 +45,7 @@
45
45
  "react-native": "*"
46
46
  },
47
47
  "devDependencies": {
48
- "@tamagui/build": "2.0.0-1768992908401",
48
+ "@tamagui/build": "2.0.0-1769035103261",
49
49
  "@testing-library/react": "^16.1.0",
50
50
  "csstype": "^3.0.10",
51
51
  "react": "*",