react-native-advanced-text 0.1.42 → 0.1.44

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

@@ -44,6 +44,7 @@ class AdvancedTextView : TextView {
 
     private var indicatorWordIndex: Int = -1
     private var indicatorColor: String = ""
+    private var indicatorMode: String = "Highlight"
 
     private var wordPositions: List<WordPosition> = emptyList()
 
@@ -162,12 +163,27 @@ class AdvancedTextView : TextView {
     fun setIndicatorWordIndex(index: Int) {
         if (indicatorWordIndex == index) return
         indicatorWordIndex = index
-        invalidate()
+        if (indicatorMode == "fill") {
+            updateTextWithHighlights()
+        } else {
+            invalidate()
+        }
     }
 
     fun setIndicatorColor(color: String) {
         if (indicatorColor == color) return
         indicatorColor = color
+        if (indicatorMode == "fill") {
+            updateTextWithHighlights()
+        } else {
+            invalidate()
+        }
+    }
+
+    fun setIndicatorMode(mode: String) {
+        if (indicatorMode == mode) return
+        indicatorMode = mode
+        updateTextWithHighlights()
         invalidate()
     }
 
@@ -214,11 +230,19 @@ class AdvancedTextView : TextView {
         val spannableString = SpannableString(currentText)
 
         wordPositions.forEach { wordPos ->
+            val wordColor = if (indicatorMode == "fill" &&
+                               indicatorWordIndex >= 0 &&
+                               wordPos.index <= indicatorWordIndex &&
+                               indicatorColor.isNotEmpty()) {
+                parseColor(indicatorColor)
+            } else {
+                parseColor(textColor)
+            }
             spannableString.setSpan(
                 WordClickableSpan(
                     wordIndex = wordPos.index,
                     word = wordPos.word,
-                    wordColor = parseColor(textColor)
+                    wordColor = wordColor
                 ),
                 wordPos.start,
                 wordPos.end,
@@ -280,7 +304,12 @@ class AdvancedTextView : TextView {
                 if (lineStartOffset >= lineEndOffset) continue
 
                 val left = currentLayout.getPrimaryHorizontal(lineStartOffset)
-                val right = currentLayout.getPrimaryHorizontal(lineEndOffset)
+                val isLastWordOnLine = lineEndOffset >= currentLayout.getLineEnd(line)
+                val right = if (isLastWordOnLine) {
+                    currentLayout.getLineRight(line)
+                } else {
+                    currentLayout.getPrimaryHorizontal(lineEndOffset)
+                }
                 val top = currentLayout.getLineTop(line).toFloat()
                 val bottom = currentLayout.getLineBottom(line).toFloat()
                 val rect = RectF(
@@ -294,8 +323,8 @@ class AdvancedTextView : TextView {
             }
         }
 
-        // Draw indicator for indicatorWordIndex
-        if (indicatorWordIndex >= 0 && indicatorColor.isNotEmpty()) {
+        // Draw indicator background only in Highlight mode
+        if (indicatorMode != "fill" && indicatorWordIndex >= 0 && indicatorColor.isNotEmpty()) {
             val wordPos = wordPositions.find { it.index == indicatorWordIndex }
             if (wordPos != null) {
                 val start = wordPos.start
@@ -314,7 +343,12 @@ class AdvancedTextView : TextView {
                         if (lineStartOffset >= lineEndOffset) continue
 
                         val left = currentLayout.getPrimaryHorizontal(lineStartOffset)
-                        val right = currentLayout.getPrimaryHorizontal(lineEndOffset)
+                        val isLastWordOnLine = lineEndOffset >= currentLayout.getLineEnd(line)
+                        val right = if (isLastWordOnLine) {
+                            currentLayout.getLineRight(line)
+                        } else {
+                            currentLayout.getPrimaryHorizontal(lineEndOffset)
+                        }
                         val top = currentLayout.getLineTop(line).toFloat()
                         val bottom = currentLayout.getLineBottom(line).toFloat()
                         val rect = RectF(

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

@@ -136,6 +136,14 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>() {
         }
     }
 
+    @ReactProp(name = "indicatorMode")
+    fun setIndicatorMode(view: AdvancedTextView?, indicatorMode: String?) {
+        android.util.Log.d(NAME, "setIndicatorMode called with: $indicatorMode")
+        if (indicatorMode != null) {
+            view?.setIndicatorMode(indicatorMode)
+        }
+    }
+
     @ReactProp(name = "lineHeight")
     fun setLineHeight(view: AdvancedTextView?, lineHeight: Float) {
         android.util.Log.d(NAME, "setLineHeight called with: $lineHeight")

package/ios/AdvancedTextView.mm

@@ -25,6 +25,7 @@ using namespace facebook::react;
 @property (nonatomic, assign) CGFloat lineHeight;
 @property (nonatomic, assign) NSInteger indicatorWordIndex;
 @property (nonatomic, strong) UIColor *indicatorColor;
+@property (nonatomic, strong) NSString *indicatorMode;
 
 - (void)handleCustomMenuAction:(UIMenuItem *)sender;
 - (void)drawHighlightedBackgroundsInTextView:(UITextView *)textView;
@@ -100,6 +101,7 @@ using namespace facebook::react;
             _lineHeight = 0.0;
             _indicatorWordIndex = -1;
             _indicatorColor = nil;
+            _indicatorMode = @"Highlight";
 
             [self setupTextView];
             [self setupGestureRecognizers];
@@ -234,10 +236,20 @@ using namespace facebook::react;
             styleChanged = YES;
         }
 
+        BOOL indicatorChanged = NO;
+
+        if (oldViewProps.indicatorMode != newViewProps.indicatorMode) {
+            NSLog(@"[AdvancedTextView] Updating indicatorMode to: %s", newViewProps.indicatorMode.c_str());
+            _indicatorMode = newViewProps.indicatorMode.empty()
+                ? @"Highlight"
+                : [NSString stringWithUTF8String:newViewProps.indicatorMode.c_str()];
+            indicatorChanged = YES;
+        }
+
         if (oldViewProps.indicatorWordIndex != newViewProps.indicatorWordIndex) {
             NSLog(@"[AdvancedTextView] Updating indicatorWordIndex to: %d", newViewProps.indicatorWordIndex);
             _indicatorWordIndex = static_cast<NSInteger>(newViewProps.indicatorWordIndex);
-            [_textView setNeedsDisplay];
+            indicatorChanged = YES;
         }
 
         if (oldViewProps.indicatorColor != newViewProps.indicatorColor) {
@@ -248,7 +260,15 @@ using namespace facebook::react;
             } else {
                 _indicatorColor = nil;
             }
-            [_textView setNeedsDisplay];
+            indicatorChanged = YES;
+        }
+
+        if (indicatorChanged) {
+            if ([_indicatorMode isEqualToString:@"fill"]) {
+                [self updateTextAppearance]; // rebuilds attributed text with fill colors; calls setNeedsDisplay
+            } else {
+                [_textView setNeedsDisplay];
+            }
         }
 
         if (textChanged) {
@@ -452,6 +472,18 @@ using namespace facebook::react;
                                  value:color
                                  range:NSMakeRange(0, attributedString.length)];
 
+        if ([_indicatorMode isEqualToString:@"fill"] && _indicatorWordIndex >= 0 && _indicatorColor) {
+            for (NSDictionary *wordInfo in _wordRanges) {
+                NSInteger idx = [wordInfo[@"index"] integerValue];
+                if (idx <= _indicatorWordIndex) {
+                    NSRange wordRange = [wordInfo[@"range"] rangeValue];
+                    [attributedString addAttribute:NSForegroundColorAttributeName
+                                             value:_indicatorColor
+                                             range:wordRange];
+                }
+            }
+        }
+
         _textView.attributedText = attributedString;
         [_textView setNeedsDisplay];
 
@@ -513,7 +545,7 @@ using namespace facebook::react;
         }];
     }
 
-    if (_indicatorWordIndex >= 0 && _indicatorColor) {
+    if (![_indicatorMode isEqualToString:@"fill"] && _indicatorWordIndex >= 0 && _indicatorColor) {
         for (NSDictionary *wordInfo in _wordRanges) {
             NSNumber *index = wordInfo[@"index"];
             if ([index integerValue] != _indicatorWordIndex) {

package/lib/module/AdvancedTextViewNativeComponent.ts

@@ -24,6 +24,7 @@ export interface NativeProps extends ViewProps {
   lineHeight?: Float;
   indicatorWordIndex?: Int32;
   indicatorColor?: string;
+  indicatorMode?: string;
 }
 
 export default codegenNativeComponent<NativeProps>('AdvancedTextView');

package/lib/typescript/src/AdvancedTextViewNativeComponent.d.ts

@@ -25,6 +25,7 @@ export interface NativeProps extends ViewProps {
     lineHeight?: Float;
     indicatorWordIndex?: Int32;
     indicatorColor?: string;
+    indicatorMode?: string;
 }
 declare const _default: import("react-native/types_generated/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
 export default _default;

package/lib/typescript/src/AdvancedTextViewNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdvancedTextViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/AdvancedTextViewNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAG,KAAK,EAAG,MAAM,2CAA2C,CAAC;AAEpG,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IACjE,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1E,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;;AAED,wBAAuE"}
+{"version":3,"file":"AdvancedTextViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/AdvancedTextViewNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAG,KAAK,EAAG,MAAM,2CAA2C,CAAC;AAEpG,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IACjE,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1E,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC;IACnB,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;;AAED,wBAAuE"}

package/package.json

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

package/src/AdvancedTextViewNativeComponent.ts

@@ -24,6 +24,7 @@ export interface NativeProps extends ViewProps {
   lineHeight?: Float;
   indicatorWordIndex?: Int32;
   indicatorColor?: string;
+  indicatorMode?: string;
 }
 
 export default codegenNativeComponent<NativeProps>('AdvancedTextView');