react-native-highlight-text-view 0.1.32 → 0.1.33

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

@@ -14,6 +14,7 @@ import android.util.TypedValue
 import android.view.Gravity
 import androidx.appcompat.widget.AppCompatEditText
 import com.facebook.react.common.assets.ReactFontManager
+import kotlin.math.abs
 
 /**
  * Custom EditText that mimics the iOS implementation by drawing per-character
@@ -141,6 +142,12 @@ class HighlightTextView : AppCompatEditText {
     val paint = paint
     val radius = if (highlightBorderRadius > 0f) highlightBorderRadius else cornerRadius
 
+    // Precompute horizontal alignment flags once per draw pass
+    val horizontalGravity = gravity and Gravity.HORIZONTAL_GRAVITY_MASK
+    val isLeftAlignedView = horizontalGravity == Gravity.START || horizontalGravity == Gravity.LEFT
+    val isRightAlignedView = horizontalGravity == Gravity.END || horizontalGravity == Gravity.RIGHT
+    val isCenterAlignedView = horizontalGravity == Gravity.CENTER_HORIZONTAL
+
     val length = text.length
     if (length == 0) return
 
@@ -194,14 +201,22 @@ class HighlightTextView : AppCompatEditText {
         xStart + paint.measureText(text, i, i + 1)
       }
 
-      // Vertical bounds based on line box (includes line spacing)
-      val lineTop = layout.getLineTop(line).toFloat()
-      val lineBottom = layout.getLineBottom(line).toFloat()
+      // Vertical bounds based on font metrics around the baseline, so
+      // they are independent from Android's line spacing mechanics.
+      val baseline = layout.getLineBaseline(line).toFloat()
+      val fm = paint.fontMetrics
 
       var left = xStart
       var right = xEnd
-      var top = lineTop
-      var bottom = lineBottom
+      var top = baseline + fm.ascent
+      var bottom = baseline + fm.descent
+
+      // For right-aligned text, ensure the outermost character on each line
+      // snaps to the line's visual right edge so the highlight's right side
+      // forms a clean vertical column across wrapped lines.
+      if (isRightAlignedView && !hasRightNeighbor) {
+        right = layout.getLineRight(line)
+      }
 
       // First shrink by background insets (from the line box)
       top += backgroundInsetTop
@@ -215,25 +230,6 @@ class HighlightTextView : AppCompatEditText {
       top -= charPaddingTop
       bottom += charPaddingBottom
 
-      if (customLineSpacing < 0f) {
-        val originalLineTop = layout.getLineTop(line).toFloat()
-        val originalLineBottom = layout.getLineBottom(line).toFloat()
-        
-        if (line > 0 && top < originalLineTop) {
-          val prevLineBottom = layout.getLineBottom(line - 1).toFloat()
-          if (top < prevLineBottom) {
-            top = prevLineBottom
-          }
-        }
-        
-        if (line < layout.lineCount - 1 && bottom > originalLineBottom) {
-          val nextLineTop = layout.getLineTop(line + 1).toFloat()
-          if (bottom > nextLineTop) {
-            bottom = nextLineTop
-          }
-        }
-      }
-
       if (right <= left || bottom <= top) continue
 
       backgroundRect.set(left, top, right, bottom)
@@ -242,11 +238,10 @@ class HighlightTextView : AppCompatEditText {
       val isFirstLineOfParagraph = line == 0 || isLineEmpty(text, layout, line - 1)
       val isLastLineOfParagraph = line == layout.lineCount - 1 || isLineEmpty(text, layout, line + 1)
       
-      // Detect text alignment from view's gravity
-      val horizontalGravity = gravity and Gravity.HORIZONTAL_GRAVITY_MASK
-      val isLeftAligned = horizontalGravity == Gravity.START || horizontalGravity == Gravity.LEFT
-      val isRightAligned = horizontalGravity == Gravity.END || horizontalGravity == Gravity.RIGHT
-      val isCenterAligned = horizontalGravity == Gravity.CENTER_HORIZONTAL
+      // Use precomputed text alignment flags
+      val isLeftAligned = isLeftAlignedView
+      val isRightAligned = isRightAlignedView
+      val isCenterAligned = isCenterAlignedView
       
       var tl = 0f
       var tr = 0f
@@ -273,8 +268,10 @@ class HighlightTextView : AppCompatEditText {
               tr = radius
             } else {
               val prevLineWidth = layout.getLineMax(line - 1)
-              // Round Top-Right if we stick out further than the line above
-              tr = if (currentLineWidth > prevLineWidth) radius else 0f
+              // Round Top-Right only if this line extends further than the line above
+              tr = if (!lineWidthsEqual(currentLineWidth, prevLineWidth) &&
+                currentLineWidth > prevLineWidth
+              ) radius else 0f
             }
 
             // Bottom-Right
@@ -282,8 +279,10 @@ class HighlightTextView : AppCompatEditText {
               br = radius
             } else {
               val nextLineWidth = layout.getLineMax(line + 1)
-              // Round Bottom-Right if we overhang the line below
-              br = if (currentLineWidth > nextLineWidth) radius else 0f
+              // Round Bottom-Right only if this line extends further than the line below
+              br = if (!lineWidthsEqual(currentLineWidth, nextLineWidth) &&
+                currentLineWidth > nextLineWidth
+              ) radius else 0f
             }
           }
         }
@@ -307,8 +306,10 @@ class HighlightTextView : AppCompatEditText {
               tl = radius
             } else {
               val prevLineWidth = layout.getLineMax(line - 1)
-              // Round Top-Left if we stick out further than the line above
-              tl = if (currentLineWidth > prevLineWidth) radius else 0f
+              // Round Top-Left only if this line extends further than the line above
+              tl = if (!lineWidthsEqual(currentLineWidth, prevLineWidth) &&
+                currentLineWidth > prevLineWidth
+              ) radius else 0f
             }
 
             // Bottom-Left
@@ -316,8 +317,10 @@ class HighlightTextView : AppCompatEditText {
               bl = radius
             } else {
               val nextLineWidth = layout.getLineMax(line + 1)
-              // Round Bottom-Left if we overhang the line below
-              bl = if (currentLineWidth > nextLineWidth) radius else 0f
+              // Round Bottom-Left only if this line extends further than the line below
+              bl = if (!lineWidthsEqual(currentLineWidth, nextLineWidth) &&
+                currentLineWidth > nextLineWidth
+              ) radius else 0f
             }
           }
         }
@@ -333,8 +336,10 @@ class HighlightTextView : AppCompatEditText {
               tl = radius
             } else {
               val prevLineWidth = layout.getLineMax(line - 1)
-              // Round Top-Left if we stick out further than the line above
-              tl = if (currentLineWidth > prevLineWidth) radius else 0f
+              // Round Top-Left only if this line extends further than the line above
+              tl = if (!lineWidthsEqual(currentLineWidth, prevLineWidth) &&
+                currentLineWidth > prevLineWidth
+              ) radius else 0f
             }
 
             // Bottom-Left
@@ -342,8 +347,10 @@ class HighlightTextView : AppCompatEditText {
               bl = radius
             } else {
               val nextLineWidth = layout.getLineMax(line + 1)
-              // Round Bottom-Left if we overhang the line below
-              bl = if (currentLineWidth > nextLineWidth) radius else 0f
+              // Round Bottom-Left only if this line extends further than the line below
+              bl = if (!lineWidthsEqual(currentLineWidth, nextLineWidth) &&
+                currentLineWidth > nextLineWidth
+              ) radius else 0f
             }
           }
 
@@ -354,8 +361,10 @@ class HighlightTextView : AppCompatEditText {
               tr = radius
             } else {
               val prevLineWidth = layout.getLineMax(line - 1)
-              // Round Top-Right if we stick out further than the line above
-              tr = if (currentLineWidth > prevLineWidth) radius else 0f
+              // Round Top-Right only if this line extends further than the line above
+              tr = if (!lineWidthsEqual(currentLineWidth, prevLineWidth) &&
+                currentLineWidth > prevLineWidth
+              ) radius else 0f
             }
 
             // Bottom-Right
@@ -363,8 +372,10 @@ class HighlightTextView : AppCompatEditText {
               br = radius
             } else {
               val nextLineWidth = layout.getLineMax(line + 1)
-              // Round Bottom-Right if we overhang the line below
-              br = if (currentLineWidth > nextLineWidth) radius else 0f
+              // Round Bottom-Right only if this line extends further than the line below
+              br = if (!lineWidthsEqual(currentLineWidth, nextLineWidth) &&
+                currentLineWidth > nextLineWidth
+              ) radius else 0f
             }
           }
         }
@@ -382,6 +393,11 @@ class HighlightTextView : AppCompatEditText {
     }
   }
 
+  private fun lineWidthsEqual(w1: Float, w2: Float): Boolean {
+    // Small tolerance so lines that should visually match are treated as equal
+    return abs(w1 - w2) < 0.5f
+  }
+
   private fun isLineEmpty(text: CharSequence, layout: android.text.Layout, line: Int): Boolean {
     if (line < 0 || line >= layout.lineCount) return false
     

package/package.json

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