tamagui 1.123.8 → 1.123.10

package/dist/native.js

@@ -1432,7 +1432,6 @@ var require_validStyleProps_native = __commonJS({
         ...textColors
       }
     }, stylePropsUnitless = {
-      perspective: !0,
       WebkitLineClamp: !0,
       animationIterationCount: !0,
       aspectRatio: !0,
@@ -5751,142 +5750,6 @@ var require_expandStyles_native = __commonJS({
   }
 });
 
-// ../../core/web/dist/cjs/helpers/normalizeValueWithProperty.native.js
-var require_normalizeValueWithProperty_native = __commonJS({
-  "../../core/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 = function(target, all) {
-      for (var name in all) __defProp2(target, name, {
-        get: all[name],
-        enumerable: !0
-      });
-    }, __copyProps2 = function(to, from, except, desc) {
-      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
-      if (from && typeof from == "object" || typeof from == "function") try {
-        for (var _loop = function() {
-          var key = _step.value;
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
-            get: function() {
-              return from[key];
-            },
-            enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
-          });
-        }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
-      } catch (err) {
-        _didIteratorError = !0, _iteratorError = err;
-      } finally {
-        try {
-          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-        } finally {
-          if (_didIteratorError)
-            throw _iteratorError;
-        }
-      }
-      return to;
-    }, __toCommonJS2 = function(mod) {
-      return __copyProps2(__defProp2({}, "__esModule", {
-        value: !0
-      }), mod);
-    }, normalizeValueWithProperty_exports = {};
-    __export2(normalizeValueWithProperty_exports, {
-      normalizeValueWithProperty: function() {
-        return normalizeValueWithProperty;
-      },
-      reverseMapClassNameToValue: function() {
-        return reverseMapClassNameToValue;
-      }
-    });
-    module2.exports = __toCommonJS2(normalizeValueWithProperty_exports);
-    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_insertStyleRule = require_insertStyleRule_native(), stylePropsAllPlusTransforms = {
-      ...import_helpers.stylePropsAll,
-      translateX: !0,
-      translateY: !0
-    };
-    function normalizeValueWithProperty(value) {
-      var property = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
-      if (!import_constants4.isWeb || import_helpers.stylePropsUnitless[property] || property && !stylePropsAllPlusTransforms[property] || typeof value == "boolean") return value;
-      var res = value;
-      return value && typeof value == "object" ? value : (typeof value == "number" ? res = `${value}px` : property && (res = `${res}`), res);
-    }
-    var rcache = {};
-    function reverseMapClassNameToValue(key, className) {
-      var selectors = (0, import_insertStyleRule.getAllSelectors)(), cssRule = selectors[className];
-      if (rcache[cssRule]) return rcache[cssRule];
-      if (!cssRule) {
-        process.env.NODE_ENV === "development" && console.warn(`No CSS rule found for ${key} looking for selector ".${className}", you may not be injecting extracted CSS`);
-        return;
-      }
-      var 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, process.env.NODE_ENV === "development" && typeof res == "number" && Number.isNaN(res) && console.info("Tamagui invalid parsed value, NaN:", {
-        res,
-        cssVal,
-        cssRule,
-        key,
-        className
-      }), res;
-    }
-  }
-});
-
-// ../../core/web/dist/cjs/helpers/transformsToString.native.js
-var require_transformsToString_native = __commonJS({
-  "../../core/web/dist/cjs/helpers/transformsToString.native.js"(exports2, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
-      for (var name in all) __defProp2(target, name, {
-        get: all[name],
-        enumerable: !0
-      });
-    }, __copyProps2 = function(to, from, except, desc) {
-      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
-      if (from && typeof from == "object" || typeof from == "function") try {
-        for (var _loop = function() {
-          var key = _step.value;
-          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
-            get: function() {
-              return from[key];
-            },
-            enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
-          });
-        }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
-      } catch (err) {
-        _didIteratorError = !0, _iteratorError = err;
-      } finally {
-        try {
-          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-        } finally {
-          if (_didIteratorError)
-            throw _iteratorError;
-        }
-      }
-      return to;
-    }, __toCommonJS2 = function(mod) {
-      return __copyProps2(__defProp2({}, "__esModule", {
-        value: !0
-      }), mod);
-    }, transformsToString_exports = {};
-    __export2(transformsToString_exports, {
-      transformsToString: function() {
-        return transformsToString;
-      }
-    });
-    module2.exports = __toCommonJS2(transformsToString_exports);
-    var import_normalizeValueWithProperty = require_normalizeValueWithProperty_native();
-    function transformsToString(transforms) {
-      return transforms.map(
-        // { scale: 2 } => 'scale(2)'
-        // { translateX: 20 } => 'translateX(20px)'
-        // { matrix: [1,2,3,4,5,6] } => 'matrix(1,2,3,4,5,6)'
-        // { perspective: 1000 } => perspective(1000px)
-        function(transform) {
-          var type = Object.keys(transform)[0], value = transform[type];
-          return type === "matrix" || type === "matrix3d" ? `${type}(${value.join(",")})` : `${type}(${(0, import_normalizeValueWithProperty.normalizeValueWithProperty)(value, type)})`;
-        }
-      ).join(" ");
-    }
-  }
-});
-
 // ../../core/web/dist/cjs/helpers/getCSSStylesAtomic.native.js
 var require_getCSSStylesAtomic_native = __commonJS({
   "../../core/web/dist/cjs/helpers/getCSSStylesAtomic.native.js"(exports2, module2) {
@@ -5923,8 +5786,8 @@ var require_getCSSStylesAtomic_native = __commonJS({
       return __copyProps2(__defProp2({}, "__esModule", {
         value: !0
       }), mod);
-    }, getCSSStylesAtomic_exports = {};
-    __export2(getCSSStylesAtomic_exports, {
+    }, getCSSStylesAtomic_native_exports = {};
+    __export2(getCSSStylesAtomic_native_exports, {
       getCSSStylesAtomic: function() {
         return getCSSStylesAtomic2;
       },
@@ -5935,177 +5798,10 @@ var require_getCSSStylesAtomic_native = __commonJS({
         return styleToCSS;
       }
     });
-    module2.exports = __toCommonJS2(getCSSStylesAtomic_exports);
-    var import_helpers = require_index_native7(), import_config = require_config_native(), import_defaultOffset = require_defaultOffset_native(), import_normalizeColor = require_normalizeColor_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_transformsToString = require_transformsToString_native(), import_useMedia = require_useMedia_native();
-    function getCSSStylesAtomic2(style) {
-      styleToCSS(style);
-      var out = [];
-      for (var key in style) if (key !== "$$css") {
-        var val = style[key];
-        if (key in import_pseudoDescriptors.pseudoDescriptors) val && out.push(...getStyleAtomic(val, import_pseudoDescriptors.pseudoDescriptors[key]));
-        else if ((0, import_useMedia.isMediaKey)(key)) for (var subKey in val) {
-          var so = getStyleObject(val, subKey);
-          so && (so[0] = key, out.push(so));
-        }
-        else {
-          var so1 = getStyleObject(style, key);
-          so1 && out.push(so1);
-        }
-      }
-      return out;
-    }
-    var getStyleAtomic = function(style, pseudo) {
-      styleToCSS(style);
-      var out = [];
-      for (var key in style) {
-        var so = getStyleObject(style, key, pseudo);
-        so && out.push(so);
-      }
-      return out;
-    }, conf = null, getStyleObject = function(style, key, pseudo) {
-      var val = style[key];
-      if (val != null) {
-        key === "transform" && Array.isArray(style.transform) && (val = (0, import_transformsToString.transformsToString)(val));
-        var value = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key), hash = (0, import_helpers.simpleHash)(typeof value == "string" ? value : `${value}`), pseudoPrefix = pseudo ? `0${pseudo.name}-` : "";
-        conf || (conf = (0, import_config.getConfigMaybe)());
-        var shortProp = (conf == null ? void 0 : conf.inverseShorthands[key]) || key, identifier = `_${shortProp}-${pseudoPrefix}${hash}`, rules = createAtomicRules(identifier, key, value, pseudo);
-        return [
-          // array for performance
-          key,
-          value,
-          identifier,
-          pseudo == null ? void 0 : pseudo.name,
-          rules
-        ];
-      }
-    };
-    function styleToCSS(style) {
-      var { shadowOffset, shadowRadius, shadowColor, shadowOpacity } = style;
-      if (shadowRadius || shadowColor) {
-        var offset4 = shadowOffset || import_defaultOffset.defaultOffset, width = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(offset4.width), height = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(offset4.height), radius = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(shadowRadius), color = (0, import_normalizeColor.normalizeColor)(shadowColor, shadowOpacity), shadow = `${width} ${height} ${radius} ${color}`;
-        style.boxShadow = style.boxShadow ? `${style.boxShadow}, ${shadow}` : shadow, delete style.shadowOffset, delete style.shadowRadius, delete style.shadowColor, delete style.shadowOpacity;
-      }
-      var { textShadowColor, textShadowOffset, textShadowRadius } = style;
-      if (textShadowColor || textShadowOffset || textShadowRadius) {
-        var { height: height1, width: width1 } = textShadowOffset || import_defaultOffset.defaultOffset, radius1 = textShadowRadius || 0, color1 = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(textShadowColor, "textShadowColor");
-        if (color1 && (height1 !== 0 || width1 !== 0 || radius1 !== 0)) {
-          var blurRadius = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(radius1), offsetX = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(width1), offsetY = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(height1);
-          style.textShadow = `${offsetX} ${offsetY} ${blurRadius} ${color1}`;
-        }
-        delete style.textShadowColor, delete style.textShadowOffset, delete style.textShadowRadius;
-      }
-    }
-    function createDeclarationBlock(style) {
-      var important = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, next = "", _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
-      try {
-        for (var _iterator = style[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-          var [key, value] = _step.value;
-          next += `${hyphenateStyleName(key)}:${value}${important ? " !important" : ""};`;
-        }
-      } catch (err) {
-        _didIteratorError = !0, _iteratorError = err;
-      } finally {
-        try {
-          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-        } finally {
-          if (_didIteratorError) throw _iteratorError;
-        }
-      }
-      return `{${next}}`;
-    }
-    var hcache = {}, toHyphenLower = function(match) {
-      return `-${match.toLowerCase()}`;
-    }, hyphenateStyleName = function(key) {
-      if (key in hcache) return hcache[key];
-      var val = key.replace(/[A-Z]/g, toHyphenLower);
-      return hcache[key] = val, val;
-    }, selectorPriority = function() {
-      var res = {};
-      for (var key in import_pseudoDescriptors.pseudoDescriptors) {
-        var pseudo = import_pseudoDescriptors.pseudoDescriptors[key];
-        res[pseudo.name] = `${[
-          ...Array(pseudo.priority)
-        ].map(function() {
-          return ":root";
-        }).join("")} `;
-      }
-      return res;
-    }();
-    function createAtomicRules(identifier, property, value, pseudo) {
-      var pseudoIdPostfix = pseudo ? pseudo.name === "disabled" ? "[aria-disabled]" : `:${pseudo.name}` : "", pseudoSelector = pseudo == null ? void 0 : pseudo.selector, selector = pseudo ? pseudoSelector ? `${pseudoSelector} .${identifier}` : `${selectorPriority[pseudo.name]} .${identifier}${pseudoIdPostfix}` : `:root .${identifier}`;
-      pseudoSelector === import_pseudoDescriptors.pseudoDescriptors.enterStyle.selector && (selector = `${selector}, .${identifier}${pseudoSelector}`);
-      var important = !!pseudo, rules = [];
-      switch (property) {
-        // Equivalent to using '::placeholder'
-        case "placeholderTextColor": {
-          var block = createDeclarationBlock([
-            [
-              "color",
-              value
-            ],
-            [
-              "opacity",
-              1
-            ]
-          ], important);
-          rules.push(`${selector}::placeholder${block}`);
-          break;
-        }
-        // all webkit prefixed rules
-        case "backgroundClip":
-        case "userSelect": {
-          var propertyCapitalized = `${property[0].toUpperCase()}${property.slice(1)}`, webkitProperty = `Webkit${propertyCapitalized}`, block1 = createDeclarationBlock([
-            [
-              property,
-              value
-            ],
-            [
-              webkitProperty,
-              value
-            ]
-          ], important);
-          rules.push(`${selector}${block1}`);
-          break;
-        }
-        // Polyfill for additional 'pointer-events' values
-        case "pointerEvents": {
-          var finalValue = value;
-          value === "auto" || value === "box-only" ? (finalValue = "auto", value === "box-only" && rules.push(`${selector}>*${boxOnly}`)) : (value === "none" || value === "box-none") && (finalValue = "none", value === "box-none" && rules.push(`${selector}>*${boxNone}`));
-          var block2 = createDeclarationBlock([
-            [
-              "pointerEvents",
-              finalValue
-            ]
-          ], !0);
-          rules.push(`${selector}${block2}`);
-          break;
-        }
-        default: {
-          var block3 = createDeclarationBlock([
-            [
-              property,
-              value
-            ]
-          ], important);
-          rules.push(`${selector}${block3}`);
-          break;
-        }
-      }
-      return (pseudo == null ? void 0 : pseudo.name) === "hover" && (rules = rules.map(function(r) {
-        return `@media (hover) {${r}}`;
-      })), rules;
-    }
-    var boxNone = createDeclarationBlock([
-      [
-        "pointerEvents",
-        "auto"
-      ]
-    ], !0), boxOnly = createDeclarationBlock([
-      [
-        "pointerEvents",
-        "none"
-      ]
-    ], !0);
+    module2.exports = __toCommonJS2(getCSSStylesAtomic_native_exports);
+    var empty = function() {
+      console.warn("no-op native");
+    }, getCSSStylesAtomic2 = empty, getStyleAtomic = empty, styleToCSS = empty;
   }
 });
 
@@ -6272,6 +5968,83 @@ var require_log_native = __commonJS({
   }
 });
 
+// ../../core/web/dist/cjs/helpers/normalizeValueWithProperty.native.js
+var require_normalizeValueWithProperty_native = __commonJS({
+  "../../core/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 = function(target, all) {
+      for (var name in all) __defProp2(target, name, {
+        get: all[name],
+        enumerable: !0
+      });
+    }, __copyProps2 = function(to, from, except, desc) {
+      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
+      if (from && typeof from == "object" || typeof from == "function") try {
+        for (var _loop = function() {
+          var key = _step.value;
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
+            get: function() {
+              return from[key];
+            },
+            enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
+          });
+        }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
+      } catch (err) {
+        _didIteratorError = !0, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError)
+            throw _iteratorError;
+        }
+      }
+      return to;
+    }, __toCommonJS2 = function(mod) {
+      return __copyProps2(__defProp2({}, "__esModule", {
+        value: !0
+      }), mod);
+    }, normalizeValueWithProperty_exports = {};
+    __export2(normalizeValueWithProperty_exports, {
+      normalizeValueWithProperty: function() {
+        return normalizeValueWithProperty;
+      },
+      reverseMapClassNameToValue: function() {
+        return reverseMapClassNameToValue;
+      }
+    });
+    module2.exports = __toCommonJS2(normalizeValueWithProperty_exports);
+    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_insertStyleRule = require_insertStyleRule_native(), stylePropsAllPlusTransforms = {
+      ...import_helpers.stylePropsAll,
+      translateX: !0,
+      translateY: !0
+    };
+    function normalizeValueWithProperty(value) {
+      var property = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+      if (!import_constants4.isWeb || import_helpers.stylePropsUnitless[property] || property && !stylePropsAllPlusTransforms[property] || typeof value == "boolean") return value;
+      var res = value;
+      return value && typeof value == "object" ? value : (typeof value == "number" ? res = `${value}px` : property && (res = `${res}`), res);
+    }
+    var rcache = {};
+    function reverseMapClassNameToValue(key, className) {
+      var selectors = (0, import_insertStyleRule.getAllSelectors)(), cssRule = selectors[className];
+      if (rcache[cssRule]) return rcache[cssRule];
+      if (!cssRule) {
+        process.env.NODE_ENV === "development" && console.warn(`No CSS rule found for ${key} looking for selector ".${className}", you may not be injecting extracted CSS`);
+        return;
+      }
+      var 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, process.env.NODE_ENV === "development" && typeof res == "number" && Number.isNaN(res) && console.info("Tamagui invalid parsed value, NaN:", {
+        res,
+        cssVal,
+        cssRule,
+        key,
+        className
+      }), res;
+    }
+  }
+});
+
 // ../../core/web/dist/cjs/constants/webToNativeProps.native.js
 var require_webToNativeProps_native = __commonJS({
   "../../core/web/dist/cjs/constants/webToNativeProps.native.js"(exports2, module2) {
@@ -7037,7 +6810,7 @@ var require_propMapper_native = __commonJS({
             return;
           }
         }
-        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveValues, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), value != null) {
+        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), value != null) {
           key === "fontFamily" && lastFontFamilyToken && (styleState.fontFamily = lastFontFamilyToken);
           var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value);
           if (expanded) for (var max2 = expanded.length, i = 0; i < max2; i++) {
@@ -7099,7 +6872,7 @@ var require_propMapper_native = __commonJS({
           if (styleProps.noExpand) res[subKey] = val;
           else if (variants && subKey in variants) {
             if (parentVariantKey && parentVariantKey === key) res[subKey] = // SYNC WITH *1
-            val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
+            val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : val;
             else {
               var variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
               if (variantOut) {
@@ -7132,7 +6905,7 @@ var require_propMapper_native = __commonJS({
           if (typeof val == "string") {
             var fVal = (
               // SYNC WITH *1
-              val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val
+              val[0] === "$" ? getTokenForKey(subKey, val, styleProps, styleState) : val
             );
             res[subKey] = fVal;
             continue;
@@ -7192,16 +6965,18 @@ var require_propMapper_native = __commonJS({
     var fontShorthand = {
       fontSize: "size",
       fontWeight: "weight"
-    }, lastFontFamilyToken = null, getTokenForKey = function(key, value) {
-      var resolveAs = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "none", styleState = arguments.length > 3 ? arguments[3] : void 0, _staticConfig_accept;
+    }, lastFontFamilyToken = null, getTokenForKey = function(key, value, styleProps, styleState) {
+      var _staticConfig_accept, resolveAs = styleProps.resolveValues || "none";
       if (resolveAs === "none") return value;
       var { theme, conf = (0, import_config.getConfig)(), context, fontFamily, staticConfig } = styleState, tokensParsed = conf.tokensParsed, valOrVar, hasSet = !1, customTokenAccept = staticConfig == null || (_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key];
       if (customTokenAccept) {
         var _theme_value, val = (_theme_value = theme == null ? void 0 : theme[value]) !== null && _theme_value !== void 0 ? _theme_value : tokensParsed[customTokenAccept][value];
         val != null && (resolveAs = "value", valOrVar = val, hasSet = !0);
       }
-      if (theme && value in theme) valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
-      else {
+      if (theme && value in theme) {
+        if (resolveAs === "except-theme") return value;
+        valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
+      } else {
         if (value in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value];
         else {
           switch (key) {
@@ -7303,6 +7078,65 @@ var require_sortString_native = __commonJS({
   }
 });
 
+// ../../core/web/dist/cjs/helpers/transformsToString.native.js
+var require_transformsToString_native = __commonJS({
+  "../../core/web/dist/cjs/helpers/transformsToString.native.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
+      for (var name in all) __defProp2(target, name, {
+        get: all[name],
+        enumerable: !0
+      });
+    }, __copyProps2 = function(to, from, except, desc) {
+      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
+      if (from && typeof from == "object" || typeof from == "function") try {
+        for (var _loop = function() {
+          var key = _step.value;
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
+            get: function() {
+              return from[key];
+            },
+            enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
+          });
+        }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
+      } catch (err) {
+        _didIteratorError = !0, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError)
+            throw _iteratorError;
+        }
+      }
+      return to;
+    }, __toCommonJS2 = function(mod) {
+      return __copyProps2(__defProp2({}, "__esModule", {
+        value: !0
+      }), mod);
+    }, transformsToString_exports = {};
+    __export2(transformsToString_exports, {
+      transformsToString: function() {
+        return transformsToString;
+      }
+    });
+    module2.exports = __toCommonJS2(transformsToString_exports);
+    var import_normalizeValueWithProperty = require_normalizeValueWithProperty_native();
+    function transformsToString(transforms) {
+      return transforms.map(
+        // { scale: 2 } => 'scale(2)'
+        // { translateX: 20 } => 'translateX(20px)'
+        // { matrix: [1,2,3,4,5,6] } => 'matrix(1,2,3,4,5,6)'
+        // { perspective: 1000 } => perspective(1000px)
+        function(transform) {
+          var type = Object.keys(transform)[0], value = transform[type];
+          return type === "matrix" || type === "matrix3d" ? `${type}(${value.join(",")})` : `${type}(${(0, import_normalizeValueWithProperty.normalizeValueWithProperty)(value, type)})`;
+        }
+      ).join(" ");
+    }
+  }
+});
+
 // ../../core/web/dist/cjs/helpers/getSplitStyles.native.js
 var require_getSplitStyles_native = __commonJS({
   "../../core/web/dist/cjs/helpers/getSplitStyles.native.js"(exports2, module2) {
@@ -7367,7 +7201,7 @@ var require_getSplitStyles_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(getSplitStyles_exports);
-    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_getCSSStylesAtomic = require_getCSSStylesAtomic_native(), import_insertStyleRule = require_insertStyleRule_native(), import_isActivePlatform = require_isActivePlatform_native(), import_isActiveTheme = require_isActiveTheme_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), import_sortString = require_sortString_native(), import_transformsToString = require_transformsToString_native(), consoleGroupCollapsed = import_constants4.isWeb ? console.groupCollapsed : console.info, conf, PROP_SPLIT = "-";
+    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_react3 = __toESM2(require("react")), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getCSSStylesAtomic = require_getCSSStylesAtomic_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_insertStyleRule = require_insertStyleRule_native(), import_isActivePlatform = require_isActivePlatform_native(), import_isActiveTheme = require_isActiveTheme_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), import_sortString = require_sortString_native(), import_transformsToString = require_transformsToString_native(), consoleGroupCollapsed = import_constants4.isWeb ? console.groupCollapsed : console.info, conf, PROP_SPLIT = "-";
     function isValidStyleKey(key, validStyles, accept) {
       return key in validStyles ? !0 : accept && key in accept;
     }
@@ -7550,7 +7384,7 @@ var require_getSplitStyles_native = __commonJS({
                   var importance1 = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKeyShort, "space", usedKeys, !0);
                   importance1 && (space = val2.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`Found more important space for current media ${mediaKeyShort}: ${val2} (importance: ${importance1})`));
                 }
-                var mediaStyles = (0, import_getCSSStylesAtomic.getStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
+                var mediaStyles = (0, import_getCSSStylesAtomic.getCSSStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
                 mediaStylesSeen += 1;
                 var _iteratorNormalCompletion12 = !0, _didIteratorError12 = !1, _iteratorError12 = void 0;
                 try {
@@ -7648,7 +7482,7 @@ var require_getSplitStyles_native = __commonJS({
           console.groupEnd();
         }
       };
-      props.reddish && (debug = "verbose"), conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
+      conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
       var { shorthands } = conf, { isHOC, isText, isInput, variants, isReactNative, inlineProps, inlineWhenUnflattened, parentStaticConfig, acceptsClassName } = staticConfig, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClass, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, validStyles = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles);
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-setup`;
       var styleState = {
@@ -7690,7 +7524,7 @@ var require_getSplitStyles_native = __commonJS({
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-propsend`;
       var avoidNormalize = styleProps.noNormalize === !1;
       if (!avoidNormalize) {
-        if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), import_constants4.isWeb && !isReactNative && (0, import_getCSSStylesAtomic.styleToCSS)(styleState.style)), styleState.flatTransforms) {
+        if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), !styleProps.noExpand && !styleProps.noMergeStyle && import_constants4.isWeb && !isReactNative && (0, import_getCSSStylesAtomic.styleToCSS)(styleState.style)), styleState.flatTransforms) {
           var _styleState;
           (_styleState = styleState).style || (_styleState.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
             var [a] = param, [b] = param1;
@@ -7710,7 +7544,7 @@ var require_getSplitStyles_native = __commonJS({
       }
       if (0) var _styleState_style, shouldStringifyTransforms;
       if (0) {
-        if (styleState.style && shouldDoClasses) {
+        if (!styleProps.noMergeStyle && styleState.style && shouldDoClasses) {
           var retainedStyles, shouldRetain;
           if (!styleState.style.$$css) {
             var atomic, _iteratorNormalCompletion, _didIteratorError, _iteratorError;
@@ -7730,7 +7564,7 @@ var require_getSplitStyles_native = __commonJS({
         } else if (viewProps.tabIndex == null) var _viewProps_focusable, isFocusable, role;
       }
       var styleProp = props.style;
-      if (styleProp) if (isHOC) viewProps.style = normalizeStyle(styleProp);
+      if (!styleProps.noMergeStyle && styleProp) if (isHOC) viewProps.style = normalizeStyle(styleProp);
       else for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i = 0; i < len; i++) {
         var style = isArray ? styleProp[i] : styleProp;
         if (style) if (style.$$css) Object.assign(styleState.classNames, style);
@@ -7762,11 +7596,11 @@ var require_getSplitStyles_native = __commonJS({
         pseudoGroups,
         mediaGroups
       }, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
-      if (!asChildExceptStyleLike) {
+      if (!styleProps.noMergeStyle && !asChildExceptStyleLike) {
         var style2 = styleState.style;
         if (0) {
           var _staticConfig_defaultProps, fontFamily, fontFamilyClassName, groupClassName, componentNameFinal, componentClassName, classList, finalClassName;
-          if (!styleProps.noMergeStyle && !(styleProps.isAnimated && !conf.animations.supportsCSSVars && isReactNative) && isReactNative) {
+          if (!(styleProps.isAnimated && !conf.animations.supportsCSSVars && isReactNative) && isReactNative) {
             var cnStyles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1;
             try {
               for (var _iterator1, _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) var name;
@@ -7774,7 +7608,7 @@ var require_getSplitStyles_native = __commonJS({
             } finally {
             }
           }
-        } else style2 && !styleProps.noMergeStyle && (viewProps.style = style2);
+        } else style2 && (viewProps.style = style2);
       }
       if (process.env.NODE_ENV === "development" && debug === "verbose" && import_isDevTools.isDevTools) {
         consoleGroupCollapsed("\u{1F539} getSplitStyles ===>");
@@ -25796,9 +25630,9 @@ var require_Popover_native = __commonJS({
             // (closed !== unmounted when animating out)
             trapFocus: trapFocus ?? context.open,
             disableOutsidePointerEvents: !0,
-            onCloseAutoFocus: (0, import_helpers.composeEventHandlers)(props.onCloseAutoFocus, function(event) {
+            onCloseAutoFocus: props.onCloseAutoFocus === !1 ? void 0 : (0, import_helpers.composeEventHandlers)(props.onCloseAutoFocus, function(event) {
               var _context_triggerRef_current;
-              event.preventDefault(), isRightClickOutsideRef.current || (_context_triggerRef_current = context.triggerRef.current) === null || _context_triggerRef_current === void 0 || _context_triggerRef_current.focus();
+              event.defaultPrevented || (event.preventDefault(), isRightClickOutsideRef.current || (_context_triggerRef_current = context.triggerRef.current) === null || _context_triggerRef_current === void 0 || _context_triggerRef_current.focus());
             }),
             onPointerDownOutside: (0, import_helpers.composeEventHandlers)(props.onPointerDownOutside, function(event) {
               var originalEvent = event.detail.originalEvent, ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === !0, isRightClick = originalEvent.button === 2 || ctrlLeftClick;