tamagui 1.109.6 → 1.109.8

package/dist/native.js

@@ -1109,8 +1109,8 @@ var require_concatClassName_native = __commonJS({
     });
     module2.exports = __toCommonJS2(concatClassName_exports);
     function concatClassName(_cn) {
-      for (var _loop = function(x2) {
-        var _loop22 = function(i2) {
+      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";
@@ -1129,11 +1129,15 @@ var require_concatClassName_native = __commonJS({
             return res;
           })) return "continue";
           final = name + " " + final;
-        }, cns = args[x2];
-        if (!cns) return "continue";
-        if (!Array.isArray(cns) && typeof cns != "string") return propObjects = propObjects || [], propObjects.push(cns), "continue";
-        for (var names = Array.isArray(cns) ? cns : cns.split(" "), numNames = names.length, i = numNames - 1; i >= 0; i--) _loop22(i);
-      }, args = arguments, usedPrefixes = [], final = "", len = args.length, propObjects = null, x = len; x >= 0; x--) _loop(x);
+        }, 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 = {
@@ -7323,7 +7327,7 @@ var require_getVariantExtras_native = __commonJS({
           return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
         },
         get font() {
-          return fonts[this.fontFamily] || (props.fontFamily ? void 0 : styleState.conf.defaultFont);
+          return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
         },
         // TODO do this in splitstlye
         // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
@@ -8162,34 +8166,69 @@ var require_getSplitStyles_native = __commonJS({
       return validStyleProps[key] || ((_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key]);
     }
     var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug, skipThemeTokenResolution) {
-      var _loop = function(keyOg2) {
-        var _loop22 = function(i3) {
+      conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
+      var shorthands = conf.shorthands, isHOC = staticConfig.isHOC, isText = staticConfig.isText, isInput = staticConfig.isInput, variants = staticConfig.variants, isReactNative = staticConfig.isReactNative, inlineProps = staticConfig.inlineProps, inlineWhenUnflattened = staticConfig.inlineWhenUnflattened, parentStaticConfig = staticConfig.parentStaticConfig, acceptsClassName = staticConfig.acceptsClassName, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, curPropsState, styleState = {
+        // this should go away, right now we're doing really crazy cumulative props,
+        // as variants are resolved basically we go back and merge the results onto
+        // the curProps, so that each following variant function recieves the current
+        // "styles" with variants expanded. powerful, but i think too fancy
+        // there's some part of the ui kit that depends on it we'd have to find and fix
+        get curProps() {
+          return curPropsState || (curPropsState = {}), curPropsState;
+        },
+        classNames,
+        conf,
+        props,
+        styleProps,
+        componentState,
+        staticConfig,
+        style: null,
+        theme,
+        usedKeys,
+        viewProps,
+        context,
+        debug,
+        skipThemeTokenResolution
+      };
+      process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants4.isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), (0, import_log.log)({
+        props,
+        staticConfig,
+        shouldDoClasses,
+        styleProps,
+        rulesToInsert,
+        componentState,
+        styleState,
+        theme: _object_spread9({}, theme)
+      }), console.groupEnd());
+      var asChild = props.asChild, accept = staticConfig.accept, noSkip = styleProps.noSkip, disableExpandShorthands = styleProps.disableExpandShorthands, noExpand = styleProps.noExpand, webContainerType = conf.settings.webContainerType, parentVariants = parentStaticConfig == null ? void 0 : parentStaticConfig.variants;
+      for (var keyOg in props) {
+        var _loop = function(i2) {
           var _parentStaticConfig_variants;
           if (expanded) {
-            var _expanded_i = _sliced_to_array(expanded[i3], 2), k = _expanded_i[0], v = _expanded_i[1];
-            key4 = k, val2 = v;
+            var _expanded_i = _sliced_to_array(expanded[i2], 2), k = _expanded_i[0], v = _expanded_i[1];
+            key = k, val = v;
           }
-          if (val2 == null || key4 in usedKeys) return "continue";
-          if (isPseudo = key4 in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key4), isMediaOrPseudo1 = !!(isMedia || isPseudo), isVariant = variants && key4 in variants, inlineProps != null && inlineProps.has(key4) || process.env.IS_STATIC === "is_static" && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key4)) {
+          if (val == null || key in usedKeys) return "continue";
+          if (isPseudo = key in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key), isMediaOrPseudo1 = !!(isMedia || isPseudo), isVariant = variants && key in variants, inlineProps != null && inlineProps.has(key) || process.env.IS_STATIC === "is_static" && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key)) {
             var _props_key;
-            viewProps[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
+            viewProps[key] = (_props_key = props[key]) !== null && _props_key !== void 0 ? _props_key : val;
           }
           var shouldPassThrough2 = styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo1 || (parentStaticConfig == null || (_parentStaticConfig_variants = parentStaticConfig.variants) === null || _parentStaticConfig_variants === void 0 ? void 0 : _parentStaticConfig_variants[keyInit]));
-          if (shouldPassThrough2) return passDownProp(viewProps, key4, val2, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key4)), (0, import_log.log)({
-            val: val2,
-            after: _object_spread9({}, viewProps[key4])
+          if (shouldPassThrough2) return passDownProp(viewProps, key, val, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key)), (0, import_log.log)({
+            val,
+            after: _object_spread9({}, viewProps[key])
           }), console.groupEnd()), "continue";
           if (isPseudo) {
-            if (!val2) return "continue";
-            var pseudoStyleObject = getSubStyle(styleState, key4, val2, styleProps.noClassNames), descriptor = import_pseudoDescriptors.pseudoDescriptors[key4], isEnter = key4 === "enterStyle", isExit = key4 === "exitStyle";
+            if (!val) return "continue";
+            var pseudoStyleObject = getSubStyle(styleState, key, val, styleProps.noClassNames), descriptor = import_pseudoDescriptors.pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
             if (!descriptor) return "continue";
             if (!shouldDoClasses || process.env.IS_STATIC === "is_static") {
               var _pseudos, _key;
-              if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key4] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") return Object.assign(pseudos[key4], pseudoStyleObject), "continue";
+              if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") return Object.assign(pseudos[key], pseudoStyleObject), "continue";
             }
             if (shouldDoClasses && !isExit) {
               var pseudoStyles = (0, import_getStylesAtomic.getStyleAtomic)(pseudoStyleObject, descriptor);
-              process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key4), (0, import_log.log)({
+              process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key), (0, import_log.log)({
                 pseudoStyleObject,
                 pseudoStyles
               }), console.groupEnd());
@@ -8211,7 +8250,7 @@ var require_getSplitStyles_native = __commonJS({
             }
             if (!shouldDoClasses || isExit || isEnter) {
               var descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = componentState[descriptorKey] === !1;
-              isExit && (isDisabled = !styleProps.isExiting), isEnter && componentState.unmounted === !1 && (isDisabled = !0), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo", key4, {
+              isExit && (isDisabled = !styleProps.isExiting), isEnter && componentState.unmounted === !1 && (isDisabled = !0), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo", key, {
                 isDisabled
               }), (0, import_log.log)({
                 pseudoStyleObject,
@@ -8227,7 +8266,7 @@ var require_getSplitStyles_native = __commonJS({
                   var curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
                   if (shouldMerge) {
                     var _pseudos1, _key1;
-                    pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = val12, mergeStyle(styleState, pkey, val12);
+                    pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key] || (_pseudos1[_key1] = {}), pseudos[key][pkey] = val12, mergeStyle(styleState, pkey, val12);
                   }
                   process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
                     importance,
@@ -8237,7 +8276,7 @@ var require_getSplitStyles_native = __commonJS({
                   });
                 }
               }
-              if (!isDisabled) for (var key12 in val2) {
+              if (!isDisabled) for (var key12 in val) {
                 var k1 = shorthands[key12] || key12;
                 usedKeys[k1] = Math.max(importance, usedKeys[k1] || 0);
               }
@@ -8245,22 +8284,22 @@ var require_getSplitStyles_native = __commonJS({
             return "continue";
           }
           if (isMedia) {
-            if (!val2) return "continue";
-            var hasSpace = val2.space, mediaKeyShort = key4.slice(1);
-            if (hasMedia || (hasMedia = !0), (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && (((typeof hasMedia > "u" ? "undefined" : _type_of3(hasMedia)) > "u" ? "undefined" : _type_of1(hasMedia)) !== "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !(0, import_isActivePlatform.isActivePlatform)(key4)) return "continue";
-            if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} ".concat(key4), {
-              key: key4,
-              val: val2,
+            if (!val) return "continue";
+            var hasSpace = val.space, mediaKeyShort = key.slice(1);
+            if (hasMedia || (hasMedia = !0), (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && (((typeof hasMedia > "u" ? "undefined" : _type_of3(hasMedia)) > "u" ? "undefined" : _type_of1(hasMedia)) !== "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !(0, import_isActivePlatform.isActivePlatform)(key)) return "continue";
+            if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} ".concat(key), {
+              key,
+              val,
               props,
               shouldDoClasses,
               acceptsClassName,
               componentState,
               mediaState: mediaState3
             }), shouldDoClasses) {
-              var mediaStyle = getSubStyle(styleState, key4, val2, !1);
+              var mediaStyle = getSubStyle(styleState, key, val, !1);
               if (hasSpace && (delete mediaStyle.space, mediaState3[mediaKeyShort])) {
                 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 ".concat(mediaKeyShort, ": ").concat(val2, " (importance: ").concat(importance1, ")")));
+                importance1 && (space = val.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("Found more important space for current media ".concat(mediaKeyShort, ": ").concat(val, " (importance: ").concat(importance1, ")")));
               }
               var mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
               mediaStylesSeen += 1;
@@ -8295,7 +8334,7 @@ var require_getSplitStyles_native = __commonJS({
                 if (!mediaState3[mediaKeyShort]) return process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} \u274C DISABLED ".concat(mediaKeyShort)), "continue";
                 process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} \u2705 ENABLED ".concat(mediaKeyShort));
               }
-              var mediaStyle1 = getSubStyle(styleState, key4, val2, !0), importanceBump = 0;
+              var mediaStyle1 = getSubStyle(styleState, key, val, !0), importanceBump = 0;
               if (isThemeMedia) {
                 dynamicThemeAccess = !0;
                 var mediaThemeName = mediaKeyShort.slice(6);
@@ -8337,148 +8376,124 @@ var require_getSplitStyles_native = __commonJS({
             }
             return "continue";
           }
-          if (key4 === "pointerEvents") return viewProps[key4] = val2, "continue";
+          if (key === "pointerEvents") return viewProps[key] = val, "continue";
           if (
             // is HOC we can just pass through the styles as props
             // this fixes issues where style prop got merged with wrong priority
-            !isHOC && (isValidStyleKey(key4, staticConfig) || import_constants4.isAndroid && key4 === "elevation")
-          ) return mergeStyle(styleState, key4, val2), "continue";
-          isVariant || (viewProps[key4] = val2);
-        }, keyInit = keyOg2, valInit = props[keyInit];
+            !isHOC && (isValidStyleKey(key, staticConfig) || import_constants4.isAndroid && key === "elevation")
+          ) return mergeStyle(styleState, key, val), "continue";
+          isVariant || (viewProps[key] = val);
+        }, keyInit = keyOg, valInit = props[keyInit];
         if (accept) {
           var accepted = accept[keyInit];
-          if ((accepted === "style" || accepted === "textStyle") && valInit && ((typeof valInit > "u" ? "undefined" : _type_of3(valInit)) > "u" ? "undefined" : _type_of1(valInit)) === "object") return viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClassNames), "continue";
-        }
-        if (process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd(), disableExpandShorthands || keyInit in shorthands && (keyInit = shorthands[keyInit]), keyInit === "className" || keyInit in usedKeys) return "continue";
-        if (keyInit in import_skipProps.skipProps && !noSkip && !isHOC) {
-          if (keyInit === "group" && !1) var identifier2, containerType, containerCSS;
-          return "continue";
+          if ((accepted === "style" || accepted === "textStyle") && valInit && ((typeof valInit > "u" ? "undefined" : _type_of3(valInit)) > "u" ? "undefined" : _type_of1(valInit)) === "object") {
+            viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClassNames);
+            continue;
+          }
         }
-        var valInitType = (typeof valInit > "u" ? "undefined" : _type_of3(valInit)) > "u" ? "undefined" : _type_of1(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
-        if (0) {
-          var isValidClassName, isMediaOrPseudo;
-          if ((isValidClassName || isMediaOrPseudo) && !shouldDoClasses) var _styleState3;
-        }
-        if (!isValidStyleKeyInit) {
-          if (!import_constants4.isAndroid && keyInit === "elevationAndroid") return "continue";
-          if (keyInit === "userSelect") keyInit = "selectable", valInit = valInit !== "none";
-          else if (keyInit.startsWith("data-")) return "continue";
-        }
-        if (keyInit === "dataSet") {
-          for (var keyInit1 in valInit) viewProps["data-".concat(hyphenate(keyInit1))] = valInit[keyInit1];
-          return "continue";
-        }
-        if (0) var didUseKeyInit;
-        var isShorthand = keyInit in shorthands, isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant, isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit), isMediaOrPseudo1 = !!(isMedia || isPseudo);
-        if (isMediaOrPseudo1 && keyInit.startsWith("$group-")) {
-          var name2 = keyInit.split("-")[1];
-          context != null && context.groups.subscribe && !(context != null && context.groups.state[name2]) && (keyInit = keyInit.replace("$group-", "$group-true-"));
-        }
-        var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo1 || isVariant && !noExpand || isShorthand;
-        if (isStyleProp && (asChild === "except-style" || asChild === "except-style-web")) return "continue";
-        var shouldPassProp = !isStyleProp || // is in parent variants
-        isHOC && parentVariants && keyInit in parentVariants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = parentVariants == null ? void 0 : parentVariants[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo1 || parentVariant || keyInit in import_skipProps.skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
-        if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), consoleGroupCollapsed("  \u{1F511} ".concat(keyOg2).concat(keyInit !== keyOg2 ? " (shorthand for ".concat(keyInit, ")") : "", " ").concat(shouldPassThrough ? "(pass)" : "")), (0, import_log.log)({
-          isVariant,
-          valInit,
-          shouldPassProp
-        }), import_constants4.isClient && (0, import_log.log)({
-          variants,
-          variant: variants == null ? void 0 : variants[keyInit],
-          isVariant,
-          isHOCShouldPassThrough,
-          curProps: _object_spread9({}, styleState.curProps),
-          parentStaticConfig
-        })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant) || !noSkip && keyInit in import_skipProps.skipProps) return process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd(), "continue";
-        (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
-        var avoidPropMap = isMediaOrPseudo1 || !isVariant && !isValidStyleKeyInit, expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
-        if (!avoidPropMap) {
-          if (!expanded) return "continue";
-          var next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
-          next && (styleState.fontFamily = next);
-        }
-        if (process.env.NODE_ENV === "development" && debug === "verbose") {
-          consoleGroupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
-          try {
-            !import_constants4.isServer && import_isDevTools.isDevTools && ((0, import_log.log)({
-              expanded,
-              styleProps,
-              componentState,
+        if (process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd(), disableExpandShorthands || keyInit in shorthands && (keyInit = shorthands[keyInit]), keyInit !== "className" && !(keyInit in usedKeys)) {
+          if (keyInit in import_skipProps.skipProps && !noSkip && !isHOC) {
+            if (keyInit === "group" && !1) var identifier, containerType, containerCSS;
+            continue;
+          }
+          var valInitType = (typeof valInit > "u" ? "undefined" : _type_of3(valInit)) > "u" ? "undefined" : _type_of1(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
+          if (0) {
+            var isValidClassName, isMediaOrPseudo;
+            if ((isValidClassName || isMediaOrPseudo) && !shouldDoClasses) var _styleState;
+          }
+          if (!isValidStyleKeyInit) {
+            if (!import_constants4.isAndroid && keyInit === "elevationAndroid") continue;
+            if (keyInit === "userSelect") keyInit = "selectable", valInit = valInit !== "none";
+            else if (keyInit.startsWith("data-")) continue;
+          }
+          if (keyInit === "dataSet") {
+            for (var keyInit1 in valInit) viewProps["data-".concat(hyphenate(keyInit1))] = valInit[keyInit1];
+            continue;
+          }
+          if (0) var didUseKeyInit;
+          var isShorthand = keyInit in shorthands, isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant, isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit), isMediaOrPseudo1 = !!(isMedia || isPseudo);
+          if (isMediaOrPseudo1 && keyInit.startsWith("$group-")) {
+            var name = keyInit.split("-")[1];
+            context != null && context.groups.subscribe && !(context != null && context.groups.state[name]) && (keyInit = keyInit.replace("$group-", "$group-true-"));
+          }
+          var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo1 || isVariant && !noExpand || isShorthand;
+          if (!(isStyleProp && (asChild === "except-style" || asChild === "except-style-web"))) {
+            var shouldPassProp = !isStyleProp || // is in parent variants
+            isHOC && parentVariants && keyInit in parentVariants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = parentVariants == null ? void 0 : parentVariants[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo1 || parentVariant || keyInit in import_skipProps.skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
+            if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), consoleGroupCollapsed("  \u{1F511} ".concat(keyOg).concat(keyInit !== keyOg ? " (shorthand for ".concat(keyInit, ")") : "", " ").concat(shouldPassThrough ? "(pass)" : "")), (0, import_log.log)({
               isVariant,
+              valInit,
+              shouldPassProp
+            }), import_constants4.isClient && (0, import_log.log)({
+              variants,
               variant: variants == null ? void 0 : variants[keyInit],
-              shouldPassProp,
+              isVariant,
               isHOCShouldPassThrough,
-              usedKeys: _object_spread9({}, usedKeys),
-              curProps: _object_spread9({}, styleState.curProps)
-            }), (0, import_log.log)("expanded", expanded, `
+              curProps: _object_spread9({}, styleState.curProps),
+              parentStaticConfig
+            })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant)) {
+              process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd();
+              continue;
+            }
+            if (!noSkip && keyInit in import_skipProps.skipProps) {
+              process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd();
+              continue;
+            }
+            (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
+            var avoidPropMap = isMediaOrPseudo1 || !isVariant && !isValidStyleKeyInit, expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
+            if (!avoidPropMap) {
+              if (!expanded) continue;
+              var next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
+              next && (styleState.fontFamily = next);
+            }
+            if (process.env.NODE_ENV === "development" && debug === "verbose") {
+              consoleGroupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
+              try {
+                !import_constants4.isServer && import_isDevTools.isDevTools && ((0, import_log.log)({
+                  expanded,
+                  styleProps,
+                  componentState,
+                  isVariant,
+                  variant: variants == null ? void 0 : variants[keyInit],
+                  shouldPassProp,
+                  isHOCShouldPassThrough,
+                  usedKeys: _object_spread9({}, usedKeys),
+                  curProps: _object_spread9({}, styleState.curProps)
+                }), (0, import_log.log)("expanded", expanded, `
 usedKeys`, _object_spread9({}, usedKeys), `
 current`, _object_spread9({}, styleState.style)));
-          } catch {
-          }
-          console.groupEnd();
-        }
-        for (var key4 = keyInit, val2 = valInit, max2 = expanded ? expanded.length : 1, i2 = 0; i2 < max2; i2++) _loop22(i2);
-        if (process.env.NODE_ENV === "development" && debug === "verbose") {
-          try {
-            (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", _object_spread9({}, styleState.style)), (0, import_log.log)("transforms", _object_spread9({}, transforms)), (0, import_log.log)("viewProps", _object_spread9({}, viewProps));
-          } catch {
+              } catch {
+              }
+              console.groupEnd();
+            }
+            for (var key = keyInit, val = valInit, max2 = expanded ? expanded.length : 1, i = 0; i < max2; i++) _loop(i);
+            if (process.env.NODE_ENV === "development" && debug === "verbose") {
+              try {
+                (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", _object_spread9({}, styleState.style)), (0, import_log.log)("transforms", _object_spread9({}, transforms)), (0, import_log.log)("viewProps", _object_spread9({}, viewProps));
+              } catch {
+              }
+              console.groupEnd();
+            }
           }
-          console.groupEnd();
         }
-      };
-      conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
-      var shorthands = conf.shorthands, isHOC = staticConfig.isHOC, isText = staticConfig.isText, isInput = staticConfig.isInput, variants = staticConfig.variants, isReactNative = staticConfig.isReactNative, inlineProps = staticConfig.inlineProps, inlineWhenUnflattened = staticConfig.inlineWhenUnflattened, parentStaticConfig = staticConfig.parentStaticConfig, acceptsClassName = staticConfig.acceptsClassName, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, curPropsState, styleState = {
-        // this should go away, right now we're doing really crazy cumulative props,
-        // as variants are resolved basically we go back and merge the results onto
-        // the curProps, so that each following variant function recieves the current
-        // "styles" with variants expanded. powerful, but i think too fancy
-        // there's some part of the ui kit that depends on it we'd have to find and fix
-        get curProps() {
-          return curPropsState || (curPropsState = {}), curPropsState;
-        },
-        classNames,
-        conf,
-        props,
-        styleProps,
-        componentState,
-        staticConfig,
-        style: null,
-        theme,
-        usedKeys,
-        viewProps,
-        context,
-        debug,
-        skipThemeTokenResolution
-      };
-      process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants4.isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), (0, import_log.log)({
-        props,
-        staticConfig,
-        shouldDoClasses,
-        styleProps,
-        rulesToInsert,
-        componentState,
-        styleState,
-        theme: _object_spread9({}, theme)
-      }), console.groupEnd());
-      var asChild = props.asChild, accept = staticConfig.accept, noSkip = styleProps.noSkip, disableExpandShorthands = styleProps.disableExpandShorthands, noExpand = styleProps.noExpand, webContainerType = conf.settings.webContainerType, parentVariants = parentStaticConfig == null ? void 0 : parentStaticConfig.variants;
-      for (var keyOg in props) _loop(keyOg);
+      }
       var avoidNormalize = styleProps.noNormalize === !1;
       if (!avoidNormalize) {
         if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), import_constants4.isWeb && !isReactNative && (0, import_getStylesAtomic.styleToCSS)(styleState.style)), styleState.flatTransforms) {
-          var _styleState;
-          (_styleState = styleState).style || (_styleState.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
+          var _styleState1;
+          (_styleState1 = styleState).style || (_styleState1.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
             var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
             return a.localeCompare(b);
           }).forEach(function(param) {
-            var _param = _sliced_to_array(param, 2), key4 = _param[0], val2 = _param[1];
-            mergeTransform(styleState.style, key4, val2, !0);
+            var _param = _sliced_to_array(param, 2), key5 = _param[0], val3 = _param[1];
+            mergeTransform(styleState.style, key5, val3, !0);
           });
         }
         if (parentSplitStyles) {
-          if (0) for (var key in parentSplitStyles.classNames) var val;
-          if (!shouldDoClasses) for (var key1 in parentSplitStyles.style) {
-            var _styleState1;
-            key1 in classNames || styleState.style && key1 in styleState.style || ((_styleState1 = styleState).style || (_styleState1.style = {}), styleState.style[key1] = parentSplitStyles.style[key1]);
+          if (0) for (var key1 in parentSplitStyles.classNames) var val1;
+          if (!shouldDoClasses) for (var key2 in parentSplitStyles.style) {
+            var _styleState2;
+            key2 in classNames || styleState.style && key2 in styleState.style || ((_styleState2 = styleState).style || (_styleState2.style = {}), styleState.style[key2] = parentSplitStyles.style[key2]);
           }
         }
       }
@@ -8489,7 +8504,7 @@ current`, _object_spread9({}, styleState.style)));
           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, _atomicStyle, key2, value, identifier, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
+              for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) var atomicStyle, _props_animateOnly, _atomicStyle, key3, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
             } catch (err) {
             } finally {
               try {
@@ -8498,8 +8513,8 @@ current`, _object_spread9({}, styleState.style)));
             }
           }
           if (transforms) for (var namespace in transforms) {
-            var _transforms_namespace, hash, val1, identifier1;
-            if (import_constants4.isClient && !insertedTransforms[identifier1]) var rule;
+            var _transforms_namespace, hash, val2, identifier2;
+            if (import_constants4.isClient && !insertedTransforms[identifier2]) var rule;
           }
         }
         if (isReactNative) {
@@ -8508,12 +8523,12 @@ current`, _object_spread9({}, styleState.style)));
       }
       var styleProp = props.style;
       if (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;
+      else for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i1 = 0; i1 < len; i1++) {
+        var style = isArray ? styleProp[i1] : styleProp;
         if (style) if (style.$$css) Object.assign(styleState.classNames, style);
         else {
-          var _styleState2;
-          (_styleState2 = styleState).style || (_styleState2.style = {}), Object.assign(styleState.style, normalizeStyle(style));
+          var _styleState3;
+          (_styleState3 = styleState).style || (_styleState3.style = {}), Object.assign(styleState.style, normalizeStyle(style));
         }
       }
       var style1 = styleState.style;
@@ -8545,7 +8560,7 @@ current`, _object_spread9({}, styleState.style)));
           if (!styleProps.noMergeStyle && !(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;
+              for (var _iterator1, _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) var name1;
             } catch (err) {
             } finally {
               try {
@@ -8566,7 +8581,7 @@ current`, _object_spread9({}, styleState.style)));
             rulesToInsert,
             parentSplitStyles
           });
-          for (var key3 in logs) (0, import_log.log)(key3, logs[key3]);
+          for (var key4 in logs) (0, import_log.log)(key4, logs[key4]);
         } catch {
         }
         console.groupEnd();
@@ -17224,50 +17239,29 @@ var require_index_native21 = __commonJS({
     });
     module2.exports = __toCommonJS2(src_exports2);
     var import_core12 = require_index_native16();
-    function _define_property9(obj, key, value) {
-      return key in obj ? Object.defineProperty(obj, key, {
-        value,
-        enumerable: !0,
-        configurable: !0,
-        writable: !0
-      }) : obj[key] = value, obj;
-    }
-    function _object_spread9(target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i] != null ? arguments[i] : {}, ownKeys8 = Object.keys(source);
-        typeof Object.getOwnPropertySymbols == "function" && (ownKeys8 = ownKeys8.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-          return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-        }))), ownKeys8.forEach(function(key) {
-          _define_property9(target, key, source[key]);
-        });
-      }
-      return target;
-    }
     function _type_of1(obj) {
       "@swc/helpers - typeof";
       return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
     }
     var getFontSized2 = function() {
       var sizeTokenIn = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "$true", _ref = arguments.length > 1 ? arguments[1] : void 0, font = _ref.font, fontFamily = _ref.fontFamily, props = _ref.props, _font_lineHeight, _font_weight, _font_letterSpacing, _font_transform, _font_style, _font_color;
-      if (!font) {
-        process.env.NODE_ENV === "development" && console.warn("Warning: No font found in props", _object_spread9({}, props), 'For a sized text component, you either need to set fontFamily directly, or through the "defaultFont" setting in your createTamagui config.');
-        return;
+      if (font) {
+        var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken], fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken], letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken], textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken], _props_fontStyle, fontStyle = (_props_fontStyle = props.fontStyle) !== null && _props_fontStyle !== void 0 ? _props_fontStyle : (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken], _props_color, color = (_props_color = props.color) !== null && _props_color !== void 0 ? _props_color : (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken], style = {
+          color,
+          fontStyle,
+          textTransform,
+          fontFamily,
+          fontWeight,
+          letterSpacing,
+          fontSize,
+          lineHeight
+        };
+        return process.env.NODE_ENV === "development" && props.debug && props.debug === "verbose" && (console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken), console.info({
+          style,
+          props,
+          font
+        }), console.groupEnd()), style;
       }
-      var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn, fontSize = font.size[sizeToken], lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken], fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken], letterSpacing = (_font_letterSpacing = font.letterSpacing) === null || _font_letterSpacing === void 0 ? void 0 : _font_letterSpacing[sizeToken], textTransform = (_font_transform = font.transform) === null || _font_transform === void 0 ? void 0 : _font_transform[sizeToken], _props_fontStyle, fontStyle = (_props_fontStyle = props.fontStyle) !== null && _props_fontStyle !== void 0 ? _props_fontStyle : (_font_style = font.style) === null || _font_style === void 0 ? void 0 : _font_style[sizeToken], _props_color, color = (_props_color = props.color) !== null && _props_color !== void 0 ? _props_color : (_font_color = font.color) === null || _font_color === void 0 ? void 0 : _font_color[sizeToken], style = {
-        color,
-        fontStyle,
-        textTransform,
-        fontFamily,
-        fontWeight,
-        letterSpacing,
-        fontSize,
-        lineHeight
-      };
-      return process.env.NODE_ENV === "development" && props.debug && props.debug === "verbose" && (console.groupCollapsed("  \u{1F539} getFontSized", sizeTokenIn, sizeToken), console.info({
-        style,
-        props,
-        font
-      }), console.groupEnd()), style;
     }, cache = /* @__PURE__ */ new WeakMap();
     function getDefaultSizeToken(font) {
       if (((typeof font > "u" ? "undefined" : _type_of3(font)) > "u" ? "undefined" : _type_of1(font)) === "object" && cache.has(font)) return cache.get(font);