expo-font 12.0.2 → 12.0.3

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 12.0.3 — 2024-04-24
+
+_This version does not introduce any user-facing changes._
+
 ## 12.0.2 — 2024-04-23
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '12.0.2'
+version = '12.0.3'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,6 +14,6 @@ android {
   namespace "expo.modules.font"
   defaultConfig {
     versionCode 29
-    versionName "12.0.2"
+    versionName "12.0.3"
   }
 }

package/ios/FontFamilyAliasManager.swift

@@ -39,21 +39,35 @@ internal struct FontFamilyAliasManager {
 }
 
 /**
- Swizzles ``UIFont.fontNames(forFamilyName:)`` to support font family aliases.
+ Swizzles ``UIFont.fontNames(forFamilyName:)`` and ``UIFont(name:size:)`` to support font family aliases.
  This is necessary because the user provides a custom family name that is then used in stylesheets,
  however the font usually has a different name encoded in the binary, thus the system may use a different name.
+
+ ``UIFont(name:size:)`` covers cases where there the font family has variants. For example, the ``CGFont fullName``
+ value for "Helvetica-Light-Oblique.ttf" would be something like "Helvetica Light Oblique", which
+ ``UIFont.fullNames`` won't recognize, because that is a font name rather than a font family name. We have to use
+ ``UIFont(name:size:)`` instead, because it accepts a font name. React Native does this looking up / falling back
+ for us, we just need to ensure both methods are swizzled so they both support aliasing.
  */
 private func maybeSwizzleUIFont() {
   if hasSwizzled {
     return
   }
-  let originalMethod = class_getClassMethod(UIFont.self, #selector(UIFont.fontNames(forFamilyName:)))
-  let newMethod = class_getClassMethod(UIFont.self, #selector(UIFont._expo_fontNames(forFamilyName:)))
+  let originalFontNamesMethod = class_getClassMethod(UIFont.self, #selector(UIFont.fontNames(forFamilyName:)))
+  let newFontNamesMethod = class_getClassMethod(UIFont.self, #selector(UIFont._expo_fontNames(forFamilyName:)))
 
-  if let originalMethod, let newMethod {
-    method_exchangeImplementations(originalMethod, newMethod)
+  if let originalFontNamesMethod, let newFontNamesMethod {
+    method_exchangeImplementations(originalFontNamesMethod, newFontNamesMethod)
   } else {
     log.error("expo-font is unable to swizzle `UIFont.fontNames(forFamilyName:)`")
   }
+  let originalInitMethod = class_getClassMethod(UIFont.self, #selector(UIFont.init(name:size:)))
+  let newInitMethod = class_getClassMethod(UIFont.self, #selector(UIFont._expo_init(name:size:)))
+
+  if let originalInitMethod, let newInitMethod {
+    method_exchangeImplementations(originalInitMethod, newInitMethod)
+  } else {
+    log.error("expo-font is unable to swizzle `UIFont.init(name:size:)`")
+  }
   hasSwizzled = true
 }

package/ios/UIFont+FontFamilyAlias.swift

@@ -15,4 +15,13 @@ public extension UIFont {
     }
     return fontNames
   }
+  @objc
+  static dynamic func _expo_init(name fontName: String, size fontSize: CGFloat) -> UIFont? {
+    let font = UIFont._expo_init(name: fontName, size: fontSize)
+
+    if let aliasedFamilyName = FontFamilyAliasManager.familyName(forAlias: fontName) {
+      return UIFont._expo_init(name: aliasedFamilyName, size: fontSize)
+    }
+    return font
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-font",
-  "version": "12.0.2",
+  "version": "12.0.3",
   "description": "Load fonts at runtime and use them in React Native components.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
+  "gitHead": "f8f9d041c6467f325b58c7913e0f5ed1af102e11"
 }