@tamagui/web 1.61.2 → 1.62.0

package/dist/esm/helpers/expandStyle.js

@@ -1,37 +1,21 @@
-var _a;
-import { isAndroid, isWeb } from "@tamagui/constants";
+import { isWeb } from "@tamagui/constants";
 function expandStyle(key, value) {
-  if (process.env.TAMAGUI_TARGET === "web") {
-    if (key === "flex") {
-      return [
-        ["flexGrow", value],
-        ["flexShrink", 1],
-        ["flexBasis", "auto"]
-      ];
-    }
-    switch (key) {
-      case "textAlignVertical": {
-        return [["verticalAlign", value === "center" ? "middle" : value]];
-      }
-      case "writingDirection": {
-        return [["direction", value]];
-      }
-    }
-  }
-  if (process.env.TAMAGUI_TARGET === "native" && isAndroid && key === "elevationAndroid") {
-    return [["elevation", value]];
-  }
-  if (key in EXPANSIONS) {
-    return EXPANSIONS[key].map((key2) => {
-      return [key2, value];
-    });
+  if (key === "flex")
+    return [
+      ["flexGrow", value],
+      ["flexShrink", 1],
+      ["flexBasis", "auto"]
+    ];
+  switch (key) {
+    case "textAlignVertical":
+      return [["verticalAlign", value === "center" ? "middle" : value]];
+    case "writingDirection":
+      return [["direction", value]];
   }
+  if (key in EXPANSIONS)
+    return EXPANSIONS[key].map((key2) => [key2, value]);
 }
-const all = ["Top", "Right", "Bottom", "Left"];
-const horiz = ["Right", "Left"];
-const vert = ["Top", "Bottom"];
-const xy = ["X", "Y"];
-const EXPANSIONS = {
+const all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert = ["Top", "Bottom"], xy = ["X", "Y"], EXPANSIONS = {
   borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
   borderRadius: [
     "TopLeftRadius",
@@ -55,7 +39,7 @@ const EXPANSIONS = {
   }
 };
 for (const parent in EXPANSIONS) {
-  const prefix = parent.slice(0, ((_a = /[A-Z]/.exec(parent)) == null ? void 0 : _a.index) ?? parent.length);
+  const prefix = parent.slice(0, /[A-Z]/.exec(parent)?.index ?? parent.length);
   EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`);
 }
 export {

package/dist/esm/helpers/expandStyle.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyle.ts"],
-  "mappings": "AAAA;AAKA,SAAS,WAAW,aAAa;AAI1B,SAAS,YAAY,KAAa,OAA6B;AACpE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,QAAQ,QAAQ;AAClB,aAAO;AAAA,QACL,CAAC,YAAY,KAAK;AAAA,QAClB,CAAC,cAAc,CAAC;AAAA,QAChB,CAAC,aAAa,MAAM;AAAA,MACtB;AAAA,IACF;AAGA,YAAQ,KAAK;AAAA,MACX,KAAK,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,MACA,KAAK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA,IACF;AAAA,EACF;AAEA,MACE,QAAQ,IAAI,mBAAmB,YAC/B,aACA,QAAQ,oBACR;AACA,WAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,EAC9B;AAEA,MAAI,OAAO,YAAY;AACrB,WAAO,WAAW,GAAG,EAAE,IAAI,CAACA,SAAQ;AAClC,aAAO,CAACA,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM;AAC7C,MAAM,QAAQ,CAAC,SAAS,MAAM;AAC9B,MAAM,OAAO,CAAC,OAAO,QAAQ;AAC7B,MAAM,KAAK,CAAC,KAAK,GAAG;AAEpB,MAAM,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,KAAG,aAAQ,KAAK,MAAM,MAAnB,mBAAsB,UAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;AACpE;",
+  "mappings": "AAKA,SAAoB,aAAa;AAI1B,SAAS,YAAY,KAAa,OAA6B;AAElE,MAAI,QAAQ;AACV,WAAO;AAAA,MACL,CAAC,YAAY,KAAK;AAAA,MAClB,CAAC,cAAc,CAAC;AAAA,MAChB,CAAC,aAAa,MAAM;AAAA,IACtB;AAIF,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,aAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,IAElE,KAAK;AACH,aAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,EAEhC;AAWF,MAAI,OAAO;AACT,WAAO,WAAW,GAAG,EAAE,IAAI,CAACA,SACnB,CAACA,MAAK,KAAK,CACnB;AAEL;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;",
   "names": ["key"]
 }

package/dist/esm/helpers/expandStyles.js

@@ -13,35 +13,17 @@ function expandStylesAndRemoveNullishValues(style) {
       res[key] = expandStylesAndRemoveNullishValues(valIn);
       continue;
     }
-    const val = normalizeValueWithProperty(valIn, key);
-    const out = expandStyle(key, val);
-    if (out) {
-      Object.assign(res, Object.fromEntries(out));
-    } else {
-      res[key] = val;
-    }
+    const val = normalizeValueWithProperty(valIn, key), out = expandStyle(key, val);
+    out ? Object.assign(res, Object.fromEntries(out)) : res[key] = val;
   }
-  fixStyles(res);
-  return res;
+  return fixStyles(res), res;
 }
 function fixStyles(style) {
-  if (process.env.TAMAGUI_TARGET === "native") {
-    if ("elevationAndroid" in style) {
-      style["elevation"] = style.elevationAndroid;
-      delete style.elevationAndroid;
-    }
-  }
-  if (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) {
-    Object.assign(style, normalizeShadow(style));
-  }
-  for (const key in borderDefaults) {
-    if (key in style && !style[borderDefaults[key]]) {
-      style[borderDefaults[key]] = "solid";
-    }
-  }
+  (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
+  for (const key in borderDefaults)
+    key in style && !style[borderDefaults[key]] && (style[borderDefaults[key]] = "solid");
 }
-const nativeStyle = isWeb ? null : "borderStyle";
-const borderDefaults = {
+const nativeStyle = isWeb ? null : "borderStyle", borderDefaults = {
   borderWidth: "borderStyle",
   borderBottomWidth: nativeStyle || "borderBottomStyle",
   borderTopWidth: nativeStyle || "borderTopStyle",

package/dist/esm/helpers/expandStyles.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAU3B,SAAS,mCAAmC,OAA4B;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,UAAM,QAAQ,MAAM,GAAG;AACvB,QAAI,SAAS;AAAM;AACnB,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,mCAAmC,KAAK;AACnD;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,OAAO,GAAG;AAEjD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MAAI,QAAQ,IAAI,mBAAmB,UAAU;AAC3C,QAAI,sBAAsB,OAAO;AAE/B,YAAM,WAAW,IAAI,MAAM;AAE3B,aAAO,MAAM;AAAA,IACf;AAAA,EACF;AAEA,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAGA,MAAM,cAAc,QAAQ,OAAO;AACnC,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
+  "mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAU3B,SAAS,mCAAmC,OAA4B;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,UAAM,QAAQ,MAAM,GAAG;AACvB,QAAI,SAAS;AAAM;AACnB,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,mCAAmC,KAAK;AACnD;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,OAAO,GAAG,GAE3C,MAAM,YAAY,KAAK,GAAG;AAChC,IAAI,MACF,OAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC,IAE1C,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,mBAAU,GAAG,GAEN;AACT;AAEO,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,MAC5C,MAAM,eAAe,GAAG,CAAC,IAAI;AAGnC;AAGA,MAAM,cAAc,QAAQ,OAAO,eAC7B,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
   "names": []
 }

package/dist/esm/helpers/getExpandedShorthands.js

@@ -4,9 +4,8 @@ function getExpandedShorthands(props) {
   if (!shorthands)
     return props;
   const res = {};
-  for (const key in props) {
+  for (const key in props)
     res[shorthands[key] || key] = props[key];
-  }
   return res;
 }
 export {

package/dist/esm/helpers/getExpandedShorthands.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getExpandedShorthands.ts"],
-  "mappings": "AAAA,SAAS,iBAAiB;AAGnB,SAAS,sBACd,OAC2B;AAC3B,QAAM,aAAa,UAAU,EAAE;AAC/B,MAAI,CAAC;AAAY,WAAO;AACxB,QAAM,MAAM,CAAC;AACb,aAAW,OAAO,OAAO;AAEvB,QAAI,WAAW,GAAG,KAAK,GAAG,IAAI,MAAM,GAAG;AAAA,EACzC;AACA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,iBAAiB;AAGnB,SAAS,sBACd,OAC2B;AAC3B,QAAM,aAAa,UAAU,EAAE;AAC/B,MAAI,CAAC;AAAY,WAAO;AACxB,QAAM,MAAM,CAAC;AACb,aAAW,OAAO;AAEhB,QAAI,WAAW,GAAG,KAAK,GAAG,IAAI,MAAM,GAAG;AAEzC,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/getGroupPropParts.js

@@ -1,15 +1,9 @@
 import { getMedia } from "../hooks/useMedia";
 function getGroupPropParts(groupProp) {
-  const mediaQueries = getMedia();
-  const [_, name, part3, part4] = groupProp.split("-");
+  const mediaQueries = getMedia(), [_, name, part3, part4] = groupProp.split("-");
   let pseudo;
   const media = part3 in mediaQueries ? part3 : void 0;
-  if (!media) {
-    pseudo = part3;
-  } else {
-    pseudo = part4;
-  }
-  return { name, pseudo, media };
+  return media ? pseudo = part4 : pseudo = part3, { name, pseudo, media };
 }
 export {
   getGroupPropParts

package/dist/esm/helpers/getGroupPropParts.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getGroupPropParts.ts"],
-  "mappings": "AAAA,SAAS,gBAAgB;AAElB,SAAS,kBAAkB,WAAmB;AACnD,QAAM,eAAe,SAAS;AAC9B,QAAM,CAAC,GAAG,MAAM,OAAO,KAAK,IAAI,UAAU,MAAM,GAAG;AACnD,MAAI;AACJ,QAAM,QAAQ,SAAS,eAAe,QAAQ;AAC9C,MAAI,CAAC,OAAO;AACV,aAAS;AAAA,EACX,OAAO;AACL,aAAS;AAAA,EACX;AACA,SAAO,EAAE,MAAM,QAAQ,MAAM;AAC/B;",
+  "mappings": "AAAA,SAAS,gBAAgB;AAElB,SAAS,kBAAkB,WAAmB;AACnD,QAAM,eAAe,SAAS,GACxB,CAAC,GAAG,MAAM,OAAO,KAAK,IAAI,UAAU,MAAM,GAAG;AACnD,MAAI;AACJ,QAAM,QAAQ,SAAS,eAAe,QAAQ;AAC9C,SAAK,QAGH,SAAS,QAFT,SAAS,OAIJ,EAAE,MAAM,QAAQ,MAAM;AAC/B;",
   "names": []
 }