@tamagui/core 1.89.30 → 1.90.0

package/dist/native.js

@@ -6890,12 +6890,12 @@ var require_getVariantExtras_native = __commonJS({
     function getVariantExtras(styleState) {
       var curProps = styleState.curProps, props = styleState.props, conf = styleState.conf, context = styleState.context, theme = styleState.theme, fonts = conf.fontsParsed;
       context != null && context.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
-      var fontFamily = (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont), next = {
+      var fontFamily = (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont), font = fonts[fontFamily] || fonts[styleState.conf.defaultFont], next = {
         fonts,
         tokens: conf.tokensParsed,
         theme,
         fontFamily,
-        font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
+        font,
         // TODO do this in splitstlye
         // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
         props: new Proxy(props, {
@@ -7162,8 +7162,7 @@ var require_propMapper_native = __commonJS({
           if (variantValue)
             return variantValue;
         }
-        var shouldReturn = !1;
-        if (styleProps.disableExpandShorthands || key in conf.shorthands && (shouldReturn = !0, key = conf.shorthands[key]), value && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveValues, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), shouldReturn || value != null) {
+        if (styleProps.disableExpandShorthands || key in conf.shorthands && (key = conf.shorthands[key]), value && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveValues, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), value != null) {
           var result = (styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value)) || [
             [
               key,
@@ -7723,11 +7722,7 @@ var require_getSplitStyles_native = __commonJS({
               curProps: _object_spread2({}, styleState.curProps),
               parentStaticConfig
             })), !(shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant)) && !(!styleProps.noSkip && keyInit in import_skipProps.skipProps)) {
-              if ((isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit), isValidStyleKeyInit && !variants && valInit !== "unset" && (valInitType === "number" || valInitType === "string" && valInit[0] !== "$")) {
-                var _styleState2;
-                (_styleState2 = styleState).style || (_styleState2.style = {}), styleState.style[keyInit] = valInit;
-                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)
@@ -7940,12 +7935,12 @@ current`, _object_spread2({}, styleState.style)));
                         }
                       }
                       for (var subKey in mediaStyle) {
-                        var _styleState3;
+                        var _styleState2;
                         if (subKey === "space") {
                           space = valInit.space;
                           continue;
                         }
-                        (_styleState3 = styleState).style || (_styleState3.style = {}), (0, import_useMedia.mergeMediaByImportance)(styleState.style, mediaKeyShort, subKey, mediaStyle[subKey], usedKeys, mediaState2[mediaKeyShort], importanceBump), key === "fontFamily" && (styleState.fontFamily = mediaStyle.fontFamily);
+                        (_styleState2 = styleState).style || (_styleState2.style = {}), (0, import_useMedia.mergeMediaByImportance)(styleState.style, mediaKeyShort, subKey, mediaStyle[subKey], usedKeys, mediaState2[mediaKeyShort], importanceBump), key === "fontFamily" && (styleState.fontFamily = mediaStyle.fontFamily);
                       }
                     }
                     continue;
@@ -7988,8 +7983,8 @@ current`, _object_spread2({}, styleState.style)));
                 if (style1.$$css)
                   Object.assign(styleState.classNames, style1);
                 else {
-                  var _styleState4;
-                  (_styleState4 = styleState).style || (_styleState4.style = {}), Object.assign(styleState.style, style1);
+                  var _styleState3;
+                  (_styleState3 = styleState).style || (_styleState3.style = {}), Object.assign(styleState.style, style1);
                 }
             }
           } catch (err) {
@@ -8006,8 +8001,8 @@ current`, _object_spread2({}, styleState.style)));
       var avoidNormalize = styleProps.noNormalize === !1;
       if (!avoidNormalize) {
         if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), import_constants.isWeb && !staticConfig.isReactNative && (0, import_getStylesAtomic.styleToCSS)(styleState.style)), styleState.transforms) {
-          var _styleState5;
-          (_styleState5 = styleState).style || (_styleState5.style = {}), Object.entries(styleState.transforms).sort(function(param, param1) {
+          var _styleState4;
+          (_styleState4 = styleState).style || (_styleState4.style = {}), Object.entries(styleState.transforms).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) {
@@ -8023,8 +8018,8 @@ current`, _object_spread2({}, styleState.style)));
               var val2;
           if (!shouldDoClasses)
             for (var key3 in parentSplitStyles.style) {
-              var _styleState6;
-              key3 in classNames || styleState.style && key3 in styleState.style || ((_styleState6 = styleState).style || (_styleState6.style = {}), styleState.style[key3] = parentSplitStyles.style[key3]);
+              var _styleState5;
+              key3 in classNames || styleState.style && key3 in styleState.style || ((_styleState5 = styleState).style || (_styleState5.style = {}), styleState.style[key3] = parentSplitStyles.style[key3]);
             }
         }
       }
@@ -8175,7 +8170,8 @@ current`, _object_spread2({}, styleState.style)));
       rotateY: "0deg",
       rotateX: "0deg",
       x: 0,
-      y: 0
+      y: 0,
+      borderRadius: 0
     }, lowercaseHyphenate = function(match) {
       return "-".concat(match.toLowerCase());
     }, hyphenate = function(str) {