@tamagui/core 1.91.2 → 1.91.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7550,7 +7550,7 @@ var require_getSplitStyles_native = __commonJS({
7550
7550
  if (isHOC)
7551
7551
  viewProps.style = normalizeStyle(styleProp);
7552
7552
  else
7553
- for (var isArray = Array.isArray(styleProp), len = isArray ? props.length : 1, i1 = 0; i1 < len; i1++) {
7553
+ for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i1 = 0; i1 < len; i1++) {
7554
7554
  var style1 = isArray ? styleProp[i1] : styleProp;
7555
7555
  if (style1)
7556
7556
  if (style1.$$css)
@@ -7560,6 +7560,14 @@ var require_getSplitStyles_native = __commonJS({
7560
7560
  (_styleState4 = styleState).style || (_styleState4.style = {}), Object.assign(styleState.style, normalizeStyle(style1));
7561
7561
  }
7562
7562
  }
7563
+ var style2 = styleState.style;
7564
+ if (style2 != null && style2.fontFamily) {
7565
+ var _getFont, faceInfo = (_getFont = (0, import_config.getFont)(style2.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
7566
+ if (faceInfo) {
7567
+ var _faceInfo_style_fontWeight_, _faceInfo_style_fontWeight, overrideFace = (_faceInfo_style_fontWeight = faceInfo[style2.fontWeight]) === null || _faceInfo_style_fontWeight === void 0 || (_faceInfo_style_fontWeight_ = _faceInfo_style_fontWeight[style2.fontStyle || "normal"]) === null || _faceInfo_style_fontWeight_ === void 0 ? void 0 : _faceInfo_style_fontWeight_.val;
7568
+ overrideFace && (style2.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style2.fontWeight, delete style2.fontStyle);
7569
+ }
7570
+ }
7563
7571
  var result = {
7564
7572
  space,
7565
7573
  hasMedia,
@@ -7572,15 +7580,7 @@ var require_getSplitStyles_native = __commonJS({
7572
7580
  dynamicThemeAccess,
7573
7581
  pseudoGroups,
7574
7582
  mediaGroups
7575
- }, style2 = styleState.style;
7576
- if (style2 != null && style2.fontFamily) {
7577
- var _getFont, faceInfo = (_getFont = (0, import_config.getFont)(style2.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
7578
- if (faceInfo) {
7579
- var _faceInfo_style_fontWeight_, _faceInfo_style_fontWeight, overrideFace = (_faceInfo_style_fontWeight = faceInfo[style2.fontWeight]) === null || _faceInfo_style_fontWeight === void 0 || (_faceInfo_style_fontWeight_ = _faceInfo_style_fontWeight[style2.fontStyle || "normal"]) === null || _faceInfo_style_fontWeight_ === void 0 ? void 0 : _faceInfo_style_fontWeight_.val;
7580
- overrideFace && (style2.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style2.fontWeight, delete style2.fontStyle);
7581
- }
7582
- }
7583
- var asChild = props.asChild, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
7583
+ }, asChild = props.asChild, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
7584
7584
  if (!asChildExceptStyleLike) {
7585
7585
  var style3 = styleState.style;
7586
7586
  if (0) {