@tamagui/web 1.86.1 → 1.86.2

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

@@ -1,28 +1,23 @@
-import { normalizeCSSColor } from "@tamagui/normalize-css-color";
 import { defaultOffset } from "./defaultOffset";
-import { rgba } from "./normalizeColor";
-import { normalizeValueWithProperty } from "./normalizeValueWithProperty";
+import { getRgba, normalizeColor } from "./normalizeColor";
 function normalizeShadow({
   shadowColor,
   shadowOffset,
   shadowOpacity,
   shadowRadius
 }) {
-  const { height, width } = shadowOffset || defaultOffset, colorStr = String(shadowColor || "black"), val = normalizeCSSColor(colorStr);
-  if (typeof val != "number")
-    throw new Error(`invalid shadow color ${colorStr}`);
-  const { r, g, b, a } = rgba(val);
+  const { height, width } = shadowOffset || defaultOffset;
   return {
     shadowOffset: {
-      width: normalizeValueWithProperty(width || 0),
-      height: normalizeValueWithProperty(height || 0)
+      width: width || 0,
+      height: height || 0
     },
-    shadowRadius: normalizeValueWithProperty(shadowRadius || 0),
-    shadowColor: `rgb(${r},${g},${b})`,
-    shadowOpacity: shadowOpacity ?? a
+    shadowRadius: shadowRadius || 0,
+    shadowColor: normalizeColor(shadowColor, 1),
+    shadowOpacity: shadowOpacity ?? (shadowColor ? getRgba(shadowColor)?.a : 1)
   };
 }
 export {
   normalizeShadow
 };
-//# sourceMappingURL=normalizeShadow.native.js.map
+//# sourceMappingURL=normalizeShadow.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../../src/helpers/normalizeShadow.native.ts"],
-  "mappings": "AAAA,SAAS,yBAAyB;AAElC,SAAS,qBAAqB;AAC9B,SAAS,YAAY;AACrB,SAAS,kCAAkC;AAEpC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,gBAAgB,eACpC,WAAW,OAAO,eAAe,OAAO,GACxC,MAAM,kBAAkB,QAAQ;AACtC,MAAI,OAAO,OAAQ;AACjB,UAAM,IAAI,MAAM,wBAAwB,QAAQ,EAAE;AAEpD,QAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,GAAG;AAC/B,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,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;AAAA,IAC/B,eAAe,iBAAiB;AAAA,EAClC;AACF;",
+  "sources": ["../../../src/helpers/normalizeShadow.ts"],
+  "mappings": "AAAA,SAAS,qBAAqB;AAC9B,SAAS,SAAS,sBAAsB;AAEjC,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAwB;AACtB,QAAM,EAAE,QAAQ,MAAM,IAAI,gBAAgB;AAC1C,SAAO;AAAA,IACL,cAAc;AAAA,MACZ,OAAO,SAAS;AAAA,MAChB,QAAQ,UAAU;AAAA,IACpB;AAAA,IACA,cAAc,gBAAgB;AAAA,IAC9B,aAAa,eAAe,aAAa,CAAC;AAAA,IAC1C,eAAe,kBAAkB,cAAc,QAAQ,WAAW,GAAG,IAAI;AAAA,EAC3E;AACF;",
   "names": []
 }

package/dist/esm/helpers/{expandStylesAndRemoveNullishValues.native.js → normalizeStyle.js}

@@ -1,15 +1,17 @@
 import { expandStyle } from "./expandStyle";
 import { fixStyles } from "./expandStyles";
+import { isObj } from "./isObj";
 import { normalizeValueWithProperty } from "./normalizeValueWithProperty";
 import { pseudoDescriptors } from "./pseudoDescriptors";
-function expandStylesAndRemoveNullishValues(style, disableNormalize = !1) {
+function normalizeStyle(style, disableNormalize = !1) {
   const res = {};
   for (let key in style) {
     const prop = style[key];
     if (prop == null)
       continue;
-    if (key in pseudoDescriptors) {
-      res[key] = expandStylesAndRemoveNullishValues(prop, disableNormalize);
+    if (key in pseudoDescriptors || // this should capture all parent-based styles like media, group, etc
+    key[0] === "$" && isObj(prop)) {
+      res[key] = normalizeStyle(prop, disableNormalize);
       continue;
     }
     const value = disableNormalize ? prop : normalizeValueWithProperty(prop, key), out = expandStyle(key, value);
@@ -18,6 +20,6 @@ function expandStylesAndRemoveNullishValues(style, disableNormalize = !1) {
   return fixStyles(res), res;
 }
 export {
-  expandStylesAndRemoveNullishValues
+  normalizeStyle
 };
-//# sourceMappingURL=expandStylesAndRemoveNullishValues.js.map
+//# sourceMappingURL=normalizeStyle.js.map

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

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/normalizeStyle.ts"],
+  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,iBAAiB;AAC1B,SAAS,aAAa;AACtB,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAU3B,SAAS,eAAe,OAA4B,mBAAmB,IAAO;AACnF,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,UAAM,OAAO,MAAM,GAAG;AACtB,QAAI,QAAQ;AAAM;AAClB,QACE,OAAO;AAAA,IAEN,IAAI,CAAC,MAAM,OAAO,MAAM,IAAI,GAC7B;AACA,UAAI,GAAG,IAAI,eAAe,MAAM,gBAAgB;AAChD;AAAA,IACF;AACA,UAAM,QAAQ,mBAAmB,OAAO,2BAA2B,MAAM,GAAG,GAEtE,MAAM,YAAY,KAAK,KAAK;AAClC,IAAI,MACF,OAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC,IAE1C,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,mBAAU,GAAG,GAEN;AACT;",
+  "names": []
+}

package/dist/esm/helpers/{expandStylesAndRemoveNullishValues.js → normalizeStyle.native.js}

@@ -1,15 +1,17 @@
 import { expandStyle } from "./expandStyle";
 import { fixStyles } from "./expandStyles";
+import { isObj } from "./isObj";
 import { normalizeValueWithProperty } from "./normalizeValueWithProperty";
 import { pseudoDescriptors } from "./pseudoDescriptors";
-function expandStylesAndRemoveNullishValues(style, disableNormalize = !1) {
+function normalizeStyle(style, disableNormalize = !1) {
   const res = {};
   for (let key in style) {
     const prop = style[key];
     if (prop == null)
       continue;
-    if (key in pseudoDescriptors) {
-      res[key] = expandStylesAndRemoveNullishValues(prop, disableNormalize);
+    if (key in pseudoDescriptors || // this should capture all parent-based styles like media, group, etc
+    key[0] === "$" && isObj(prop)) {
+      res[key] = normalizeStyle(prop, disableNormalize);
       continue;
     }
     const value = disableNormalize ? prop : normalizeValueWithProperty(prop, key), out = expandStyle(key, value);
@@ -18,6 +20,6 @@ function expandStylesAndRemoveNullishValues(style, disableNormalize = !1) {
   return fixStyles(res), res;
 }
 export {
-  expandStylesAndRemoveNullishValues
+  normalizeStyle
 };
-//# sourceMappingURL=expandStylesAndRemoveNullishValues.js.map
+//# sourceMappingURL=normalizeStyle.js.map

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

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/normalizeStyle.ts"],
+  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,iBAAiB;AAC1B,SAAS,aAAa;AACtB,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAU3B,SAAS,eAAe,OAA4B,mBAAmB,IAAO;AACnF,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,UAAM,OAAO,MAAM,GAAG;AACtB,QAAI,QAAQ;AAAM;AAClB,QACE,OAAO;AAAA,IAEN,IAAI,CAAC,MAAM,OAAO,MAAM,IAAI,GAC7B;AACA,UAAI,GAAG,IAAI,eAAe,MAAM,gBAAgB;AAChD;AAAA,IACF;AACA,UAAM,QAAQ,mBAAmB,OAAO,2BAA2B,MAAM,GAAG,GAEtE,MAAM,YAAY,KAAK,KAAK;AAClC,IAAI,MACF,OAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC,IAE1C,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,mBAAU,GAAG,GAEN;AACT;",
+  "names": []
+}

package/dist/esm/helpers/normalizeValueWithProperty.js

@@ -6,8 +6,8 @@ const stylePropsAllPlusTransforms = {
   translateX: !0,
   translateY: !0
 };
-function normalizeValueWithProperty(value, property) {
-  if (!isWeb || typeof value == "boolean" || property && property in stylePropsUnitless || property && !(property in stylePropsAllPlusTransforms))
+function normalizeValueWithProperty(value, property = "") {
+  if (!isWeb || stylePropsUnitless[property] || property && !stylePropsAllPlusTransforms[property] || typeof value == "boolean")
     return value;
   let res = value;
   return value && typeof value == "object" ? value : (typeof value == "number" ? res = `${value}px` : property && (res = `${res}`), res);

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
-  "mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAA0B;AAElD,SAAS,uBAAuB;AAIhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,UAAwB;AAM7E,MALI,CAAC,SACD,OAAO,SAAU,aAAc,YAAY,YAAY,sBAIvD,YAAY,EAAE,YAAY;AAC5B,WAAO;AAET,MAAI,MAAM;AAEV,SAAI,SAAS,OAAO,SAAU,WAAiB,SAC3C,OAAO,SAAU,WACnB,MAAM,GAAG,KAAK,OACL,aACT,MAAM,GAAG,GAAG,KAEP;AACT;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AAEzE,QAAM,UADY,gBAAgB,EACR,SAAS;AACnC,MAAI,OAAO,OAAO;AAChB,WAAO,OAAO,OAAO;AAGvB,MAAI,CAAC,SAAS;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN,yBAAyB,GAAG,2BAA2B,SAAS;AAAA,IAClE;AAEF;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,SAAI,OAAO,WAAW,MAAM,IAC1B,MAAM,SACG,mBAAmB,GAAG,IAC/B,MAAM,CAAC,SACE,OAAO,SAAS,IAAI,IAC7B,MAAM,CAAC,OAAO,QAAQ,MAAM,EAAE,IAE9B,MAAM,QAER,OAAO,OAAO,IAAI,KACd,QAAQ,IAAI,aAAa,iBAEvB,OAAO,OAAQ,YAAY,OAAO,MAAM,GAAG,KAC7C,QAAQ,KAAK,sCAAsC;AAAA,IACjD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,GAGE;AACT;",
+  "mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAA0B;AAElD,SAAS,uBAAuB;AAKhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,WAAW,IAAS;AAEzE,MADI,CAAC,SAEH,mBAAmB,QAAQ,KAC1B,YAAY,CAAC,4BAA4B,QAAQ,KAClD,OAAO,SAAU;AAEjB,WAAO;AAET,MAAI,MAAM;AACV,SAAI,SAAS,OAAO,SAAU,WAAiB,SAC3C,OAAO,SAAU,WACnB,MAAM,GAAG,KAAK,OACL,aACT,MAAM,GAAG,GAAG,KAEP;AACT;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AAEzE,QAAM,UADY,gBAAgB,EACR,SAAS;AACnC,MAAI,OAAO,OAAO;AAChB,WAAO,OAAO,OAAO;AAGvB,MAAI,CAAC,SAAS;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN,yBAAyB,GAAG,2BAA2B,SAAS;AAAA,IAClE;AAEF;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,SAAI,OAAO,WAAW,MAAM,IAC1B,MAAM,SACG,mBAAmB,GAAG,IAC/B,MAAM,CAAC,SACE,OAAO,SAAS,IAAI,IAC7B,MAAM,CAAC,OAAO,QAAQ,MAAM,EAAE,IAE9B,MAAM,QAER,OAAO,OAAO,IAAI,KACd,QAAQ,IAAI,aAAa,iBAEvB,OAAO,OAAQ,YAAY,OAAO,MAAM,GAAG,KAC7C,QAAQ,KAAK,sCAAsC;AAAA,IACjD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,GAGE;AACT;",
   "names": []
 }

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

@@ -6,8 +6,8 @@ const stylePropsAllPlusTransforms = {
   translateX: !0,
   translateY: !0
 };
-function normalizeValueWithProperty(value, property) {
-  if (!isWeb || typeof value == "boolean" || property && property in stylePropsUnitless || property && !(property in stylePropsAllPlusTransforms))
+function normalizeValueWithProperty(value, property = "") {
+  if (!isWeb || stylePropsUnitless[property] || property && !stylePropsAllPlusTransforms[property] || typeof value == "boolean")
     return value;
   let res = value;
   return value && typeof value == "object" ? value : (typeof value == "number" ? res = `${value}px` : property && (res = `${res}`), res);

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
-  "mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAA0B;AAElD,SAAS,uBAAuB;AAIhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,UAAwB;AAM7E,MALI,CAAC,SACD,OAAO,SAAU,aAAc,YAAY,YAAY,sBAIvD,YAAY,EAAE,YAAY;AAC5B,WAAO;AAET,MAAI,MAAM;AAEV,SAAI,SAAS,OAAO,SAAU,WAAiB,SAC3C,OAAO,SAAU,WACnB,MAAM,GAAG,KAAK,OACL,aACT,MAAM,GAAG,GAAG,KAEP;AACT;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AAEzE,QAAM,UADY,gBAAgB,EACR,SAAS;AACnC,MAAI,OAAO,OAAO;AAChB,WAAO,OAAO,OAAO;AAGvB,MAAI,CAAC,SAAS;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN,yBAAyB,GAAG,2BAA2B,SAAS;AAAA,IAClE;AAEF;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,SAAI,OAAO,WAAW,MAAM,IAC1B,MAAM,SACG,mBAAmB,GAAG,IAC/B,MAAM,CAAC,SACE,OAAO,SAAS,IAAI,IAC7B,MAAM,CAAC,OAAO,QAAQ,MAAM,EAAE,IAE9B,MAAM,QAER,OAAO,OAAO,IAAI,KACd,QAAQ,IAAI,aAAa,iBAEvB,OAAO,OAAQ,YAAY,OAAO,MAAM,GAAG,KAC7C,QAAQ,KAAK,sCAAsC;AAAA,IACjD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,GAGE;AACT;",
+  "mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAA0B;AAElD,SAAS,uBAAuB;AAKhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,WAAW,IAAS;AAEzE,MADI,CAAC,SAEH,mBAAmB,QAAQ,KAC1B,YAAY,CAAC,4BAA4B,QAAQ,KAClD,OAAO,SAAU;AAEjB,WAAO;AAET,MAAI,MAAM;AACV,SAAI,SAAS,OAAO,SAAU,WAAiB,SAC3C,OAAO,SAAU,WACnB,MAAM,GAAG,KAAK,OACL,aACT,MAAM,GAAG,GAAG,KAEP;AACT;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AAEzE,QAAM,UADY,gBAAgB,EACR,SAAS;AACnC,MAAI,OAAO,OAAO;AAChB,WAAO,OAAO,OAAO;AAGvB,MAAI,CAAC,SAAS;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN,yBAAyB,GAAG,2BAA2B,SAAS;AAAA,IAClE;AAEF;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,SAAI,OAAO,WAAW,MAAM,IAC1B,MAAM,SACG,mBAAmB,GAAG,IAC/B,MAAM,CAAC,SACE,OAAO,SAAS,IAAI,IAC7B,MAAM,CAAC,OAAO,QAAQ,MAAM,EAAE,IAE9B,MAAM,QAER,OAAO,OAAO,IAAI,KACd,QAAQ,IAAI,aAAa,iBAEvB,OAAO,OAAQ,YAAY,OAAO,MAAM,GAAG,KAC7C,QAAQ,KAAK,sCAAsC;AAAA,IACjD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,GAGE;AACT;",
   "names": []
 }

package/dist/esm/helpers/propMapper.js

@@ -4,7 +4,7 @@ import { getConfig } from "../config";
 import { isDevTools } from "../constants/isDevTools";
 import { getVariableValue, isVariable } from "../createVariable";
 import { expandStyle } from "./expandStyle";
-import { expandStylesAndRemoveNullishValues } from "./expandStylesAndRemoveNullishValues";
+import { normalizeStyle } from "./normalizeStyle";
 import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras";
 import { isObj } from "./isObj";
 import { pseudoDescriptors } from "./pseudoDescriptors";
@@ -76,10 +76,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
     );
   }
   if (variantValue) {
-    const expanded = expandStylesAndRemoveNullishValues(
-      variantValue,
-      !!styleProps.noNormalize
-    );
+    const expanded = normalizeStyle(variantValue, !!styleProps.noNormalize);
     process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   expanding styles from ", variantValue, "to", expanded);
     const next = Object.entries(expanded);
     return fontFamilyResult && fontFamilyResult[0] === "$" && fontFamilyCache.set(next, getVariableValue(fontFamilyResult)), next;

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/propMapper.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["key", "val"]
 }

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

@@ -4,7 +4,7 @@ import { getConfig } from "../config";
 import { isDevTools } from "../constants/isDevTools";
 import { getVariableValue, isVariable } from "../createVariable";
 import { expandStyle } from "./expandStyle";
-import { expandStylesAndRemoveNullishValues } from "./expandStylesAndRemoveNullishValues";
+import { normalizeStyle } from "./normalizeStyle";
 import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras";
 import { isObj } from "./isObj";
 import { pseudoDescriptors } from "./pseudoDescriptors";
@@ -76,10 +76,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
     );
   }
   if (variantValue) {
-    const expanded = expandStylesAndRemoveNullishValues(
-      variantValue,
-      !!styleProps.noNormalize
-    );
+    const expanded = normalizeStyle(variantValue, !!styleProps.noNormalize);
     process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   expanding styles from ", variantValue, "to", expanded);
     const next = Object.entries(expanded);
     return fontFamilyResult && fontFamilyResult[0] === "$" && fontFamilyCache.set(next, getVariableValue(fontFamilyResult)), next;

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/propMapper.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["key", "val"]
 }

package/dist/esm/hooks/useProps.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useProps.tsx"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAS,wBAAwB;AACjC,SAAS,oCAAoC;AAC7C,SAAS,sBAAsB;AAE/B,SAAS,aAAa;AACtB,SAAS,gBAAgB;AACzB,SAAS,yBAAyB;AAqB3B,SAAS,SACd,OACA,MAC4B;AAC5B,QAAM,CAAC,UAAU,QAAQ,IAAI,iBAAiB,OAAO;AAAA,IACnD,GAAG;AAAA,IACH,UAAU;AAAA,IACV,aAAa;AAAA,IACb,eAAe;AAAA,EACjB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAQO,SAAS,SACd,OACA,MAC4B;AAC5B,SAAO,iBAAiB,OAAO,IAAI,EAAE,CAAC;AACxC;AAQO,SAAS,iBACd,OACA,MACsF;AACtF,QAAM,eAAe,MAAM,cAAc,gBAAgB,MAAM,cACzD,CAAC,YAAY,KAAK,IAAI,kBAAkB;AAAA,IAC5C,eAAe,aAAa;AAAA,EAC9B,CAAC,GACK,mBAAmB,WAAW,gBAAgB,GAC9C,QAAQ,SAAS,GACjB,cAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,OAAO,QAAQ;AAAA,IAC1B;AAAA,IACA;AAAA,MACE,YAAY;AAAA,MACZ,YAAY;AAAA,MACZ,QAAQ;AAAA,MACR,cAAc;AAAA,MACd,eAAe;AAAA,MACf,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO,CAAC,YAAY,WAAW,YAAY,OAAO,OAAO,KAAK;AAChE;",
+  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAS,wBAAwB;AACjC,SAAS,oCAAoC;AAC7C,SAAS,sBAAsB;AAQ/B,SAAS,aAAa;AACtB,SAAS,gBAAgB;AACzB,SAAS,yBAAyB;AAuB3B,SAAS,SACd,OACA,MAC4B;AAC5B,QAAM,CAAC,UAAU,QAAQ,IAAI,iBAAiB,OAAO;AAAA,IACnD,GAAG;AAAA,IACH,UAAU;AAAA,IACV,aAAa;AAAA,IACb,eAAe;AAAA,EACjB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAQO,SAAS,SACd,OACA,MAC4B;AAC5B,SAAO,iBAAiB,OAAO,IAAI,EAAE,CAAC;AACxC;AAQO,SAAS,iBACd,OACA,MACsF;AACtF,QAAM,eAAe,MAAM,cAAc,gBAAgB,MAAM,cACzD,CAAC,YAAY,KAAK,IAAI,kBAAkB;AAAA,IAC5C,eAAe,aAAa;AAAA,EAC9B,CAAC,GACK,mBAAmB,WAAW,gBAAgB,GAC9C,QAAQ,SAAS,GACjB,cAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,OAAO,QAAQ;AAAA,IAC1B;AAAA,IACA;AAAA,MACE,YAAY;AAAA,MACZ,YAAY;AAAA,MACZ,QAAQ;AAAA,MACR,cAAc;AAAA,MACd,eAAe;AAAA,MACf,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO,CAAC,YAAY,WAAW,YAAY,OAAO,OAAO,KAAK;AAChE;",
   "names": []
 }

package/dist/esm/hooks/useProps.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useProps.tsx"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAS,wBAAwB;AACjC,SAAS,oCAAoC;AAC7C,SAAS,sBAAsB;AAE/B,SAAS,aAAa;AACtB,SAAS,gBAAgB;AACzB,SAAS,yBAAyB;AAqB3B,SAAS,SACd,OACA,MAC4B;AAC5B,QAAM,CAAC,UAAU,QAAQ,IAAI,iBAAiB,OAAO;AAAA,IACnD,GAAG;AAAA,IACH,UAAU;AAAA,IACV,aAAa;AAAA,IACb,eAAe;AAAA,EACjB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAQO,SAAS,SACd,OACA,MAC4B;AAC5B,SAAO,iBAAiB,OAAO,IAAI,EAAE,CAAC;AACxC;AAQO,SAAS,iBACd,OACA,MACsF;AACtF,QAAM,eAAe,MAAM,cAAc,gBAAgB,MAAM,cACzD,CAAC,YAAY,KAAK,IAAI,kBAAkB;AAAA,IAC5C,eAAe,aAAa;AAAA,EAC9B,CAAC,GACK,mBAAmB,WAAW,gBAAgB,GAC9C,QAAQ,SAAS,GACjB,cAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,OAAO,QAAQ;AAAA,IAC1B;AAAA,IACA;AAAA,MACE,YAAY;AAAA,MACZ,YAAY;AAAA,MACZ,QAAQ;AAAA,MACR,cAAc;AAAA,MACd,eAAe;AAAA,MACf,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO,CAAC,YAAY,WAAW,YAAY,OAAO,OAAO,KAAK;AAChE;",
+  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAS,wBAAwB;AACjC,SAAS,oCAAoC;AAC7C,SAAS,sBAAsB;AAQ/B,SAAS,aAAa;AACtB,SAAS,gBAAgB;AACzB,SAAS,yBAAyB;AAuB3B,SAAS,SACd,OACA,MAC4B;AAC5B,QAAM,CAAC,UAAU,QAAQ,IAAI,iBAAiB,OAAO;AAAA,IACnD,GAAG;AAAA,IACH,UAAU;AAAA,IACV,aAAa;AAAA,IACb,eAAe;AAAA,EACjB,CAAC;AACD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAQO,SAAS,SACd,OACA,MAC4B;AAC5B,SAAO,iBAAiB,OAAO,IAAI,EAAE,CAAC;AACxC;AAQO,SAAS,iBACd,OACA,MACsF;AACtF,QAAM,eAAe,MAAM,cAAc,gBAAgB,MAAM,cACzD,CAAC,YAAY,KAAK,IAAI,kBAAkB;AAAA,IAC5C,eAAe,aAAa;AAAA,EAC9B,CAAC,GACK,mBAAmB,WAAW,gBAAgB,GAC9C,QAAQ,SAAS,GACjB,cAAc;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,OAAO,QAAQ;AAAA,IAC1B;AAAA,IACA;AAAA,MACE,YAAY;AAAA,MACZ,YAAY;AAAA,MACZ,QAAQ;AAAA,MACR,cAAc;AAAA,MACd,eAAe;AAAA,MACf,GAAG;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,SAAO,CAAC,YAAY,WAAW,YAAY,OAAO,OAAO,KAAK;AAChE;",
   "names": []
 }

package/dist/esm/index.js

@@ -26,7 +26,7 @@ export * from "./contexts/ComponentContext";
 export * from "./helpers/createStyledContext";
 export * from "./helpers/expandStyles";
 export * from "./helpers/createMediaStyle";
-export * from "./helpers/expandStylesAndRemoveNullishValues";
+export * from "./helpers/normalizeStyle";
 export * from "./helpers/propMapper";
 export * from "./helpers/getExpandedShorthands";
 export * from "./helpers/getSplitStyles";

package/dist/esm/index.native.js

@@ -26,7 +26,7 @@ export * from "./contexts/ComponentContext";
 export * from "./helpers/createStyledContext";
 export * from "./helpers/expandStyles";
 export * from "./helpers/createMediaStyle";
-export * from "./helpers/expandStylesAndRemoveNullishValues";
+export * from "./helpers/normalizeStyle";
 export * from "./helpers/propMapper";
 export * from "./helpers/getExpandedShorthands";
 export * from "./helpers/getSplitStyles";

package/package.json

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

package/src/helpers/getSplitStyles.tsx

@@ -548,9 +548,9 @@ export const getSplitStyles: StyleSplitter = (
 
     if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
       console.groupCollapsed(
-        `🔹🔹🔹🔹 ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ''} ${
+        `  🔑 ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ''} ${
           shouldPassThrough ? '(pass)' : ''
-        } 🔹🔹🔹🔹`
+        }`
       )
       log({ isVariant, valInit, shouldPassProp })
       if (isClient) {
@@ -1159,6 +1159,12 @@ export const getSplitStyles: StyleSplitter = (
           }
         }
 
+        if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
+          console.groupCollapsed(`🔹 getSplitStyles final style object`)
+          console.info(style)
+          console.groupEnd()
+        }
+
         if (shouldRetain || !IS_STATIC) {
           style = retainedStyles || {}
         }
@@ -1275,7 +1281,7 @@ export const getSplitStyles: StyleSplitter = (
 
   if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
     if (isDevTools) {
-      console.groupCollapsed('  🔹 ===>')
+      console.groupCollapsed('🔹 getSplitStyles ===>')
       try {
         // prettier-ignore
         const logs = {

package/src/helpers/getStylesAtomic.ts

@@ -14,6 +14,7 @@ import {
   pseudoDescriptors,
   pseudoDescriptorsBase,
 } from './pseudoDescriptors'
+import { normalizeColor } from './normalizeColor'
 
 // refactor this file away next...
 
@@ -97,13 +98,14 @@ export const generateAtomicStyles = (
 
 export function styleToCSS(style: Record<string, any>) {
   // box-shadow
-  const { shadowOffset, shadowRadius, shadowColor } = style
-  if (style.shadowRadius) {
+  const { shadowOffset, shadowRadius, shadowColor, shadowOpacity } = style
+  if (shadowRadius || shadowColor) {
     const offset = shadowOffset || defaultOffset
     const width = normalizeValueWithProperty(offset.width)
     const height = normalizeValueWithProperty(offset.height)
     const radius = normalizeValueWithProperty(shadowRadius)
-    const shadow = `${width} ${height} ${radius} ${shadowColor}`
+    const color = normalizeColor(shadowColor, shadowOpacity)
+    const shadow = `${width} ${height} ${radius} ${color}`
     style.boxShadow = style.boxShadow ? `${style.boxShadow}, ${shadow}` : shadow
     delete style.shadowOffset
     delete style.shadowRadius

package/src/helpers/normalizeColor.ts

@@ -7,20 +7,17 @@ export const normalizeColor = (color?: string | null, opacity?: number) => {
   if (color[0] === '$' || color.startsWith('var(')) {
     return color
   }
-  const colorProcessed = normalizeCSSColor(color)
-  if (colorProcessed != null) {
-    const { r, g, b, a } = rgba(colorProcessed)
-    const o = opacity ?? a ?? 1
-    const alpha = o.toFixed(2)
-    return `rgba(${r},${g},${b},${alpha})`
+  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 (process.env.NODE_ENV === 'development') {
-    console.warn(`Unknown color value: ${color}`)
-  }
-  if (process.env.TAMAGUI_TARGET === 'native') {
-    // avoids errors
-    return
-  }
-  // on web pass it through could be a var or something
   return color
 }
+
+export const getRgba = (color: string) => {
+  const colorNum = normalizeCSSColor(color)
+  if (colorNum != null) {
+    return rgba(colorNum)
+  }
+}

package/src/helpers/normalizeShadow.ts

@@ -1,6 +1,5 @@
 import { defaultOffset } from './defaultOffset'
-import { normalizeColor } from './normalizeColor'
-import { normalizeValueWithProperty } from './normalizeValueWithProperty'
+import { getRgba, normalizeColor } from './normalizeColor'
 
 export function normalizeShadow({
   shadowColor,
@@ -11,10 +10,11 @@ export function normalizeShadow({
   const { height, width } = shadowOffset || defaultOffset
   return {
     shadowOffset: {
-      width: normalizeValueWithProperty(width || 0),
-      height: normalizeValueWithProperty(height || 0),
+      width: width || 0,
+      height: height || 0,
     },
-    shadowRadius: normalizeValueWithProperty(shadowRadius || 0),
-    shadowColor: normalizeColor(shadowColor, shadowOpacity),
+    shadowRadius: shadowRadius || 0,
+    shadowColor: normalizeColor(shadowColor, 1),
+    shadowOpacity: shadowOpacity ?? (shadowColor ? getRgba(shadowColor)?.a : 1),
   }
 }

package/src/helpers/{expandStylesAndRemoveNullishValues.ts → normalizeStyle.ts}

@@ -1,27 +1,29 @@
 import { expandStyle } from './expandStyle'
 import { fixStyles } from './expandStyles'
+import { isObj } from './isObj'
 import { normalizeValueWithProperty } from './normalizeValueWithProperty'
 import { pseudoDescriptors } from './pseudoDescriptors'
 
 /**
  * This is what you want to run before Object.assign() a style onto another.
  * It does the following:
- *   1. Turns user shorthands into longhands, ie px = paddingHorizontal
- *   2. Normalizes various inconsistent styles to be more consistent
- *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight
+ *   1. Shorthands into longhands, px = paddingHorizontal
+ *   2. Expands flex, borderColor and other properties that can expand into sub-parts
+ *   3. Normalizes all sub pseudo-media-etc styles
  */
 
-export function expandStylesAndRemoveNullishValues(
-  style: Record<string, any>,
-  disableNormalize = false
-) {
+export function normalizeStyle(style: Record<string, any>, disableNormalize = false) {
   const res: Record<string, any> = {}
 
   for (let key in style) {
     const prop = style[key]
     if (prop == null) continue
-    if (key in pseudoDescriptors) {
-      res[key] = expandStylesAndRemoveNullishValues(prop, disableNormalize)
+    if (
+      key in pseudoDescriptors ||
+      // this should capture all parent-based styles like media, group, etc
+      (key[0] === '$' && isObj(prop))
+    ) {
+      res[key] = normalizeStyle(prop, disableNormalize)
       continue
     }
     const value = disableNormalize ? prop : normalizeValueWithProperty(prop, key)

package/src/helpers/normalizeValueWithProperty.ts

@@ -7,6 +7,7 @@ import { isWeb } from '@tamagui/constants'
 import { stylePropsAll, stylePropsUnitless } from '@tamagui/helpers'
 
 import { getAllSelectors } from './insertStyleRule'
+import { isObj } from './isObj'
 
 // only doing this on web on native it accepts pixel values
 
@@ -16,17 +17,16 @@ const stylePropsAllPlusTransforms = {
   translateY: true,
 }
 
-export function normalizeValueWithProperty(value: any, property?: string): any {
+export function normalizeValueWithProperty(value: any, property = ''): any {
   if (!isWeb) return value
-  if (typeof value === 'boolean' || (property && property in stylePropsUnitless)) {
-    return value
-  }
-  // if not a style prop
-  if (property && !(property in stylePropsAllPlusTransforms)) {
+  if (
+    stylePropsUnitless[property] ||
+    (property && !stylePropsAllPlusTransforms[property]) ||
+    typeof value === 'boolean'
+  ) {
     return value
   }
   let res = value
-  // shadowOffset etc
   if (value && typeof value === 'object') return value
   if (typeof value === 'number') {
     res = `${value}px`

package/src/helpers/propMapper.ts

@@ -13,7 +13,7 @@ import type {
   VariantSpreadFunction,
 } from '../types'
 import { expandStyle } from './expandStyle'
-import { expandStylesAndRemoveNullishValues } from './expandStylesAndRemoveNullishValues'
+import { normalizeStyle } from './normalizeStyle'
 import { getFontsForLanguage, getVariantExtras } from './getVariantExtras'
 import { isObj } from './isObj'
 import { pseudoDescriptors } from './pseudoDescriptors'
@@ -186,10 +186,7 @@ const resolveVariants: StyleResolver = (
   }
 
   if (variantValue) {
-    const expanded = expandStylesAndRemoveNullishValues(
-      variantValue,
-      !!styleProps.noNormalize
-    )
+    const expanded = normalizeStyle(variantValue, !!styleProps.noNormalize)
     if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
       console.info(`   expanding styles from `, variantValue, `to`, expanded)
     }