@tamagui/core 1.86.1 → 1.86.2

package/dist/test.native.js

@@ -2688,6 +2688,27 @@ var require_createMediaStyle_native = __commonJS({
   }
 });
 
+// ../web/dist/cjs/helpers/defaultOffset.native.js
+var require_defaultOffset_native = __commonJS({
+  "../web/dist/cjs/helpers/defaultOffset.native.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: !0 });
+    }, __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from == "object" || typeof from == "function")
+        for (let key of __getOwnPropNames2(from))
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      return to;
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), defaultOffset_exports = {};
+    __export2(defaultOffset_exports, {
+      defaultOffset: () => defaultOffset
+    });
+    module2.exports = __toCommonJS2(defaultOffset_exports);
+    var defaultOffset = { height: 0, width: 0 };
+  }
+});
+
 // ../../node_modules/@react-native/normalize-color/index.js
 var require_normalize_color = __commonJS({
   "../../node_modules/@react-native/normalize-color/index.js"(exports2, module2) {
@@ -3156,7 +3177,7 @@ var require_index_native7 = __commonJS({
     module2.exports = __toCommonJS2(src_exports2);
     var normalizeColor = __toESM2(require_normalize_color()), norm = normalizeColor.default || normalizeColor, normalizeCSSColor = norm;
     function rgba2(colorInt) {
-      var r = Math.round((colorInt & 4278190080) >>> 24), g = Math.round((colorInt & 16711680) >>> 16), b = Math.round((colorInt & 65280) >>> 8), a = ((colorInt & 255) >>> 0) / 255;
+      let r = Math.round((colorInt & 4278190080) >>> 24), g = Math.round((colorInt & 16711680) >>> 16), b = Math.round((colorInt & 65280) >>> 8), a = ((colorInt & 255) >>> 0) / 255;
       return {
         r,
         g,
@@ -3168,27 +3189,6 @@ var require_index_native7 = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/defaultOffset.native.js
-var require_defaultOffset_native = __commonJS({
-  "../web/dist/cjs/helpers/defaultOffset.native.js"(exports2, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), defaultOffset_exports = {};
-    __export2(defaultOffset_exports, {
-      defaultOffset: () => defaultOffset
-    });
-    module2.exports = __toCommonJS2(defaultOffset_exports);
-    var defaultOffset = { height: 0, width: 0 };
-  }
-});
-
 // ../web/dist/cjs/helpers/normalizeColor.native.js
 var require_normalizeColor_native = __commonJS({
   "../web/dist/cjs/helpers/normalizeColor.native.js"(exports2, module2) {
@@ -3203,6 +3203,7 @@ var require_normalizeColor_native = __commonJS({
       return to;
     }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), normalizeColor_exports = {};
     __export2(normalizeColor_exports, {
+      getRgba: () => getRgba,
       normalizeColor: () => normalizeColor,
       rgba: () => import_normalize_css_color2.rgba
     });
@@ -3212,57 +3213,20 @@ var require_normalizeColor_native = __commonJS({
         return;
       if (color[0] === "$" || color.startsWith("var("))
         return color;
-      let colorProcessed = (0, import_normalize_css_color.normalizeCSSColor)(color);
-      if (colorProcessed != null) {
-        let { r, g, b, a } = (0, import_normalize_css_color.rgba)(colorProcessed), alpha = (opacity ?? a ?? 1).toFixed(2);
-        return `rgba(${r},${g},${b},${alpha})`;
+      let rgba3 = getRgba(color);
+      if (rgba3) {
+        let colors = `${rgba3.r},${rgba3.g},${rgba3.b}`;
+        return opacity === 1 ? `rgb(${colors})` : `rgba(${colors},${opacity ?? rgba3.a ?? 1})`;
       }
+      return color;
+    }, getRgba = (color) => {
+      let colorNum = (0, import_normalize_css_color.normalizeCSSColor)(color);
+      if (colorNum != null)
+        return (0, import_normalize_css_color.rgba)(colorNum);
     };
   }
 });
 
-// ../web/dist/cjs/helpers/normalizeValueWithProperty.native.js
-var require_normalizeValueWithProperty_native = __commonJS({
-  "../web/dist/cjs/helpers/normalizeValueWithProperty.native.js"(exports2, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), normalizeValueWithProperty_exports = {};
-    __export2(normalizeValueWithProperty_exports, {
-      normalizeValueWithProperty: () => normalizeValueWithProperty,
-      reverseMapClassNameToValue: () => reverseMapClassNameToValue
-    });
-    module2.exports = __toCommonJS2(normalizeValueWithProperty_exports);
-    var import_constants = require_index_native3(), import_helpers = require_index_native4(), import_insertStyleRule = require_insertStyleRule_native(), stylePropsAllPlusTransforms = {
-      ...import_helpers.stylePropsAll,
-      translateX: !0,
-      translateY: !0
-    };
-    function normalizeValueWithProperty(value, property) {
-      if (!import_constants.isWeb || typeof value == "boolean" || property && property in import_helpers.stylePropsUnitless || property && !(property in stylePropsAllPlusTransforms))
-        return value;
-      let res = value;
-      return value && typeof value == "object" ? value : (typeof value == "number" ? res = `${value}px` : property && (res = `${res}`), res);
-    }
-    var rcache = {};
-    function reverseMapClassNameToValue(key, className) {
-      let cssRule = (0, import_insertStyleRule.getAllSelectors)()[className];
-      if (rcache[cssRule])
-        return rcache[cssRule];
-      if (!cssRule)
-        return;
-      let cssVal = cssRule.replace(/.*:/, "").replace(/;.*/, "").trim(), res;
-      return cssVal.startsWith("var(") ? res = cssVal : import_helpers.stylePropsUnitless[key] ? res = +cssVal : cssVal.endsWith("px") ? res = +cssVal.replace("px", "") : res = cssVal, rcache[cssRule] = res, res;
-    }
-  }
-});
-
 // ../web/dist/cjs/helpers/normalizeShadow.native.js
 var require_normalizeShadow_native = __commonJS({
   "../web/dist/cjs/helpers/normalizeShadow.native.js"(exports2, module2) {
@@ -3275,30 +3239,28 @@ var require_normalizeShadow_native = __commonJS({
         for (let key of __getOwnPropNames2(from))
           !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
       return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), normalizeShadow_native_exports = {};
-    __export2(normalizeShadow_native_exports, {
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), normalizeShadow_exports = {};
+    __export2(normalizeShadow_exports, {
       normalizeShadow: () => normalizeShadow
     });
-    module2.exports = __toCommonJS2(normalizeShadow_native_exports);
-    var import_normalize_css_color = require_index_native7(), import_defaultOffset = require_defaultOffset_native(), import_normalizeColor = require_normalizeColor_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native();
+    module2.exports = __toCommonJS2(normalizeShadow_exports);
+    var import_defaultOffset = require_defaultOffset_native(), import_normalizeColor = require_normalizeColor_native();
     function normalizeShadow({
       shadowColor,
       shadowOffset,
       shadowOpacity,
       shadowRadius
     }) {
-      let { height, width } = shadowOffset || import_defaultOffset.defaultOffset, colorStr = String(shadowColor || "black"), val = (0, import_normalize_css_color.normalizeCSSColor)(colorStr);
-      if (typeof val != "number")
-        throw new Error(`invalid shadow color ${colorStr}`);
-      let { r, g, b, a } = (0, import_normalizeColor.rgba)(val);
+      var _a;
+      let { height, width } = shadowOffset || import_defaultOffset.defaultOffset;
       return {
         shadowOffset: {
-          width: (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(width || 0),
-          height: (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(height || 0)
+          width: width || 0,
+          height: height || 0
         },
-        shadowRadius: (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(shadowRadius || 0),
-        shadowColor: `rgb(${r},${g},${b})`,
-        shadowOpacity: shadowOpacity ?? a
+        shadowRadius: shadowRadius || 0,
+        shadowColor: (0, import_normalizeColor.normalizeColor)(shadowColor, 1),
+        shadowOpacity: shadowOpacity ?? (shadowColor ? (_a = (0, import_normalizeColor.getRgba)(shadowColor)) == null ? void 0 : _a.a : 1)
       };
     }
   }
@@ -3386,6 +3348,48 @@ var require_log_native = __commonJS({
   }
 });
 
+// ../web/dist/cjs/helpers/normalizeValueWithProperty.native.js
+var require_normalizeValueWithProperty_native = __commonJS({
+  "../web/dist/cjs/helpers/normalizeValueWithProperty.native.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: !0 });
+    }, __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from == "object" || typeof from == "function")
+        for (let key of __getOwnPropNames2(from))
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      return to;
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), normalizeValueWithProperty_exports = {};
+    __export2(normalizeValueWithProperty_exports, {
+      normalizeValueWithProperty: () => normalizeValueWithProperty,
+      reverseMapClassNameToValue: () => reverseMapClassNameToValue
+    });
+    module2.exports = __toCommonJS2(normalizeValueWithProperty_exports);
+    var import_constants = require_index_native3(), import_helpers = require_index_native4(), import_insertStyleRule = require_insertStyleRule_native(), stylePropsAllPlusTransforms = {
+      ...import_helpers.stylePropsAll,
+      translateX: !0,
+      translateY: !0
+    };
+    function normalizeValueWithProperty(value, property = "") {
+      if (!import_constants.isWeb || import_helpers.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);
+    }
+    var rcache = {};
+    function reverseMapClassNameToValue(key, className) {
+      let cssRule = (0, import_insertStyleRule.getAllSelectors)()[className];
+      if (rcache[cssRule])
+        return rcache[cssRule];
+      if (!cssRule)
+        return;
+      let cssVal = cssRule.replace(/.*:/, "").replace(/;.*/, "").trim(), res;
+      return cssVal.startsWith("var(") ? res = cssVal : import_helpers.stylePropsUnitless[key] ? res = +cssVal : cssVal.endsWith("px") ? res = +cssVal.replace("px", "") : res = cssVal, rcache[cssRule] = res, res;
+    }
+  }
+});
+
 // ../web/dist/cjs/helpers/expandStyle.native.js
 var require_expandStyle_native = __commonJS({
   "../web/dist/cjs/helpers/expandStyle.native.js"(exports2, module2) {
@@ -3445,9 +3449,9 @@ var require_expandStyle_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/expandStylesAndRemoveNullishValues.native.js
-var require_expandStylesAndRemoveNullishValues_native = __commonJS({
-  "../web/dist/cjs/helpers/expandStylesAndRemoveNullishValues.native.js"(exports2, module2) {
+// ../web/dist/cjs/helpers/isObj.native.js
+var require_isObj_native = __commonJS({
+  "../web/dist/cjs/helpers/isObj.native.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
       for (var name in all)
@@ -3457,20 +3461,42 @@ var require_expandStylesAndRemoveNullishValues_native = __commonJS({
         for (let key of __getOwnPropNames2(from))
           !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
       return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), expandStylesAndRemoveNullishValues_exports = {};
-    __export2(expandStylesAndRemoveNullishValues_exports, {
-      expandStylesAndRemoveNullishValues: () => expandStylesAndRemoveNullishValues
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), isObj_exports = {};
+    __export2(isObj_exports, {
+      isObj: () => isObj
     });
-    module2.exports = __toCommonJS2(expandStylesAndRemoveNullishValues_exports);
-    var import_expandStyle = require_expandStyle_native(), import_expandStyles = require_expandStyles_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_pseudoDescriptors = require_pseudoDescriptors_native();
-    function expandStylesAndRemoveNullishValues(style, disableNormalize = !1) {
+    module2.exports = __toCommonJS2(isObj_exports);
+    var isObj = (x) => x && !Array.isArray(x) && typeof x == "object";
+  }
+});
+
+// ../web/dist/cjs/helpers/normalizeStyle.native.js
+var require_normalizeStyle_native = __commonJS({
+  "../web/dist/cjs/helpers/normalizeStyle.native.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: !0 });
+    }, __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from == "object" || typeof from == "function")
+        for (let key of __getOwnPropNames2(from))
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      return to;
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), normalizeStyle_exports = {};
+    __export2(normalizeStyle_exports, {
+      normalizeStyle: () => normalizeStyle
+    });
+    module2.exports = __toCommonJS2(normalizeStyle_exports);
+    var import_expandStyle = require_expandStyle_native(), import_expandStyles = require_expandStyles_native(), import_isObj = require_isObj_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_pseudoDescriptors = require_pseudoDescriptors_native();
+    function normalizeStyle(style, disableNormalize = !1) {
       let res = {};
       for (let key in style) {
         let prop = style[key];
         if (prop == null)
           continue;
-        if (key in import_pseudoDescriptors.pseudoDescriptors) {
-          res[key] = expandStylesAndRemoveNullishValues(prop, disableNormalize);
+        if (key in import_pseudoDescriptors.pseudoDescriptors || // this should capture all parent-based styles like media, group, etc
+        key[0] === "$" && (0, import_isObj.isObj)(prop)) {
+          res[key] = normalizeStyle(prop, disableNormalize);
           continue;
         }
         let value = disableNormalize ? prop : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(prop, key), out = (0, import_expandStyle.expandStyle)(key, value);
@@ -3546,27 +3572,6 @@ var require_getVariantExtras_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/isObj.native.js
-var require_isObj_native = __commonJS({
-  "../web/dist/cjs/helpers/isObj.native.js"(exports2, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: !0 });
-    }, __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from == "object" || typeof from == "function")
-        for (let key of __getOwnPropNames2(from))
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      return to;
-    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), isObj_exports = {};
-    __export2(isObj_exports, {
-      isObj: () => isObj
-    });
-    module2.exports = __toCommonJS2(isObj_exports);
-    var isObj = (x) => x && !Array.isArray(x) && typeof x == "object";
-  }
-});
-
 // ../web/dist/cjs/helpers/propMapper.native.js
 var require_propMapper_native = __commonJS({
   "../web/dist/cjs/helpers/propMapper.native.js"(exports2, module2) {
@@ -3587,7 +3592,7 @@ var require_propMapper_native = __commonJS({
       propMapper: () => propMapper
     });
     module2.exports = __toCommonJS2(propMapper_exports);
-    var import_constants = require_index_native3(), import_helpers = require_index_native4(), import_config = require_config_native(), import_isDevTools = require_isDevTools_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_expandStylesAndRemoveNullishValues = require_expandStylesAndRemoveNullishValues_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
+    var import_constants = require_index_native3(), import_helpers = require_index_native4(), import_config = require_config_native(), import_isDevTools = require_isDevTools_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_normalizeStyle = require_normalizeStyle_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
       var _a;
       if (lastFontFamilyToken = null, !import_constants.isAndroid && key === "elevationAndroid")
         return;
@@ -3646,10 +3651,7 @@ var require_propMapper_native = __commonJS({
         );
       }
       if (variantValue) {
-        let expanded = (0, import_expandStylesAndRemoveNullishValues.expandStylesAndRemoveNullishValues)(
-          variantValue,
-          !!styleProps.noNormalize
-        ), next = Object.entries(expanded);
+        let expanded = (0, import_normalizeStyle.normalizeStyle)(variantValue, !!styleProps.noNormalize), next = Object.entries(expanded);
         return fontFamilyResult && fontFamilyResult[0] === "$" && fontFamilyCache.set(next, (0, import_createVariable.getVariableValue)(fontFamilyResult)), next;
       }
     };
@@ -6383,7 +6385,7 @@ var require_index_native9 = __commonJS({
     __reExport2(src_exports2, require_createStyledContext_native(), module2.exports);
     __reExport2(src_exports2, require_expandStyles_native(), module2.exports);
     __reExport2(src_exports2, require_createMediaStyle_native(), module2.exports);
-    __reExport2(src_exports2, require_expandStylesAndRemoveNullishValues_native(), module2.exports);
+    __reExport2(src_exports2, require_normalizeStyle_native(), module2.exports);
     __reExport2(src_exports2, require_propMapper_native(), module2.exports);
     __reExport2(src_exports2, require_getExpandedShorthands_native(), module2.exports);
     __reExport2(src_exports2, require_getSplitStyles_native(), module2.exports);