Skip to content

Commit 6e4dd60

Browse files
committed
refactor: improve font family detection logic in NitroTextImpl+Font.swift
1 parent d2fefad commit 6e4dd60

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

ios/NitroTextImpl+Font.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ extension NitroTextImpl {
4949
var familyName = resolvedFamily
5050
let normalizedFamilyName = familyName.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
5151
let isSystemCondensed = normalizedFamilyName == "systemcondensed"
52+
let isSystemFamily =
53+
familyName == Self.defaultFontFamily
54+
|| normalizedFamilyName == "system-ui"
55+
|| normalizedFamilyName == "system"
56+
|| isSystemCondensed
5257
var isCondensed = isSystemCondensed
5358
var didFindFont = false
5459
var base: UIFont? = nil
@@ -70,7 +75,7 @@ extension NitroTextImpl {
7075
}
7176
}()
7277

73-
if familyName == Self.defaultFontFamily || systemDesign != nil
78+
if isSystemFamily || systemDesign != nil
7479
{
7580
base = UIFont.systemFont(ofSize: finalPointSize, weight: targetWeight)
7681
didFindFont = true

0 commit comments

Comments
 (0)