Skip to content

Commit d2fefad

Browse files
committed
refactor: streamline font handling logic in NitroTextImpl+Font.swift
1 parent 25dcf5d commit d2fefad

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

ios/NitroTextImpl+Font.swift

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension NitroTextImpl {
4848
var targetWeight = uiWeight
4949
var familyName = resolvedFamily
5050
let normalizedFamilyName = familyName.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
51-
let isSystemCondensed = normalizedFamilyName == "systemcondensed" || familyName == "SystemCondensed"
51+
let isSystemCondensed = normalizedFamilyName == "systemcondensed"
5252
var isCondensed = isSystemCondensed
5353
var didFindFont = false
5454
var base: UIFont? = nil
@@ -63,17 +63,14 @@ extension NitroTextImpl {
6363
return .rounded
6464
case "ui-monospace":
6565
return .monospaced
66+
case "systemcondensed":
67+
return .default
6668
default:
6769
return nil
6870
}
6971
}()
7072

71-
if familyName == Self.defaultFontFamily
72-
|| familyName == "System"
73-
|| familyName == "SystemCondensed"
74-
|| systemDesign != nil
75-
|| normalizedFamilyName == "system-ui"
76-
|| normalizedFamilyName == "system"
73+
if familyName == Self.defaultFontFamily || systemDesign != nil
7774
{
7875
base = UIFont.systemFont(ofSize: finalPointSize, weight: targetWeight)
7976
didFindFont = true

0 commit comments

Comments
 (0)