@tamagui/core 1.110.4 → 1.110.5

package/dist/native.js

@@ -7630,9 +7630,9 @@ var require_propMapper_native = __commonJS({
             case "lineHeight":
             case "letterSpacing":
             case "fontWeight": {
-              var defaultFont = conf.defaultFont || "$body", fam = fontFamily || defaultFont;
+              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[defaultFont];
+                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_[value]) || value, hasSet = !0;
               }
               break;
@@ -11318,10 +11318,11 @@ var require_createTamagui_native = __commonJS({
         return getCSS(_object_spread_props(_object_spread2({}, opts), {
           sinceLastCall: !0
         }));
-      }, _configIn_settings_defaultFont, defaultFontSetting = (_configIn_settings_defaultFont = (_configIn_settings = configIn.settings) === null || _configIn_settings === void 0 ? void 0 : _configIn_settings.defaultFont) !== null && _configIn_settings_defaultFont !== void 0 ? _configIn_settings_defaultFont : configIn.defaultFont, defaultFontName = defaultFontSetting || // uses font named "body" if present for compat
-      configIn.fonts && ("body" in configIn.fonts ? "body" : "");
-      !defaultFontName && configIn.fonts && (defaultFontName = Object.keys(configIn.fonts)[0]), (defaultFontName == null ? void 0 : defaultFontName[0]) === "$" && (defaultFontName = defaultFontName.slice(1));
-      var defaultFont = "$".concat(defaultFontName), config = _object_spread_props(_object_spread2({
+      }, _configIn_settings_defaultFont, defaultFontSetting = (_configIn_settings_defaultFont = (_configIn_settings = configIn.settings) === null || _configIn_settings === void 0 ? void 0 : _configIn_settings.defaultFont) !== null && _configIn_settings_defaultFont !== void 0 ? _configIn_settings_defaultFont : configIn.defaultFont, defaultFont = function() {
+        var val2 = defaultFontSetting || // uses font named "body" if present for compat
+        configIn.fonts && ("body" in configIn.fonts ? "body" : "");
+        return !val2 && configIn.fonts && (val2 = Object.keys(configIn.fonts)[0]), (val2 == null ? void 0 : val2[0]) === "$" && (val2 = val2.slice(1)), val2;
+      }(), defaultFontToken = "$".concat(defaultFont), config = _object_spread_props(_object_spread2({
         fonts: {},
         onlyAllowShorthands: !1,
         fontLanguages: [],
@@ -11329,7 +11330,7 @@ var require_createTamagui_native = __commonJS({
         media: {}
       }, configIn), {
         unset: _object_spread2({
-          fontFamily: defaultFontName ? defaultFont : void 0
+          fontFamily: defaultFont ? defaultFontToken : void 0
         }, configIn.unset),
         settings: _object_spread2({
           // move deprecated settings here so we can reference them all using `getSetting`
@@ -11362,7 +11363,8 @@ var require_createTamagui_native = __commonJS({
         getCSS,
         defaultFont,
         fontSizeTokens: fontSizeTokens || /* @__PURE__ */ new Set(),
-        specificTokens
+        specificTokens,
+        defaultFontToken
       });
       if ((0, import_config.setConfig)(config), (0, import_useMedia.configureMedia)(config), createdConfigs.set(config, !0), import_config.configListeners.size && (import_config.configListeners.forEach(function(cb) {
         return cb(config);