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

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

@@ -315,40 +315,60 @@ class HighlightTextView : AppCompatEditText {
       Typeface.create(baseTypeface, style)
     }
     
-    // Save current text to force complete rebuild
+    // Save current text and selection
     val currentText = text?.toString() ?: ""
     val currentSelection = selectionStart
     
+    // Apply new typeface
     this.typeface = typeface
     
-    // Force complete text rebuild with new font metrics
-    // This is crucial for fonts with different ascender/descender values like Eczar
+    // CRITICAL: Force complete layout rebuild for fonts with different metrics (like Eczar)
+    // Multiple post calls ensure all layout phases complete with new font
     post {
-      // Clear text first to force layout recalculation
       isUpdatingText = true
+      
+      // Phase 1: Clear everything
       setText("")
+      paint.typeface = typeface  // Ensure paint also has new typeface
       
-      // Force measure and layout with empty text
+      // Force measure with empty text and new font
       measure(
         MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
         MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
       )
+      layout(left, top, right, bottom)
       
-      // 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()
+      // Phase 2: Restore text and rebuild (next frame)
+      post {
+        setText(currentText)
+        
+        // Force another measure/layout cycle with actual text
+        measure(
+          MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+          MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        )
+        layout(left, top, right, bottom)
+        
+        // Phase 3: Apply backgrounds and finalize (next frame)
+        post {
+          applyCharacterBackgrounds()
+          
+          // Restore cursor position
+          val safePosition = currentSelection.coerceIn(0, currentText.length)
+          setSelection(safePosition)
+          
+          isUpdatingText = false
+          
+          // Final layout pass
+          requestLayout()
+          invalidate()
+          
+          // Extra invalidate to ensure rendering
+          post {
+            invalidate()
+          }
+        }
+      }
     }
   }
   

package/ios/HighlightTextView.mm

@@ -528,33 +528,51 @@ Class<RCTComponentViewProtocol> HighlightTextViewCls(void)
         newFont = [UIFont systemFontOfSize:fontSize weight:fontWeight];
     }
     
-    _textView.font = newFont;
-    
-    // Save current text to force complete rebuild
+    // Save current text and selection
     NSString *currentText = [_textView.text copy];
+    NSRange currentSelection = _textView.selectedRange;
     
-    // Clear text storage to force complete recalculation
-    [_textView.textStorage beginEditing];
-    [_textView.textStorage replaceCharactersInRange:NSMakeRange(0, _textView.textStorage.length) withString:@""];
-    [_textView.textStorage endEditing];
+    // Update font on text view
+    _textView.font = newFont;
     
-    // Force layout manager to invalidate everything
-    [_layoutManager invalidateLayoutForCharacterRange:NSMakeRange(0, 0) actualCharacterRange:NULL];
-    [_layoutManager invalidateDisplayForCharacterRange:NSMakeRange(0, 0)];
+    // CRITICAL: Force complete rebuild by removing and re-adding the text container
+    // This ensures all glyph and layout caches are cleared for the new font metrics
+    NSTextContainer *textContainer = _textView.textContainer;
+    NSTextStorage *textStorage = _textView.textStorage;
     
-    // Restore text and rebuild with new font
-    _textView.text = currentText;
+    // Remove text container from layout manager
+    [_layoutManager removeTextContainerAtIndex:0];
     
-    // Reapply character backgrounds with new font metrics - this rebuilds attributed text
-    [self applyCharacterBackgrounds];
+    // Completely invalidate all layout
+    [_layoutManager invalidateLayoutForCharacterRange:NSMakeRange(0, textStorage.length) actualCharacterRange:NULL];
+    [_layoutManager invalidateDisplayForCharacterRange:NSMakeRange(0, textStorage.length)];
     
-    // Force complete layout recalculation
-    [_textView.layoutManager ensureLayoutForTextContainer:_textView.textContainer];
+    // Re-add text container - forces complete layout recalculation
+    [_layoutManager addTextContainer:textContainer];
     
-    // Force the text view to redraw
-    [_textView setNeedsDisplay];
-    [_textView setNeedsLayout];
-    [_textView layoutIfNeeded];
+    // Force immediate layout with new font metrics
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Restore text through applyCharacterBackgrounds which rebuilds attributed string
+        [self applyCharacterBackgrounds];
+        
+        // Ensure layout is calculated with new font
+        [self->_layoutManager ensureLayoutForTextContainer:self->_textView.textContainer];
+        
+        // Restore selection if valid
+        if (currentSelection.location <= currentText.length) {
+            self->_textView.selectedRange = currentSelection;
+        }
+        
+        // Force complete redraw
+        [self->_textView setNeedsDisplay];
+        [self->_textView setNeedsLayout];
+        [self->_textView layoutIfNeeded];
+        
+        // Trigger another display update to ensure rendering
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self->_textView setNeedsDisplay];
+        });
+    });
 }
 
 - (void)applyCharacterBackgrounds

package/package.json

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