@tamagui/core 1.123.9 → 1.123.11

package/dist/native.js

@@ -5711,7 +5711,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 max = expanded.length, i = 0; i < max; i++) {
@@ -5773,7 +5773,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) {
@@ -5806,7 +5806,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;
@@ -5866,16 +5866,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) {
@@ -6381,7 +6383,7 @@ var require_getSplitStyles_native = __commonJS({
           console.groupEnd();
         }
       };
-      props.reddish && (debug = "verbose"), conf = conf || (0, import_config.getConfig)(), import_constants2.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
+      conf = conf || (0, import_config.getConfig)(), import_constants2.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 = {}, mediaState2 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants2.isWeb && !styleProps.noClass, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, validStyles2 = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers2.stylePropsText : import_helpers2.validStyles);
       process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-setup`;
       var styleState = {
@@ -7073,7 +7075,7 @@ var require_themeable_native = __commonJS({
     module2.exports = __toCommonJS2(themeable_exports);
     var import_jsx_runtime = require("react/jsx-runtime"), import_react3 = __toESM2(require("react")), import_Theme = require_Theme_native();
     function themeable(Component, staticConfig) {
-      var withThemeComponent = /* @__PURE__ */ import_react3.default.forwardRef(function(props, ref) {
+      var optimize = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1, withThemeComponent = function(props, ref) {
         var { themeInverse, theme, componentName, themeReset, ...rest } = props, overriddenContextProps, context = staticConfig == null ? void 0 : staticConfig.context;
         if (context) for (var key in context.props) {
           var val = props[key];
@@ -7086,10 +7088,8 @@ var require_themeable_native = __commonJS({
             ...rest,
             "data-disable-theme": !0
           })
-        ), filteredProps = {
-          componentName: componentName || (staticConfig == null ? void 0 : staticConfig.componentName)
-        };
-        "debug" in props && (filteredProps.debug = props.debug), "theme" in props && (filteredProps.name = props.theme), "themeInverse" in props && (filteredProps.inverse = props.themeInverse), "themeReset" in props && (filteredProps.reset = themeReset);
+        ), filteredProps = null, compName = componentName || (staticConfig == null ? void 0 : staticConfig.componentName);
+        if (compName && (filteredProps || (filteredProps = {}), filteredProps.componentName = compName), "debug" in props && (filteredProps || (filteredProps = {}), filteredProps.debug = props.debug), "theme" in props && (filteredProps || (filteredProps = {}), filteredProps.name = props.theme), "themeInverse" in props && (filteredProps || (filteredProps = {}), filteredProps.inverse = props.themeInverse), "themeReset" in props && (filteredProps || (filteredProps = {}), filteredProps.reset = themeReset), optimize && !filteredProps) return element;
         var contents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Theme.Theme, {
           "disable-child-theme": !0,
           ...filteredProps,
@@ -7104,8 +7104,8 @@ var require_themeable_native = __commonJS({
           });
         }
         return contents;
-      }), withTheme = withThemeComponent;
-      return withTheme.displayName = `Themed(${(Component == null ? void 0 : Component.displayName) || (Component == null ? void 0 : Component.name) || "Anonymous"})`, withTheme;
+      }, withTheme = withThemeComponent;
+      return withTheme.displayName = `Themed(${(Component == null ? void 0 : Component.displayName) || (Component == null ? void 0 : Component.name) || "Anonymous"})`, optimize ? withTheme : /* @__PURE__ */ import_react3.default.forwardRef(withTheme);
     }
   }
 });
@@ -8039,7 +8039,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
       }
       function styleable(Component2, options) {
         var _Component_render, isForwardedRefAlready = ((_Component_render = Component2.render) === null || _Component_render === void 0 ? void 0 : _Component_render.length) === 2, out = isForwardedRefAlready ? Component2 : /* @__PURE__ */ import_react3.default.forwardRef(Component2), extendedConfig = extendStyledConfig(options == null ? void 0 : options.staticConfig);
-        return out = options != null && options.disableTheme ? out : (0, import_themeable.themeable)(out, extendedConfig), process.env.TAMAGUI_MEMOIZE_STYLEABLE && (out = /* @__PURE__ */ import_react3.default.memo(out)), out.staticConfig = extendedConfig, out.styleable = styleable, out;
+        return out = options != null && options.disableTheme ? out : (0, import_themeable.themeable)(out, extendedConfig, !0), process.env.TAMAGUI_MEMOIZE_STYLEABLE && (out = /* @__PURE__ */ import_react3.default.memo(out)), out.staticConfig = extendedConfig, out.styleable = styleable, out;
       }
       return res.extractable = extractable, res.styleable = styleable, res;
     }