react-native-advanced-text 0.1.13 → 0.1.15

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

@@ -8,9 +8,9 @@ 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.util.TypedValue
 import android.view.ActionMode
 import android.view.Menu
 import android.view.MenuItem
@@ -32,16 +32,20 @@ class AdvancedTextView : TextView {
     private var isSelectionEnabled: Boolean = true
     private var customActionMode: ActionMode? = null
 
+    // Cache for base text color to avoid parsing multiple times
+    private var baseTextColor: Int = Color.BLACK
+
     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 text appearance
         textSize = 16f
         setPadding(16, 16, 16, 16)
+        baseTextColor = currentTextColor
 
         movementMethod = LinkMovementMethod.getInstance()
         setTextIsSelectable(true)
@@ -63,7 +67,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)
@@ -95,25 +98,44 @@ class AdvancedTextView : TextView {
 
     fun setAdvancedText(text: String) {
         Log.d(TAG, "setAdvancedText: $text (length=${text.length})")
-
-        // Set the text first
         super.setText(text, BufferType.SPANNABLE)
-
-        // Then apply highlights
         updateTextWithHighlights()
-
-        // Force layout update
         requestLayout()
         invalidate()
     }
 
+    // Performance-optimized: Set base font size at view level
+    fun setFontSize(size: Float) {
+        Log.d(TAG, "setFontSize: $size")
+        // Use SP units for accessibility
+        setTextSize(TypedValue.COMPLEX_UNIT_SP, size)
+    }
+
+    // Performance-optimized: Set base color at view level
+    fun setTextColorProp(colorString: String?) {
+        try {
+            val color = if (colorString != null) {
+                Color.parseColor(colorString)
+            } else {
+                Color.BLACK
+            }
+            Log.d(TAG, "setTextColorProp: $colorString -> $color")
+            baseTextColor = color
+            setTextColor(color)
+        } catch (e: IllegalArgumentException) {
+            Log.e(TAG, "Invalid color: $colorString, using black", e)
+            baseTextColor = Color.BLACK
+            setTextColor(Color.BLACK)
+        }
+    }
+
     fun setMenuOptions(menuOptions: List<String>) {
-        Log.d(TAG, "setMenuOptions received from RN: $menuOptions")
+        Log.d(TAG, "setMenuOptions received: $menuOptions")
         this.menuOptions = menuOptions
     }
 
     fun setHighlightedWords(highlightedWords: List<HighlightedWord>) {
-        Log.d(TAG, "setHighlightedWords received from RN: $highlightedWords")
+        Log.d(TAG, "setHighlightedWords received: $highlightedWords")
         this.highlightedWords = highlightedWords
         updateTextWithHighlights()
     }
@@ -127,9 +149,6 @@ class AdvancedTextView : TextView {
     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")
@@ -137,21 +156,15 @@ class AdvancedTextView : TextView {
         }
 
         val spannableString = SpannableString(textValue)
-
-        // Split words while preserving spaces for accurate indexing
         val words = textValue.split("\\s+".toRegex()).filter { it.isNotEmpty() }
 
         var currentIndex = 0
         words.forEachIndexed { wordIndex, word ->
-
-            // 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)
+                // Apply clickable span
                 spannableString.setSpan(
                     WordClickableSpan(wordIndex, word),
                     wordStart,
@@ -159,15 +172,14 @@ class AdvancedTextView : TextView {
                     Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                 )
 
-                // Then apply background color for highlighted words
+                // Apply background highlight
                 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")
+                        Log.e(TAG, "Invalid color: ${highlightedWord.highlightColor}")
                         Color.YELLOW
                     }
-                    Log.d(TAG, "Applying highlight to word '$word' at index $wordIndex with color ${highlightedWord.highlightColor}")
 
                     spannableString.setSpan(
                         BackgroundColorSpan(color),
@@ -177,10 +189,8 @@ class AdvancedTextView : TextView {
                     )
                 }
 
-                // Then apply indicator span
+                // Apply indicator span
                 if (wordIndex == indicatorWordIndex) {
-                    Log.d(TAG, "Applying indicator span to word '$word' at index $wordIndex")
-
                     spannableString.setSpan(
                         IndicatorSpan(),
                         wordStart,
@@ -193,22 +203,8 @@ class AdvancedTextView : TextView {
             }
         }
 
-        // Set the spannable text
         setText(spannableString, BufferType.SPANNABLE)
-
-        // 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) {
@@ -229,23 +225,20 @@ 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
+            Log.d(TAG, "WordClickableSpan onClick: '$word' (index=$wordIndex)")
             widget.post {
                 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.color = currentTextColor
+            // Preserve the base text color instead of forcing a color
+            ds.color = baseTextColor
             ds.isUnderlineText = false
             ds.bgColor = Color.TRANSPARENT
         }
@@ -253,11 +246,11 @@ class AdvancedTextView : TextView {
 
     private inner class IndicatorSpan : ClickableSpan() {
         override fun onClick(widget: View) {
-            Log.d(TAG, "IndicatorSpan clicked (shouldn't trigger action)")
+            Log.d(TAG, "IndicatorSpan clicked")
         }
 
         override fun updateDrawState(ds: TextPaint) {
-
+            ds.color = baseTextColor
             ds.isFakeBoldText = true
             ds.isUnderlineText = false
         }
@@ -293,7 +286,7 @@ class AdvancedTextView : TextView {
 
     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]")
+        Log.d(TAG, "onLayout: changed=$changed")
     }
 }
 

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

@@ -1,5 +1,3 @@
-// File: AdvancedTextViewManager.kt
-// This should be the ONLY content in this file
 package com.advancedtext
 
 import android.view.ViewGroup
@@ -31,7 +29,6 @@ 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
@@ -44,6 +41,16 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
         view?.setAdvancedText(text ?: "")
     }
 
+    @ReactProp(name = "fontSize", defaultFloat = 16f)
+    override fun setFontSize(view: AdvancedTextView?, fontSize: Float) {
+        view?.setFontSize(fontSize)
+    }
+
+    @ReactProp(name = "color")
+    override fun setColor(view: AdvancedTextView?, color: String?) {
+        view?.setTextColorProp(color)
+    }
+
     @ReactProp(name = "highlightedWords")
     override fun setHighlightedWords(view: AdvancedTextView?, highlightedWords: ReadableArray?) {
         val words = mutableListOf<HighlightedWord>()
@@ -81,24 +88,6 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
         view?.setIndicatorWordIndex(index)
     }
 
-    @ReactProp(name = "color")
-    fun setColor(view: AdvancedTextView?, color: String?) {
-        color?.let {
-            try {
-                view?.setTextColor(android.graphics.Color.parseColor(it))
-            } catch (e: IllegalArgumentException) {
-                // fallback to default color if parsing fails
-                view?.setTextColor(android.graphics.Color.BLACK)
-            }
-        }
-    }
-
-    @ReactProp(name = "fontSize")
-    fun setFontSize(view: AdvancedTextView?, fontSize: Int) {
-        view?.setTextSize(fontSize.toFloat())
-    }
-
-    // Add this method to register custom events
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
         return mapOf(
             "onWordPress" to mapOf("registrationName" to "onWordPress"),
@@ -106,7 +95,6 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
         )
     }
 
-
     companion object {
         const val NAME = "AdvancedTextView"
     }

package/lib/module/AdvancedText.js

@@ -9,8 +9,8 @@ export const AdvancedText = ({
   onWordPress,
   onSelection,
   indicatorWordIndex,
-  color,
-  fontSize
+  fontSize,
+  color
 }) => {
   return /*#__PURE__*/_jsx(AdvancedTextViewNativeComponent, {
     text: text,
@@ -19,8 +19,8 @@ export const AdvancedText = ({
     onWordPress: onWordPress,
     onSelection: onSelection,
     indicatorWordIndex: indicatorWordIndex,
-    color: color,
-    fontSize: fontSize
+    fontSize: fontSize,
+    color: color
   });
 };
 //# sourceMappingURL=AdvancedText.js.map

package/lib/module/AdvancedText.js.map

@@ -1 +1 @@
-{"version":3,"names":["AdvancedTextViewNativeComponent","jsx","_jsx","AdvancedText","text","highlightedWords","menuOptions","onWordPress","onSelection","indicatorWordIndex","color","fontSize"],"sourceRoot":"..\\..\\src","sources":["AdvancedText.tsx"],"mappings":";;AACA,OAAOA,+BAA+B,MAAM,mCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAuBhF,OAAO,MAAMC,YAAmC,GAAGA,CAAC;EAClDC,IAAI;EACJC,gBAAgB;EAChBC,WAAW;EACXC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,KAAK;EACLC;AACF,CAAC,KAAK;EACJ,oBACET,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,kBAAmB;IACvCC,KAAK,EAAEA,KAAM;IACbC,QAAQ,EAAEA;EAAS,CACpB,CAAC;AAEN,CAAC","ignoreList":[]}
+{"version":3,"names":["AdvancedTextViewNativeComponent","jsx","_jsx","AdvancedText","text","highlightedWords","menuOptions","onWordPress","onSelection","indicatorWordIndex","fontSize","color"],"sourceRoot":"..\\..\\src","sources":["AdvancedText.tsx"],"mappings":";;AACA,OAAOA,+BAA+B,MAAM,mCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAsBhF,OAAO,MAAMC,YAAmC,GAAGA,CAAC;EAClDC,IAAI;EACJC,gBAAgB;EAChBC,WAAW;EACXC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,QAAQ;EACRC;AACF,CAAC,KAAK;EACJ,oBACET,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,kBAAmB;IACvCC,QAAQ,EAAEA,QAAS;IACnBC,KAAK,EAAEA;EAAM,CACd,CAAC;AAEN,CAAC","ignoreList":[]}

package/lib/module/AdvancedTextViewNativeComponent.ts

@@ -2,7 +2,7 @@ import { codegenNativeComponent } from 'react-native';
 import type { ViewProps } from 'react-native';
 // @ts-ignore
 // eslint-disable-next-line prettier/prettier
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { DirectEventHandler, Int32, Float } from 'react-native/Libraries/Types/CodegenTypes';
 
 interface HighlightedWord {
   index: Int32;
@@ -11,12 +11,12 @@ interface HighlightedWord {
 
 interface NativeProps extends ViewProps {
   text: string;
-  color: string;
-  fontSize: Int32;
+  fontSize?: Float;
+  color?: 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;
 }
 

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

@@ -6,8 +6,8 @@ interface HighlightedWord {
 interface NativeProps extends ViewProps {
     text: string;
     highlightedWords?: ReadonlyArray<HighlightedWord>;
-    color: string;
-    fontSize: number;
+    fontSize?: number;
+    color?: string;
     menuOptions?: ReadonlyArray<string>;
     onWordPress?: (event: NativeSyntheticEvent<{
         word: string;

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;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IAEjB,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,CAsB9C,CAAC"}
+{"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;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,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,CAsB9C,CAAC"}

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

@@ -1,21 +1,22 @@
 import type { ViewProps } from 'react-native';
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { DirectEventHandler, Int32, Float } from 'react-native/Libraries/Types/CodegenTypes';
 interface HighlightedWord {
     index: Int32;
     highlightColor: string;
 }
 interface NativeProps extends ViewProps {
     text: string;
-    color: string;
-    fontSize: Int32;
+    fontSize?: Float;
+    color?: string;
     highlightedWords?: ReadonlyArray<HighlightedWord>;
     menuOptions?: ReadonlyArray<string>;
     onWordPress?: DirectEventHandler<{
         word: string;
+        index: Int32;
     }>;
     onSelection?: DirectEventHandler<{
         selectedText: string;
-        eventType: string;
+        event: string;
     }>;
     indicatorWordIndex?: Int32;
 }

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,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC;IAChB,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,EAAE,MAAM,2CAA2C,CAAC;AAElG,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,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;CAC5B;;AAED,wBAAuE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-advanced-text",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "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

@@ -9,9 +9,8 @@ interface HighlightedWord {
 interface NativeProps extends ViewProps {
   text: string;
   highlightedWords?: ReadonlyArray<HighlightedWord>;
-  color: string;
-  fontSize: number;
-
+  fontSize?: number;
+  color?: string;
   menuOptions?: ReadonlyArray<string>;
   onWordPress?: (
     event: NativeSyntheticEvent<{ word: string; index: string }>
@@ -29,8 +28,8 @@ export const AdvancedText: React.FC<NativeProps> = ({
   onWordPress,
   onSelection,
   indicatorWordIndex,
-  color,
   fontSize,
+  color,
 }) => {
   return (
     <AdvancedTextViewNativeComponent
@@ -40,8 +39,8 @@ export const AdvancedText: React.FC<NativeProps> = ({
       onWordPress={onWordPress}
       onSelection={onSelection}
       indicatorWordIndex={indicatorWordIndex}
-      color={color}
       fontSize={fontSize}
+      color={color}
     />
   );
 };

package/src/AdvancedTextViewNativeComponent.ts

@@ -2,7 +2,7 @@ import { codegenNativeComponent } from 'react-native';
 import type { ViewProps } from 'react-native';
 // @ts-ignore
 // eslint-disable-next-line prettier/prettier
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { DirectEventHandler, Int32, Float } from 'react-native/Libraries/Types/CodegenTypes';
 
 interface HighlightedWord {
   index: Int32;
@@ -11,12 +11,12 @@ interface HighlightedWord {
 
 interface NativeProps extends ViewProps {
   text: string;
-  color: string;
-  fontSize: Int32;
+  fontSize?: Float;
+  color?: 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;
 }