feat: add indicator inside onMentionDetected

Author: exploIF

android/src/main/java/com/swmansion/reactnativerichtexteditor/events/OnMentionDetectedEvent.kt

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class OnMentionDetectedEvent(surfaceId: Int, viewId: Int, private val text: String, private val payload: String) :
+class OnMentionDetectedEvent(surfaceId: Int, viewId: Int, private val text: String, private val indicator: String, private val payload: String) :
   Event<OnMentionDetectedEvent>(surfaceId, viewId) {
 
   override fun getEventName(): String {
@@ -14,6 +14,7 @@ class OnMentionDetectedEvent(surfaceId: Int, viewId: Int, private val text: Stri
   override fun getEventData(): WritableMap {
     val eventData: WritableMap = Arguments.createMap()
     eventData.putString("text", text)
+    eventData.putString("indicator", indicator)
     eventData.putString("payload", payload)
     return eventData
   }

android/src/main/java/com/swmansion/reactnativerichtexteditor/utils/EditorSelection.kt

@@ -231,16 +231,22 @@ class EditorSelection(private val editorView: ReactNativeRichTextEditorView) {
   private fun emitMentionDetectedEvent(spannable: Spannable, span: EditorMentionSpan?, start: Int, end: Int) {
     val text = spannable.substring(start, end)
     val attributes = span?.getAttributes() ?: emptyMap()
+    val indicator = span?.getIndicator() ?: ""
     val payload = JSONObject(attributes).toString()
 
-    if (text == previousMentionDetectedEvent["text"] && payload == previousMentionDetectedEvent["payload"]) return
+    val previousText = previousMentionDetectedEvent["text"] ?: ""
+    val previousPayload = previousMentionDetectedEvent["payload"] ?: ""
+    val previousIndicator = previousMentionDetectedEvent["indicator"] ?: ""
+
+    if (text == previousText && payload == previousPayload && indicator == previousIndicator) return
 
     previousMentionDetectedEvent.put("text", text)
     previousMentionDetectedEvent.put("payload", payload)
+    previousMentionDetectedEvent.put("indicator", indicator)
 
     val context = editorView.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, editorView.id)
-    dispatcher?.dispatchEvent(OnMentionDetectedEvent(surfaceId, editorView.id, text, payload))
+    dispatcher?.dispatchEvent(OnMentionDetectedEvent(surfaceId, editorView.id, text, indicator, payload))
   }
 }

src/ReactNativeRichTextEditorViewNativeComponent.ts

@@ -42,11 +42,13 @@ export interface OnLinkDetected {
 
 export interface OnMentionDetectedInternal {
   text: string;
+  indicator: string;
   payload: string;
 }
 
 export interface OnMentionDetected {
   text: string;
+  indicator: string;
   attributes: Record<string, string>;
 }
 

src/RichTextInput.tsx

@@ -303,9 +303,9 @@ export const RichTextInput = ({
   const handleMentionDetected = (
     e: NativeSyntheticEvent<OnMentionDetectedInternal>
   ) => {
-    const { text, payload } = e.nativeEvent;
-    const parsedAttributes = JSON.parse(payload) as Record<string, string>;
-    onMentionDetected?.({ text, attributes: parsedAttributes });
+    const { text, indicator, payload } = e.nativeEvent;
+    const attributes = JSON.parse(payload) as Record<string, string>;
+    onMentionDetected?.({ text, indicator, attributes });
   };
 
   return (