react-native-enriched 0.2.0 → 0.3.0

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

@@ -4,12 +4,17 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.EventDispatcher
 import com.swmansion.enriched.EnrichedTextInputView
+import com.swmansion.enriched.events.OnChangeStateDeprecatedEvent
 import com.swmansion.enriched.events.OnChangeStateEvent
 import com.swmansion.enriched.spans.EnrichedSpans
 
-class EnrichedSpanState(private val view: EnrichedTextInputView) {
+class EnrichedSpanState(
+  private val view: EnrichedTextInputView,
+) {
   private var previousPayload: WritableMap? = null
+  private var previousDeprecatedPayload: WritableMap? = null
 
   var boldStart: Int? = null
     private set
@@ -27,6 +32,12 @@ class EnrichedSpanState(private val view: EnrichedTextInputView) {
     private set
   var h3Start: Int? = null
     private set
+  var h4Start: Int? = null
+    private set
+  var h5Start: Int? = null
+    private set
+  var h6Start: Int? = null
+    private set
   var codeBlockStart: Int? = null
     private set
   var blockQuoteStart: Int? = null
@@ -82,6 +93,21 @@ class EnrichedSpanState(private val view: EnrichedTextInputView) {
     emitStateChangeEvent()
   }
 
+  fun setH4Start(start: Int?) {
+    this.h4Start = start
+    emitStateChangeEvent()
+  }
+
+  fun setH5Start(start: Int?) {
+    this.h5Start = start
+    emitStateChangeEvent()
+  }
+
+  fun setH6Start(start: Int?) {
+    this.h6Start = start
+    emitStateChangeEvent()
+  }
+
   fun setCodeBlockStart(start: Int?) {
     this.codeBlockStart = start
     emitStateChangeEvent()
@@ -118,29 +144,36 @@ class EnrichedSpanState(private val view: EnrichedTextInputView) {
   }
 
   fun getStart(name: String): Int? {
-    val start = when (name) {
-      EnrichedSpans.BOLD -> boldStart
-      EnrichedSpans.ITALIC -> italicStart
-      EnrichedSpans.UNDERLINE -> underlineStart
-      EnrichedSpans.STRIKETHROUGH -> strikethroughStart
-      EnrichedSpans.INLINE_CODE -> inlineCodeStart
-      EnrichedSpans.H1 -> h1Start
-      EnrichedSpans.H2 -> h2Start
-      EnrichedSpans.H3 -> h3Start
-      EnrichedSpans.CODE_BLOCK -> codeBlockStart
-      EnrichedSpans.BLOCK_QUOTE -> blockQuoteStart
-      EnrichedSpans.ORDERED_LIST -> orderedListStart
-      EnrichedSpans.UNORDERED_LIST -> unorderedListStart
-      EnrichedSpans.LINK -> linkStart
-      EnrichedSpans.IMAGE -> imageStart
-      EnrichedSpans.MENTION -> mentionStart
-      else -> null
-    }
+    val start =
+      when (name) {
+        EnrichedSpans.BOLD -> boldStart
+        EnrichedSpans.ITALIC -> italicStart
+        EnrichedSpans.UNDERLINE -> underlineStart
+        EnrichedSpans.STRIKETHROUGH -> strikethroughStart
+        EnrichedSpans.INLINE_CODE -> inlineCodeStart
+        EnrichedSpans.H1 -> h1Start
+        EnrichedSpans.H2 -> h2Start
+        EnrichedSpans.H3 -> h3Start
+        EnrichedSpans.H4 -> h4Start
+        EnrichedSpans.H5 -> h5Start
+        EnrichedSpans.H6 -> h6Start
+        EnrichedSpans.CODE_BLOCK -> codeBlockStart
+        EnrichedSpans.BLOCK_QUOTE -> blockQuoteStart
+        EnrichedSpans.ORDERED_LIST -> orderedListStart
+        EnrichedSpans.UNORDERED_LIST -> unorderedListStart
+        EnrichedSpans.LINK -> linkStart
+        EnrichedSpans.IMAGE -> imageStart
+        EnrichedSpans.MENTION -> mentionStart
+        else -> null
+      }
 
     return start
   }
 
-  fun setStart(name: String, start: Int?) {
+  fun setStart(
+    name: String,
+    start: Int?,
+  ) {
     when (name) {
       EnrichedSpans.BOLD -> setBoldStart(start)
       EnrichedSpans.ITALIC -> setItalicStart(start)
@@ -150,6 +183,9 @@ class EnrichedSpanState(private val view: EnrichedTextInputView) {
       EnrichedSpans.H1 -> setH1Start(start)
       EnrichedSpans.H2 -> setH2Start(start)
       EnrichedSpans.H3 -> setH3Start(start)
+      EnrichedSpans.H4 -> setH4Start(start)
+      EnrichedSpans.H5 -> setH5Start(start)
+      EnrichedSpans.H6 -> setH6Start(start)
       EnrichedSpans.CODE_BLOCK -> setCodeBlockStart(start)
       EnrichedSpans.BLOCK_QUOTE -> setBlockQuoteStart(start)
       EnrichedSpans.ORDERED_LIST -> setOrderedListStart(start)
@@ -161,41 +197,140 @@ class EnrichedSpanState(private val view: EnrichedTextInputView) {
   }
 
   private fun emitStateChangeEvent() {
-    val payload: WritableMap = Arguments.createMap()
-    payload.putBoolean("isBold", boldStart != null)
-    payload.putBoolean("isItalic", italicStart != null)
-    payload.putBoolean("isUnderline", underlineStart != null)
-    payload.putBoolean("isStrikeThrough", strikethroughStart != null)
-    payload.putBoolean("isInlineCode", inlineCodeStart != null)
-    payload.putBoolean("isH1", h1Start != null)
-    payload.putBoolean("isH2", h2Start != null)
-    payload.putBoolean("isH3", h3Start != null)
-    payload.putBoolean("isCodeBlock", codeBlockStart != null)
-    payload.putBoolean("isBlockQuote", blockQuoteStart != null)
-    payload.putBoolean("isOrderedList", orderedListStart != null)
-    payload.putBoolean("isUnorderedList", unorderedListStart != null)
-    payload.putBoolean("isLink", linkStart != null)
-    payload.putBoolean("isImage", imageStart != null)
-    payload.putBoolean("isMention", mentionStart != null)
+    val context = view.context as ReactContext
+    val surfaceId = UIManagerHelper.getSurfaceId(context)
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
+
+    dispatchDeprecatedPayload(dispatcher, surfaceId)
+    dispatchPayload(dispatcher, surfaceId)
+  }
+
+  private fun dispatchDeprecatedPayload(
+    dispatcher: EventDispatcher?,
+    surfaceId: Int,
+  ) {
+    val deprecatedPayload = Arguments.createMap()
+    deprecatedPayload.putBoolean("isBold", boldStart != null)
+    deprecatedPayload.putBoolean("isItalic", italicStart != null)
+    deprecatedPayload.putBoolean("isUnderline", underlineStart != null)
+    deprecatedPayload.putBoolean("isStrikeThrough", strikethroughStart != null)
+    deprecatedPayload.putBoolean("isInlineCode", inlineCodeStart != null)
+    deprecatedPayload.putBoolean("isH1", h1Start != null)
+    deprecatedPayload.putBoolean("isH2", h2Start != null)
+    deprecatedPayload.putBoolean("isH3", h3Start != null)
+    deprecatedPayload.putBoolean("isH4", h4Start != null)
+    deprecatedPayload.putBoolean("isH5", h5Start != null)
+    deprecatedPayload.putBoolean("isH6", h6Start != null)
+    deprecatedPayload.putBoolean("isCodeBlock", codeBlockStart != null)
+    deprecatedPayload.putBoolean("isBlockQuote", blockQuoteStart != null)
+    deprecatedPayload.putBoolean("isOrderedList", orderedListStart != null)
+    deprecatedPayload.putBoolean("isUnorderedList", unorderedListStart != null)
+    deprecatedPayload.putBoolean("isLink", linkStart != null)
+    deprecatedPayload.putBoolean("isImage", imageStart != null)
+    deprecatedPayload.putBoolean("isMention", mentionStart != null)
+
+    if (previousDeprecatedPayload == deprecatedPayload) {
+      return
+    }
+
+    previousDeprecatedPayload =
+      Arguments.createMap().apply {
+        merge(deprecatedPayload)
+      }
+
+    dispatcher?.dispatchEvent(
+      OnChangeStateDeprecatedEvent(
+        surfaceId,
+        view.id,
+        deprecatedPayload,
+        view.experimentalSynchronousEvents,
+      ),
+    )
+  }
+
+  private fun dispatchPayload(
+    dispatcher: EventDispatcher?,
+    surfaceId: Int,
+  ) {
+    val activeStyles =
+      listOfNotNull(
+        if (boldStart != null) EnrichedSpans.BOLD else null,
+        if (italicStart != null) EnrichedSpans.ITALIC else null,
+        if (underlineStart != null) EnrichedSpans.UNDERLINE else null,
+        if (strikethroughStart != null) EnrichedSpans.STRIKETHROUGH else null,
+        if (inlineCodeStart != null) EnrichedSpans.INLINE_CODE else null,
+        if (h1Start != null) EnrichedSpans.H1 else null,
+        if (h2Start != null) EnrichedSpans.H2 else null,
+        if (h3Start != null) EnrichedSpans.H3 else null,
+        if (h4Start != null) EnrichedSpans.H4 else null,
+        if (h5Start != null) EnrichedSpans.H5 else null,
+        if (h6Start != null) EnrichedSpans.H6 else null,
+        if (codeBlockStart != null) EnrichedSpans.CODE_BLOCK else null,
+        if (blockQuoteStart != null) EnrichedSpans.BLOCK_QUOTE else null,
+        if (orderedListStart != null) EnrichedSpans.ORDERED_LIST else null,
+        if (unorderedListStart != null) EnrichedSpans.UNORDERED_LIST else null,
+        if (linkStart != null) EnrichedSpans.LINK else null,
+        if (imageStart != null) EnrichedSpans.IMAGE else null,
+        if (mentionStart != null) EnrichedSpans.MENTION else null,
+      )
+    val payload = Arguments.createMap()
+    payload.putMap("bold", getStyleState(activeStyles, EnrichedSpans.BOLD))
+    payload.putMap("italic", getStyleState(activeStyles, EnrichedSpans.ITALIC))
+    payload.putMap("underline", getStyleState(activeStyles, EnrichedSpans.UNDERLINE))
+    payload.putMap("strikeThrough", getStyleState(activeStyles, EnrichedSpans.STRIKETHROUGH))
+    payload.putMap("inlineCode", getStyleState(activeStyles, EnrichedSpans.INLINE_CODE))
+    payload.putMap("h1", getStyleState(activeStyles, EnrichedSpans.H1))
+    payload.putMap("h2", getStyleState(activeStyles, EnrichedSpans.H2))
+    payload.putMap("h3", getStyleState(activeStyles, EnrichedSpans.H3))
+    payload.putMap("h4", getStyleState(activeStyles, EnrichedSpans.H4))
+    payload.putMap("h5", getStyleState(activeStyles, EnrichedSpans.H5))
+    payload.putMap("h6", getStyleState(activeStyles, EnrichedSpans.H6))
+    payload.putMap("codeBlock", getStyleState(activeStyles, EnrichedSpans.CODE_BLOCK))
+    payload.putMap("blockQuote", getStyleState(activeStyles, EnrichedSpans.BLOCK_QUOTE))
+    payload.putMap("orderedList", getStyleState(activeStyles, EnrichedSpans.ORDERED_LIST))
+    payload.putMap("unorderedList", getStyleState(activeStyles, EnrichedSpans.UNORDERED_LIST))
+    payload.putMap("link", getStyleState(activeStyles, EnrichedSpans.LINK))
+    payload.putMap("image", getStyleState(activeStyles, EnrichedSpans.IMAGE))
+    payload.putMap("mention", getStyleState(activeStyles, EnrichedSpans.MENTION))
 
     // Do not emit event if payload is the same
     if (previousPayload == payload) {
       return
     }
 
-    previousPayload = Arguments.createMap().apply {
-      merge(payload)
-    }
+    previousPayload =
+      Arguments.createMap().apply {
+        merge(payload)
+      }
+    dispatcher?.dispatchEvent(
+      OnChangeStateEvent(
+        surfaceId,
+        view.id,
+        payload,
+        view.experimentalSynchronousEvents,
+      ),
+    )
+  }
 
-    val context = view.context as ReactContext
-    val surfaceId = UIManagerHelper.getSurfaceId(context)
-    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatcher?.dispatchEvent(OnChangeStateEvent(
-      surfaceId,
-      view.id,
-      payload,
-      view.experimentalSynchronousEvents,
-    ))
+  private fun getStyleState(
+    activeStyles: List<String>,
+    type: String,
+  ): WritableMap {
+    val mergingConfig = EnrichedSpans.getMergingConfigForStyle(type, view.htmlStyle)
+    val blockingList = mergingConfig?.blockingStyles
+    val conflictingList = mergingConfig?.conflictingStyles
+
+    val state = Arguments.createMap()
+
+    state.putBoolean("isActive", activeStyles.contains(type))
+
+    val isBlocking = blockingList?.any { activeStyles.contains(it) } ?: false
+    state.putBoolean("isBlocking", isBlocking)
+
+    val isConflicting = conflictingList?.any { activeStyles.contains(it) } ?: false
+    state.putBoolean("isConflicting", isConflicting)
+
+    return state
   }
 
   companion object {

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

@@ -0,0 +1,82 @@
+package com.swmansion.enriched.utils
+
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import com.swmansion.enriched.spans.interfaces.EnrichedBlockSpan
+import com.swmansion.enriched.spans.interfaces.EnrichedParagraphSpan
+
+fun Spannable.getSafeSpanBoundaries(
+  start: Int,
+  end: Int,
+): Pair<Int, Int> {
+  val safeStart = start.coerceAtMost(end).coerceAtLeast(0)
+  val safeEnd = end.coerceAtLeast(start).coerceAtMost(this.length)
+
+  return Pair(safeStart, safeEnd)
+}
+
+fun Spannable.getParagraphBounds(
+  start: Int,
+  end: Int,
+): Pair<Int, Int> {
+  var startPosition = start.coerceAtLeast(0).coerceAtMost(this.length)
+  var endPosition = end.coerceAtLeast(0).coerceAtMost(this.length)
+
+  // Find the start of the paragraph
+  while (startPosition > 0 && this[startPosition - 1] != '\n') {
+    startPosition--
+  }
+
+  // Find the end of the paragraph
+  while (endPosition < this.length && this[endPosition] != '\n') {
+    endPosition++
+  }
+
+  if (startPosition >= endPosition) {
+    // If the start position is equal or greater than the end position, return the same position
+    startPosition = endPosition
+  }
+
+  return Pair(startPosition, endPosition)
+}
+
+fun Spannable.getParagraphBounds(index: Int): Pair<Int, Int> = this.getParagraphBounds(index, index)
+
+fun Spannable.mergeSpannables(
+  start: Int,
+  end: Int,
+  string: String,
+): Spannable = this.mergeSpannables(start, end, SpannableString(string))
+
+fun Spannable.mergeSpannables(
+  start: Int,
+  end: Int,
+  spannable: Spannable,
+): Spannable {
+  var finalStart = start
+  var finalEnd = end
+
+  val builder = SpannableStringBuilder(this)
+  val startBlockSpans = spannable.getSpans(0, 0, EnrichedBlockSpan::class.java)
+  val startParagraphSpans = spannable.getSpans(0, 0, EnrichedParagraphSpan::class.java)
+  val endBlockSpans = spannable.getSpans(this.length, this.length, EnrichedBlockSpan::class.java)
+  val endParagraphSpans = spannable.getSpans(this.length, this.length, EnrichedParagraphSpan::class.java)
+  val (paragraphStart, paragraphEnd) = this.getParagraphBounds(start, end)
+  val isNewLineStart = startBlockSpans.isNotEmpty() || startParagraphSpans.isNotEmpty()
+  val isNewLineEnd = endBlockSpans.isNotEmpty() || endParagraphSpans.isNotEmpty()
+
+  if (isNewLineStart && start != paragraphStart) {
+    builder.insert(start, "\n")
+    finalStart = start + 1
+    finalEnd = end + 1
+  }
+
+  if (isNewLineEnd && end != paragraphEnd) {
+    builder.insert(finalEnd, "\n")
+  }
+
+  builder.replace(finalStart, finalEnd, spannable)
+
+  return builder
+}

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

@@ -0,0 +1,15 @@
+package com.swmansion.enriched.utils
+
+import android.text.SpannableStringBuilder
+
+// Removes zero-width spaces from the given range in the SpannableStringBuilder without affecting spans
+fun SpannableStringBuilder.removeZWS(
+  start: Int,
+  end: Int,
+) {
+  for (i in (end - 1) downTo start) {
+    if (this[i] == EnrichedConstants.ZWS) {
+      delete(i, i + 1)
+    }
+  }
+}

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

@@ -1,11 +1,6 @@
 package com.swmansion.enriched.utils
 
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.SpannableStringBuilder
 import android.util.Log
-import com.swmansion.enriched.spans.interfaces.EnrichedBlockSpan
-import com.swmansion.enriched.spans.interfaces.EnrichedParagraphSpan
 import org.json.JSONObject
 
 fun jsonStringToStringMap(json: String): Map<String, String> {
@@ -24,68 +19,3 @@ fun jsonStringToStringMap(json: String): Map<String, String> {
 
   return result
 }
-
-fun Spannable.getSafeSpanBoundaries(start: Int, end: Int): Pair<Int, Int> {
-  val safeStart = start.coerceAtMost(end).coerceAtLeast(0)
-  val safeEnd = end.coerceAtLeast(start).coerceAtMost(this.length)
-
-  return Pair(safeStart, safeEnd)
-}
-
-fun Spannable.getParagraphBounds(start: Int, end: Int): Pair<Int, Int> {
-  var startPosition = start.coerceAtLeast(0).coerceAtMost(this.length)
-  var endPosition = end.coerceAtLeast(0).coerceAtMost(this.length)
-
-  // Find the start of the paragraph
-  while (startPosition > 0 && this[startPosition - 1] != '\n') {
-    startPosition--
-  }
-
-  // Find the end of the paragraph
-  while (endPosition < this.length && this[endPosition] != '\n') {
-    endPosition++
-  }
-
-  if (startPosition >= endPosition) {
-    // If the start position is equal or greater than the end position, return the same position
-    startPosition = endPosition
-  }
-
-  return Pair(startPosition, endPosition)
-}
-
-fun Spannable.getParagraphBounds(index: Int): Pair<Int, Int> {
-  return this.getParagraphBounds(index, index)
-}
-
-fun Spannable.mergeSpannables(start: Int, end: Int, string: String): Spannable {
-  return this.mergeSpannables(start, end, SpannableString(string))
-}
-
-fun Spannable.mergeSpannables(start: Int, end: Int, spannable: Spannable): Spannable {
-  var finalStart = start
-  var finalEnd = end
-
-  val builder = SpannableStringBuilder(this)
-  val startBlockSpans = spannable.getSpans(0, 0, EnrichedBlockSpan::class.java)
-  val startParagraphSpans = spannable.getSpans(0, 0, EnrichedParagraphSpan::class.java)
-  val endBlockSpans = spannable.getSpans(this.length, this.length, EnrichedBlockSpan::class.java)
-  val endParagraphSpans = spannable.getSpans(this.length, this.length, EnrichedParagraphSpan::class.java)
-  val (paragraphStart, paragraphEnd) = this.getParagraphBounds(start, end)
-  val isNewLineStart = startBlockSpans.isNotEmpty() || startParagraphSpans.isNotEmpty()
-  val isNewLineEnd = endBlockSpans.isNotEmpty() || endParagraphSpans.isNotEmpty()
-
-  if (isNewLineStart && start != paragraphStart) {
-    builder.insert(start, "\n")
-    finalStart = start + 1
-    finalEnd = end + 1
-  }
-
-  if (isNewLineEnd && end != paragraphEnd) {
-    builder.insert(finalEnd, "\n")
-  }
-
-  builder.replace(finalStart, finalEnd, spannable)
-
-  return builder
-}

package/android/src/main/java/com/swmansion/enriched/watchers/EnrichedSpanWatcher.kt

@@ -13,26 +13,49 @@ import com.swmansion.enriched.spans.interfaces.EnrichedSpan
 import com.swmansion.enriched.utils.EnrichedParser
 import com.swmansion.enriched.utils.getSafeSpanBoundaries
 
-class EnrichedSpanWatcher(private val view: EnrichedTextInputView) : SpanWatcher {
+class EnrichedSpanWatcher(
+  private val view: EnrichedTextInputView,
+) : SpanWatcher {
   private var previousHtml: String? = null
 
-  override fun onSpanAdded(text: Spannable, what: Any, start: Int, end: Int) {
+  override fun onSpanAdded(
+    text: Spannable,
+    what: Any,
+    start: Int,
+    end: Int,
+  ) {
     updateNextLineLayout(what, text, end)
     updateUnorderedListSpans(what, text, end)
     emitEvent(text, what)
   }
 
-  override fun onSpanRemoved(text: Spannable, what: Any, start: Int, end: Int) {
+  override fun onSpanRemoved(
+    text: Spannable,
+    what: Any,
+    start: Int,
+    end: Int,
+  ) {
     updateNextLineLayout(what, text, end)
     updateUnorderedListSpans(what, text, end)
     emitEvent(text, what)
   }
 
-  override fun onSpanChanged(text: Spannable, what: Any, ostart: Int, oend: Int, nstart: Int, nend: Int) {
+  override fun onSpanChanged(
+    text: Spannable,
+    what: Any,
+    ostart: Int,
+    oend: Int,
+    nstart: Int,
+    nend: Int,
+  ) {
     // Do nothing for now
   }
 
-  private fun updateUnorderedListSpans(what: Any, text: Spannable, end: Int) {
+  private fun updateUnorderedListSpans(
+    what: Any,
+    text: Spannable,
+    end: Int,
+  ) {
     if (what is EnrichedOrderedListSpan) {
       view.listStyles?.updateOrderedListIndexes(text, end)
     }
@@ -40,8 +63,12 @@ class EnrichedSpanWatcher(private val view: EnrichedTextInputView) : SpanWatcher
 
   // After adding/removing heading span, we have to manually set empty paragraph span to the following text
   // This allows us to update the layout (as it's not updated automatically - looks like an Android issue)
-  private fun updateNextLineLayout(what: Any, text: Spannable, end: Int) {
-    class EmptySpan : ParagraphStyle {}
+  private fun updateNextLineLayout(
+    what: Any,
+    text: Spannable,
+    end: Int,
+  ) {
+    class EmptySpan : ParagraphStyle
 
     if (what is EnrichedHeadingSpan) {
       val finalStart = (end + 1)
@@ -51,7 +78,10 @@ class EnrichedSpanWatcher(private val view: EnrichedTextInputView) : SpanWatcher
     }
   }
 
-  fun emitEvent(s: Spannable, what: Any?) {
+  fun emitEvent(
+    s: Spannable,
+    what: Any?,
+  ) {
     // Do not parse spannable and emit event if onChangeHtml is not provided
     if (!view.shouldEmitHtml) return
 
@@ -65,11 +95,13 @@ class EnrichedSpanWatcher(private val view: EnrichedTextInputView) : SpanWatcher
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatcher?.dispatchEvent(OnChangeHtmlEvent(
-      surfaceId,
-      view.id,
-      html,
-      view.experimentalSynchronousEvents,
-    ))
+    dispatcher?.dispatchEvent(
+      OnChangeHtmlEvent(
+        surfaceId,
+        view.id,
+        html,
+        view.experimentalSynchronousEvents,
+      ),
+    )
   }
 }

package/android/src/main/java/com/swmansion/enriched/watchers/EnrichedTextWatcher.kt

@@ -7,15 +7,29 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.swmansion.enriched.EnrichedTextInputView
 import com.swmansion.enriched.events.OnChangeTextEvent
 
-class EnrichedTextWatcher(private val view: EnrichedTextInputView) : TextWatcher {
+class EnrichedTextWatcher(
+  private val view: EnrichedTextInputView,
+) : TextWatcher {
   private var endCursorPosition: Int = 0
+  private var startCursorPosition: Int = 0
   private var previousTextLength: Int = 0
 
-  override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+  override fun beforeTextChanged(
+    s: CharSequence?,
+    start: Int,
+    count: Int,
+    after: Int,
+  ) {
     previousTextLength = s?.length ?: 0
   }
 
-  override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+  override fun onTextChanged(
+    s: CharSequence?,
+    start: Int,
+    before: Int,
+    count: Int,
+  ) {
+    startCursorPosition = start
     endCursorPosition = start + count
     view.layoutManager.invalidateLayout()
     view.isRemovingMany = !view.isDuringTransaction && before > count + 1
@@ -33,19 +47,28 @@ class EnrichedTextWatcher(private val view: EnrichedTextInputView) : TextWatcher
     view.inlineStyles?.afterTextChanged(s, endCursorPosition)
     view.paragraphStyles?.afterTextChanged(s, endCursorPosition, previousTextLength)
     view.listStyles?.afterTextChanged(s, endCursorPosition, previousTextLength)
-    view.parametrizedStyles?.afterTextChanged(s, endCursorPosition)
+    view.parametrizedStyles?.afterTextChanged(s, startCursorPosition, endCursorPosition)
   }
 
-  private fun emitEvents(s: Editable) {
+  private fun emitChangeText(editable: Editable) {
+    if (!view.shouldEmitOnChangeText) {
+      return
+    }
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatcher?.dispatchEvent(OnChangeTextEvent(
-      surfaceId,
-      view.id,
-      s,
-      view.experimentalSynchronousEvents,
-    ))
+    dispatcher?.dispatchEvent(
+      OnChangeTextEvent(
+        surfaceId,
+        view.id,
+        editable,
+        view.experimentalSynchronousEvents,
+      ),
+    )
+  }
+
+  private fun emitEvents(s: Editable) {
+    emitChangeText(s)
     view.spanWatcher?.emitEvent(s, null)
   }
 }

package/android/src/main/new_arch/CMakeLists.txt

@@ -11,6 +11,12 @@ set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/
 file(GLOB LIB_MODULE_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/${LIB_LITERAL}/*.cpp)
 file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
 
+if(NOT DEFINED REACT_NATIVE_MINOR_VERSION)
+  set(REACT_NATIVE_MINOR_VERSION ${ReactAndroid_VERSION_MINOR})
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}")
+
 add_library(
         ${LIB_TARGET_NAME}
         SHARED

package/android/src/main/new_arch/RNEnrichedTextInputViewSpec.cpp

@@ -1,9 +1,10 @@
 
 /**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ * This code was generated by
+ * [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  *
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
@@ -12,9 +13,8 @@
 
 namespace facebook::react {
 
-
-
-std::shared_ptr<TurboModule> RNEnrichedTextInputViewSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+std::shared_ptr<TurboModule> RNEnrichedTextInputViewSpec_ModuleProvider(
+    const std::string &moduleName, const JavaTurboModule::InitParams &params) {
 
   return nullptr;
 }