@tamagui/core 1.65.3 → 1.66.0

package/dist/native.js

@@ -2400,7 +2400,7 @@ var require_getVariantExtras_native = __commonJS({
         tokens: conf.tokensParsed,
         theme,
         fontFamily,
-        font: fonts[fontFamily],
+        font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
         // TODO do this in splitstlye
         // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
         props: (0, import_createProxy.createProxy)(curProps, {
@@ -2626,9 +2626,9 @@ var require_propMapper_native = __commonJS({
           case "lineHeight":
           case "letterSpacing":
           case "fontWeight": {
-            let fam = fontFamily || conf.defaultFont;
+            let defaultFont = conf.defaultFont || "$body", fam = fontFamily || defaultFont;
             if (fam) {
-              let font = (context != null && context.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed)[fam];
+              let fontsParsed = context != null && context.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed, font = fontsParsed[fam] || fontsParsed[defaultFont];
               valOrVar = ((_b = font == null ? void 0 : font[fontShorthand[key] || key]) == null ? void 0 : _b[value]) || value, hasSet = !0;
             }
             break;
@@ -3882,7 +3882,7 @@ var require_getSplitStyles_native = __commonJS({
         if (isStyleProp && props.asChild === "except-style")
           continue;
         let shouldPassProp = !isStyleProp || // is in parent variants
-        isHOC && (parentStaticConfig == null ? void 0 : parentStaticConfig.variants) && keyInit in parentStaticConfig.variants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo || (_a = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) != null && _a[keyInit] || keyInit in skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
+        isHOC && (parentStaticConfig == null ? void 0 : parentStaticConfig.variants) && keyInit in parentStaticConfig.variants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = (_a = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _a[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo || parentVariant || keyInit in skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
         if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(
           `\u{1F539}\u{1F539}\u{1F539}\u{1F539} ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ""} ${shouldPassThrough ? "(pass)" : ""} \u{1F539}\u{1F539}\u{1F539}\u{1F539}`
         ), console.log({ isVariant, valInit, shouldPassProp }), import_constants2.isClient && console.log({
@@ -5025,7 +5025,8 @@ If you meant to do this, you can disable this warning - either change untilMeasu
           ...staticConfig,
           ...extended,
           neverFlatten: !0,
-          isHOC: !0
+          isHOC: !0,
+          isStyledHOC: !1
         };
       }
       function extractable(Component2, extended) {
@@ -5846,7 +5847,7 @@ var require_styled_native = __commonJS({
           }), parentStaticConfig && (parentStaticConfig.isHOC && !parentStaticConfig.isStyledHOC || (defaultProps = {
             ...parentStaticConfig.defaultProps,
             ...defaultProps
-          }), parentStaticConfig.variants && (variants = (0, import_mergeVariants.mergeVariants)(parentStaticConfig.variants, variants))), parentStaticConfig != null && parentStaticConfig.isHOC && name && (defaultProps.componentName = name);
+          }, parentStaticConfig.variants && (variants = (0, import_mergeVariants.mergeVariants)(parentStaticConfig.variants, variants)))), parentStaticConfig != null && parentStaticConfig.isHOC && name && (defaultProps.componentName = name);
           let isText = !!(staticExtractionOptions != null && staticExtractionOptions.isText || parentStaticConfig != null && parentStaticConfig.isText), acceptsClassName = acceptsClassNameProp ?? (isPlainStyledComponent || isReactNative || (parentStaticConfig == null ? void 0 : parentStaticConfig.isHOC) && (parentStaticConfig == null ? void 0 : parentStaticConfig.acceptsClassName)), conf = {
             ...parentStaticConfig,
             ...staticExtractionOptions,