react-native-advanced-text 0.2.10 → 0.2.11

package/android/build.gradle

@@ -33,6 +33,7 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    consumerProguardFiles "consumer-rules.pro"
   }
 
   buildFeatures {

package/android/consumer-rules.pro

@@ -0,0 +1,3 @@
+# NativeTextMeasurement is only called from C++ (ShadowNodes.cpp) via JNI,
+# so R8 can't see it's used and would strip or rename it.
+-keep class com.advancedtext.NativeTextMeasurement { *; }

package/android/src/main/java/com/advancedtext/AdvancedTextPackage.kt

@@ -8,6 +8,9 @@ import java.util.ArrayList
 
 class AdvancedTextViewPackage : ReactPackage {
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    // Fabric measures text before any view exists, so hand the app's assets
+    // to the measurer as early as possible.
+    NativeTextMeasurement.assetManager = reactContext.assets
     val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
     viewManagers.add(AdvancedTextViewManager())
     return viewManagers

package/android/src/main/java/com/advancedtext/AdvancedTextView.kt

@@ -173,7 +173,7 @@ class AdvancedTextView : TextView {
     fun setAdvancedFontFamily(family: String) {
         if (fontFamily == family) return
         fontFamily = family
-        typeface = Typeface.create(family, Typeface.NORMAL)
+        typeface = NativeTextMeasurement.resolveTypeface(family, Typeface.NORMAL)
     }
 
     fun setMenuOptions(menuOptions: List<String>) {
@@ -281,9 +281,9 @@ class AdvancedTextView : TextView {
         setTextSize(fontSize)
 
         typeface = when (fontWeight) {
-            "bold" -> Typeface.create(fontFamily, Typeface.BOLD)
-            "italic" -> Typeface.create(fontFamily, Typeface.ITALIC)
-            else -> Typeface.create(fontFamily, Typeface.NORMAL)
+            "bold" -> NativeTextMeasurement.resolveTypeface(fontFamily, Typeface.BOLD)
+            "italic" -> NativeTextMeasurement.resolveTypeface(fontFamily, Typeface.ITALIC)
+            else -> NativeTextMeasurement.resolveTypeface(fontFamily, Typeface.NORMAL)
         }
 
 

package/android/src/main/java/com/advancedtext/NativeTextMeasurement.kt

@@ -1,10 +1,12 @@
 package com.advancedtext
 
+import android.content.res.AssetManager
 import android.content.res.Resources
 import android.graphics.Typeface
 import android.text.StaticLayout
 import android.text.TextPaint
 import android.util.TypedValue
+import com.facebook.react.common.assets.ReactFontManager
 
 /**
  * JNI bridge so the Fabric ShadowNode (C++ `measureContent()`) can ask
@@ -31,6 +33,20 @@ import android.util.TypedValue
  */
 object NativeTextMeasurement {
 
+    /** App assets, so fonts bundled under `assets/fonts/` resolve here too. */
+    @Volatile
+    var assetManager: AssetManager? = null
+
+    /**
+     * Resolves a font family the way React Native's own <Text> does: fonts
+     * registered at runtime (expo-font), then `assets/fonts/<family>.ttf|otf`,
+     * then system families. `AdvancedTextView` uses this too, so measuring and
+     * rendering always pick the same typeface.
+     */
+    @JvmStatic
+    fun resolveTypeface(fontFamily: String, style: Int): Typeface =
+        ReactFontManager.getInstance().getTypeface(fontFamily, style, assetManager)
+
     @JvmStatic
     fun measureHeight(
         text: String,
@@ -50,7 +66,7 @@ object NativeTextMeasurement {
             TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, fontSizeSp, displayMetrics)
 
         val paint = TextPaint(TextPaint.ANTI_ALIAS_FLAG)
-        paint.typeface = Typeface.create(fontFamily, typefaceStyle)
+        paint.typeface = resolveTypeface(fontFamily, typefaceStyle)
         paint.textSize = fontSizePx
         // Mirrors AdvancedTextView's own letterSpacing conversion: dp/points
         // prop -> em, scale-invariant so no density conversion is needed.

package/ios/AdvancedTextView.mm

@@ -9,6 +9,21 @@
 
 using namespace facebook::react;
 
+// Resolves a PostScript name, a family name, or an expo-font alias (expo-font
+// only hooks +fontNamesForFamilyName:, which is also what RN's <Text> uses).
+static UIFont *ATResolveFont(NSString *family, CGFloat size)
+{
+    if (family.length == 0) {
+        return nil;
+    }
+    UIFont *font = [UIFont fontWithName:family size:size];
+    if (font) {
+        return font;
+    }
+    NSString *fontName = [UIFont fontNamesForFamilyName:family].firstObject;
+    return fontName ? [UIFont fontWithName:fontName size:size] : nil;
+}
+
 
 @class AdvancedTextView;
 
@@ -446,10 +461,7 @@ using namespace facebook::react;
         if (_lineHeight > 0) {
             NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
 
-            UIFont *font = nil;
-            if (_fontFamily && _fontFamily.length > 0) {
-                font = [UIFont fontWithName:_fontFamily size:_fontSize > 0 ? _fontSize : 16.0];
-            }
+            UIFont *font = ATResolveFont(_fontFamily, _fontSize > 0 ? _fontSize : 16.0);
             if (!font) {
                 font = [UIFont systemFontOfSize:_fontSize > 0 ? _fontSize : 16.0];
             }
@@ -462,11 +474,7 @@ using namespace facebook::react;
                                      range:NSMakeRange(0, attributedString.length)];
         }
 
-        UIFont *font = nil;
-
-        if (_fontFamily && _fontFamily.length > 0) {
-            font = [UIFont fontWithName:_fontFamily size:_fontSize > 0 ? _fontSize : 16.0];
-        }
+        UIFont *font = ATResolveFont(_fontFamily, _fontSize > 0 ? _fontSize : 16.0);
 
         if (!font) {
             if (_fontWeight && [_fontWeight.lowercaseString isEqualToString:@"bold"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-advanced-text",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": " Advanced text component for React Native with custom select options.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",