react-native-advanced-text 0.1.9 → 0.1.11

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

@@ -1,4 +1,3 @@
-// File: AdvancedTextView.kt
 package com.advancedtext
 
 import android.content.Context
@@ -30,13 +29,14 @@ class AdvancedTextView : TextView {
     private var menuOptions: List<String> = emptyList()
     private var indicatorWordIndex: Int = -1
     private var lastSelectedText: String = ""
+    private var isSelectionEnabled: Boolean = true
     private var customActionMode: ActionMode? = null
 
     constructor(context: Context?) : super(context) { init() }
     constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) { init() }
     constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { init() }
 
-    private fun init() {
+        private fun init() {
         Log.d(TAG, "AdvancedTextView initialized")
 
         // Set default text appearance - DON'T set black color here
@@ -46,7 +46,6 @@ class AdvancedTextView : TextView {
         movementMethod = LinkMovementMethod.getInstance()
         setTextIsSelectable(true)
 
-        // Use custom action mode for selection menu
         customSelectionActionModeCallback = object : ActionMode.Callback {
             override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
                 Log.d(TAG, "onCreateActionMode triggered")
@@ -96,8 +95,14 @@ class AdvancedTextView : TextView {
 
     fun setAdvancedText(text: String) {
         Log.d(TAG, "setAdvancedText: $text (length=${text.length})")
-        this.text = text
+
+        // Set the text first
+        super.setText(text, BufferType.SPANNABLE)
+
+        // Then apply highlights
         updateTextWithHighlights()
+
+        // Force layout update
         requestLayout()
         invalidate()
     }
@@ -132,59 +137,78 @@ class AdvancedTextView : TextView {
         }
 
         val spannableString = SpannableString(textValue)
-        val words = textValue.split("\\s+".toRegex())
+
+        // Split words while preserving spaces for accurate indexing
+        val words = textValue.split("\\s+".toRegex()).filter { it.isNotEmpty() }
 
         var currentIndex = 0
         words.forEachIndexed { wordIndex, word ->
 
-            if (word.isNotEmpty()) {
-                val wordStart = textValue.indexOf(word, currentIndex)
-                if (wordStart >= 0) {
-                    val wordEnd = wordStart + word.length
-
-                    highlightedWords.find { it.index == wordIndex }?.let { highlightedWord ->
-                        val color = try {
-                            Color.parseColor(highlightedWord.highlightColor)
-                        } catch (e: IllegalArgumentException) {
-                            Log.e(TAG, "Invalid color: ${highlightedWord.highlightColor}, using yellow")
-                            Color.YELLOW
-                        }
-                        Log.d(TAG, "Applying highlight to word '$word' at index $wordIndex with color ${highlightedWord.highlightColor}")
-
-                        spannableString.setSpan(
-                            BackgroundColorSpan(color),
-                            wordStart,
-                            wordEnd,
-                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                        )
+            // Find the actual position of the word in the text
+            val wordStart = textValue.indexOf(word, currentIndex)
+            if (wordStart >= 0) {
+                val wordEnd = wordStart + word.length
+
+                Log.d(TAG, "Processing word '$word' at position $wordStart-$wordEnd, index $wordIndex")
+
+                // Apply clickable span FIRST (this is important)
+                spannableString.setSpan(
+                    WordClickableSpan(wordIndex, word),
+                    wordStart,
+                    wordEnd,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+
+                // Then apply background color for highlighted words
+                highlightedWords.find { it.index == wordIndex }?.let { highlightedWord ->
+                    val color = try {
+                        Color.parseColor(highlightedWord.highlightColor)
+                    } catch (e: IllegalArgumentException) {
+                        Log.e(TAG, "Invalid color: ${highlightedWord.highlightColor}, using yellow")
+                        Color.YELLOW
                     }
+                    Log.d(TAG, "Applying highlight to word '$word' at index $wordIndex with color ${highlightedWord.highlightColor}")
 
-                    if (wordIndex == indicatorWordIndex) {
-                        Log.d(TAG, "Applying indicator span to word '$word' at index $wordIndex")
-                        // Apply red color to the indicator word
-                        spannableString.setSpan(
-                            ForegroundColorSpan(Color.RED),
-                            wordStart,
-                            wordEnd,
-                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                        )
-                    }
-
-                    // Make words clickable
                     spannableString.setSpan(
-                        WordClickableSpan(wordIndex, word),
+                        BackgroundColorSpan(color),
                         wordStart,
                         wordEnd,
                         Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                     )
+                }
+
+                // Then apply indicator span
+                if (wordIndex == indicatorWordIndex) {
+                    Log.d(TAG, "Applying indicator span to word '$word' at index $wordIndex")
 
-                    currentIndex = wordEnd
+                    spannableString.setSpan(
+                        IndicatorSpan(),
+                        wordStart,
+                        wordEnd,
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                    )
                 }
+
+                currentIndex = wordEnd
             }
         }
 
+        // Set the spannable text
         setText(spannableString, BufferType.SPANNABLE)
-        Log.d(TAG, "Text updated with spans")
+
+        // Ensure movement method is still set
+        movementMethod = LinkMovementMethod.getInstance()
+
+        Log.d(TAG, "Text updated with spans, total spans")
+    }
+
+
+
+    private fun onMenuItemClick(item: MenuItem, selectedText: String): Boolean {
+        val menuItemText = menuOptions[item.itemId]
+        Log.d(TAG, "onMenuItemClick: menuOption='$menuItemText', selectedText='$selectedText'")
+        sendSelectionEvent(selectedText, menuItemText)
+        return true
     }
 
     private fun sendSelectionEvent(selectedText: String, eventType: String) {
@@ -205,23 +229,36 @@ class AdvancedTextView : TextView {
     }
 
     private inner class WordClickableSpan(
-        private val wordIndex: Int,
-        private val word: String
+    private val wordIndex: Int,
+    private val word: String
     ) : ClickableSpan() {
 
         override fun onClick(widget: View) {
-            Log.d(TAG, "Word clicked: '$word' (index=$wordIndex)")
-            // Clear any selection first to prevent interference
-            val spannable = widget as? TextView
-            spannable?.let {
-                Selection.removeSelection(it.text as? android.text.Spannable)
+            Log.d(TAG, "WordClickableSpan onClick triggered: '$word' (index=$wordIndex)")
+
+            // Small delay to ensure the click is processed
+            widget.post {
+                sendWordPressEvent(word, wordIndex)
             }
-            sendWordPressEvent(word, wordIndex)
         }
 
         override fun updateDrawState(ds: TextPaint) {
-            super.updateDrawState(ds)
-            // Don't change the color - let ForegroundColorSpan handle it
+            // Don't call super to avoid default link styling (blue color, underline)
+            // Keep the original text appearance
+            ds.color = currentTextColor
+            ds.isUnderlineText = false
+            ds.bgColor = Color.TRANSPARENT
+        }
+    }
+
+    private inner class IndicatorSpan : ClickableSpan() {
+        override fun onClick(widget: View) {
+            Log.d(TAG, "IndicatorSpan clicked (shouldn't trigger action)")
+        }
+
+        override fun updateDrawState(ds: TextPaint) {
+
+            ds.isFakeBoldText = true
             ds.isUnderlineText = false
         }
     }

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

@@ -1,7 +1,7 @@
 // File: AdvancedTextViewManager.kt
+// This should be the ONLY content in this file
 package com.advancedtext
 
-import android.graphics.Color
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.module.annotations.ReactModule
@@ -31,10 +31,10 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
 
     public override fun createViewInstance(context: ThemedReactContext): AdvancedTextView {
         val view = AdvancedTextView(context)
-        // Set layout params for proper sizing
+        // Set default layout params to ensure the view is visible
         view.layoutParams = ViewGroup.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT  // Changed to WRAP_CONTENT for auto height
+            ViewGroup.LayoutParams.WRAP_CONTENT
         )
         return view
     }
@@ -81,15 +81,7 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
         view?.setIndicatorWordIndex(index)
     }
 
-    // Handle color prop from React Native style
-    @ReactProp(name = "color", customType = "Color")
-    fun setColor(view: AdvancedTextView?, color: Int?) {
-        color?.let {
-            view?.setTextColor(it)
-        }
-    }
-
-    // Register custom events
+    // Add this method to register custom events
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
         return mapOf(
             "onWordPress" to mapOf("registrationName" to "onWordPress"),

package/package.json

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