expo-font 12.0.5 → 12.0.7

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 12.0.7 — 2024-06-06
+
+### 🐛 Bug fixes
+
+- On `iOS`, store the font `postscriptName` instead of `fullName` which is what `iOS` will use to register the font. ([#29502](https://github.com/expo/expo/pull/29502) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 12.0.6 — 2024-05-29
+
+### 🐛 Bug fixes
+
+- [iOS] Fix font registration failing when font was in use. ([#28989](https://github.com/expo/expo/pull/28989) by [@aleqsio](https://github.com/aleqsio))
+
 ## 12.0.5 — 2024-05-10
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '12.0.5'
+version = '12.0.7'
 
 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.5"
+    versionName "12.0.7"
   }
 }

package/ios/FontLoaderModule.swift

@@ -12,7 +12,9 @@ public final class FontLoaderModule: Module {
       // If the font was already registered, unregister it first. Otherwise CTFontManagerRegisterGraphicsFont
       // would fail because of a duplicated font name when the app reloads or someone wants to override a font.
       if let familyName = FontFamilyAliasManager.familyName(forAlias: fontFamilyAlias) {
-        try unregisterFont(named: familyName)
+        guard try unregisterFont(named: familyName) else {
+          return
+        }
       }
 
       // Create a font object from the given file
@@ -23,8 +25,8 @@ public final class FontLoaderModule: Module {
 
       // The real font name might be different than it's been requested by the user,
       // so we save the provided name as an alias.
-      if let fullName = font.fullName as? String {
-        FontFamilyAliasManager.setAlias(fontFamilyAlias, forFamilyName: fullName)
+      if let postScriptName = font.postScriptName as? String {
+        FontFamilyAliasManager.setAlias(fontFamilyAlias, forFamilyName: postScriptName)
       }
     }
   }

package/ios/FontUtils.swift

@@ -66,20 +66,33 @@ internal func registerFont(_ font: CGFont) throws {
 
 /**
  Unregisters the given font, so the app will no longer be able to render it.
+ Returns a boolean indicating if the font is successfully unregistered after this function completes.
  */
-internal func unregisterFont(_ font: CGFont) throws {
+internal func unregisterFont(_ font: CGFont) throws -> Bool {
   var error: Unmanaged<CFError>?
 
   if !CTFontManagerUnregisterGraphicsFont(font, &error), let error = error?.takeRetainedValue() {
-    throw FontRegistrationFailedException(error)
+    if let ctFontManagerError = CTFontManagerError(rawValue: CFErrorGetCode(error as CFError)) {
+      switch ctFontManagerError {
+      case .systemRequired, .inUse:
+        return false
+      case .notRegistered:
+        return true
+      default:
+        throw FontRegistrationFailedException(error)
+      }
+    }
   }
+  return true
 }
 
 /**
  Unregisters a font with the given name, so the app will no longer be able to render it.
+ Returns a boolean indicating if the font is successfully unregistered after this function completes.
  */
-internal func unregisterFont(named fontName: String) throws {
+internal func unregisterFont(named fontName: String) throws -> Bool {
   if let font = CGFont(fontName as CFString) {
-    try unregisterFont(font)
+    return try unregisterFont(font)
   }
+  return true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-font",
-  "version": "12.0.5",
+  "version": "12.0.7",
   "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": "e4b8d86442482c7316365a6b7ec1141eec73409d"
+  "gitHead": "f424c7ea50d8787fa8d3354a33fe402160b63032"
 }