react-native-advanced-text 0.1.16 → 0.1.18

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

@@ -1,3 +1,4 @@
+// File: AdvancedTextView.kt
 package com.advancedtext
 
 import android.content.Context
@@ -29,32 +30,32 @@ 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
+    private var currentText: String = ""
+
+    // Cache for word positions to avoid recalculating
+    private var wordPositions: List<WordPosition> = emptyList()
 
     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
+        // Set default properties
         textSize = 16f
         setPadding(16, 16, 16, 16)
-
         movementMethod = LinkMovementMethod.getInstance()
         setTextIsSelectable(true)
 
         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
@@ -62,8 +63,6 @@ class AdvancedTextView : TextView {
 
                 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)
@@ -78,7 +77,6 @@ class AdvancedTextView : TextView {
             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
@@ -87,133 +85,119 @@ class AdvancedTextView : TextView {
             }
 
             override fun onDestroyActionMode(mode: ActionMode?) {
-                Log.d(TAG, "onDestroyActionMode")
                 customActionMode = null
             }
         }
     }
 
     fun setAdvancedText(text: String) {
-        Log.d(TAG, "setAdvancedText: $text (length=${text.length})")
-
-        // Set the text first
-        super.setText(text, BufferType.SPANNABLE)
+        if (currentText == text) {
+            Log.d(TAG, "Text unchanged, skipping update")
+            return
+        }
 
-        // Then apply highlights
+        Log.d(TAG, "setAdvancedText: length=${text.length}")
+        currentText = text
+        calculateWordPositions(text)
         updateTextWithHighlights()
-
-        // Force layout update
-        requestLayout()
-        invalidate()
     }
 
     fun setMenuOptions(menuOptions: List<String>) {
-        Log.d(TAG, "setMenuOptions received from RN: $menuOptions")
+        if (this.menuOptions == menuOptions) return
         this.menuOptions = menuOptions
     }
 
     fun setHighlightedWords(highlightedWords: List<HighlightedWord>) {
-        Log.d(TAG, "setHighlightedWords received from RN: $highlightedWords")
+        if (this.highlightedWords == highlightedWords) return
         this.highlightedWords = highlightedWords
         updateTextWithHighlights()
     }
 
     fun setIndicatorWordIndex(index: Int) {
-        Log.d(TAG, "setIndicatorWordIndex received: $index")
+        if (this.indicatorWordIndex == index) return
         this.indicatorWordIndex = index
         updateTextWithHighlights()
     }
 
-    private fun updateTextWithHighlights() {
-        val textValue = this.text?.toString() ?: ""
-        Log.d(TAG, "updateTextWithHighlights called")
-        Log.d(TAG, "Current text: $textValue")
-        Log.d(TAG, "Highlighted words: $highlightedWords")
-        Log.d(TAG, "Indicator index: $indicatorWordIndex")
-
-        if (textValue.isEmpty()) {
-            Log.d(TAG, "No text available, skipping")
+    private fun calculateWordPositions(text: String) {
+        if (text.isEmpty()) {
+            wordPositions = emptyList()
             return
         }
 
-        val spannableString = SpannableString(textValue)
+        val positions = mutableListOf<WordPosition>()
+        val regex = "\\S+".toRegex()
 
-        // Split words while preserving spaces for accurate indexing
-        val words = textValue.split("\\s+".toRegex()).filter { it.isNotEmpty() }
+        regex.findAll(text).forEachIndexed { index, match ->
+            positions.add(WordPosition(
+                index = index,
+                start = match.range.first,
+                end = match.range.last + 1,
+                word = match.value
+            ))
+        }
 
-        var currentIndex = 0
-        words.forEachIndexed { wordIndex, word ->
+        wordPositions = positions
+        Log.d(TAG, "Calculated ${wordPositions.size} word positions")
+    }
 
-            // Find the actual position of the word in the text
-            val wordStart = textValue.indexOf(word, currentIndex)
-            if (wordStart >= 0) {
-                val wordEnd = wordStart + word.length
+    private fun updateTextWithHighlights() {
+        if (currentText.isEmpty()) {
+            Log.d(TAG, "No text available, skipping")
+            return
+        }
 
-                Log.d(TAG, "Processing word '$word' at position $wordStart-$wordEnd, index $wordIndex")
+        val spannableString = SpannableString(currentText)
 
-                // Apply clickable span FIRST (this is important)
+        // Apply spans efficiently
+        wordPositions.forEach { wordPos ->
+            // Apply highlights
+            highlightedWords.find { it.index == wordPos.index }?.let { highlightedWord ->
+                val color = parseColor(highlightedWord.highlightColor)
                 spannableString.setSpan(
-                    WordClickableSpan(wordIndex, word),
-                    wordStart,
-                    wordEnd,
+                    BackgroundColorSpan(color),
+                    wordPos.start,
+                    wordPos.end,
                     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}")
-
-                    spannableString.setSpan(
-                        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")
-
-                    spannableString.setSpan(
-                        IndicatorSpan(),
-                        wordStart,
-                        wordEnd,
-                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                    )
-                }
-
-                currentIndex = wordEnd
             }
-        }
 
-        // Set the spannable text
-        setText(spannableString, BufferType.SPANNABLE)
+            // Apply indicator color
+            if (wordPos.index == indicatorWordIndex) {
+                spannableString.setSpan(
+                    ForegroundColorSpan(Color.RED),
+                    wordPos.start,
+                    wordPos.end,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+            }
 
-        // Ensure movement method is still set
-        movementMethod = LinkMovementMethod.getInstance()
+            // Make words clickable
+            spannableString.setSpan(
+                WordClickableSpan(wordPos.index, wordPos.word),
+                wordPos.start,
+                wordPos.end,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+        }
 
-        Log.d(TAG, "Text updated with spans, total spans")
+        // Use post to ensure UI thread and avoid layout issues
+        post {
+            setText(spannableString, BufferType.SPANNABLE)
+            Log.d(TAG, "Text updated with ${wordPositions.size} 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 parseColor(colorString: String): Int {
+        return try {
+            Color.parseColor(colorString)
+        } catch (e: IllegalArgumentException) {
+            Log.e(TAG, "Invalid color: $colorString, using yellow")
+            Color.YELLOW
+        }
     }
 
     private fun sendSelectionEvent(selectedText: String, eventType: String) {
-        Log.d(TAG, "sendSelectionEvent -> eventType='$eventType' selectedText='$selectedText'")
-
         try {
             val reactContext = context as? ReactContext ?: return
             val event = Arguments.createMap().apply {
@@ -229,43 +213,28 @@ 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, "WordClickableSpan onClick triggered: '$word' (index=$wordIndex)")
-
-            // Small delay to ensure the click is processed
-            widget.post {
-                sendWordPressEvent(word, wordIndex)
+            Log.d(TAG, "Word clicked: '$word' (index=$wordIndex)")
+            val spannable = widget as? TextView
+            spannable?.text?.let {
+                if (it is android.text.Spannable) {
+                    Selection.removeSelection(it)
+                }
             }
+            sendWordPressEvent(word, wordIndex)
         }
 
         override fun updateDrawState(ds: TextPaint) {
-            // Don't call super to avoid default link styling (blue color, underline)
-            // Keep the original text appearance
-
-            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
+            super.updateDrawState(ds)
             ds.isUnderlineText = false
         }
     }
 
     private fun sendWordPressEvent(word: String, index: Int) {
-        Log.d(TAG, "sendWordPressEvent -> word='$word', index=$index")
-
         try {
             val reactContext = context as? ReactContext ?: return
             val event = Arguments.createMap().apply {
@@ -281,20 +250,17 @@ class AdvancedTextView : TextView {
     }
 
     fun clearSelection() {
-        Log.d(TAG, "clearSelection called")
-        val spannable = this.text as? android.text.Spannable ?: return
-        Selection.removeSelection(spannable)
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        Log.d(TAG, "onMeasure: width=${measuredWidth}, height=${measuredHeight}")
+        (text as? android.text.Spannable)?.let {
+            Selection.removeSelection(it)
+        }
     }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        Log.d(TAG, "onLayout: changed=$changed, bounds=[$left,$top,$right,$bottom]")
-    }
+    data class WordPosition(
+        val index: Int,
+        val start: Int,
+        val end: Int,
+        val word: String
+    )
 }
 
 data class HighlightedWord(

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

@@ -1,7 +1,8 @@
 // File: AdvancedTextViewManager.kt
-// This should be the ONLY content in this file
 package com.advancedtext
 
+import android.graphics.Color
+import android.util.TypedValue
 import android.view.ViewGroup
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.module.annotations.ReactModule
@@ -11,10 +12,12 @@ import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.AdvancedTextViewManagerInterface
 import com.facebook.react.viewmanagers.AdvancedTextViewManagerDelegate
+import com.facebook.react.uimanager.PixelUtil
 
 @ReactModule(name = AdvancedTextViewManager.NAME)
 class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
     AdvancedTextViewManagerInterface<AdvancedTextView> {
+
     private val mDelegate: ViewManagerDelegate<AdvancedTextView>
 
     init {
@@ -31,26 +34,33 @@ 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
         view.layoutParams = ViewGroup.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
+        // Set default text color to black to ensure visibility
+        view.setTextColor(Color.BLACK)
         return view
     }
 
     @ReactProp(name = "text")
     override fun setText(view: AdvancedTextView?, text: String?) {
+        android.util.Log.d("AdvancedTextViewManager", "setText called with: '$text'")
         view?.setAdvancedText(text ?: "")
     }
 
     @ReactProp(name = "highlightedWords")
     override fun setHighlightedWords(view: AdvancedTextView?, highlightedWords: ReadableArray?) {
+        if (highlightedWords == null) {
+            view?.setHighlightedWords(emptyList())
+            return
+        }
+
         val words = mutableListOf<HighlightedWord>()
-        highlightedWords?.let {
-            for (i in 0 until it.size()) {
-                val map = it.getMap(i)
-                map?.let { wordMap ->
+        for (i in 0 until highlightedWords.size()) {
+            val map = highlightedWords.getMap(i)
+            map?.let { wordMap ->
+                if (wordMap.hasKey("index") && wordMap.hasKey("highlightColor")) {
                     words.add(
                         HighlightedWord(
                             index = wordMap.getInt("index"),
@@ -65,12 +75,15 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
 
     @ReactProp(name = "menuOptions")
     override fun setMenuOptions(view: AdvancedTextView?, menuOptions: ReadableArray?) {
+        if (menuOptions == null) {
+            view?.setMenuOptions(emptyList())
+            return
+        }
+
         val options = mutableListOf<String>()
-        menuOptions?.let {
-            for (i in 0 until it.size()) {
-                it.getString(i)?.let { option ->
-                    options.add(option)
-                }
+        for (i in 0 until menuOptions.size()) {
+            menuOptions.getString(i)?.let { option ->
+                options.add(option)
             }
         }
         view?.setMenuOptions(options)
@@ -78,10 +91,24 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
 
     @ReactProp(name = "indicatorWordIndex")
     override fun setIndicatorWordIndex(view: AdvancedTextView?, index: Int) {
-        view?.setIndicatorWordIndex(index)
+        view?.setIndicatorWordIndex(if (index >= 0) index else -1)
+    }
+
+    @ReactProp(name = "color", customType = "Color")
+    fun setColor(view: AdvancedTextView?, color: Int?) {
+        android.util.Log.d("AdvancedTextViewManager", "setColor called with: $color")
+        view?.setTextColor(color ?: Color.BLACK)
+    }
+
+    @ReactProp(name = "fontSize")
+    fun setFontSize(view: AdvancedTextView?, fontSize: Float) {
+        android.util.Log.d("AdvancedTextViewManager", "setFontSize called with: $fontSize")
+        if (fontSize > 0) {
+            // Convert from React Native points to Android pixels
+            view?.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize)
+        }
     }
 
-    // Add this method to register custom events
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
         return mapOf(
             "onWordPress" to mapOf("registrationName" to "onWordPress"),

package/lib/module/AdvancedText.js

@@ -1,16 +1,21 @@
 "use strict";
 
+import React from 'react';
 import AdvancedTextViewNativeComponent from './AdvancedTextViewNativeComponent';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const AdvancedText = ({
   text,
+  style,
   highlightedWords,
   menuOptions,
   onWordPress,
   onSelection,
-  indicatorWordIndex
+  indicatorWordIndex,
+  ...restProps
 }) => {
   return /*#__PURE__*/_jsx(AdvancedTextViewNativeComponent, {
+    ...restProps,
+    style: style,
     text: text,
     highlightedWords: highlightedWords,
     menuOptions: menuOptions,

package/lib/module/AdvancedText.js.map

@@ -1 +1 @@
-{"version":3,"names":["AdvancedTextViewNativeComponent","jsx","_jsx","AdvancedText","text","highlightedWords","menuOptions","onWordPress","onSelection","indicatorWordIndex"],"sourceRoot":"..\\..\\src","sources":["AdvancedText.tsx"],"mappings":";;AACA,OAAOA,+BAA+B,MAAM,mCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAqBhF,OAAO,MAAMC,YAAmC,GAAGA,CAAC;EAClDC,IAAI;EACJC,gBAAgB;EAChBC,WAAW;EACXC,WAAW;EACXC,WAAW;EACXC;AACF,CAAC,KAAK;EACJ,oBACEP,IAAA,CAACF,+BAA+B;IAC9BI,IAAI,EAAEA,IAAK;IACXC,gBAAgB,EAAEA,gBAAiB;IACnCC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,kBAAkB,EAAEA;EAAmB,CACxC,CAAC;AAEN,CAAC","ignoreList":[]}
+{"version":3,"names":["React","AdvancedTextViewNativeComponent","jsx","_jsx","AdvancedText","text","style","highlightedWords","menuOptions","onWordPress","onSelection","indicatorWordIndex","restProps"],"sourceRoot":"..\\..\\src","sources":["AdvancedText.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAOzB,OAAOC,+BAA+B,MAAM,mCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AA2BhF,OAAO,MAAMC,YAAmC,GAAGA,CAAC;EAClDC,IAAI;EACJC,KAAK;EACLC,gBAAgB;EAChBC,WAAW;EACXC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClB,GAAGC;AACL,CAAC,KAAK;EACJ,oBACET,IAAA,CAACF,+BAA+B;IAAA,GAC1BW,SAAS;IACbN,KAAK,EAAEA,KAAM;IACbD,IAAI,EAAEA,IAAK;IACXE,gBAAgB,EAAEA,gBAAiB;IACnCC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,kBAAkB,EAAEA;EAAmB,CACxC,CAAC;AAEN,CAAC","ignoreList":[]}

package/lib/module/AdvancedTextViewNativeComponent.ts

@@ -1,8 +1,8 @@
-import { codegenNativeComponent } from 'react-native';
+/* eslint-disable prettier/prettier */
 import type { ViewProps } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 // @ts-ignore
-// eslint-disable-next-line prettier/prettier
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { DirectEventHandler, Float, Int32} from 'react-native/Libraries/Types/CodegenTypes';
 
 interface HighlightedWord {
   index: Int32;
@@ -13,9 +13,11 @@ interface NativeProps extends ViewProps {
   text: string;
   highlightedWords?: ReadonlyArray<HighlightedWord>;
   menuOptions?: ReadonlyArray<string>;
-  onWordPress?: DirectEventHandler<{ word: string }>;
-  onSelection?: DirectEventHandler<{ selectedText: string; eventType: string }>;
+  onWordPress?: DirectEventHandler<{ word: string; index: Int32 }>;
+  onSelection?: DirectEventHandler<{ selectedText: string; event: string }>;
   indicatorWordIndex?: Int32;
+  color?: Int32;
+  fontSize?: Float;
 }
 
 export default codegenNativeComponent<NativeProps>('AdvancedTextView');

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

@@ -1,20 +1,24 @@
-import type { NativeSyntheticEvent, ViewProps } from 'react-native';
+import React from 'react';
+import type { NativeSyntheticEvent, StyleProp, ViewProps, ViewStyle } from 'react-native';
 interface HighlightedWord {
     index: number;
     highlightColor: string;
 }
+interface WordPressEvent {
+    word: string;
+    index: number;
+}
+interface SelectionEvent {
+    selectedText: string;
+    event: string;
+}
 interface NativeProps extends ViewProps {
     text: string;
+    style?: StyleProp<ViewStyle>;
     highlightedWords?: ReadonlyArray<HighlightedWord>;
     menuOptions?: ReadonlyArray<string>;
-    onWordPress?: (event: NativeSyntheticEvent<{
-        word: string;
-        index: string;
-    }>) => void;
-    onSelection?: (event: NativeSyntheticEvent<{
-        selectedText: string;
-        event: string;
-    }>) => void;
+    onWordPress?: (event: NativeSyntheticEvent<WordPressEvent>) => void;
+    onSelection?: (event: NativeSyntheticEvent<SelectionEvent>) => void;
     indicatorWordIndex?: number;
 }
 export declare const AdvancedText: React.FC<NativeProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"AdvancedText.d.ts","sourceRoot":"","sources":["../../../src/AdvancedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGpE,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAElD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,CACZ,KAAK,EAAE,oBAAoB,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,KACzD,IAAI,CAAC;IACV,WAAW,CAAC,EAAE,CACZ,KAAK,EAAE,oBAAoB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,KACjE,IAAI,CAAC;IACV,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAkB9C,CAAC"}
+{"version":3,"file":"AdvancedText.d.ts","sourceRoot":"","sources":["../../../src/AdvancedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EACV,oBAAoB,EACpB,SAAS,EACT,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAGtB,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,cAAc;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC;IACpE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC;IACpE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAsB9C,CAAC"}

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

@@ -1,5 +1,5 @@
 import type { ViewProps } from 'react-native';
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { DirectEventHandler, Float, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 interface HighlightedWord {
     index: Int32;
     highlightColor: string;
@@ -10,12 +10,15 @@ interface NativeProps extends ViewProps {
     menuOptions?: ReadonlyArray<string>;
     onWordPress?: DirectEventHandler<{
         word: string;
+        index: Int32;
     }>;
     onSelection?: DirectEventHandler<{
         selectedText: string;
-        eventType: string;
+        event: string;
     }>;
     indicatorWordIndex?: Int32;
+    color?: Int32;
+    fontSize?: Float;
 }
 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,EAAE,MAAM,2CAA2C,CAAC;AAE3F,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,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,CAAA;KAAE,CAAC,CAAC;IACnD,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9E,kBAAkB,CAAC,EAAE,KAAK,CAAC;CAC5B;;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,EAAE,KAAK,EAAC,MAAM,2CAA2C,CAAC;AAEjG,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,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,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB;;AAED,wBAAuE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-advanced-text",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "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/AdvancedText.tsx

@@ -1,4 +1,10 @@
-import type { NativeSyntheticEvent, ViewProps } from 'react-native';
+import React from 'react';
+import type {
+  NativeSyntheticEvent,
+  StyleProp,
+  ViewProps,
+  ViewStyle,
+} from 'react-native';
 import AdvancedTextViewNativeComponent from './AdvancedTextViewNativeComponent';
 
 interface HighlightedWord {
@@ -6,30 +12,40 @@ interface HighlightedWord {
   highlightColor: string;
 }
 
+interface WordPressEvent {
+  word: string;
+  index: number;
+}
+
+interface SelectionEvent {
+  selectedText: string;
+  event: string;
+}
+
 interface NativeProps extends ViewProps {
   text: string;
+  style?: StyleProp<ViewStyle>;
   highlightedWords?: ReadonlyArray<HighlightedWord>;
-
   menuOptions?: ReadonlyArray<string>;
-  onWordPress?: (
-    event: NativeSyntheticEvent<{ word: string; index: string }>
-  ) => void;
-  onSelection?: (
-    event: NativeSyntheticEvent<{ selectedText: string; event: string }>
-  ) => void;
+  onWordPress?: (event: NativeSyntheticEvent<WordPressEvent>) => void;
+  onSelection?: (event: NativeSyntheticEvent<SelectionEvent>) => void;
   indicatorWordIndex?: number;
 }
 
 export const AdvancedText: React.FC<NativeProps> = ({
   text,
+  style,
   highlightedWords,
   menuOptions,
   onWordPress,
   onSelection,
   indicatorWordIndex,
+  ...restProps
 }) => {
   return (
     <AdvancedTextViewNativeComponent
+      {...restProps}
+      style={style}
       text={text}
       highlightedWords={highlightedWords}
       menuOptions={menuOptions}

package/src/AdvancedTextViewNativeComponent.ts

@@ -1,8 +1,8 @@
-import { codegenNativeComponent } from 'react-native';
+/* eslint-disable prettier/prettier */
 import type { ViewProps } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
 // @ts-ignore
-// eslint-disable-next-line prettier/prettier
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { DirectEventHandler, Float, Int32} from 'react-native/Libraries/Types/CodegenTypes';
 
 interface HighlightedWord {
   index: Int32;
@@ -13,9 +13,11 @@ interface NativeProps extends ViewProps {
   text: string;
   highlightedWords?: ReadonlyArray<HighlightedWord>;
   menuOptions?: ReadonlyArray<string>;
-  onWordPress?: DirectEventHandler<{ word: string }>;
-  onSelection?: DirectEventHandler<{ selectedText: string; eventType: string }>;
+  onWordPress?: DirectEventHandler<{ word: string; index: Int32 }>;
+  onSelection?: DirectEventHandler<{ selectedText: string; event: string }>;
   indicatorWordIndex?: Int32;
+  color?: Int32;
+  fontSize?: Float;
 }
 
 export default codegenNativeComponent<NativeProps>('AdvancedTextView');