@tamagui/core 1.132.14 → 1.132.16-1754534218765

package/dist/native.js

@@ -150,9 +150,9 @@ var require_clamp_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(clamp_exports);
-    function clamp(value2, param) {
+    function clamp(value, param) {
       var [min, max] = param;
-      return Math.min(max, Math.max(min, value2));
+      return Math.min(max, Math.max(min, value));
     }
   }
 });
@@ -210,92 +210,6 @@ var require_composeEventHandlers_native = __commonJS({
   }
 });
 
-// ../helpers/dist/cjs/concatClassName.native.js
-var require_concatClassName_native = __commonJS({
-  "../helpers/dist/cjs/concatClassName.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);
-    }, concatClassName_exports = {};
-    __export2(concatClassName_exports, {
-      concatClassName: function() {
-        return concatClassName;
-      }
-    });
-    module2.exports = __toCommonJS2(concatClassName_exports);
-    function concatClassName(_cn) {
-      for (var args = arguments, usedPrefixes = [], final = "", len = args.length, propObjects = null, x = len; x >= 0; x--) {
-        var _loop = function(i2) {
-          var name = names[i2];
-          if (!name || name === " ") return "continue";
-          if (name[0] !== "_") return final = name + " " + final, "continue";
-          var splitIndex = name.indexOf("-");
-          if (splitIndex < 1) return final = name + " " + final, "continue";
-          var nextChar = name[splitIndex + 1], isMediaQuery = nextChar === "_", styleKey = name.slice(1, name.lastIndexOf("-")), mediaKey = isMediaQuery ? name.slice(splitIndex + 2, splitIndex + 7) : null, uid = mediaKey ? styleKey + mediaKey : styleKey;
-          if (usedPrefixes.indexOf(uid) > -1) return "continue";
-          usedPrefixes.push(uid);
-          var propName = styleKey;
-          if (propName && propObjects && propObjects.some(function(po) {
-            if (mediaKey) {
-              var propKey = pseudoInvert[mediaKey];
-              return po && po[propKey] && propName in po[propKey] && po[propKey] !== null;
-            }
-            var res = po && propName in po && po[propName] !== null;
-            return res;
-          })) return "continue";
-          final = name + " " + final;
-        }, cns = args[x];
-        if (cns) {
-          if (!Array.isArray(cns) && typeof cns != "string") {
-            propObjects = propObjects || [], propObjects.push(cns);
-            continue;
-          }
-          for (var names = Array.isArray(cns) ? cns : cns.split(" "), numNames = names.length, i = numNames - 1; i >= 0; i--) _loop(i);
-        }
-      }
-      return final;
-    }
-    var pseudoInvert = {
-      hover: "hoverStyle",
-      focus: "focusStyle",
-      press: "pressStyle",
-      focusVisible: "focusVisibleStyle",
-      focusWithin: "focusWithinStyle",
-      disabled: "disabledStyle"
-    };
-  }
-});
-
 // ../helpers/dist/cjs/types.native.js
 var require_types_native = __commonJS({
   "../helpers/dist/cjs/types.native.js"(exports2, module2) {
@@ -1014,7 +928,6 @@ var require_index_native3 = __commonJS({
     __reExport2(index_exports2, require_index_native(), module2.exports);
     __reExport2(index_exports2, require_clamp_native(), module2.exports);
     __reExport2(index_exports2, require_composeEventHandlers_native(), module2.exports);
-    __reExport2(index_exports2, require_concatClassName_native(), module2.exports);
     __reExport2(index_exports2, require_types_native(), module2.exports);
     __reExport2(index_exports2, require_shouldRenderNativePlatform_native(), module2.exports);
     __reExport2(index_exports2, require_validStyleProps_native(), module2.exports);
@@ -1283,22 +1196,22 @@ Haven't called createTamagui yet. ${import_constants2.MISSING_THEME_MESSAGE}
       if (process.env.NODE_ENV === "development" && !conf) throw new Error(haventCalledErrorMessage);
       var { tokens, tokensParsed } = conf;
       return prefixed === !1 ? tokens : prefixed === !0 ? tokensParsed : tokensMerged;
-    }, getTokenObject = function(value2, group) {
+    }, getTokenObject = function(value, group) {
       var _tokensMerged_group, _tokensMerged_, _conf_specificTokens_value;
-      return (_conf_specificTokens_value = conf.specificTokens[value2]) !== null && _conf_specificTokens_value !== void 0 ? _conf_specificTokens_value : group ? (_tokensMerged_group = tokensMerged[group]) === null || _tokensMerged_group === void 0 ? void 0 : _tokensMerged_group[value2] : (_tokensMerged_ = tokensMerged[Object.keys(tokensMerged).find(function(cat) {
-        return tokensMerged[cat][value2];
-      }) || ""]) === null || _tokensMerged_ === void 0 ? void 0 : _tokensMerged_[value2];
-    }, getToken2 = function(value2, group) {
-      var useVariable = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : import_constants.isWeb, token = getTokenObject(value2, group);
+      return (_conf_specificTokens_value = conf.specificTokens[value]) !== null && _conf_specificTokens_value !== void 0 ? _conf_specificTokens_value : group ? (_tokensMerged_group = tokensMerged[group]) === null || _tokensMerged_group === void 0 ? void 0 : _tokensMerged_group[value] : (_tokensMerged_ = tokensMerged[Object.keys(tokensMerged).find(function(cat) {
+        return tokensMerged[cat][value];
+      }) || ""]) === null || _tokensMerged_ === void 0 ? void 0 : _tokensMerged_[value];
+    }, getToken2 = function(value, group) {
+      var useVariable = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : import_constants.isWeb, token = getTokenObject(value, group);
       return useVariable ? token == null ? void 0 : token.variable : token == null ? void 0 : token.val;
-    }, getTokenValue2 = function(value2, group) {
-      if (!(value2 === "unset" || value2 === "auto")) return getToken2(value2, group, !1);
+    }, getTokenValue2 = function(value, group) {
+      if (!(value === "unset" || value === "auto")) return getToken2(value, group, !1);
     }, useTokens = getTokens2, getThemes2 = function() {
       return conf.themes;
     }, configListeners = /* @__PURE__ */ new Set(), onConfiguredOnce = function(cb) {
       conf ? cb(conf) : configListeners.add(cb);
-    }, updateConfig2 = function(key, value2) {
-      Object.assign(conf[key], value2);
+    }, updateConfig2 = function(key, value) {
+      Object.assign(conf[key], value);
     }, getFont = function(name) {
       var _Object_entries_find, conf2 = getConfig2(), _conf_fontsParsed_name;
       return (_conf_fontsParsed_name = conf2.fontsParsed[name]) !== null && _conf_fontsParsed_name !== void 0 ? _conf_fontsParsed_name : (_Object_entries_find = Object.entries(conf2.fontsParsed).find(function(param) {
@@ -1440,9 +1353,9 @@ var require_createVariable_native = __commonJS({
       var name = (0, import_helpers2.simpleHash)(nameProp, 60);
       return includeVar ? constructCSSVariableName(name) : name;
     };
-    function px(value2) {
+    function px(value) {
       return {
-        val: value2,
+        val: value,
         needsPx: !0
       };
     }
@@ -1532,8 +1445,8 @@ var require_insertStyleRule_native = __commonJS({
         process.env.NODE_ENV === "development" && console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`);
         return;
       }
-      var startI = s + 10, endI = css.indexOf(";"), value2 = css.slice(startI, endI);
-      if (!insertedTransforms[identifier]) return insertedTransforms[identifier] = value2, !0;
+      var startI = s + 10, endI = css.indexOf(";"), value = css.slice(startI, endI);
+      if (!insertedTransforms[identifier]) return insertedTransforms[identifier] = value, !0;
     }
     var lastScannedSheets = null;
     function scanAllSheets() {
@@ -1648,15 +1561,15 @@ var require_insertStyleRule_native = __commonJS({
             if (sepI !== -1) {
               var varIndex = rule.indexOf("--"), key1 = rule.slice(varIndex === -1 ? 0 : varIndex + 2, sepI);
               process.env.TAMAGUI_CSS_VARIABLE_PREFIX && (key1 = key1.replace(process.env.TAMAGUI_CSS_VARIABLE_PREFIX, ""));
-              var val = rule.slice(sepI + 2), value2 = void 0;
+              var val = rule.slice(sepI + 2), value = void 0;
               if (val[0] === "v" && val.startsWith("var(")) {
                 var varName = val.slice(6, -1), tokenVal = colorVarToVal[varName];
-                tokenVal ? value2 = tokenVal : (rootComputedStyle || (rootComputedStyle = getComputedStyle(document.body)), value2 = rootComputedStyle.getPropertyValue("--" + varName));
-              } else value2 = val;
+                tokenVal ? value = tokenVal : (rootComputedStyle || (rootComputedStyle = getComputedStyle(document.body)), value = rootComputedStyle.getPropertyValue("--" + varName));
+              } else value = val;
               values[key1] = (0, import_createVariable.createVariable)({
                 key: key1,
                 name: key1,
-                val: value2
+                val: value
               }, !0);
             }
           }
@@ -2190,8 +2103,8 @@ var require_useMedia_native = __commonJS({
       if (typeof query == "string") return query;
       if (cache.has(query)) return cache.get(query);
       var res = Object.entries(query).map(function(param) {
-        var [feature, value2] = param;
-        return feature = camelToHyphen(feature), typeof value2 == "string" ? `(${feature}: ${value2})` : (typeof value2 == "number" && /[height|width]$/.test(feature) && (value2 = `${value2}px`), `(${feature}: ${value2})`);
+        var [feature, value] = param;
+        return feature = camelToHyphen(feature), typeof value == "string" ? `(${feature}: ${value})` : (typeof value == "number" && /[height|width]$/.test(feature) && (value = `${value}px`), `(${feature}: ${value})`);
       }).join(" and ");
       return key && (cachedMediaKeyToQuery[key] = res), cache.set(query, res), res;
     }
@@ -2282,13 +2195,13 @@ var require_Tamagui_native = __commonJS({
     function _create_class(Constructor, protoProps, staticProps) {
       return protoProps && _defineProperties(Constructor.prototype, protoProps), staticProps && _defineProperties(Constructor, staticProps), Constructor;
     }
-    function _define_property(obj, key, value2) {
+    function _define_property(obj, key, value) {
       return key in obj ? Object.defineProperty(obj, key, {
-        value: value2,
+        value,
         enumerable: !0,
         configurable: !0,
         writable: !0
-      }) : obj[key] = value2, obj;
+      }) : obj[key] = value, obj;
     }
     var Tamagui = function() {
       if (process.env.NODE_ENV === "development") {
@@ -2342,8 +2255,8 @@ var require_Tamagui_native = __commonJS({
       }
     }(), identifierToValue = /* @__PURE__ */ new Map(), getValueFromIdentifier = function(identifier) {
       return identifierToValue.get(identifier);
-    }, setIdentifierValue = function(identifier, value2) {
-      identifierToValue.set(identifier, value2);
+    }, setIdentifierValue = function(identifier, value) {
+      identifierToValue.set(identifier, value);
     };
   }
 });
@@ -2410,8 +2323,8 @@ var require_compose_refs_native = __commonJS({
     });
     module2.exports = __toCommonJS2(compose_refs_exports);
     var React3 = __toESM2(require("react"));
-    function setRef(ref, value2) {
-      typeof ref == "function" ? ref(value2) : ref && (ref.current = value2);
+    function setRef(ref, value) {
+      typeof ref == "function" ? ref(value) : ref && (ref.current = value);
     }
     function composeRefs() {
       for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) refs[_key] = arguments[_key];
@@ -2738,8 +2651,8 @@ var require_createStyledContext_native = __commonJS({
           })
         });
       }, useStyledContext = function() {
-        var scopeIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", lastScopeInNamespace = (0, import_react3.useContext)(LastScopeInNamespace), scope = namespace ? scopeIn ? getNamespacedScope(scopeIn) : lastScopeInNamespace : scopeIn, context = scope ? getOrCreateScopedContext(scope) : OGContext, value2 = import_react3.default.useContext(context);
-        return value2;
+        var scopeIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", lastScopeInNamespace = (0, import_react3.useContext)(LastScopeInNamespace), scope = namespace ? scopeIn ? getNamespacedScope(scopeIn) : lastScopeInNamespace : scopeIn, context = scope ? getOrCreateScopedContext(scope) : OGContext, value = import_react3.default.useContext(context);
+        return value;
       };
       return Context.Provider = Provider, Context.props = defaultValues, Context.context = OGContext, Context.useStyledContext = useStyledContext, Context;
     }
@@ -4283,11 +4196,11 @@ var require_normalizeValueWithProperty_native = __commonJS({
       translateX: !0,
       translateY: !0
     };
-    function normalizeValueWithProperty(value2) {
+    function normalizeValueWithProperty(value) {
       var property = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
-      if (!import_constants.isWeb || import_helpers2.stylePropsUnitless[property] || property && !stylePropsAllPlusTransforms[property] || typeof value2 == "boolean") return value2;
-      var res = value2;
-      return value2 && typeof value2 == "object" ? value2 : (typeof value2 == "number" ? res = `${value2}px` : property && (res = `${res}`), res);
+      if (!import_constants.isWeb || import_helpers2.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);
     }
   }
 });
@@ -4551,26 +4464,26 @@ var require_expandStyle_native = __commonJS({
         return `${prefix}${k}`;
       });
     };
-    function expandStyle(key, value2) {
+    function expandStyle(key, value) {
       if (import_constants.isAndroid && key === "elevationAndroid") return [
         [
           "elevation",
-          value2
+          value
         ]
       ];
       if (key in EXPANSIONS) return EXPANSIONS[key].map(function(key2) {
         return [
           key2,
-          value2
+          value
         ];
       });
       if (key in import_webToNativeProps.webToNativeExpansion) return import_webToNativeProps.webToNativeExpansion[key].map(function(key2) {
         return [
           key2,
-          value2
+          value
         ];
       });
-      if (key in import_webToNativeProps.webToNativeDynamicExpansion) return import_webToNativeProps.webToNativeDynamicExpansion[key](value2);
+      if (key in import_webToNativeProps.webToNativeDynamicExpansion) return import_webToNativeProps.webToNativeDynamicExpansion[key](value);
     }
     var all = [
       "Top",
@@ -4815,8 +4728,8 @@ var require_normalizeStyle_native = __commonJS({
             res[key] = normalizeStyle(prop, disableNormalize);
             continue;
           }
-          var value2 = disableNormalize ? prop : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(prop, key), out = (0, import_expandStyle.expandStyle)(key, value2);
-          out ? Object.assign(res, Object.fromEntries(out)) : res[key] = value2;
+          var value = disableNormalize ? prop : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(prop, key), out = (0, import_expandStyle.expandStyle)(key, value);
+          out ? Object.assign(res, Object.fromEntries(out)) : res[key] = value;
         }
       }
       return (0, import_expandStyles.fixStyles)(res), res;
@@ -5035,18 +4948,18 @@ var require_propMapper_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(propMapper_exports);
-    var import_constants = require_index_native2(), import_helpers2 = require_index_native3(), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_normalizeStyle = require_normalizeStyle_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), propMapper = function(key, value2, styleState, disabled, map) {
-      if (disabled) return map(key, value2);
+    var import_constants = require_index_native2(), import_helpers2 = require_index_native3(), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_normalizeStyle = require_normalizeStyle_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), propMapper = function(key, value, styleState, disabled, map) {
+      if (disabled) return map(key, value);
       if (lastFontFamilyToken = null, !(!import_constants.isAndroid && key === "elevationAndroid")) {
         var { conf, styleProps, staticConfig } = styleState;
-        if (value2 === "unset") {
+        if (value === "unset") {
           var _conf_unset, unsetVal = (_conf_unset = conf.unset) === null || _conf_unset === void 0 ? void 0 : _conf_unset[key];
-          if (unsetVal != null) value2 = unsetVal;
+          if (unsetVal != null) value = unsetVal;
           else return;
         }
         var { variants } = staticConfig;
         if (!styleProps.noExpand && variants && key in variants) {
-          var variantValue = resolveVariants(key, value2, styleProps, styleState, "");
+          var variantValue = resolveVariants(key, value, styleProps, styleState, "");
           if (variantValue) {
             variantValue.forEach(function(param) {
               var [_$key, _$value] = param;
@@ -5055,35 +4968,35 @@ var require_propMapper_native = __commonJS({
             return;
           }
         }
-        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value2 != null && (value2[0] === "$" ? value2 = getTokenForKey(key, value2, styleProps, styleState) : (0, import_createVariable.isVariable)(value2) && (value2 = resolveVariableValue(key, value2, styleProps.resolveValues))), value2 != 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, value2);
+          var expanded = styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value);
           if (expanded) for (var max = expanded.length, i = 0; i < max; i++) {
             var [nkey, nvalue] = expanded[i];
             map(nkey, nvalue);
           }
-          else map(key, value2);
+          else map(key, value);
         }
       }
-    }, resolveVariants = function(key, value2, styleProps, styleState, parentVariantKey) {
+    }, resolveVariants = function(key, value, styleProps, styleState, parentVariantKey) {
       var { staticConfig, conf, debug } = styleState, { variants } = staticConfig;
       if (variants) {
-        var variantValue = getVariantDefinition(variants[key], value2, conf);
+        var variantValue = getVariantDefinition(variants[key], value, conf);
         if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(`\u2666\uFE0F\u2666\uFE0F\u2666\uFE0F resolve variant ${key}`), console.info({
           key,
-          value: value2,
+          value,
           variantValue,
           variants
         }), console.groupEnd()), !variantValue) {
-          if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value2 != "boolean") {
+          if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value != "boolean") {
             var name = staticConfig.componentName || "[UnnamedComponent]";
-            console.warn(`No variant found: ${name} has variant "${key}", but no matching value "${value2}"`);
+            console.warn(`No variant found: ${name} has variant "${key}", but no matching value "${value}"`);
           }
           return;
         }
         if (typeof variantValue == "function") {
           var fn = variantValue, extras = (0, import_getVariantExtras.getVariantExtras)(styleState);
-          variantValue = fn(value2, extras), process.env.NODE_ENV;
+          variantValue = fn(value, extras), process.env.NODE_ENV;
         }
         var fontFamilyResult;
         if ((0, import_isObj.isObj)(variantValue)) {
@@ -5108,11 +5021,11 @@ var require_propMapper_native = __commonJS({
         }
       } else if (typeof input == "string" && input[0] === "$") return input;
     }
-    var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVariants = function(key, value2, styleProps, styleState, parentVariantKey) {
+    var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), resolveTokensAndVariants = function(key, value, styleProps, styleState, parentVariantKey) {
       var { conf, staticConfig, debug, theme } = styleState, { variants } = staticConfig, res = {};
-      process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   - resolveTokensAndVariants", key, value2);
-      for (var _key in value2) {
-        var subKey = conf.shorthands[_key] || _key, val = value2[_key];
+      process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   - resolveTokensAndVariants", key, value);
+      for (var _key in value) {
+        var subKey = conf.shorthands[_key] || _key, val = value[_key];
         if (!(!styleProps.noSkip && subKey in import_skipProps.skipProps)) {
           if (styleProps.noExpand) res[subKey] = val;
           else if (variants && subKey in variants) {
@@ -5180,17 +5093,17 @@ var require_propMapper_native = __commonJS({
         spreadName: `...${name}`
       };
     });
-    function getVariantDefinition(variant, value2, conf) {
+    function getVariantDefinition(variant, value, conf) {
       if (variant) {
         if (typeof variant == "function") return variant;
-        var exact = variant[value2];
+        var exact = variant[value];
         if (exact) return exact;
-        if (value2 != null) {
+        if (value != null) {
           var { tokensParsed } = conf, _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
           try {
             for (var _iterator = tokenCats[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
               var { name, spreadName } = _step.value;
-              if (spreadName in variant && name in tokensParsed && value2 in tokensParsed[name]) return variant[spreadName];
+              if (spreadName in variant && name in tokensParsed && value in tokensParsed[name]) return variant[spreadName];
             }
           } catch (err) {
             _didIteratorError = !0, _iteratorError = err;
@@ -5202,32 +5115,32 @@ var require_propMapper_native = __commonJS({
             }
           }
           var fontSizeVariant = variant["...fontSize"];
-          if (fontSizeVariant && conf.fontSizeTokens.has(value2)) return fontSizeVariant;
+          if (fontSizeVariant && conf.fontSizeTokens.has(value)) return fontSizeVariant;
         }
-        return variant[`:${typeof value2}`] || variant["..."];
+        return variant[`:${typeof value}`] || variant["..."];
       }
     }
     var fontShorthand = {
       fontSize: "size",
       fontWeight: "weight"
-    }, lastFontFamilyToken = null, getTokenForKey = function(key, value2, styleProps, styleState) {
+    }, lastFontFamilyToken = null, getTokenForKey = function(key, value, styleProps, styleState) {
       var _staticConfig_accept, resolveAs = styleProps.resolveValues || "none";
-      if (resolveAs === "none") return value2;
-      var { theme, conf = (0, import_config.getConfig)(), context, fontFamily, staticConfig } = styleState, themeValue = theme ? theme[value2] || theme[value2.slice(1)] : void 0, tokensParsed = conf.tokensParsed, valOrVar, hasSet = !1, customTokenAccept = staticConfig == null || (_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key];
+      if (resolveAs === "none") return value;
+      var { theme, conf = (0, import_config.getConfig)(), context, fontFamily, staticConfig } = styleState, themeValue = theme ? theme[value] || theme[value.slice(1)] : void 0, 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 val = themeValue ?? tokensParsed[customTokenAccept][value2];
+        var val = themeValue ?? tokensParsed[customTokenAccept][value];
         val != null && (resolveAs = "value", valOrVar = val, hasSet = !0);
       }
       if (themeValue) {
-        if (resolveAs === "except-theme") return value2;
-        valOrVar = themeValue, process.env.NODE_ENV === "development" && styleState.debug === "verbose" && (globalThis.tamaguiAvoidTracking = !0, console.info(` - resolving ${key} to theme value ${value2} resolveAs ${resolveAs}`, valOrVar), globalThis.tamaguiAvoidTracking = !1), hasSet = !0;
+        if (resolveAs === "except-theme") return value;
+        valOrVar = themeValue, 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 (value2 in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value2];
+        if (value in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value];
         else {
           switch (key) {
             case "fontFamily": {
               var _fontsParsed_value, fontsParsed = context != null && context.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed;
-              valOrVar = ((_fontsParsed_value = fontsParsed[value2]) === null || _fontsParsed_value === void 0 ? void 0 : _fontsParsed_value.family) || value2, lastFontFamilyToken = value2, hasSet = !0;
+              valOrVar = ((_fontsParsed_value = fontsParsed[value]) === null || _fontsParsed_value === void 0 ? void 0 : _fontsParsed_value.family) || value, lastFontFamilyToken = value, hasSet = !0;
               break;
             }
             case "fontSize":
@@ -5237,18 +5150,18 @@ var require_propMapper_native = __commonJS({
               var fam = fontFamily || conf.defaultFontToken;
               if (fam) {
                 var _font_, fontsParsed1 = context != null && context.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed, font = fontsParsed1[fam] || fontsParsed1[conf.defaultFontToken];
-                valOrVar = (font == null || (_font_ = font[fontShorthand[key] || key]) === null || _font_ === void 0 ? void 0 : _font_[value2]) || value2, hasSet = !0;
+                valOrVar = (font == null || (_font_ = font[fontShorthand[key] || key]) === null || _font_ === void 0 ? void 0 : _font_[value]) || value, hasSet = !0;
               }
               break;
             }
           }
           for (var cat in import_helpers2.tokenCategories) if (key in import_helpers2.tokenCategories[cat]) {
-            var res = tokensParsed[cat][value2];
+            var res = tokensParsed[cat][value];
             res != null && (valOrVar = res, hasSet = !0);
           }
         }
         if (!hasSet) {
-          var spaceVar = tokensParsed.space[value2];
+          var spaceVar = tokensParsed.space[value];
           spaceVar != null && (valOrVar = spaceVar, hasSet = !0);
         }
       }
@@ -5374,8 +5287,8 @@ var require_transformsToString_native = __commonJS({
         // { 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], value2 = transform[type];
-          return type === "matrix" || type === "matrix3d" ? `${type}(${value2.join(",")})` : `${type}(${(0, import_normalizeValueWithProperty.normalizeValueWithProperty)(value2, type)})`;
+          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(" ");
     }
@@ -5811,7 +5724,7 @@ var require_getSplitStyles_native = __commonJS({
           if (!styleState.style.$$css) {
             var atomic, _iteratorNormalCompletion, _didIteratorError, _iteratorError;
             try {
-              for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) var atomicStyle, _props_animateOnly, _props_animateOnly1, key2, value2, identifier, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
+              for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) var atomicStyle, _props_animateOnly, _props_animateOnly1, key2, value, identifier, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
             } catch (err) {
             } finally {
             }
@@ -5985,14 +5898,14 @@ var require_getSplitStyles_native = __commonJS({
         delete viewProps[key], viewProps[key] = next;
       } else viewProps[key] = val;
     }
-    function mergeMediaByImportance(styleState, mediaKey, key, value2, isSizeMedia, importanceBump, debugProp) {
+    function mergeMediaByImportance(styleState, mediaKey, key, value, isSizeMedia, importanceBump, debugProp) {
       var usedKeys = styleState.usedKeys, importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKey, key, styleState, isSizeMedia);
       if (importanceBump && (importance = (importance || 0) + importanceBump), process.env.NODE_ENV === "development" && debugProp === "verbose" && (0, import_log.log)(`mergeMediaByImportance ${key} importance usedKey ${usedKeys[key]} next ${importance}`), importance === null) return !1;
       if (key in import_pseudoDescriptors.pseudoDescriptors) {
         var descriptor = import_pseudoDescriptors.pseudoDescriptors[key], descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = styleState.componentState[descriptorKey] === !1;
         if (isDisabled) return !1;
-        for (var subKey in value2) mergeStyle(styleState, subKey, value2[subKey], importance);
-      } else mergeStyle(styleState, key, value2, importance);
+        for (var subKey in value) mergeStyle(styleState, subKey, value[subKey], importance);
+      } else mergeStyle(styleState, key, value, importance);
       return !0;
     }
     function normalizeStyle(style) {
@@ -6622,14 +6535,14 @@ var require_getThemeProxied_native = __commonJS({
         curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */ new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`, curKeys));
       }
       var proxied1 = Object.fromEntries(Object.entries(_state.theme).flatMap(function(param) {
-        var [key, value2] = param, proxied2 = {
-          ...value2,
+        var [key, value] = param, proxied2 = {
+          ...value,
           get val() {
-            return globalThis.tamaguiAvoidTracking || track(key), value2.val;
+            return globalThis.tamaguiAvoidTracking || track(key), value.val;
           },
           get(platform) {
             if (curState) {
-              var outVal = (0, import_createVariable.getVariable)(value2), { name, scheme, inverses } = curState, shouldOptimize = scheme && platform !== "web" && import_constants.isIos && !curProps.deopt && (0, import_config.getSetting)("fastSchemeChange") && inverses === 0 && (0, import_doesRootSchemeMatchSystem.doesRootSchemeMatchSystem)();
+              var outVal = (0, import_createVariable.getVariable)(value), { name, scheme, inverses } = curState, shouldOptimize = scheme && platform !== "web" && import_constants.isIos && !curProps.deopt && (0, import_config.getSetting)("fastSchemeChange") && inverses === 0 && (0, import_doesRootSchemeMatchSystem.doesRootSchemeMatchSystem)();
               if (shouldOptimize) {
                 var _config_themes_name, _config_themes_oppositeName, oppositeScheme = scheme === "dark" ? "light" : "dark", oppositeName = name.replace(scheme, oppositeScheme), color = (0, import_createVariable.getVariable)((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]), oppositeColor = (0, import_createVariable.getVariable)((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]), dynamicVal = (0, import_getDynamicVal.getDynamicVal)({
                   scheme,
@@ -7198,11 +7111,11 @@ var require_index_native7 = __commonJS({
     };
     function useDidFinishSSR() {
       var clientOnly = React3.useContext(import_ClientOnly.ClientOnlyContext);
-      return value != null ? value : !0;
+      return !0;
     }
-    function useClientValue(value1) {
+    function useClientValue(value) {
       var done = useDidFinishSSR();
-      return done ? typeof value1 == "function" ? value1() : value1 : void 0;
+      return done ? typeof value == "function" ? value() : value : void 0;
     }
   }
 });
@@ -8819,10 +8732,10 @@ var require_createFont_native = __commonJS({
           ...sectionKeys
         ])
       ].map(function(key) {
-        var _section_key, _ref, value2 = (_ref = (_section_key = section[key]) !== null && _section_key !== void 0 ? _section_key : defaultValue) !== null && _ref !== void 0 ? _ref : fillValue;
-        return fillValue = value2, defaultValue = value2, [
+        var _section_key, _ref, value = (_ref = (_section_key = section[key]) !== null && _section_key !== void 0 ? _section_key : defaultValue) !== null && _ref !== void 0 ? _ref : fillValue;
+        return fillValue = value, defaultValue = value, [
           key,
-          value2
+          value
         ];
       }));
     }, createFont = function(font) {
@@ -9040,7 +8953,7 @@ ${JSON.stringify(variable, null, 2)}`);
           var sep;
           if (fontDeclarations) for (var key22 in fontDeclarations) var name1, declarations1, language1, fontSelector, langSelector, selectors, specificRuleSet;
         }
-        var themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn), themes = (0, import_proxyThemeToParents.proxyThemesToParents)(dedupedThemes);
+        var themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color), themes = (0, import_proxyThemeToParents.proxyThemesToParents)(dedupedThemes);
         return {
           themes,
           cssRuleSets,
@@ -9144,7 +9057,7 @@ ${JSON.stringify(variable, null, 2)}`);
       }
       return config;
     }
-    function getThemesDeduped(themes) {
+    function getThemesDeduped(themes, colorTokens) {
       var dedupedThemes = [], existing = /* @__PURE__ */ new Map();
       for (var themeName in themes) {
         var darkOrLightSpecificPrefix = themeName.startsWith("dark") ? "dark" : themeName.startsWith("light") ? "light" : "", rawTheme = themes[themeName], key = darkOrLightSpecificPrefix + JSON.stringify(rawTheme);
@@ -9156,6 +9069,7 @@ ${JSON.stringify(variable, null, 2)}`);
         var theme = {
           ...rawTheme
         };
+        colorTokens && Object.assign(theme, colorTokens);
         for (var key1 in theme) (0, import_themes.ensureThemeVariable)(theme, key1);
         var deduped = {
           names: [
@@ -10394,12 +10308,13 @@ var require_FontLanguage_native = __commonJS({
     });
     module2.exports = __toCommonJS2(FontLanguage_native_exports);
     var import_jsx_runtime2 = require("react/jsx-runtime"), import_react3 = __toESM2(require("react")), import_ComponentContext = require_ComponentContext_native(), FontLanguage = function(param) {
-      var { children, ...props } = param, language = import_react3.default.useMemo(function() {
+      var { children, ...props } = param, parentProps = import_react3.default.useContext(import_ComponentContext.ComponentContext), language = import_react3.default.useMemo(function() {
         return props;
       }, [
         JSON.stringify(props)
       ]);
       return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ComponentContext.ComponentContext.Provider, {
+        ...parentProps,
         language,
         children
       });
@@ -10976,41 +10891,41 @@ var require_matchQuery_native = __commonJS({
           var inverse = query.inverse, typeMatch = query.type === "all" || values.type === query.type;
           if (typeMatch && inverse || !(typeMatch || inverse)) return !1;
           var expressionsMatch = query.expressions.every(function(expression) {
-            var feature = expression.feature, modifier = expression.modifier, expValue = expression.value, value2 = values[feature];
-            if (!value2) return !1;
+            var feature = expression.feature, modifier = expression.modifier, expValue = expression.value, value = values[feature];
+            if (!value) return !1;
             switch (feature) {
               case "orientation":
               case "scan":
-                return value2.toLowerCase() === expValue.toLowerCase();
+                return value.toLowerCase() === expValue.toLowerCase();
               case "width":
               case "height":
               case "device-width":
               case "device-height":
-                expValue = toPx(expValue), value2 = toPx(value2);
+                expValue = toPx(expValue), value = toPx(value);
                 break;
               case "resolution":
-                expValue = toDpi(expValue), value2 = toDpi(value2);
+                expValue = toDpi(expValue), value = toDpi(value);
                 break;
               case "aspect-ratio":
               case "device-aspect-ratio":
               case /* Deprecated */
               "device-pixel-ratio":
-                expValue = toDecimal(expValue), value2 = toDecimal(value2);
+                expValue = toDecimal(expValue), value = toDecimal(value);
                 break;
               case "grid":
               case "color":
               case "color-index":
               case "monochrome":
-                expValue = Number.parseInt(expValue, 10) || 1, value2 = Number.parseInt(value2, 10) || 0;
+                expValue = Number.parseInt(expValue, 10) || 1, value = Number.parseInt(value, 10) || 0;
                 break;
             }
             switch (modifier) {
               case "min":
-                return value2 >= expValue;
+                return value >= expValue;
               case "max":
-                return value2 <= expValue;
+                return value <= expValue;
               default:
-                return value2 === expValue;
+                return value === expValue;
             }
           });
           return expressionsMatch && !inverse || !expressionsMatch && inverse;
@@ -11042,35 +10957,35 @@ var require_matchQuery_native = __commonJS({
       return decimal || (numbers = ratio.match(/^(\d+)\s*\/\s*(\d+)$/), decimal = numbers[1] / numbers[2]), decimal;
     }
     function toDpi(resolution) {
-      var _String_match, value2 = Number.parseFloat(resolution), units = (_String_match = String(resolution).match(RE_RESOLUTION_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
+      var _String_match, value = Number.parseFloat(resolution), units = (_String_match = String(resolution).match(RE_RESOLUTION_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
       switch (units) {
         case "dpcm":
-          return value2 / 2.54;
+          return value / 2.54;
         case "dppx":
-          return value2 * 96;
+          return value * 96;
         default:
-          return value2;
+          return value;
       }
     }
     function toPx(length) {
-      var _String_match, value2 = Number.parseFloat(length), units = (_String_match = String(length).match(RE_LENGTH_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
+      var _String_match, value = Number.parseFloat(length), units = (_String_match = String(length).match(RE_LENGTH_UNIT)) === null || _String_match === void 0 ? void 0 : _String_match[1];
       switch (units) {
         case "em":
-          return value2 * 16;
+          return value * 16;
         case "rem":
-          return value2 * 16;
+          return value * 16;
         case "cm":
-          return value2 * 96 / 2.54;
+          return value * 96 / 2.54;
         case "mm":
-          return value2 * 96 / 2.54 / 10;
+          return value * 96 / 2.54 / 10;
         case "in":
-          return value2 * 96;
+          return value * 96;
         case "pt":
-          return value2 * 72;
+          return value * 72;
         case "pc":
-          return value2 * 72 / 12;
+          return value * 72 / 12;
         default:
-          return value2;
+          return value;
       }
     }
   }
@@ -11132,13 +11047,13 @@ var require_mediaQueryList_native = __commonJS({
     function _create_class(Constructor, protoProps, staticProps) {
       return protoProps && _defineProperties(Constructor.prototype, protoProps), staticProps && _defineProperties(Constructor, staticProps), Constructor;
     }
-    function _define_property(obj, key, value2) {
+    function _define_property(obj, key, value) {
       return key in obj ? Object.defineProperty(obj, key, {
-        value: value2,
+        value,
         enumerable: !0,
         configurable: !0,
         writable: !0
-      }) : obj[key] = value2, obj;
+      }) : obj[key] = value, obj;
     }
     var NativeMediaQueryList = /* @__PURE__ */ function() {
       "use strict";
@@ -11808,13 +11723,13 @@ var require_ResponderTouchHistoryStore_native = __commonJS({
     function _create_class(Constructor, protoProps, staticProps) {
       return protoProps && _defineProperties(Constructor.prototype, protoProps), staticProps && _defineProperties(Constructor, staticProps), Constructor;
     }
-    function _define_property(obj, key, value2) {
+    function _define_property(obj, key, value) {
       return key in obj ? Object.defineProperty(obj, key, {
-        value: value2,
+        value,
         enumerable: !0,
         configurable: !0,
         writable: !0
-      }) : obj[key] = value2, obj;
+      }) : obj[key] = value, obj;
     }
     var ResponderTouchHistoryStore = /* @__PURE__ */ function() {
       "use strict";