fix(ios): fix the "given a font name rather than font family" condition

Tencent · Oct 22, 2024 · b8c1816 · b8c1816
1 parent 46d3540
commit b8c1816
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/renderer/native/ios/renderer/HippyFont.mm b/renderer/native/ios/renderer/HippyFont.mm
@@ -284,11 +284,16 @@ + (UIFont *)updateFont:(UIFont *)font
     // Gracefully handle being given a font name rather than font family, for
     // example: "Helvetica Light Oblique" rather than just "Helvetica".
     if (!didFindFont && familyName.length > 0 && fontNamesForFamilyName(familyName).count == 0) {
-        familyName = [HippyFont familyNameWithCSSNameMatching:familyName] ?: familyName;
-        fontWeight = weight ? fontWeight : weightOfFont(font);
-        isItalic = style ? isItalic : isItalicFont(font);
-        isCondensed = isCondensedFont(font);
-        font = cachedSystemFont(fontSize, fontWeight);
+        font = [UIFont fontWithName:familyName size:fontSize];
+        if (font) {
+            didFindFont = YES;
+        }
+        else {
+            fontWeight = weight ? fontWeight : weightOfFont(font);
+            isItalic = style ? isItalic : isItalicFont(font);
+            isCondensed = isCondensedFont(font);
+            font = cachedSystemFont(fontSize, fontWeight);
+        }
 
         if (font) {
             // It's actually a font name, not a font family name,