react-native-enriched-html 1.0.0 → 1.0.1

package/android/src/main/java/com/swmansion/enriched/common/EnrichedSpanFlags.kt

@@ -0,0 +1,39 @@
+package com.swmansion.enriched.common
+
+import android.text.Spannable
+import com.swmansion.enriched.common.spans.EnrichedAlignmentSpan
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
+
+// Higher priority spans are processed first, so styles with lower priorities are painted on top of previously applied styles.
+// For example, inline styles are applied on top of paragraph styles, allowing them to override paragraph-level styling.
+// Alignment styles are applied last, ensuring they position the final, fully styled text.
+object EnrichedSpanFlags {
+  private const val ALIGNMENT_SPAN_PRIORITY = 0
+  private const val INLINE_SPAN_PRIORITY = 1
+  private const val PARAGRAPH_SPAN_PRIORITY = 2
+
+  @JvmStatic
+  @JvmOverloads
+  fun forSpan(
+    span: Any?,
+    baseFlags: Int = Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
+  ): Int {
+    val priority =
+      when (span) {
+        is EnrichedAlignmentSpan -> ALIGNMENT_SPAN_PRIORITY
+        is EnrichedInlineSpan -> INLINE_SPAN_PRIORITY
+        else -> PARAGRAPH_SPAN_PRIORITY
+      }
+    return applyPriority(baseFlags, priority)
+  }
+
+  private fun applyPriority(
+    flags: Int,
+    priority: Int,
+  ): Int {
+    // Cleaning up priority bits
+    val cleared = flags and Spannable.SPAN_PRIORITY.inv()
+    // Injecting priority bits
+    return cleared or ((priority shl Spannable.SPAN_PRIORITY_SHIFT) and Spannable.SPAN_PRIORITY)
+  }
+}

package/android/src/main/java/com/swmansion/enriched/common/parser/EnrichedParser.java

@@ -7,6 +7,7 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.ParagraphStyle;
 import com.swmansion.enriched.common.EnrichedConstants;
+import com.swmansion.enriched.common.EnrichedSpanFlags;
 import com.swmansion.enriched.common.spans.EnrichedAlignmentSpan;
 import com.swmansion.enriched.common.spans.EnrichedBoldSpan;
 import com.swmansion.enriched.common.spans.EnrichedCheckboxListSpan;
@@ -66,6 +67,11 @@ public class EnrichedParser {
   }
 
   public static <T> Spanned fromHtml(String source, T style, EnrichedSpanFactory<T> spanFactory) {
+    return fromHtml(source, style, spanFactory, null);
+  }
+
+  public static <T> Spanned fromHtml(
+      String source, T style, EnrichedSpanFactory<T> spanFactory, Pattern linkRegex) {
     Parser parser = new Parser();
     try {
       parser.setProperty(Parser.schemaProperty, HtmlParser.schema);
@@ -74,7 +80,7 @@ public class EnrichedParser {
       throw new RuntimeException(e);
     }
     HtmlToSpannedConverter converter =
-        new HtmlToSpannedConverter(source, style, parser, spanFactory);
+        new HtmlToSpannedConverter(source, style, parser, spanFactory, linkRegex);
     return converter.convert();
   }
 
@@ -408,6 +414,7 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
   private final String mSource;
   private final XMLReader mReader;
   private final SpannableStringBuilder mSpannableStringBuilder;
+  private final Pattern mLinkRegex;
   private static Integer currentOrderedListItemIndex = 0;
   private static Boolean isInOrderedList = false;
   private static Boolean isInCheckboxList = false;
@@ -432,12 +439,17 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
   }
 
   public HtmlToSpannedConverter(
-      String source, T style, Parser parser, EnrichedSpanFactory<T> spanFactory) {
+      String source,
+      T style,
+      Parser parser,
+      EnrichedSpanFactory<T> spanFactory,
+      Pattern linkRegex) {
     mStyle = style;
     mSource = source;
     mSpannableStringBuilder = new SpannableStringBuilder();
     mReader = parser;
     mSpanFactory = spanFactory;
+    mLinkRegex = linkRegex;
   }
 
   public Spanned convert() {
@@ -467,10 +479,7 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
       if (end == start) {
         mSpannableStringBuilder.removeSpan(obj[i]);
       } else {
-        // TODO: verify if Spannable.SPAN_EXCLUSIVE_EXCLUSIVE does not break anything.
-        // Previously it was SPAN_PARAGRAPH. I've changed that in order to fix ranges for list
-        // items.
-        mSpannableStringBuilder.setSpan(obj[i], start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        mSpannableStringBuilder.setSpan(obj[i], start, end, EnrichedSpanFlags.forSpan(obj[i]));
       }
     }
 
@@ -505,7 +514,7 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
 
       mSpannableStringBuilder.removeSpan(zeroWidthSpaceSpan);
       mSpannableStringBuilder.setSpan(
-          zeroWidthSpaceSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+          zeroWidthSpaceSpan, start, end, EnrichedSpanFlags.forSpan(zeroWidthSpaceSpan));
     }
 
     return mSpannableStringBuilder;
@@ -602,7 +611,7 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
     } else if (tag.equalsIgnoreCase("codeblock")) {
       endCodeBlock(mSpannableStringBuilder, mStyle, mSpanFactory);
     } else if (tag.equalsIgnoreCase("a")) {
-      endA(mSpannableStringBuilder, mStyle, mSpanFactory);
+      endA(mSpannableStringBuilder, mStyle, mSpanFactory, mLinkRegex);
     } else if (tag.equalsIgnoreCase("u")) {
       end(mSpannableStringBuilder, Underline.class, mSpanFactory.createUnderlineSpan(mStyle));
     } else if (tag.equalsIgnoreCase("s")) {
@@ -802,7 +811,7 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
     int len = text.length();
     if (where != len) {
       for (Object span : spans) {
-        text.setSpan(span, where, len, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        text.setSpan(span, where, len, EnrichedSpanFlags.forSpan(span));
       }
     }
   }
@@ -825,7 +834,7 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
 
     if (where != len) {
       for (Object span : spans) {
-        text.setSpan(span, where, len, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        text.setSpan(span, where, len, EnrichedSpanFlags.forSpan(span));
       }
     }
   }
@@ -850,11 +859,19 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
 
     int len = text.length();
     text.append("");
-    text.setSpan(
-        spanFactory.createImageSpan(src, Integer.parseInt(width), Integer.parseInt(height)),
-        len,
-        text.length(),
-        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+    Object imageSpan =
+        spanFactory.createImageSpan(src, parseDimension(width), parseDimension(height));
+    text.setSpan(imageSpan, len, text.length(), EnrichedSpanFlags.forSpan(imageSpan));
+  }
+
+  private static int parseDimension(String value) {
+    if (value == null) return 0;
+    try {
+      int parsed = (int) Math.floor(Float.parseFloat(value));
+      return Math.max(parsed, 0);
+    } catch (NumberFormatException e) {
+      return 0;
+    }
   }
 
   private static void startA(Editable text, Attributes attributes) {
@@ -862,12 +879,18 @@ class HtmlToSpannedConverter<T> implements ContentHandler {
     start(text, new Href(href));
   }
 
-  private static <T> void endA(Editable text, T style, EnrichedSpanFactory<T> spanFactory) {
+  private static boolean urlMatchesLinkRegex(String url, Pattern linkRegex) {
+    if (linkRegex == null) return false;
+    return linkRegex.matcher(url).matches();
+  }
+
+  private static <T> void endA(
+      Editable text, T style, EnrichedSpanFactory<T> spanFactory, Pattern linkRegex) {
     Href h = getLast(text, Href.class);
-    if (h != null) {
-      if (h.mHref != null) {
-        setSpanFromMark(text, h, spanFactory.createLinkSpan(h.mHref, style));
-      }
+    if (h != null && h.mHref != null) {
+      String linkText = text.subSequence(text.getSpanStart(h), text.length()).toString();
+      boolean isManual = !linkText.equals(h.mHref) || !urlMatchesLinkRegex(h.mHref, linkRegex);
+      setSpanFromMark(text, h, spanFactory.createLinkSpan(h.mHref, style, isManual));
     }
   }
 

package/android/src/main/java/com/swmansion/enriched/common/parser/EnrichedSpanFactory.kt

@@ -37,6 +37,7 @@ interface EnrichedSpanFactory<T> {
   fun createLinkSpan(
     url: String,
     style: T,
+    isManual: Boolean,
   ): EnrichedLinkSpan
 
   fun createMentionSpan(

package/android/src/main/java/com/swmansion/enriched/text/EnrichedTextSpanFactory.kt

@@ -38,6 +38,7 @@ class EnrichedTextSpanFactory : EnrichedSpanFactory<EnrichedTextStyle> {
   override fun createLinkSpan(
     url: String,
     style: EnrichedTextStyle,
+    isManual: Boolean,
   ) = EnrichedTextLinkSpan(url, style)
 
   override fun createMentionSpan(

package/android/src/main/java/com/swmansion/enriched/text/EnrichedTextView.kt

@@ -23,6 +23,7 @@ import com.facebook.react.views.text.ReactTypefaceUtils.applyStyles
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontStyle
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
 import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.common.GumboNormalizer
 import com.swmansion.enriched.common.parser.EnrichedParser
 import com.swmansion.enriched.common.pixelFromSpOrDp
@@ -277,7 +278,7 @@ class EnrichedTextView : AppCompatTextView {
 
       spannable.removeSpan(span)
       val newSpan = span.rebuildWithStyle(enrichedStyle)
-      spannable.setSpan(newSpan, start, end, flags)
+      spannable.setSpan(newSpan, start, end, EnrichedSpanFlags.forSpan(newSpan, flags))
       modified = true
     }
 

package/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputSpannableFactory.kt

@@ -40,7 +40,8 @@ class EnrichedTextInputSpannableFactory : EnrichedSpanFactory<HtmlStyle> {
   override fun createLinkSpan(
     url: String,
     style: HtmlStyle,
-  ) = EnrichedInputLinkSpan(url, style, true)
+    isManual: Boolean,
+  ) = EnrichedInputLinkSpan(url, style, isManual)
 
   override fun createMentionSpan(
     text: String,

package/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputView.kt

@@ -9,6 +9,7 @@ import android.graphics.Color
 import android.graphics.Rect
 import android.graphics.text.LineBreaker
 import android.os.Build
+import android.text.Editable
 import android.text.InputType
 import android.text.Spannable
 import android.text.SpannableString
@@ -38,6 +39,7 @@ import com.facebook.react.views.text.ReactTypefaceUtils.applyStyles
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontStyle
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
 import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.common.GumboNormalizer
 import com.swmansion.enriched.common.parser.EnrichedParser
 import com.swmansion.enriched.common.pixelFromSpOrDp
@@ -398,8 +400,9 @@ class EnrichedTextInputView :
     val pasteEnd = (start + insertedLength).coerceIn(0, finalText.length)
     setSelection(pasteEnd)
 
-    // Detect links in the newly pasted range
-    parametrizedStyles?.detectLinksInRange(finalText, start.coerceAtMost(pasteEnd), pasteEnd)
+    // Update links and mentions in the newly pasted range
+    val editable = text as? Editable ?: return
+    parametrizedStyles?.afterTextChanged(editable, start.coerceAtMost(pasteEnd), pasteEnd)
   }
 
   fun requestFocusProgrammatically() {
@@ -413,7 +416,7 @@ class EnrichedTextInputView :
     val normalized = GumboNormalizer.normalizeHtml(text.toString()) ?: return text
 
     return try {
-      val parsed = EnrichedParser.fromHtml(normalized, htmlStyle, spannableFactory)
+      val parsed = EnrichedParser.fromHtml(normalized, htmlStyle, spannableFactory, linkRegex)
       parsed.trimEnd('\n')
     } catch (e: Exception) {
       Log.e(TAG, "Error parsing normalized HTML: ${e.message}")
@@ -426,7 +429,7 @@ class EnrichedTextInputView :
 
     if (isInternalHtml) {
       try {
-        val parsed = EnrichedParser.fromHtml(text.toString(), htmlStyle, spannableFactory)
+        val parsed = EnrichedParser.fromHtml(text.toString(), htmlStyle, spannableFactory, linkRegex)
         return parsed.trimEnd('\n')
       } catch (e: Exception) {
         Log.e(TAG, "Error parsing HTML: ${e.message}")
@@ -1108,7 +1111,7 @@ class EnrichedTextInputView :
 
         spannable.removeSpan(span)
         val newSpan = span.rebuildWithStyle(htmlStyle)
-        spannable.setSpan(newSpan, start, end, flags)
+        spannable.setSpan(newSpan, start, end, EnrichedSpanFlags.forSpan(newSpan, flags))
       }
 
       if (shouldEmitStateChange) {

package/android/src/main/java/com/swmansion/enriched/textinput/events/MentionHandler.kt

@@ -27,8 +27,17 @@ class MentionHandler(
     indicator: String,
     text: String?,
   ) {
+    // switching directly to an active mention
+    if (previousIndicator != indicator) {
+      endMention()
+
+      // explicit startMention event before changeMention event
+      if (!text.isNullOrEmpty()) {
+        emitEvent(indicator, "")
+      }
+    }
+
     emitEvent(indicator, text)
-    previousIndicator = indicator
   }
 
   private fun emitEvent(
@@ -36,8 +45,9 @@ class MentionHandler(
     text: String?,
   ) {
     // Do not emit events too often
-    if (previousText == text) return
+    if (previousIndicator == indicator && previousText == text) return
 
+    previousIndicator = indicator
     previousText = text
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)

package/android/src/main/java/com/swmansion/enriched/textinput/events/OnMentionEvent.kt

@@ -13,6 +13,12 @@ class OnMentionEvent(
 ) : Event<OnMentionEvent>(surfaceId, viewId) {
   override fun getEventName(): String = EVENT_NAME
 
+  // start/change/end can be emitted as a burst within a single frame
+  // (e.g. when switching mentions: end -> start -> change).
+  // The default coalescing would merge them in the batch and drop the
+  // intermediate ones, so it must be disabled to deliver every event in order.
+  override fun canCoalesce(): Boolean = false
+
   override fun getEventData(): WritableMap? {
     val eventData: WritableMap = Arguments.createMap()
     eventData.putString("indicator", indicator)

package/android/src/main/java/com/swmansion/enriched/textinput/styles/AlignmentStyles.kt

@@ -4,6 +4,7 @@ import android.text.Editable
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.textinput.EnrichedTextInputView
 import com.swmansion.enriched.textinput.spans.EnrichedInputAlignmentSpan
 import com.swmansion.enriched.textinput.spans.EnrichedInputCheckboxListSpan
@@ -24,12 +25,8 @@ class AlignmentStyles(
     flags: Int = Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
   ) {
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
-    spannable.setSpan(
-      EnrichedInputAlignmentSpan(cssValue),
-      safeStart,
-      safeEnd,
-      flags,
-    )
+    val span = EnrichedInputAlignmentSpan(cssValue)
+    spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span, flags))
   }
 
   private fun toCssValue(alignment: String): String =
@@ -302,7 +299,9 @@ class AlignmentStyles(
     // INCLUSIVE_EXCLUSIVE is intentional here: autoStretchAlignmentSpan will convert
     // it to EXCLUSIVE_EXCLUSIVE once the merge is complete.
     val (safeStart, safeEnd) = s.getSafeSpanBoundaries(paraStart, paraEnd)
-    dominantTopSpan?.let { s.setSpan(it, safeStart, safeEnd, Spannable.SPAN_INCLUSIVE_EXCLUSIVE) }
+    dominantTopSpan?.let {
+      s.setSpan(it, safeStart, safeEnd, EnrichedSpanFlags.forSpan(it, Spannable.SPAN_INCLUSIVE_EXCLUSIVE))
+    }
     return cursorPosition
   }
 

package/android/src/main/java/com/swmansion/enriched/textinput/styles/InlineStyles.kt

@@ -2,6 +2,7 @@ package com.swmansion.enriched.textinput.styles
 
 import android.text.Editable
 import android.text.Spannable
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.textinput.EnrichedTextInputView
 import com.swmansion.enriched.textinput.spans.EnrichedSpans
 import com.swmansion.enriched.textinput.utils.getSafeSpanBoundaries
@@ -41,7 +42,7 @@ class InlineStyles(
 
     val span = type.getDeclaredConstructor(HtmlStyle::class.java).newInstance(view.htmlStyle)
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(minimum, maximum)
-    spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
   }
 
   private fun <T> setAndMergeSpans(
@@ -222,7 +223,18 @@ class InlineStyles(
     if (spans.isEmpty()) return false
 
     for (span in spans) {
+      val spanStart = spannable.getSpanStart(span)
+      val spanEnd = spannable.getSpanEnd(span)
+
       spannable.removeSpan(span)
+
+      if (spanStart < start) {
+        setSpan(spannable, config.clazz, spanStart, start - 1)
+      }
+
+      if (spanEnd > end) {
+        setSpan(spannable, config.clazz, end, spanEnd)
+      }
     }
 
     return true

package/android/src/main/java/com/swmansion/enriched/textinput/styles/ListStyles.kt

@@ -5,6 +5,7 @@ import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.textinput.EnrichedTextInputView
 import com.swmansion.enriched.textinput.spans.EnrichedInputCheckboxListSpan
 import com.swmansion.enriched.textinput.spans.EnrichedInputOrderedListSpan
@@ -66,18 +67,18 @@ class ListStyles(
     when (name) {
       EnrichedSpans.UNORDERED_LIST -> {
         val span = EnrichedInputUnorderedListSpan(view.htmlStyle)
-        spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
       }
 
       EnrichedSpans.ORDERED_LIST -> {
         val index = getOrderedListIndex(spannable, safeStart)
         val span = EnrichedInputOrderedListSpan(index, view.htmlStyle)
-        spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
       }
 
       EnrichedSpans.CHECKBOX_LIST -> {
         val span = EnrichedInputCheckboxListSpan(isChecked ?: false, view.htmlStyle)
-        spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
 
         // Invalidate layout to update checkbox drawing in case checkbox is bigger than line height
         view.layoutManager.invalidateLayout()

package/android/src/main/java/com/swmansion/enriched/textinput/styles/ParagraphStyles.kt

@@ -4,6 +4,7 @@ import android.text.Editable
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.util.Log
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.textinput.EnrichedTextInputView
 import com.swmansion.enriched.textinput.spans.EnrichedSpans
 import com.swmansion.enriched.textinput.spans.interfaces.EnrichedInputSpan
@@ -89,7 +90,7 @@ class ParagraphStyles(
     }
 
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(newStart, newEnd)
-    spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
   }
 
   private fun <T> setSpan(
@@ -105,7 +106,7 @@ class ParagraphStyles(
 
     val span = type.getDeclaredConstructor(HtmlStyle::class.java).newInstance(view.htmlStyle)
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
-    spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
   }
 
   // Removes spans of the given type in the specified range.
@@ -232,7 +233,7 @@ class ParagraphStyles(
     val (safeStart, safeEnd) = s.getSafeSpanBoundaries(newStart, newEnd)
     val span = type.getDeclaredConstructor(HtmlStyle::class.java).newInstance(view.htmlStyle)
 
-    s.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    s.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
   }
 
   private fun handleConflictsDuringNewlineDeletion(

package/android/src/main/java/com/swmansion/enriched/textinput/styles/ParametrizedStyles.kt

@@ -1,10 +1,12 @@
 package com.swmansion.enriched.textinput.styles
 
 import android.text.Editable
+import android.text.Selection
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.textinput.EnrichedTextInputView
 import com.swmansion.enriched.textinput.spans.EnrichedInputImageSpan
 import com.swmansion.enriched.textinput.spans.EnrichedInputLinkSpan
@@ -17,6 +19,7 @@ class ParametrizedStyles(
   private val view: EnrichedTextInputView,
 ) {
   private var mentionStart: Int? = null
+  private var mentionEnd: Int? = null
   private var isSettingLinkSpan = false
 
   var mentionIndicators: Array<String> = emptyArray<String>()
@@ -63,7 +66,7 @@ class ParametrizedStyles(
     val spanEnd = start + text.length
     val span = EnrichedInputLinkSpan(url, view.htmlStyle, true)
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, spanEnd)
-    spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
 
     view.selection?.validateStyles()
     isSettingLinkSpan = false
@@ -91,7 +94,23 @@ class ParametrizedStyles(
     endCursorPosition: Int,
   ) {
     afterTextChangedLinks(startCursorPosition, endCursorPosition)
-    afterTextChangedMentions(s, startCursorPosition)
+    detectActiveMention(s, startCursorPosition)
+  }
+
+  // Re-runs in-progress mention detection on a pure caret move (no text change),
+  fun afterSelectionChangedMentions(
+    start: Int,
+    end: Int,
+  ) {
+    val s = view.text ?: return
+
+    // A non-collapsed selection can't be editing a single mention.
+    if (start != end) {
+      view.mentionHandler?.endMention()
+      return
+    }
+
+    detectActiveMention(s, end)
   }
 
   fun onStyleToggled(
@@ -160,7 +179,7 @@ class ParametrizedStyles(
           span,
           safeStart,
           safeEnd,
-          Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
+          EnrichedSpanFlags.forSpan(span),
         )
       }
     }
@@ -239,7 +258,7 @@ class ParametrizedStyles(
     detectLinksInRange(spannable, affectedRange.first, affectedRange.last)
   }
 
-  private fun afterTextChangedMentions(
+  private fun detectActiveMention(
     s: CharSequence,
     endCursorPosition: Int,
   ) {
@@ -261,12 +280,16 @@ class ParametrizedStyles(
 
       // No previous word -> no mention to be detected
       if (previousWord == null) {
+        mentionStart = null
+        mentionEnd = null
         mentionHandler.endMention()
         return
       }
 
       // Previous word is not a mention -> end mention
       if (!mentionRegex.matches(previousWord.text)) {
+        mentionStart = null
+        mentionEnd = null
         mentionHandler.endMention()
         return
       }
@@ -280,6 +303,9 @@ class ParametrizedStyles(
       indicator = mentionIndicatorRegex.find(currentWord.text)?.value ?: ""
     }
 
+    mentionStart = finalStart
+    mentionEnd = finalEnd
+
     // Mirror iOS conflicting-styles behaviour: check the full candidate range for
     // a finalized mention span. If the span's stored text still matches what is in
     // the buffer the mention is intact — block the event (covers HTML-loaded
@@ -292,21 +318,19 @@ class ParametrizedStyles(
       val spanEnd = spannable.getSpanEnd(span)
       val currentSpanText = spannable.subSequence(spanStart, spanEnd).toString()
       if (currentSpanText == span.getText()) {
+        mentionStart = null
+        mentionEnd = null
         mentionHandler.endMention()
         return
       }
       spannable.removeSpan(span)
       mentionStart = spanStart
+      mentionEnd = spanEnd
     }
 
     // Extract text without indicator
     val text = spannable.subSequence(finalStart, finalEnd).toString().replaceFirst(indicator, "")
 
-    // Means we are starting mention
-    if (text.isEmpty()) {
-      mentionStart = finalStart
-    }
-
     mentionHandler.onMention(indicator, text)
   }
 
@@ -366,24 +390,27 @@ class ParametrizedStyles(
     }
 
     val start = mentionStart ?: selectionStart
+    val end = mentionEnd ?: selectionEnd
 
     view.runAsATransaction {
-      spannable.replace(start, selectionEnd, text)
+      spannable.replace(start, end, text)
 
       val span = EnrichedInputMentionSpan(text, indicator, attributes, view.htmlStyle)
       val spanEnd = start + text.length
       val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, spanEnd)
-      spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+      spannable.setSpan(span, safeStart, safeEnd, EnrichedSpanFlags.forSpan(span))
 
       val hasSpaceAtTheEnd = spannable.length > safeEnd && spannable[safeEnd] == ' '
       if (!hasSpaceAtTheEnd) {
         spannable.insert(safeEnd, " ")
       }
+      Selection.setSelection(spannable, (safeEnd + 1).coerceAtMost(spannable.length))
     }
 
     view.mentionHandler?.reset()
     view.selection.validateStyles()
     mentionStart = null
+    mentionEnd = null
   }
 
   fun getStyleRange(): Pair<Int, Int> = view.selection?.getInlineSelection() ?: Pair(0, 0)

package/android/src/main/java/com/swmansion/enriched/textinput/utils/EnrichedSelection.kt

@@ -55,6 +55,8 @@ class EnrichedSelection(
     start = finalStart
     end = finalEnd
     validateStyles()
+
+    view.parametrizedStyles?.afterSelectionChangedMentions(finalStart, finalEnd)
     emitSelectionChangeEvent(view.text, finalStart, finalEnd)
   }
 

package/android/src/main/java/com/swmansion/enriched/textinput/utils/EnrichedSpannable.kt

@@ -3,6 +3,7 @@ package com.swmansion.enriched.textinput.utils
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.common.spans.interfaces.EnrichedBlockSpan
 import com.swmansion.enriched.common.spans.interfaces.EnrichedParagraphSpan
 import com.swmansion.enriched.common.spans.interfaces.EnrichedSpan
@@ -144,7 +145,7 @@ fun Spannable.mergeSpannables(
       val (_, newParagraphEnd) = builder.getParagraphBounds(spanStart, pasteEnd)
       val flags = builder.getSpanFlags(span)
       builder.removeSpan(span)
-      builder.setSpan(span, spanStart, newParagraphEnd, flags)
+      builder.setSpan(span, spanStart, newParagraphEnd, EnrichedSpanFlags.forSpan(span, flags))
     }
   }
 

package/android/src/main/java/com/swmansion/enriched/textinput/utils/Utils.kt

@@ -7,6 +7,7 @@ import android.text.Spanned
 import android.util.Log
 import android.view.MotionEvent
 import android.widget.TextView
+import com.swmansion.enriched.common.EnrichedSpanFlags
 import com.swmansion.enriched.textinput.spans.EnrichedInputCheckboxListSpan
 import org.json.JSONObject
 
@@ -78,7 +79,7 @@ fun TextView.setCheckboxClickListener() {
 
             // Reapply span so changes are visible without need to redraw entire TextView
             spannable.removeSpan(span)
-            spannable.setSpan(span, start, end, flags)
+            spannable.setSpan(span, start, end, EnrichedSpanFlags.forSpan(span, flags))
 
             // For focused input, ensure cursor is active for affected paragraph
             if (tv.isFocused) {