feat: fixed fontFamily (#7)

bluesky-social · Apr 26, 2024 · 461c9d6 · 461c9d6
1 parent 8690b58
commit 461c9d6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/ios/RNUITextViewChildShadow.swift b/ios/RNUITextViewChildShadow.swift
@@ -7,6 +7,7 @@ class RNUITextViewChildShadow: RCTShadowView {
   @objc var fontSize: CGFloat = 16.0
   @objc var fontStyle: String = "normal"
   @objc var fontWeight: String = "normal"
+  @objc var fontFamily: String?
   @objc var letterSpacing: CGFloat = 0.0
   @objc var lineHeight: CGFloat = 0.0
   @objc var pointerEvents: NSString?

diff --git a/ios/RNUITextViewManager.m b/ios/RNUITextViewManager.m
@@ -17,6 +17,7 @@ @interface RCT_EXTERN_MODULE(RNUITextViewChildManager, RCTViewManager)
 RCT_REMAP_SHADOW_PROPERTY(fontSize, fontSize, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(fontStyle, fontStyle, NSString)
 RCT_REMAP_SHADOW_PROPERTY(fontWeight, fontWeight, NSString)
+RCT_REMAP_SHADOW_PROPERTY(fontFamily, fontFamily, NSString)
 RCT_REMAP_SHADOW_PROPERTY(letterSpacing, letterSpacing, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(lineHeight, lineHeight, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(pointerEvents, pointerEvents, NSString)

diff --git a/ios/RNUITextViewShadow.swift b/ios/RNUITextViewShadow.swift
@@ -176,6 +176,8 @@ class RNUITextViewShadow: RCTShadowView {
 
     if child.fontStyle == "italic" {
       return font.italics()
+    } else if child.fontFamily != nil {
+      return UIFont(name: child.fontFamily!, size: scaledFontSize) ?? font
     }
 
     return font