tamagui 1.123.9 → 1.123.10

package/dist/native.js

@@ -6810,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++) {
@@ -6872,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) {
@@ -6905,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;
@@ -6965,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) {
@@ -7480,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 = {