@tamagui/web 1.94.2 → 1.94.3

package/dist/cjs/helpers/expandStyles.js

@@ -19,7 +19,7 @@ __export(expandStyles_exports, {
 module.exports = __toCommonJS(expandStyles_exports);
 var import_constants = require("@tamagui/constants"), import_normalizeShadow = require("./normalizeShadow");
 function fixStyles(style) {
-  (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
+  (style.shadowRadius != null || style.shadowColor || style.shadowOpacity != null || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
   for (const key in borderDefaults)
     key in style && (style[borderDefaults[key]] ||= "solid");
 }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,yBAAQ,OAAO,eAC7B,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBAAgB,QACtB,MAAM,eACN,MAAM,iBAAiB,QACvB,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,yBAAQ,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/cjs/helpers/expandStyles.native.js

@@ -20,7 +20,7 @@ __export(expandStyles_exports, {
 module.exports = __toCommonJS(expandStyles_exports);
 var import_constants = require("@tamagui/constants"), import_normalizeShadow = require("./normalizeShadow");
 function fixStyles(style) {
-  "elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
+  "elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius != null || style.shadowColor || style.shadowOpacity != null || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
   for (var key in borderDefaults)
     if (key in style) {
       var _style, _borderDefaults_key;

package/dist/cjs/helpers/expandStyles.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/packages/web/src/helpers/expandStyles.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAAsB,+BAEtB,yBAAgC;AAEzB,SAASA,UAAUC,OAA0B;AAEhD,EAAI,sBAAsBA,UAExBA,MAAM,YAAeA,MAAMC,kBAE3B,OAAOD,MAAMC,oBAKfD,MAAME,gBACNF,MAAMG,eACNH,MAAMI,iBACNJ,MAAMK,iBAENC,OAAOC,OAAOP,WAAOQ,wCAAgBR,KAAAA,CAAAA;AAKvC,WAAWS,OAAOC;AAChB,QAAID,OAAOT,OAAO;UAChBA,QAAMU;AAANV,OAAAA,SAAAA,OAAMU,sBAAAA,eAAeD,GAAAA,CAAI,MAAzBT,OAAMU,mBAAAA,IAAyB;IACjC;AAEJ;AAGA,IAAMC,cAAcC,yBAAQ,OAAO,eAC7BF,iBAAiB;EACrBG,aAAa;EACbC,mBAAmBH,eAAe;EAClCI,gBAAgBJ,eAAe;EAC/BK,iBAAiBL,eAAe;EAChCM,kBAAkBN,eAAe;AACnC;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAAsB,+BAEtB,yBAAgC;AAEzB,SAASA,UAAUC,OAA0B;AAEhD,EAAI,sBAAsBA,UAExBA,MAAM,YAAeA,MAAMC,kBAE3B,OAAOD,MAAMC,oBAKfD,MAAME,gBAAgB,QACtBF,MAAMG,eACNH,MAAMI,iBAAiB,QACvBJ,MAAMK,iBAENC,OAAOC,OAAOP,WAAOQ,wCAAgBR,KAAAA,CAAAA;AAKvC,WAAWS,OAAOC;AAChB,QAAID,OAAOT,OAAO;UAChBA,QAAMU;AAANV,OAAAA,SAAAA,OAAMU,sBAAAA,eAAeD,GAAAA,CAAI,MAAzBT,OAAMU,mBAAAA,IAAyB;IACjC;AAEJ;AAGA,IAAMC,cAAcC,yBAAQ,OAAO,eAC7BF,iBAAiB;EACrBG,aAAa;EACbC,mBAAmBH,eAAe;EAClCI,gBAAgBJ,eAAe;EAC/BK,iBAAiBL,eAAe;EAChCM,kBAAkBN,eAAe;AACnC;",
   "names": ["fixStyles", "style", "elevationAndroid", "shadowRadius", "shadowColor", "shadowOpacity", "shadowOffset", "Object", "assign", "normalizeShadow", "key", "borderDefaults", "nativeStyle", "isWeb", "borderWidth", "borderBottomWidth", "borderTopWidth", "borderLeftWidth", "borderRightWidth"]
 }

package/dist/cjs/helpers/normalizeColor.js

@@ -21,16 +21,21 @@ __export(normalizeColor_exports, {
 module.exports = __toCommonJS(normalizeColor_exports);
 var import_normalize_css_color = require("@tamagui/normalize-css-color"), import_normalize_css_color2 = require("@tamagui/normalize-css-color");
 const normalizeColor = (color, opacity) => {
-  if (!color)
-    return;
-  if (color[0] === "$" || color.startsWith("var("))
+  if (color) {
+    if (color[0] === "$")
+      return color;
+    if (color.startsWith("var(")) {
+      if (typeof opacity == "number" && opacity < 1)
+        return `color-mix(in srgb, ${color} ${opacity * 100}%, transparent)`;
+    } else {
+      const rgba3 = getRgba(color);
+      if (rgba3) {
+        const colors = `${rgba3.r},${rgba3.g},${rgba3.b}`;
+        return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba3.a ?? 1})`;
+      }
+    }
     return color;
-  const rgba3 = getRgba(color);
-  if (rgba3) {
-    const colors = `${rgba3.r},${rgba3.g},${rgba3.b}`;
-    return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba3.a ?? 1})`;
   }
-  return color;
 }, getRgba = (color) => {
   const colorNum = (0, import_normalize_css_color.normalizeCSSColor)(color);
   if (colorNum != null)

package/dist/cjs/helpers/normalizeColor.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeColor.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iCAAwC,yCAExCA,8BAAqB;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AACZ,MAAI,MAAM,CAAC,MAAM,OAAO,MAAM,WAAW,MAAM;AAC7C,WAAO;AAET,QAAMC,QAAO,QAAQ,KAAK;AAC1B,MAAIA,OAAM;AACR,UAAM,SAAS,GAAGA,MAAK,CAAC,IAAIA,MAAK,CAAC,IAAIA,MAAK,CAAC;AAC5C,WAAO,YAAY,IAAI,OAAO,MAAM,MAAM,QAAQ,MAAM,IAAI,WAAWA,MAAK,KAAK,CAAC;AAAA,EACpF;AACA,SAAO;AACT,GAEa,UAAU,CAAC,UAAkB;AACxC,QAAM,eAAW,8CAAkB,KAAK;AACxC,MAAI,YAAY;AACd,eAAO,iCAAK,QAAQ;AAExB;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iCAAwC,yCAExCA,8BAAqB;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAK,OACL;AAAA,QAAI,MAAM,CAAC,MAAM;AAAK,aAAO;AAC7B,QAAI,MAAM,WAAW,MAAM;AACzB,UAAI,OAAO,WAAY,YAAY,UAAU;AAC3C,eAAO,sBAAsB,KAAK,IAAI,UAAU,GAAG;AAAA,WAEhD;AACL,YAAMC,QAAO,QAAQ,KAAK;AAC1B,UAAIA,OAAM;AACR,cAAM,SAAS,GAAGA,MAAK,CAAC,IAAIA,MAAK,CAAC,IAAIA,MAAK,CAAC;AAC5C,eAAO,YAAY,IACf,OAAO,MAAM,MACb,QAAQ,MAAM,IAAI,WAAWA,MAAK,KAAK,CAAC;AAAA,MAC9C;AAAA,IACF;AACA,WAAO;AAAA;AACT,GAEa,UAAU,CAAC,UAAkB;AACxC,QAAM,eAAW,8CAAkB,KAAK;AACxC,MAAI,YAAY;AACd,eAAO,iCAAK,QAAQ;AAExB;",
   "names": ["import_normalize_css_color", "rgba"]
 }

package/dist/cjs/helpers/normalizeColor.native.js

@@ -22,12 +22,17 @@ __export(normalizeColor_exports, {
 module.exports = __toCommonJS(normalizeColor_exports);
 var import_normalize_css_color = require("@tamagui/normalize-css-color"), import_normalize_css_color2 = require("@tamagui/normalize-css-color"), normalizeColor = function(color, opacity) {
   if (color) {
-    if (color[0] === "$" || color.startsWith("var("))
+    if (color[0] === "$")
       return color;
-    var rgba3 = getRgba(color);
-    if (rgba3) {
-      var colors = "".concat(rgba3.r, ",").concat(rgba3.g, ",").concat(rgba3.b), _ref;
-      return opacity === 1 ? "rgb(".concat(colors, ")") : "rgba(".concat(colors, ",").concat((_ref = opacity ?? rgba3.a) !== null && _ref !== void 0 ? _ref : 1, ")");
+    if (color.startsWith("var(")) {
+      if (typeof opacity == "number" && opacity < 1)
+        return "color-mix(in srgb, ".concat(color, " ").concat(opacity * 100, "%, transparent)");
+    } else {
+      var rgba3 = getRgba(color);
+      if (rgba3) {
+        var colors = "".concat(rgba3.r, ",").concat(rgba3.g, ",").concat(rgba3.b), _ref;
+        return opacity === 1 ? "rgb(".concat(colors, ")") : "rgba(".concat(colors, ",").concat((_ref = opacity ?? rgba3.a) !== null && _ref !== void 0 ? _ref : 1, ")");
+      }
     }
     return color;
   }

package/dist/cjs/helpers/normalizeColor.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/packages/web/src/helpers/normalizeColor.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;iCAAwC,yCAExCA,8BAAqB,yCAERC,iBAAiB,SAACC,OAAuBC,SAAAA;AACpD,MAAKD,OACL;QAAIA,MAAM,CAAA,MAAO,OAAOA,MAAME,WAAW,MAAA;AACvC,aAAOF;AAET,QAAMG,QAAOC,QAAQJ,KAAAA;AACrB,QAAIG,OAAM;AACR,UAAME,SAAU,GAAYF,OAAVA,MAAKG,GAAE,GAAA,EAAaH,OAAVA,MAAKI,GAAE,GAAA,EAAU,OAAPJ,MAAKK,CAAC,GACgBP;AAA5D,aAAOA,YAAY,IAAK,OAAa,OAAPI,QAAO,GAAA,IAAM,QAAiBJ,OAAVI,QAAO,GAAA,EAA0B,QAAvBJ,OAAAA,WAAWE,MAAKM,OAAC,QAAjBR,SAAAA,SAAAA,OAAqB,GAAE,GAAA;IACrF;AACA,WAAOD;;AACT,GAEaI,UAAU,SAACJ,OAAAA;AACtB,MAAMU,eAAWC,8CAAkBX,KAAAA;AACnC,MAAIU,YAAY;AACd,eAAOP,iCAAKO,QAAAA;AAEhB;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;iCAAwC,yCAExCA,8BAAqB,yCAERC,iBAAiB,SAACC,OAAuBC,SAAAA;AACpD,MAAKD,OACL;QAAIA,MAAM,CAAA,MAAO;AAAK,aAAOA;AAC7B,QAAIA,MAAME,WAAW,MAAA;AACnB,UAAI,OAAOD,WAAY,YAAYA,UAAU;AAC3C,eAAQ,sBAA8BA,OAATD,OAAM,GAAA,EAAiB,OAAdC,UAAU,KAAI,iBAAA;WAEjD;AACL,UAAME,QAAOC,QAAQJ,KAAAA;AACrB,UAAIG,OAAM;AACR,YAAME,SAAU,GAAYF,OAAVA,MAAKG,GAAE,GAAA,EAAaH,OAAVA,MAAKI,GAAE,GAAA,EAAU,OAAPJ,MAAKK,CAAC,GAGtBP;AAFtB,eAAOA,YAAY,IACd,OAAa,OAAPI,QAAO,GAAA,IACb,QAAiBJ,OAAVI,QAAO,GAAA,EAA0B,QAAvBJ,OAAAA,WAAWE,MAAKM,OAAC,QAAjBR,SAAAA,SAAAA,OAAqB,GAAE,GAAA;MAC/C;IACF;AACA,WAAOD;;AACT,GAEaI,UAAU,SAACJ,OAAAA;AACtB,MAAMU,eAAWC,8CAAkBX,KAAAA;AACnC,MAAIU,YAAY;AACd,eAAOP,iCAAKO,QAAAA;AAEhB;",
   "names": ["import_normalize_css_color", "normalizeColor", "color", "opacity", "startsWith", "rgba", "getRgba", "colors", "r", "g", "b", "a", "colorNum", "normalizeCSSColor"]
 }

package/dist/esm/helpers/expandStyles.js

@@ -1,7 +1,7 @@
 import { isWeb } from "@tamagui/constants";
 import { normalizeShadow } from "./normalizeShadow";
 function fixStyles(style) {
-  (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
+  (style.shadowRadius != null || style.shadowColor || style.shadowOpacity != null || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
   for (const key in borderDefaults)
     key in style && (style[borderDefaults[key]] ||= "solid");
 }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAEzB,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,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;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;",
+  "mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAEzB,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBAAgB,QACtB,MAAM,eACN,MAAM,iBAAiB,QACvB,MAAM,iBAEN,OAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;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/expandStyles.mjs

@@ -1,7 +1,7 @@
 import { isWeb } from "@tamagui/constants";
 import { normalizeShadow } from "./normalizeShadow.mjs";
 function fixStyles(style) {
-  (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
+  (style.shadowRadius != null || style.shadowColor || style.shadowOpacity != null || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
   for (const key in borderDefaults) key in style && (style[borderDefaults[key]] ||= "solid");
 }
 const nativeStyle = isWeb ? null : "borderStyle",

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

@@ -1,7 +1,7 @@
 import { isWeb } from "@tamagui/constants";
 import { normalizeShadow } from "./normalizeShadow";
 function fixStyles(style) {
-  "elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
+  "elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius != null || style.shadowColor || style.shadowOpacity != null || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
   for (var key in borderDefaults)
     if (key in style) {
       var _style, _borderDefaults_key;

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/packages/web/src/helpers/expandStyles.ts"],
-  "mappings": "AAAA,SAASA,aAAa;AAEtB,SAASC,uBAAuB;AAEzB,SAASC,UAAUC,OAA0B;AAEhD,EAAI,sBAAsBA,UAExBA,MAAM,YAAeA,MAAMC,kBAE3B,OAAOD,MAAMC,oBAKfD,MAAME,gBACNF,MAAMG,eACNH,MAAMI,iBACNJ,MAAMK,iBAENC,OAAOC,OAAOP,OAAOF,gBAAgBE,KAAAA,CAAAA;AAKvC,WAAWQ,OAAOC;AAChB,QAAID,OAAOR,OAAO;UAChBA,QAAMS;AAANT,OAAAA,SAAAA,OAAMS,sBAAAA,eAAeD,GAAAA,CAAI,MAAzBR,OAAMS,mBAAAA,IAAyB;IACjC;AAEJ;AAGA,IAAMC,cAAcb,QAAQ,OAAO,eAC7BY,iBAAiB;EACrBE,aAAa;EACbC,mBAAmBF,eAAe;EAClCG,gBAAgBH,eAAe;EAC/BI,iBAAiBJ,eAAe;EAChCK,kBAAkBL,eAAe;AACnC;",
+  "mappings": "AAAA,SAASA,aAAa;AAEtB,SAASC,uBAAuB;AAEzB,SAASC,UAAUC,OAA0B;AAEhD,EAAI,sBAAsBA,UAExBA,MAAM,YAAeA,MAAMC,kBAE3B,OAAOD,MAAMC,oBAKfD,MAAME,gBAAgB,QACtBF,MAAMG,eACNH,MAAMI,iBAAiB,QACvBJ,MAAMK,iBAENC,OAAOC,OAAOP,OAAOF,gBAAgBE,KAAAA,CAAAA;AAKvC,WAAWQ,OAAOC;AAChB,QAAID,OAAOR,OAAO;UAChBA,QAAMS;AAANT,OAAAA,SAAAA,OAAMS,sBAAAA,eAAeD,GAAAA,CAAI,MAAzBR,OAAMS,mBAAAA,IAAyB;IACjC;AAEJ;AAGA,IAAMC,cAAcb,QAAQ,OAAO,eAC7BY,iBAAiB;EACrBE,aAAa;EACbC,mBAAmBF,eAAe;EAClCG,gBAAgBH,eAAe;EAC/BI,iBAAiBJ,eAAe;EAChCK,kBAAkBL,eAAe;AACnC;",
   "names": ["isWeb", "normalizeShadow", "fixStyles", "style", "elevationAndroid", "shadowRadius", "shadowColor", "shadowOpacity", "shadowOffset", "Object", "assign", "key", "borderDefaults", "nativeStyle", "borderWidth", "borderBottomWidth", "borderTopWidth", "borderLeftWidth", "borderRightWidth"]
 }

package/dist/esm/helpers/normalizeColor.js

@@ -1,16 +1,21 @@
 import { normalizeCSSColor, rgba } from "@tamagui/normalize-css-color";
 import { rgba as rgba2 } from "@tamagui/normalize-css-color";
 const normalizeColor = (color, opacity) => {
-  if (!color)
-    return;
-  if (color[0] === "$" || color.startsWith("var("))
+  if (color) {
+    if (color[0] === "$")
+      return color;
+    if (color.startsWith("var(")) {
+      if (typeof opacity == "number" && opacity < 1)
+        return `color-mix(in srgb, ${color} ${opacity * 100}%, transparent)`;
+    } else {
+      const rgba3 = getRgba(color);
+      if (rgba3) {
+        const colors = `${rgba3.r},${rgba3.g},${rgba3.b}`;
+        return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba3.a ?? 1})`;
+      }
+    }
     return color;
-  const rgba3 = getRgba(color);
-  if (rgba3) {
-    const colors = `${rgba3.r},${rgba3.g},${rgba3.b}`;
-    return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba3.a ?? 1})`;
   }
-  return color;
 }, getRgba = (color) => {
   const colorNum = normalizeCSSColor(color);
   if (colorNum != null)

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeColor.ts"],
-  "mappings": "AAAA,SAAS,mBAAmB,YAAY;AAExC,SAAS,QAAAA,aAAY;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AACZ,MAAI,MAAM,CAAC,MAAM,OAAO,MAAM,WAAW,MAAM;AAC7C,WAAO;AAET,QAAMA,QAAO,QAAQ,KAAK;AAC1B,MAAIA,OAAM;AACR,UAAM,SAAS,GAAGA,MAAK,CAAC,IAAIA,MAAK,CAAC,IAAIA,MAAK,CAAC;AAC5C,WAAO,YAAY,IAAI,OAAO,MAAM,MAAM,QAAQ,MAAM,IAAI,WAAWA,MAAK,KAAK,CAAC;AAAA,EACpF;AACA,SAAO;AACT,GAEa,UAAU,CAAC,UAAkB;AACxC,QAAM,WAAW,kBAAkB,KAAK;AACxC,MAAI,YAAY;AACd,WAAO,KAAK,QAAQ;AAExB;",
+  "mappings": "AAAA,SAAS,mBAAmB,YAAY;AAExC,SAAS,QAAAA,aAAY;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAK,OACL;AAAA,QAAI,MAAM,CAAC,MAAM;AAAK,aAAO;AAC7B,QAAI,MAAM,WAAW,MAAM;AACzB,UAAI,OAAO,WAAY,YAAY,UAAU;AAC3C,eAAO,sBAAsB,KAAK,IAAI,UAAU,GAAG;AAAA,WAEhD;AACL,YAAMA,QAAO,QAAQ,KAAK;AAC1B,UAAIA,OAAM;AACR,cAAM,SAAS,GAAGA,MAAK,CAAC,IAAIA,MAAK,CAAC,IAAIA,MAAK,CAAC;AAC5C,eAAO,YAAY,IACf,OAAO,MAAM,MACb,QAAQ,MAAM,IAAI,WAAWA,MAAK,KAAK,CAAC;AAAA,MAC9C;AAAA,IACF;AACA,WAAO;AAAA;AACT,GAEa,UAAU,CAAC,UAAkB;AACxC,QAAM,WAAW,kBAAkB,KAAK;AACxC,MAAI,YAAY;AACd,WAAO,KAAK,QAAQ;AAExB;",
   "names": ["rgba"]
 }

package/dist/esm/helpers/normalizeColor.mjs

@@ -1,14 +1,19 @@
 import { normalizeCSSColor, rgba } from "@tamagui/normalize-css-color";
 import { rgba as rgba2 } from "@tamagui/normalize-css-color";
 const normalizeColor = (color, opacity) => {
-    if (!color) return;
-    if (color[0] === "$" || color.startsWith("var(")) return color;
-    const rgba3 = getRgba(color);
-    if (rgba3) {
-      const colors = `${rgba3.r},${rgba3.g},${rgba3.b}`;
-      return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba3.a ?? 1})`;
+    if (color) {
+      if (color[0] === "$") return color;
+      if (color.startsWith("var(")) {
+        if (typeof opacity == "number" && opacity < 1) return `color-mix(in srgb, ${color} ${opacity * 100}%, transparent)`;
+      } else {
+        const rgba3 = getRgba(color);
+        if (rgba3) {
+          const colors = `${rgba3.r},${rgba3.g},${rgba3.b}`;
+          return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba3.a ?? 1})`;
+        }
+      }
+      return color;
     }
-    return color;
   },
   getRgba = color => {
     const colorNum = normalizeCSSColor(color);

package/dist/esm/helpers/normalizeColor.native.js

@@ -2,12 +2,17 @@ import { normalizeCSSColor, rgba } from "@tamagui/normalize-css-color";
 import { rgba as rgba2 } from "@tamagui/normalize-css-color";
 var normalizeColor = function(color, opacity) {
   if (color) {
-    if (color[0] === "$" || color.startsWith("var("))
+    if (color[0] === "$")
       return color;
-    var rgba3 = getRgba(color);
-    if (rgba3) {
-      var colors = "".concat(rgba3.r, ",").concat(rgba3.g, ",").concat(rgba3.b), _ref;
-      return opacity === 1 ? "rgb(".concat(colors, ")") : "rgba(".concat(colors, ",").concat((_ref = opacity ?? rgba3.a) !== null && _ref !== void 0 ? _ref : 1, ")");
+    if (color.startsWith("var(")) {
+      if (typeof opacity == "number" && opacity < 1)
+        return "color-mix(in srgb, ".concat(color, " ").concat(opacity * 100, "%, transparent)");
+    } else {
+      var rgba3 = getRgba(color);
+      if (rgba3) {
+        var colors = "".concat(rgba3.r, ",").concat(rgba3.g, ",").concat(rgba3.b), _ref;
+        return opacity === 1 ? "rgb(".concat(colors, ")") : "rgba(".concat(colors, ",").concat((_ref = opacity ?? rgba3.a) !== null && _ref !== void 0 ? _ref : 1, ")");
+      }
     }
     return color;
   }

package/dist/esm/helpers/normalizeColor.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/packages/web/src/helpers/normalizeColor.ts"],
-  "mappings": "AAAA,SAASA,mBAAmBC,YAAY;AAExC,SAASA,QAAAA,aAAY;AAEd,IAAMC,iBAAiB,SAACC,OAAuBC,SAAAA;AACpD,MAAKD,OACL;QAAIA,MAAM,CAAA,MAAO,OAAOA,MAAME,WAAW,MAAA;AACvC,aAAOF;AAET,QAAMF,QAAOK,QAAQH,KAAAA;AACrB,QAAIF,OAAM;AACR,UAAMM,SAAU,GAAYN,OAAVA,MAAKO,GAAE,GAAA,EAAaP,OAAVA,MAAKQ,GAAE,GAAA,EAAU,OAAPR,MAAKS,CAAC,GACgBN;AAA5D,aAAOA,YAAY,IAAK,OAAa,OAAPG,QAAO,GAAA,IAAM,QAAiBH,OAAVG,QAAO,GAAA,EAA0B,QAAvBH,OAAAA,WAAWH,MAAKU,OAAC,QAAjBP,SAAAA,SAAAA,OAAqB,GAAE,GAAA;IACrF;AACA,WAAOD;;AACT,GAEaG,UAAU,SAACH,OAAAA;AACtB,MAAMS,WAAWZ,kBAAkBG,KAAAA;AACnC,MAAIS,YAAY;AACd,WAAOX,KAAKW,QAAAA;AAEhB;",
+  "mappings": "AAAA,SAASA,mBAAmBC,YAAY;AAExC,SAASA,QAAAA,aAAY;AAEd,IAAMC,iBAAiB,SAACC,OAAuBC,SAAAA;AACpD,MAAKD,OACL;QAAIA,MAAM,CAAA,MAAO;AAAK,aAAOA;AAC7B,QAAIA,MAAME,WAAW,MAAA;AACnB,UAAI,OAAOD,WAAY,YAAYA,UAAU;AAC3C,eAAQ,sBAA8BA,OAATD,OAAM,GAAA,EAAiB,OAAdC,UAAU,KAAI,iBAAA;WAEjD;AACL,UAAMH,QAAOK,QAAQH,KAAAA;AACrB,UAAIF,OAAM;AACR,YAAMM,SAAU,GAAYN,OAAVA,MAAKO,GAAE,GAAA,EAAaP,OAAVA,MAAKQ,GAAE,GAAA,EAAU,OAAPR,MAAKS,CAAC,GAGtBN;AAFtB,eAAOA,YAAY,IACd,OAAa,OAAPG,QAAO,GAAA,IACb,QAAiBH,OAAVG,QAAO,GAAA,EAA0B,QAAvBH,OAAAA,WAAWH,MAAKU,OAAC,QAAjBP,SAAAA,SAAAA,OAAqB,GAAE,GAAA;MAC/C;IACF;AACA,WAAOD;;AACT,GAEaG,UAAU,SAACH,OAAAA;AACtB,MAAMS,WAAWZ,kBAAkBG,KAAAA;AACnC,MAAIS,YAAY;AACd,WAAOX,KAAKW,QAAAA;AAEhB;",
   "names": ["normalizeCSSColor", "rgba", "normalizeColor", "color", "opacity", "startsWith", "getRgba", "colors", "r", "g", "b", "a", "colorNum"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.94.2",
+  "version": "1.94.3",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,20 +27,20 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.94.2",
-    "@tamagui/constants": "1.94.2",
-    "@tamagui/helpers": "1.94.2",
-    "@tamagui/normalize-css-color": "1.94.2",
-    "@tamagui/timer": "1.94.2",
-    "@tamagui/types": "1.94.2",
-    "@tamagui/use-did-finish-ssr": "1.94.2",
-    "@tamagui/use-event": "1.94.2",
-    "@tamagui/use-force-update": "1.94.2",
+    "@tamagui/compose-refs": "1.94.3",
+    "@tamagui/constants": "1.94.3",
+    "@tamagui/helpers": "1.94.3",
+    "@tamagui/normalize-css-color": "1.94.3",
+    "@tamagui/timer": "1.94.3",
+    "@tamagui/types": "1.94.3",
+    "@tamagui/use-did-finish-ssr": "1.94.3",
+    "@tamagui/use-event": "1.94.3",
+    "@tamagui/use-force-update": "1.94.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.94.2",
+    "@tamagui/build": "1.94.3",
     "@testing-library/react": "^14.0.0",
     "csstype": "^3.0.10",
     "typescript": "^5.3.3",

package/src/helpers/expandStyles.ts

@@ -13,9 +13,9 @@ export function fixStyles(style: Record<string, any>) {
   }
 
   if (
-    style.shadowRadius ||
+    style.shadowRadius != null ||
     style.shadowColor ||
-    style.shadowOpacity ||
+    style.shadowOpacity != null ||
     style.shadowOffset
   ) {
     Object.assign(style, normalizeShadow(style))

package/src/helpers/normalizeColor.ts

@@ -4,13 +4,19 @@ export { rgba } from '@tamagui/normalize-css-color'
 
 export const normalizeColor = (color?: string | null, opacity?: number) => {
   if (!color) return
-  if (color[0] === '$' || color.startsWith('var(')) {
-    return color
-  }
-  const rgba = getRgba(color)
-  if (rgba) {
-    const colors = `${rgba.r},${rgba.g},${rgba.b}`
-    return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba.a ?? 1})`
+  if (color[0] === '$') return color
+  if (color.startsWith('var(')) {
+    if (typeof opacity === 'number' && opacity < 1) {
+      return `color-mix(in srgb, ${color} ${opacity * 100}%, transparent)`
+    }
+  } else {
+    const rgba = getRgba(color)
+    if (rgba) {
+      const colors = `${rgba.r},${rgba.g},${rgba.b}`
+      return opacity === 1
+        ? `rgb(${colors})`
+        : `rgba(${colors},${opacity ?? rgba.a ?? 1})`
+    }
   }
   return color
 }

package/types/helpers/normalizeColor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeColor.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeColor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AAEnD,eAAO,MAAM,cAAc,WAAY,MAAM,GAAG,IAAI,YAAY,MAAM,uBAWrE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,MAAM;;;;;aAKpC,CAAA"}
+{"version":3,"file":"normalizeColor.d.ts","sourceRoot":"","sources":["../../src/helpers/normalizeColor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AAEnD,eAAO,MAAM,cAAc,WAAY,MAAM,GAAG,IAAI,YAAY,MAAM,uBAiBrE,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,MAAM;;;;;aAKpC,CAAA"}