react-native-highlight-text-view 0.1.16 → 0.1.18

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

@@ -206,6 +206,13 @@ class HighlightTextView : AppCompatEditText {
         }
       }
     })
+    
+    // Set cursor at end when view gains focus
+    setOnFocusChangeListener { _, hasFocus ->
+      if (hasFocus) {
+        text?.length?.let { setSelection(it) }
+      }
+    }
   }
 
   fun setCharacterBackgroundColor(color: Int) {
@@ -308,8 +315,41 @@ class HighlightTextView : AppCompatEditText {
       Typeface.create(baseTypeface, style)
     }
     
+    // Save current text to force complete rebuild
+    val currentText = text?.toString() ?: ""
+    val currentSelection = selectionStart
+    
     this.typeface = typeface
-    applyCharacterBackgrounds()
+    
+    // Force complete text rebuild with new font metrics
+    // This is crucial for fonts with different ascender/descender values like Eczar
+    post {
+      // Clear text first to force layout recalculation
+      isUpdatingText = true
+      setText("")
+      
+      // Force measure and layout with empty text
+      measure(
+        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+      )
+      
+      // Restore text - this triggers complete rebuild with new font metrics
+      setText(currentText)
+      
+      // Reapply all character backgrounds with new font metrics
+      applyCharacterBackgrounds()
+      
+      // Restore cursor position
+      val safePosition = currentSelection.coerceIn(0, currentText.length)
+      setSelection(safePosition)
+      
+      isUpdatingText = false
+      
+      // Force complete layout recalculation
+      requestLayout()
+      invalidate()
+    }
   }
   
   fun setVerticalAlign(align: String?) {
@@ -367,6 +407,8 @@ class HighlightTextView : AppCompatEditText {
     if (autoFocus && isFocusable && isFocusableInTouchMode) {
       post {
         requestFocus()
+        // Set cursor at the end of text
+        text?.length?.let { setSelection(it) }
         val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager
         imm?.showSoftInput(this, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT)
       }
@@ -377,6 +419,9 @@ class HighlightTextView : AppCompatEditText {
     val text = text?.toString() ?: return
     if (text.isEmpty()) return
     
+    // Save current cursor position
+    val currentSelection = selectionStart
+    
     val spannable = SpannableString(text)
     
     // Apply line height if specified
@@ -430,7 +475,9 @@ class HighlightTextView : AppCompatEditText {
     
     isUpdatingText = true
     setText(spannable)
-    setSelection(text.length) // Keep cursor at end
+    // Restore cursor position, or set to end if position is invalid
+    val safePosition = currentSelection.coerceIn(0, text.length)
+    setSelection(safePosition)
     isUpdatingText = false
     
     // Detect line wraps after layout is ready

package/ios/HighlightTextView.mm

@@ -430,6 +430,9 @@ using namespace facebook::react;
         if (newViewProps.autoFocus && _textView.isEditable) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 [self->_textView becomeFirstResponder];
+                // Set cursor at the end of text
+                NSUInteger textLength = self->_textView.text.length;
+                self->_textView.selectedRange = NSMakeRange(textLength, 0);
             });
         }
     }
@@ -468,6 +471,13 @@ Class<RCTComponentViewProtocol> HighlightTextViewCls(void)
     }
 }
 
+- (void)textViewDidBeginEditing:(UITextView *)textView
+{
+    // Set cursor at the end when editing begins
+    NSUInteger textLength = textView.text.length;
+    textView.selectedRange = NSMakeRange(textLength, 0);
+}
+
 - (void)updateFont
 {
     CGFloat fontSize = _fontSize > 0 ? _fontSize : 32.0;
@@ -519,7 +529,32 @@ Class<RCTComponentViewProtocol> HighlightTextViewCls(void)
     }
     
     _textView.font = newFont;
+    
+    // Save current text to force complete rebuild
+    NSString *currentText = [_textView.text copy];
+    
+    // Clear text storage to force complete recalculation
+    [_textView.textStorage beginEditing];
+    [_textView.textStorage replaceCharactersInRange:NSMakeRange(0, _textView.textStorage.length) withString:@""];
+    [_textView.textStorage endEditing];
+    
+    // Force layout manager to invalidate everything
+    [_layoutManager invalidateLayoutForCharacterRange:NSMakeRange(0, 0) actualCharacterRange:NULL];
+    [_layoutManager invalidateDisplayForCharacterRange:NSMakeRange(0, 0)];
+    
+    // Restore text and rebuild with new font
+    _textView.text = currentText;
+    
+    // Reapply character backgrounds with new font metrics - this rebuilds attributed text
     [self applyCharacterBackgrounds];
+    
+    // Force complete layout recalculation
+    [_textView.layoutManager ensureLayoutForTextContainer:_textView.textContainer];
+    
+    // Force the text view to redraw
+    [_textView setNeedsDisplay];
+    [_textView setNeedsLayout];
+    [_textView layoutIfNeeded];
 }
 
 - (void)applyCharacterBackgrounds
@@ -529,6 +564,9 @@ Class<RCTComponentViewProtocol> HighlightTextViewCls(void)
         return;
     }
     
+    // Save current cursor position
+    NSRange currentSelection = _textView.selectedRange;
+    
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:text];
     UIColor *bgColor = [self hexStringToColor:_characterBackgroundColor];
     
@@ -577,6 +615,12 @@ Class<RCTComponentViewProtocol> HighlightTextViewCls(void)
     }
     
     _textView.attributedText = attributedString;
+    
+    // Restore cursor position if valid
+    if (currentSelection.location <= text.length) {
+        _textView.selectedRange = currentSelection;
+    }
+    
     [_textView setNeedsDisplay];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-highlight-text-view",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "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",