react-native-advanced-text 0.1.8 → 0.1.9

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

@@ -9,9 +9,11 @@ import android.text.TextPaint
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
 import android.text.style.BackgroundColorSpan
+import android.text.style.ForegroundColorSpan
 import android.util.AttributeSet
 import android.util.Log
-import android.view.ContextMenu
+import android.view.ActionMode
+import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
@@ -20,7 +22,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import android.text.Selection
 
-class AdvancedTextView : TextView, View.OnCreateContextMenuListener {
+class AdvancedTextView : TextView {
 
     private val TAG = "AdvancedTextView"
 
@@ -28,7 +30,7 @@ class AdvancedTextView : TextView, View.OnCreateContextMenuListener {
     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() }
@@ -37,24 +39,65 @@ class AdvancedTextView : TextView, View.OnCreateContextMenuListener {
     private fun init() {
         Log.d(TAG, "AdvancedTextView initialized")
 
-        // Set default text appearance
-        setTextColor(Color.BLACK)
+        // Set default text appearance - DON'T set black color here
         textSize = 16f
         setPadding(16, 16, 16, 16)
 
         movementMethod = LinkMovementMethod.getInstance()
         setTextIsSelectable(true)
-        setOnCreateContextMenuListener(this)
 
-        // Ensure minimum height for visibility during debugging
-        minHeight = 100
+        // Use custom action mode for selection menu
+        customSelectionActionModeCallback = object : ActionMode.Callback {
+            override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+                Log.d(TAG, "onCreateActionMode triggered")
+                customActionMode = mode
+                return true
+            }
+
+            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+                Log.d(TAG, "onPrepareActionMode triggered")
+                menu?.clear()
+
+                val selectionStart = selectionStart
+                val selectionEnd = selectionEnd
+
+                if (selectionStart >= 0 && selectionEnd >= 0 && selectionStart != selectionEnd) {
+                    lastSelectedText = text.subSequence(selectionStart, selectionEnd).toString()
+                    Log.d(TAG, "User selected text: '$lastSelectedText'")
+                    Log.d(TAG, "Menu options available: $menuOptions")
+
+                    menuOptions.forEachIndexed { index, option ->
+                        menu?.add(0, index, index, option)
+                    }
+
+                    sendSelectionEvent(lastSelectedText, "selection")
+                    return true
+                }
+                return false
+            }
+
+            override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+                item?.let {
+                    val menuItemText = it.title.toString()
+                    Log.d(TAG, "Menu item clicked: $menuItemText")
+                    sendSelectionEvent(lastSelectedText, menuItemText)
+                    mode?.finish()
+                    return true
+                }
+                return false
+            }
+
+            override fun onDestroyActionMode(mode: ActionMode?) {
+                Log.d(TAG, "onDestroyActionMode")
+                customActionMode = null
+            }
+        }
     }
 
     fun setAdvancedText(text: String) {
         Log.d(TAG, "setAdvancedText: $text (length=${text.length})")
         this.text = text
         updateTextWithHighlights()
-        // Force layout update
         requestLayout()
         invalidate()
     }
@@ -118,16 +161,16 @@ class AdvancedTextView : TextView, View.OnCreateContextMenuListener {
 
                     if (wordIndex == indicatorWordIndex) {
                         Log.d(TAG, "Applying indicator span to word '$word' at index $wordIndex")
-
+                        // Apply red color to the indicator word
                         spannableString.setSpan(
-                            IndicatorSpan(),
+                            ForegroundColorSpan(Color.RED),
                             wordStart,
                             wordEnd,
                             Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                         )
                     }
 
-                    // clickable span
+                    // Make words clickable
                     spannableString.setSpan(
                         WordClickableSpan(wordIndex, word),
                         wordStart,
@@ -144,39 +187,6 @@ class AdvancedTextView : TextView, View.OnCreateContextMenuListener {
         Log.d(TAG, "Text updated with spans")
     }
 
-    override fun onCreateContextMenu(menu: ContextMenu?, v: View?, menuInfo: ContextMenu.ContextMenuInfo?) {
-        val selectionStart = selectionStart
-        val selectionEnd = selectionEnd
-
-        Log.d(TAG, "onCreateContextMenu triggered. selectionStart=$selectionStart selectionEnd=$selectionEnd")
-
-        if (selectionStart >= 0 && selectionEnd >= 0 && selectionStart != selectionEnd) {
-            lastSelectedText = text.subSequence(selectionStart, selectionEnd).toString()
-
-            Log.d(TAG, "User selected text: '$lastSelectedText'")
-            Log.d(TAG, "Menu options available: $menuOptions")
-
-            menu?.clear()
-
-            menuOptions.forEachIndexed { index, option ->
-                menu?.add(0, index, index, option)?.setOnMenuItemClickListener {
-                    Log.d(TAG, "Menu item clicked: $option")
-                    onMenuItemClick(it, lastSelectedText)
-                    true
-                }
-            }
-
-            sendSelectionEvent(lastSelectedText, "selection")
-        }
-    }
-
-    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) {
         Log.d(TAG, "sendSelectionEvent -> eventType='$eventType' selectedText='$selectedText'")
 
@@ -201,24 +211,17 @@ class AdvancedTextView : TextView, View.OnCreateContextMenuListener {
 
         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)
+            }
             sendWordPressEvent(word, wordIndex)
         }
 
         override fun updateDrawState(ds: TextPaint) {
             super.updateDrawState(ds)
-            ds.color = currentTextColor
-            ds.isUnderlineText = false
-        }
-    }
-
-    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.color = Color.RED
-            ds.isFakeBoldText = true
+            // Don't change the color - let ForegroundColorSpan handle it
             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 default layout params to ensure the view is visible
+        // Set layout params for proper sizing
         view.layoutParams = ViewGroup.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT
+            ViewGroup.LayoutParams.WRAP_CONTENT  // Changed to WRAP_CONTENT for auto height
         )
         return view
     }
@@ -81,7 +81,15 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
         view?.setIndicatorWordIndex(index)
     }
 
-    // Add this method to register custom events
+    // 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
     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.8",
+  "version": "0.1.9",
   "description": " Advanced text component for React Native with custom select options.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",