react-native-highlight-text-view 0.1.11 → 0.1.12

package/android/src/main/java/com/highlighttext/HighlightTextView.kt

@@ -264,22 +264,44 @@ class HighlightTextView : AppCompatEditText {
   }
   
   private fun updateFont() {
-    val style = when (currentFontWeight) {
-      "bold", "700", "800", "900" -> Typeface.BOLD
-      "100", "200", "300" -> Typeface.NORMAL // Android doesn't have lighter than normal
-      else -> Typeface.NORMAL
+    // Parse font weight to integer (100-900)
+    val weight = when (currentFontWeight) {
+      "100" -> 100
+      "200" -> 200
+      "300" -> 300
+      "400", "normal" -> 400
+      "500" -> 500
+      "600" -> 600
+      "700", "bold" -> 700
+      "800" -> 800
+      "900" -> 900
+      else -> 400
     }
     
-    val typeface = if (currentFontFamily != null) {
+    // Get base typeface
+    val baseTypeface = if (currentFontFamily != null) {
       when (currentFontFamily?.lowercase()) {
-        "system" -> Typeface.create(Typeface.DEFAULT, style)
-        "sans-serif" -> Typeface.create(Typeface.SANS_SERIF, style)
-        "serif" -> Typeface.create(Typeface.SERIF, style)
-        "monospace" -> Typeface.create(Typeface.MONOSPACE, style)
-        else -> Typeface.create(currentFontFamily, style)
+        "system" -> Typeface.DEFAULT
+        "sans-serif" -> Typeface.SANS_SERIF
+        "serif" -> Typeface.SERIF
+        "monospace" -> Typeface.MONOSPACE
+        else -> try {
+          Typeface.create(currentFontFamily, Typeface.NORMAL)
+        } catch (e: Exception) {
+          Typeface.DEFAULT
+        }
       }
     } else {
-      Typeface.create(Typeface.DEFAULT, style)
+      Typeface.DEFAULT
+    }
+    
+    // Apply font weight - use API 28+ method for better weight support
+    val typeface = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+      Typeface.create(baseTypeface, weight, false)
+    } else {
+      // Fallback for older Android versions
+      val style = if (weight >= 600) Typeface.BOLD else Typeface.NORMAL
+      Typeface.create(baseTypeface, style)
     }
     
     this.typeface = typeface

package/android/src/main/java/com/highlighttext/HighlightTextViewManager.kt

@@ -128,7 +128,7 @@ class HighlightTextViewManager : SimpleViewManager<HighlightTextView>(),
   @ReactProp(name = "fontSize")
   override fun setFontSize(view: HighlightTextView?, value: String?) {
     value?.toFloatOrNull()?.let { size ->
-      view?.textSize = size
+      view?.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, size)
     }
   }
 

package/ios/HighlightTextView.mm

@@ -89,6 +89,7 @@ using namespace facebook::react;
     CGFloat _backgroundInsetLeft;
     CGFloat _backgroundInsetRight;
     CGFloat _lineHeight;
+    CGFloat _fontSize;
     NSString * _fontFamily;
     NSString * _fontWeight;
     BOOL _isUpdatingText;
@@ -120,6 +121,7 @@ using namespace facebook::react;
     _backgroundInsetLeft = 0.0;
     _backgroundInsetRight = 0.0;
     _lineHeight = 0.0; // 0 means use default line height
+    _fontSize = 32.0; // Default font size
     _fontFamily = nil;
     _fontWeight = @"normal";
     _currentVerticalAlignment = nil;
@@ -280,6 +282,7 @@ using namespace facebook::react;
         NSString *fontSizeStr = [[NSString alloc] initWithUTF8String: newViewProps.fontSize.c_str()];
         CGFloat fontSize = [fontSizeStr floatValue];
         if (fontSize > 0) {
+            _fontSize = fontSize;
             [self updateFont];
         }
     }
@@ -459,7 +462,7 @@ Class<RCTComponentViewProtocol> HighlightTextViewCls(void)
 
 - (void)updateFont
 {
-    CGFloat fontSize = _textView.font.pointSize;
+    CGFloat fontSize = _fontSize > 0 ? _fontSize : 32.0;
     UIFont *newFont = nil;
     
     // Parse font weight

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-highlight-text-view",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "A native text input for React Native that supports inline text highlighting",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",