react-native-enriched 0.2.1 → 0.4.0

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

@@ -1,28 +1,37 @@
-package com.swmansion.enriched.styles
+package com.swmansion.enriched.textinput.styles
 
 import android.text.Editable
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
-import com.swmansion.enriched.EnrichedTextInputView
-import com.swmansion.enriched.spans.EnrichedImageSpan
-import com.swmansion.enriched.spans.EnrichedLinkSpan
-import com.swmansion.enriched.spans.EnrichedMentionSpan
-import com.swmansion.enriched.spans.EnrichedSpans
-import com.swmansion.enriched.utils.getSafeSpanBoundaries
-
-class ParametrizedStyles(private val view: EnrichedTextInputView) {
+import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.spans.EnrichedInputImageSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputLinkSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputMentionSpan
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
+import com.swmansion.enriched.textinput.utils.getSafeSpanBoundaries
+import com.swmansion.enriched.textinput.utils.removeZWS
+
+class ParametrizedStyles(
+  private val view: EnrichedTextInputView,
+) {
   private var mentionStart: Int? = null
   private var isSettingLinkSpan = false
 
   var mentionIndicators: Array<String> = emptyArray<String>()
 
-  fun <T>removeSpansForRange(spannable: Spannable, start: Int, end: Int, clazz: Class<T>): Boolean {
+  fun <T> removeSpansForRange(
+    spannable: Spannable,
+    start: Int,
+    end: Int,
+    clazz: Class<T>,
+  ): Boolean {
     val ssb = spannable as SpannableStringBuilder
     val spans = ssb.getSpans(start, end, clazz)
     if (spans.isEmpty()) return false
 
-    ssb.replace(start, end, ssb.substring(start, end).replace("\u200B", ""))
+    ssb.removeZWS(start, end)
 
     for (span in spans) {
       ssb.removeSpan(span)
@@ -31,11 +40,16 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     return true
   }
 
-  fun setLinkSpan(start: Int, end: Int, text: String, url: String) {
+  fun setLinkSpan(
+    start: Int,
+    end: Int,
+    text: String,
+    url: String,
+  ) {
     isSettingLinkSpan = true
 
     val spannable = view.text as SpannableStringBuilder
-    val spans = spannable.getSpans(start, end, EnrichedLinkSpan::class.java)
+    val spans = spannable.getSpans(start, end, EnrichedInputLinkSpan::class.java)
     for (span in spans) {
       spannable.removeSpan(span)
     }
@@ -47,7 +61,7 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     }
 
     val spanEnd = start + text.length
-    val span = EnrichedLinkSpan(url, view.htmlStyle)
+    val span = EnrichedInputLinkSpan(url, view.htmlStyle)
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, spanEnd)
     spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
 
@@ -55,36 +69,66 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     isSettingLinkSpan = false
   }
 
-  fun afterTextChanged(s: Editable, endCursorPosition: Int) {
-    val result = getWordAtIndex(s, endCursorPosition) ?: return
-
-    afterTextChangedLinks(result)
-    afterTextChangedMentions(result)
+  fun afterTextChanged(
+    s: Editable,
+    startCursorPosition: Int,
+    endCursorPosition: Int,
+  ) {
+    afterTextChangedLinks(startCursorPosition, endCursorPosition)
+    afterTextChangedMentions(s, startCursorPosition)
   }
 
-  fun detectAllLinks() {
-    val spannable = view.text as Spannable
-
-    // TODO: Consider using more reliable regex, this one matches almost anything
-    val urlPattern = android.util.Patterns.WEB_URL.matcher(spannable)
+  fun detectLinksInRange(
+    spannable: Spannable,
+    start: Int,
+    end: Int,
+  ) {
+    val regex = view.linkRegex ?: return
+    val contextText = spannable.subSequence(start, end).toString()
 
-    val spans = spannable.getSpans(0, spannable.length, EnrichedLinkSpan::class.java)
+    val spans = spannable.getSpans(start, end, EnrichedInputLinkSpan::class.java)
     for (span in spans) {
       spannable.removeSpan(span)
     }
 
-    while (urlPattern.find()) {
-      val word = urlPattern.group()
-      val start = urlPattern.start()
-      val end = urlPattern.end()
-      val span = EnrichedLinkSpan(word, view.htmlStyle)
-      val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
-      spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    val wordsRegex = Regex("\\S+")
+    for (wordMatch in wordsRegex.findAll(contextText)) {
+      var word = wordMatch.value
+      var wordStart = wordMatch.range.first
+
+      // Do not include zero-width space in link detection
+      if (word.startsWith(EnrichedConstants.ZWS_STRING)) {
+        word = word.substring(1)
+        wordStart += 1
+      }
+
+      // Loop over words and detect links
+      val matcher = regex.matcher(word)
+      while (matcher.find()) {
+        val linkStart = matcher.start()
+        val linkEnd = matcher.end()
+
+        val spanStart = start + wordStart + linkStart
+        val spanEnd = start + wordStart + linkEnd
+
+        val span = EnrichedInputLinkSpan(matcher.group(), view.htmlStyle)
+        val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(spanStart, spanEnd)
+
+        spannable.setSpan(
+          span,
+          safeStart,
+          safeEnd,
+          Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
+        )
+      }
     }
   }
 
-  private fun getWordAtIndex(s: CharSequence, index: Int): TextRange? {
-    if (index < 0 ) return null
+  private fun getWordAtIndex(
+    s: CharSequence,
+    index: Int,
+  ): TextRange? {
+    if (index < 0) return null
 
     var start = index
     var end = index
@@ -102,8 +146,31 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     return TextRange(result, start, end)
   }
 
+  // After editing text we want to automatically detect links in the affected range
+  // Affected range is range + previous word + next word
+  private fun getLinksAffectedRange(
+    s: CharSequence,
+    start: Int,
+    end: Int,
+  ): IntRange {
+    var actualStart = start
+    var actualEnd = end
+
+    // Expand backward to find the start of the first affected word
+    while (actualStart > 0 && !Character.isWhitespace(s[actualStart - 1])) {
+      actualStart--
+    }
+
+    // Expand forward to find the end of the last affected word
+    while (actualEnd < s.length && !Character.isWhitespace(s[actualEnd])) {
+      actualEnd++
+    }
+
+    return actualStart..actualEnd
+  }
+
   private fun canLinkBeApplied(): Boolean {
-    val mergingConfig = EnrichedSpans.getMergingConfigForStyle(EnrichedSpans.LINK, view.htmlStyle)?: return true
+    val mergingConfig = EnrichedSpans.getMergingConfigForStyle(EnrichedSpans.LINK, view.htmlStyle) ?: return true
     val conflictingStyles = mergingConfig.conflictingStyles
     val blockingStyles = mergingConfig.blockingStyles
 
@@ -118,36 +185,31 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     return true
   }
 
-  private fun afterTextChangedLinks(result: TextRange) {
+  private fun afterTextChangedLinks(
+    editStart: Int,
+    editEnd: Int,
+  ) {
     // Do not detect link if it's applied manually
     if (isSettingLinkSpan || !canLinkBeApplied()) return
 
-    val spannable = view.text as Spannable
-    val (word, start, end) = result
-
-    // TODO: Consider using more reliable regex, this one matches almost anything
-    val urlPattern = android.util.Patterns.WEB_URL.matcher(word)
-    val spans = spannable.getSpans(start, end, EnrichedLinkSpan::class.java)
-    for (span in spans) {
-      spannable.removeSpan(span)
-    }
-
-    if (urlPattern.matches()) {
-      val span = EnrichedLinkSpan(word, view.htmlStyle)
-      val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
-      spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-    }
+    val spannable = view.text as? Spannable ?: return
+    val affectedRange = getLinksAffectedRange(spannable, editStart, editEnd)
+    detectLinksInRange(spannable, affectedRange.first, affectedRange.last)
   }
 
-  private fun afterTextChangedMentions(currentWord: TextRange) {
+  private fun afterTextChangedMentions(
+    s: CharSequence,
+    endCursorPosition: Int,
+  ) {
     val mentionHandler = view.mentionHandler ?: return
+    val currentWord = getWordAtIndex(s, endCursorPosition) ?: return
     val spannable = view.text as Spannable
 
     val indicatorsPattern = mentionIndicators.joinToString("|") { Regex.escape(it) }
     val mentionIndicatorRegex = Regex("^($indicatorsPattern)")
-    val mentionRegex= Regex("^($indicatorsPattern)\\w*")
+    val mentionRegex = Regex("^($indicatorsPattern)\\w*")
 
-    val spans = spannable.getSpans(currentWord.start, currentWord.end, EnrichedMentionSpan::class.java)
+    val spans = spannable.getSpans(currentWord.start, currentWord.end, EnrichedInputMentionSpan::class.java)
     for (span in spans) {
       spannable.removeSpan(span)
     }
@@ -192,24 +254,28 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     mentionHandler.onMention(indicator, text)
   }
 
-  fun setImageSpan(src: String, width: Float, height: Float) {
+  fun setImageSpan(
+    src: String,
+    width: Float,
+    height: Float,
+  ) {
     if (view.selection == null) return
     val spannable = view.text as SpannableStringBuilder
     val (start, originalEnd) = view.selection.getInlineSelection()
 
     if (start == originalEnd) {
-      spannable.insert(start, "\uFFFC")
+      spannable.insert(start, EnrichedConstants.ORC_STRING)
     } else {
-      val spans = spannable.getSpans(start, originalEnd, EnrichedImageSpan::class.java)
+      val spans = spannable.getSpans(start, originalEnd, EnrichedInputImageSpan::class.java)
       for (s in spans) {
         spannable.removeSpan(s)
       }
 
-      spannable.replace(start, originalEnd, "\uFFFC")
+      spannable.replace(start, originalEnd, EnrichedConstants.ORC_STRING)
     }
 
     val (imageStart, imageEnd) = spannable.getSafeSpanBoundaries(start, start + 1)
-    val span = EnrichedImageSpan.createEnrichedImageSpan(src, width.toInt(), height.toInt())
+    val span = EnrichedInputImageSpan.createEnrichedImageSpan(src, width.toInt(), height.toInt())
     span.observeAsyncDrawableLoaded(view.text)
 
     spannable.setSpan(span, imageStart, imageEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -228,12 +294,16 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     }
   }
 
-  fun setMentionSpan(indicator: String, text: String, attributes: Map<String, String>) {
+  fun setMentionSpan(
+    indicator: String,
+    text: String,
+    attributes: Map<String, String>,
+  ) {
     val selection = view.selection ?: return
 
     val spannable = view.text as SpannableStringBuilder
     val (selectionStart, selectionEnd) = selection.getInlineSelection()
-    val spans = spannable.getSpans(selectionStart, selectionEnd, EnrichedMentionSpan::class.java)
+    val spans = spannable.getSpans(selectionStart, selectionEnd, EnrichedInputMentionSpan::class.java)
 
     for (span in spans) {
       spannable.removeSpan(span)
@@ -244,7 +314,7 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     view.runAsATransaction {
       spannable.replace(start, selectionEnd, text)
 
-      val span = EnrichedMentionSpan(text, indicator, attributes, view.htmlStyle)
+      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)
@@ -259,17 +329,23 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     view.selection.validateStyles()
   }
 
-  fun getStyleRange(): Pair<Int, Int> {
-    return view.selection?.getInlineSelection() ?: Pair(0, 0)
-  }
+  fun getStyleRange(): Pair<Int, Int> = view.selection?.getInlineSelection() ?: Pair(0, 0)
 
-  fun removeStyle(name: String, start: Int, end: Int): Boolean {
+  fun removeStyle(
+    name: String,
+    start: Int,
+    end: Int,
+  ): Boolean {
     val config = EnrichedSpans.parametrizedStyles[name] ?: return false
     val spannable = view.text as Spannable
     return removeSpansForRange(spannable, start, end, config.clazz)
   }
 
   companion object {
-    data class TextRange(val text: String, val start: Int, val end: Int)
+    data class TextRange(
+      val text: String,
+      val start: Int,
+      val end: Int,
+    )
   }
 }

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

@@ -0,0 +1,17 @@
+package com.swmansion.enriched.textinput.utils
+
+import android.text.Editable
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import com.swmansion.enriched.textinput.watchers.EnrichedSpanWatcher
+
+class EnrichedEditableFactory(
+  private val watcher: EnrichedSpanWatcher,
+) : Editable.Factory() {
+  override fun newEditable(source: CharSequence): Editable {
+    val s = source as? SpannableStringBuilder ?: SpannableStringBuilder(source)
+    s.removeSpan(watcher)
+    s.setSpan(watcher, 0, s.length, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
+    return s
+  }
+}

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

@@ -1,26 +1,32 @@
-package com.swmansion.enriched.utils
+package com.swmansion.enriched.textinput.utils
 
 import android.text.Editable
 import android.text.Spannable
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.swmansion.enriched.EnrichedTextInputView
-import com.swmansion.enriched.events.OnChangeSelectionEvent
-import com.swmansion.enriched.events.OnLinkDetectedEvent
-import com.swmansion.enriched.events.OnMentionDetectedEvent
-import com.swmansion.enriched.spans.EnrichedLinkSpan
-import com.swmansion.enriched.spans.EnrichedMentionSpan
-import com.swmansion.enriched.spans.EnrichedSpans
+import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.events.OnChangeSelectionEvent
+import com.swmansion.enriched.textinput.events.OnLinkDetectedEvent
+import com.swmansion.enriched.textinput.events.OnMentionDetectedEvent
+import com.swmansion.enriched.textinput.spans.EnrichedInputLinkSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputMentionSpan
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
 import org.json.JSONObject
 
-class EnrichedSelection(private val view: EnrichedTextInputView) {
+class EnrichedSelection(
+  private val view: EnrichedTextInputView,
+) {
   var start: Int = 0
   var end: Int = 0
 
   private var previousLinkDetectedEvent: MutableMap<String, String> = mutableMapOf("text" to "", "url" to "")
   private var previousMentionDetectedEvent: MutableMap<String, String> = mutableMapOf("text" to "", "payload" to "")
 
-  fun onSelection(selStart: Int, selEnd: Int) {
+  fun onSelection(
+    selStart: Int,
+    selEnd: Int,
+  ) {
     var shouldValidateStyles = false
     var newStart = start
     var newEnd = end
@@ -52,19 +58,23 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     emitSelectionChangeEvent(view.text, finalStart, finalEnd)
   }
 
-  private fun isZeroWidthSelection(start: Int, end: Int): Boolean {
+  private fun isZeroWidthSelection(
+    start: Int,
+    end: Int,
+  ): Boolean {
     val text = view.text ?: return false
 
     if (start != end) {
-      return text.substring(start, end) == "\u200B"
+      return text.substring(start, end) == EnrichedConstants.ZWS_STRING
     }
 
-    val isNewLine = if (start > 0 ) text.substring(start - 1, start) == "\n" else true
-    val isNextCharacterZeroWidth = if (start < text.length) {
-      text.substring(start, start + 1) == "\u200B"
-    } else {
-      false
-    }
+    val isNewLine = if (start > 0) text.substring(start - 1, start) == "\n" else true
+    val isNextCharacterZeroWidth =
+      if (start < text.length) {
+        text.substring(start, start + 1) == EnrichedConstants.ZWS_STRING
+      } else {
+        false
+      }
 
     return isNewLine && isNextCharacterZeroWidth
   }
@@ -103,7 +113,7 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     return Pair(finalStart, finalEnd)
   }
 
-  private fun <T>getInlineStyleStart(type: Class<T>): Int? {
+  private fun <T> getInlineStyleStart(type: Class<T>): Int? {
     val (start, end) = getInlineSelection()
     val spannable = view.text as Spannable
     val spans = spannable.getSpans(start, end, type)
@@ -129,7 +139,7 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     return spannable.getParagraphBounds(currentStart, currentEnd)
   }
 
-  private fun <T>getParagraphStyleStart(type: Class<T>): Int? {
+  private fun <T> getParagraphStyleStart(type: Class<T>): Int? {
     val (start, end) = getParagraphSelection()
     val spannable = view.text as Spannable
     val spans = spannable.getSpans(start, end, type)
@@ -148,7 +158,7 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     return styleStart
   }
 
-  private fun <T>getListStyleStart(type: Class<T>): Int? {
+  private fun <T> getListStyleStart(type: Class<T>): Int? {
     val (start, end) = getParagraphSelection()
     val spannable = view.text as Spannable
     var styleStart: Int? = null
@@ -177,12 +187,12 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     return styleStart
   }
 
-  private fun <T>getParametrizedStyleStart(type: Class<T>): Int? {
+  private fun <T> getParametrizedStyleStart(type: Class<T>): Int? {
     val (start, end) = getInlineSelection()
     val spannable = view.text as Spannable
     val spans = spannable.getSpans(start, end, type)
-    val isLinkType = type == EnrichedLinkSpan::class.java
-    val isMentionType = type == EnrichedMentionSpan::class.java
+    val isLinkType = type == EnrichedInputLinkSpan::class.java
+    val isMentionType = type == EnrichedInputMentionSpan::class.java
 
     if (isLinkType && spans.isEmpty()) {
       emitLinkDetectedEvent(spannable, null, start, end)
@@ -199,9 +209,9 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
       val spanEnd = spannable.getSpanEnd(span)
 
       if (start >= spanStart && end <= spanEnd) {
-        if (isLinkType && span is EnrichedLinkSpan) {
+        if (isLinkType && span is EnrichedInputLinkSpan) {
           emitLinkDetectedEvent(spannable, span, spanStart, spanEnd)
-        } else if (isMentionType && span is EnrichedMentionSpan) {
+        } else if (isMentionType && span is EnrichedInputMentionSpan) {
           emitMentionDetectedEvent(spannable, span, spanStart, spanEnd)
         }
 
@@ -212,7 +222,11 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     return null
   }
 
-  private fun emitSelectionChangeEvent(editable: Editable?, start: Int, end: Int) {
+  private fun emitSelectionChangeEvent(
+    editable: Editable?,
+    start: Int,
+    end: Int,
+  ) {
     if (editable == null) return
 
     val context = view.context as ReactContext
@@ -220,17 +234,24 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
 
     val text = editable.substring(start, end)
-    dispatcher?.dispatchEvent(OnChangeSelectionEvent(
-      surfaceId,
-      view.id,
-      text,
-      start ,
-      end,
-      view.experimentalSynchronousEvents,
-    ))
+    dispatcher?.dispatchEvent(
+      OnChangeSelectionEvent(
+        surfaceId,
+        view.id,
+        text,
+        start,
+        end,
+        view.experimentalSynchronousEvents,
+      ),
+    )
   }
 
-  private fun emitLinkDetectedEvent(spannable: Spannable, span: EnrichedLinkSpan?, start: Int, end: Int) {
+  private fun emitLinkDetectedEvent(
+    spannable: Spannable,
+    span: EnrichedInputLinkSpan?,
+    start: Int,
+    end: Int,
+  ) {
     val text = spannable.substring(start, end)
     val url = span?.getUrl() ?: ""
 
@@ -243,18 +264,25 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatcher?.dispatchEvent(OnLinkDetectedEvent(
-      surfaceId,
-      view.id,
-      text,
-      url,
-      start,
-      end,
-      view.experimentalSynchronousEvents,
-    ))
+    dispatcher?.dispatchEvent(
+      OnLinkDetectedEvent(
+        surfaceId,
+        view.id,
+        text,
+        url,
+        start,
+        end,
+        view.experimentalSynchronousEvents,
+      ),
+    )
   }
 
-  private fun emitMentionDetectedEvent(spannable: Spannable, span: EnrichedMentionSpan?, start: Int, end: Int) {
+  private fun emitMentionDetectedEvent(
+    spannable: Spannable,
+    span: EnrichedInputMentionSpan?,
+    start: Int,
+    end: Int,
+  ) {
     val text = spannable.substring(start, end)
     val attributes = span?.getAttributes() ?: emptyMap()
     val indicator = span?.getIndicator() ?: ""
@@ -273,13 +301,15 @@ class EnrichedSelection(private val view: EnrichedTextInputView) {
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatcher?.dispatchEvent(OnMentionDetectedEvent(
-      surfaceId,
-      view.id,
-      text,
-      indicator,
-      payload,
-      view.experimentalSynchronousEvents,
-    ))
+    dispatcher?.dispatchEvent(
+      OnMentionDetectedEvent(
+        surfaceId,
+        view.id,
+        text,
+        indicator,
+        payload,
+        view.experimentalSynchronousEvents,
+      ),
+    )
   }
 }