react-native-enriched 0.3.0 → 0.4.1

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

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.styles
+package com.swmansion.enriched.textinput.styles
 
 import android.graphics.Color
 import com.facebook.react.bridge.ColorPropConverter
@@ -6,63 +6,70 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
-import com.swmansion.enriched.EnrichedTextInputView
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.MentionStyle
+import com.swmansion.enriched.textinput.EnrichedTextInputView
 import kotlin.Float
 import kotlin.Int
 import kotlin.String
 import kotlin.math.ceil
 
-class HtmlStyle {
+class HtmlStyle : EnrichedStyle {
   private var style: ReadableMap? = null
   private var view: EnrichedTextInputView? = null
 
   // Default values are ignored as they are specified on the JS side.
   // They are specified only because they are required by the constructor.
   // JS passes them as a prop - so they are initialized after the constructor is called.
-  var h1FontSize: Int = 72
-  var h1Bold: Boolean = false
+  override var h1FontSize: Int = 72
+  override var h1Bold: Boolean = false
 
-  var h2FontSize: Int = 64
-  var h2Bold: Boolean = false
+  override var h2FontSize: Int = 64
+  override var h2Bold: Boolean = false
 
-  var h3FontSize: Int = 56
-  var h3Bold: Boolean = false
+  override var h3FontSize: Int = 56
+  override var h3Bold: Boolean = false
 
-  var h4FontSize: Int = 48
-  var h4Bold: Boolean = false
+  override var h4FontSize: Int = 48
+  override var h4Bold: Boolean = false
 
-  var h5FontSize: Int = 40
-  var h5Bold: Boolean = false
+  override var h5FontSize: Int = 40
+  override var h5Bold: Boolean = false
 
-  var h6FontSize: Int = 32
-  var h6Bold: Boolean = false
+  override var h6FontSize: Int = 32
+  override var h6Bold: Boolean = false
 
-  var blockquoteColor: Int? = null
-  var blockquoteBorderColor: Int = Color.BLACK
-  var blockquoteStripeWidth: Int = 2
-  var blockquoteGapWidth: Int = 16
+  override var blockquoteColor: Int? = null
+  override var blockquoteBorderColor: Int = Color.BLACK
+  override var blockquoteStripeWidth: Int = 2
+  override var blockquoteGapWidth: Int = 16
 
-  var olGapWidth: Int = 16
-  var olMarginLeft: Int = 24
-  var olMarkerFontWeight: Int? = null
-  var olMarkerColor: Int? = null
+  override var olGapWidth: Int = 16
+  override var olMarginLeft: Int = 24
+  override var olMarkerFontWeight: Int? = null
+  override var olMarkerColor: Int? = null
 
-  var ulGapWidth: Int = 16
-  var ulMarginLeft: Int = 24
-  var ulBulletSize: Int = 8
-  var ulBulletColor: Int = Color.BLACK
+  override var ulGapWidth: Int = 16
+  override var ulMarginLeft: Int = 24
+  override var ulBulletSize: Int = 8
+  override var ulBulletColor: Int = Color.BLACK
 
-  var aColor: Int = Color.BLACK
-  var aUnderline: Boolean = true
+  override var ulCheckboxBoxSize: Int = 50
+  override var ulCheckboxGapWidth: Int = 16
+  override var ulCheckboxMarginLeft: Int = 24
+  override var ulCheckboxBoxColor: Int = Color.BLACK
 
-  var codeBlockColor: Int = Color.BLACK
-  var codeBlockBackgroundColor: Int = Color.BLACK
-  var codeBlockRadius: Float = 4f
+  override var aColor: Int = Color.BLACK
+  override var aUnderline: Boolean = true
 
-  var inlineCodeColor: Int = Color.BLACK
-  var inlineCodeBackgroundColor: Int = Color.BLACK
+  override var codeBlockColor: Int = Color.BLACK
+  override var codeBlockBackgroundColor: Int = Color.BLACK
+  override var codeBlockRadius: Float = 4f
 
-  var mentionsStyle: MutableMap<String, MentionStyle> = mutableMapOf()
+  override var inlineCodeColor: Int = Color.BLACK
+  override var inlineCodeBackgroundColor: Int = Color.BLACK
+
+  override var mentionsStyle: MutableMap<String, MentionStyle> = mutableMapOf()
 
   constructor(view: EnrichedTextInputView?, style: ReadableMap?) {
     this.view = view
@@ -118,6 +125,12 @@ class HtmlStyle {
     ulMarginLeft = parseFloat(ulStyle, "marginLeft").toInt()
     ulBulletSize = parseFloat(ulStyle, "bulletSize").toInt()
 
+    val ulCheckboxStyle = style.getMap("ulCheckbox")
+    ulCheckboxBoxSize = parseFloat(ulCheckboxStyle, "boxSize").toInt()
+    ulCheckboxGapWidth = parseFloat(ulCheckboxStyle, "gapWidth").toInt()
+    ulCheckboxMarginLeft = parseFloat(ulCheckboxStyle, "marginLeft").toInt()
+    ulCheckboxBoxColor = parseColor(ulCheckboxStyle, "boxColor")
+
     val aStyle = style.getMap("a")
     aColor = parseColor(aStyle, "color")
     aUnderline = parseIsUnderline(aStyle)
@@ -290,6 +303,11 @@ class HtmlStyle {
       ulBulletSize == other.ulBulletSize &&
       ulBulletColor == other.ulBulletColor &&
 
+      ulCheckboxBoxSize == other.ulCheckboxBoxSize &&
+      ulCheckboxGapWidth == other.ulCheckboxGapWidth &&
+      ulCheckboxMarginLeft == other.ulCheckboxMarginLeft &&
+      ulCheckboxBoxColor == other.ulCheckboxBoxColor &&
+
       aColor == other.aColor &&
       aUnderline == other.aUnderline &&
 
@@ -332,6 +350,11 @@ class HtmlStyle {
     result = 31 * result + ulBulletSize.hashCode()
     result = 31 * result + ulBulletColor.hashCode()
 
+    result = 31 * result + ulCheckboxBoxSize.hashCode()
+    result = 31 * result + ulCheckboxGapWidth.hashCode()
+    result = 31 * result + ulCheckboxMarginLeft.hashCode()
+    result = 31 * result + ulCheckboxBoxColor.hashCode()
+
     result = 31 * result + aColor.hashCode()
     result = 31 * result + aUnderline.hashCode()
 
@@ -346,12 +369,4 @@ class HtmlStyle {
 
     return result
   }
-
-  companion object {
-    data class MentionStyle(
-      val color: Int,
-      val backgroundColor: Int,
-      val underline: Boolean,
-    )
-  }
 }

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

@@ -1,10 +1,10 @@
-package com.swmansion.enriched.styles
+package com.swmansion.enriched.textinput.styles
 
 import android.text.Editable
 import android.text.Spannable
-import com.swmansion.enriched.EnrichedTextInputView
-import com.swmansion.enriched.spans.EnrichedSpans
-import com.swmansion.enriched.utils.getSafeSpanBoundaries
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
+import com.swmansion.enriched.textinput.utils.getSafeSpanBoundaries
 
 class InlineStyles(
   private val view: EnrichedTextInputView,

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

@@ -1,17 +1,18 @@
-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.EnrichedOrderedListSpan
-import com.swmansion.enriched.spans.EnrichedSpans
-import com.swmansion.enriched.spans.EnrichedUnorderedListSpan
-import com.swmansion.enriched.utils.EnrichedConstants
-import com.swmansion.enriched.utils.getParagraphBounds
-import com.swmansion.enriched.utils.getSafeSpanBoundaries
-import com.swmansion.enriched.utils.removeZWS
+import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.spans.EnrichedInputCheckboxListSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputOrderedListSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputUnorderedListSpan
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
+import com.swmansion.enriched.textinput.utils.getParagraphBounds
+import com.swmansion.enriched.textinput.utils.getSafeSpanBoundaries
+import com.swmansion.enriched.textinput.utils.removeZWS
 
 class ListStyles(
   private val view: EnrichedTextInputView,
@@ -47,8 +48,8 @@ class ListStyles(
     spannable: Spannable,
     s: Int,
   ): Int {
-    val span = getPreviousParagraphSpan(spannable, s, EnrichedOrderedListSpan::class.java)
-    val index = span?.getIndex() ?: 0
+    val span = getPreviousParagraphSpan(spannable, s, EnrichedInputOrderedListSpan::class.java)
+    val index = span?.getListIndex() ?: 0
     return index + 1
   }
 
@@ -57,19 +58,29 @@ class ListStyles(
     name: String,
     start: Int,
     end: Int,
+    isChecked: Boolean? = false,
   ) {
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
 
-    if (name == EnrichedSpans.UNORDERED_LIST) {
-      val span = EnrichedUnorderedListSpan(view.htmlStyle)
-      spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-      return
-    }
+    when (name) {
+      EnrichedSpans.UNORDERED_LIST -> {
+        val span = EnrichedInputUnorderedListSpan(view.htmlStyle)
+        spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+      }
+
+      EnrichedSpans.ORDERED_LIST -> {
+        val index = getOrderedListIndex(spannable, safeStart)
+        val span = EnrichedInputOrderedListSpan(index, view.htmlStyle)
+        spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+      }
+
+      EnrichedSpans.CHECKBOX_LIST -> {
+        val span = EnrichedInputCheckboxListSpan(isChecked ?: false, view.htmlStyle)
+        spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
 
-    if (name == EnrichedSpans.ORDERED_LIST) {
-      val index = getOrderedListIndex(spannable, safeStart)
-      val span = EnrichedOrderedListSpan(index, view.htmlStyle)
-      spannable.setSpan(span, safeStart, safeEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        // Invalidate layout to update checkbox drawing in case checkbox is bigger than line height
+        view.layoutManager.invalidateLayout()
+      }
     }
   }
 
@@ -95,16 +106,19 @@ class ListStyles(
     text: Spannable,
     position: Int,
   ) {
-    val spans = text.getSpans(position + 1, text.length, EnrichedOrderedListSpan::class.java)
+    val spans = text.getSpans(position + 1, text.length, EnrichedInputOrderedListSpan::class.java)
     val sortedSpans = spans.sortedBy { text.getSpanStart(it) }
     for (span in sortedSpans) {
       val spanStart = text.getSpanStart(span)
       val index = getOrderedListIndex(text, spanStart)
-      span.setIndex(index)
+      span.setListIndex(index)
     }
   }
 
-  fun toggleStyle(name: String) {
+  private fun toggleStyle(
+    name: String,
+    checkboxState: Boolean?,
+  ) {
     if (view.selection == null) return
     val config = EnrichedSpans.listSpans[name] ?: return
     val spannable = view.text as SpannableStringBuilder
@@ -123,7 +137,7 @@ class ListStyles(
       spannable.insert(start, EnrichedConstants.ZWS_STRING)
       view.spanState?.setStart(name, start + 1)
       removeSpansForRange(spannable, start, end, config.clazz)
-      setSpan(spannable, name, start, end + 1)
+      setSpan(spannable, name, start, end + 1, checkboxState)
 
       return
     }
@@ -135,7 +149,7 @@ class ListStyles(
     for (paragraph in paragraphs) {
       spannable.insert(currentStart, EnrichedConstants.ZWS_STRING)
       val currentEnd = currentStart + paragraph.length + 1
-      setSpan(spannable, name, currentStart, currentEnd)
+      setSpan(spannable, name, currentStart, currentEnd, checkboxState)
 
       currentStart = currentEnd + 1
     }
@@ -143,6 +157,14 @@ class ListStyles(
     view.spanState?.setStart(name, currentStart)
   }
 
+  fun toggleStyle(name: String) {
+    toggleStyle(name, false)
+  }
+
+  fun toggleCheckboxListStyle(checked: Boolean) {
+    toggleStyle(EnrichedSpans.CHECKBOX_LIST, checked)
+  }
+
   private fun handleAfterTextChanged(
     s: Editable,
     name: String,
@@ -155,7 +177,7 @@ class ListStyles(
 
     val isBackspace = previousTextLength > s.length
     val isNewLine = cursorPosition > 0 && s[cursorPosition - 1] == '\n'
-    val isShortcut = s.substring(start, end).startsWith(config.shortcut)
+    val isShortcut = config.shortcut?.let { s.substring(start, end).startsWith(it) } ?: false
     val spans = s.getSpans(start, end, config.clazz)
 
     // Remove spans if cursor is at the start of the paragraph and spans exist
@@ -173,6 +195,19 @@ class ListStyles(
     }
 
     if (!isBackspace && isNewLine && isPreviousParagraphList(s, start, config.clazz)) {
+      // Check if the span from the previous line "leaked" into this one
+      if (spans.isNotEmpty()) {
+        val existingSpan = spans[0]
+        val spanStart = s.getSpanStart(existingSpan)
+
+        // If the span started before the current paragraph (belongs to the previous item)
+        // update it to end at the newline (start - 1)
+        if (spanStart < start) {
+          val spanFlags = s.getSpanFlags(existingSpan)
+          s.setSpan(existingSpan, spanStart, start - 1, spanFlags)
+        }
+      }
+
       s.insert(cursorPosition, EnrichedConstants.ZWS_STRING)
       setSpan(s, name, start, end + 1)
       // Inform that new span has been added
@@ -180,6 +215,21 @@ class ListStyles(
       return
     }
 
+    if (name === EnrichedSpans.CHECKBOX_LIST) {
+      if (spans.isNotEmpty()) {
+        val previousSpan = spans[0] as EnrichedInputCheckboxListSpan
+        val isChecked = previousSpan.isChecked
+
+        for (span in spans) {
+          s.removeSpan(span)
+        }
+
+        setSpan(s, EnrichedSpans.CHECKBOX_LIST, start, end, isChecked)
+      }
+
+      return
+    }
+
     if (spans.isNotEmpty()) {
       for (span in spans) {
         s.removeSpan(span)
@@ -196,6 +246,7 @@ class ListStyles(
   ) {
     handleAfterTextChanged(s, EnrichedSpans.ORDERED_LIST, endCursorPosition, previousTextLength)
     handleAfterTextChanged(s, EnrichedSpans.UNORDERED_LIST, endCursorPosition, previousTextLength)
+    handleAfterTextChanged(s, EnrichedSpans.CHECKBOX_LIST, endCursorPosition, previousTextLength)
   }
 
   fun getStyleRange(): Pair<Int, Int> = view.selection?.getParagraphSelection() ?: Pair(0, 0)

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

@@ -1,16 +1,16 @@
-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.util.Log
-import com.swmansion.enriched.EnrichedTextInputView
-import com.swmansion.enriched.spans.EnrichedSpans
-import com.swmansion.enriched.spans.interfaces.EnrichedSpan
-import com.swmansion.enriched.utils.EnrichedConstants
-import com.swmansion.enriched.utils.getParagraphBounds
-import com.swmansion.enriched.utils.getSafeSpanBoundaries
-import com.swmansion.enriched.utils.removeZWS
+import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
+import com.swmansion.enriched.textinput.spans.interfaces.EnrichedInputSpan
+import com.swmansion.enriched.textinput.utils.getParagraphBounds
+import com.swmansion.enriched.textinput.utils.getSafeSpanBoundaries
+import com.swmansion.enriched.textinput.utils.removeZWS
 
 class ParagraphStyles(
   private val view: EnrichedTextInputView,
@@ -108,6 +108,9 @@ class ParagraphStyles(
     spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
   }
 
+  // Removes spans of the given type in the specified range.
+  // If the removed span intersects with the range, it will be split and the remaining part will be re-applied after the removal
+  // Returns true if any spans were removed, false otherwise
   private fun <T> removeSpansForRange(
     spannable: Spannable,
     start: Int,
@@ -115,21 +118,24 @@ class ParagraphStyles(
     clazz: Class<T>,
   ): Boolean {
     val ssb = spannable as SpannableStringBuilder
-    var finalStart = start
-    var finalEnd = end
-
     val spans = ssb.getSpans(start, end, clazz)
     if (spans.isEmpty()) return false
 
     for (span in spans) {
-      finalStart = ssb.getSpanStart(span).coerceAtMost(finalStart)
-      finalEnd = ssb.getSpanEnd(span).coerceAtLeast(finalEnd)
-
+      val spanStart = ssb.getSpanStart(span)
+      val spanEnd = ssb.getSpanEnd(span)
       ssb.removeSpan(span)
-    }
 
-    ssb.removeZWS(finalStart, finalEnd)
+      if (spanStart < start) {
+        setSpan(ssb, clazz, spanStart, start - 1)
+      }
 
+      if (spanEnd > end) {
+        setSpan(ssb, clazz, end + 1, spanEnd)
+      }
+    }
+
+    ssb.removeZWS(start, end)
     return true
   }
 
@@ -215,11 +221,7 @@ class ParagraphStyles(
     }
 
     val currSpan = currParagraphSpans[0]
-    val nextSpan = getNextParagraphSpan(s, end, type)
-
-    if (nextSpan == null) {
-      return
-    }
+    val nextSpan = getNextParagraphSpan(s, end, type) ?: return
 
     val newStart = s.getSpanStart(currSpan)
     val newEnd = s.getSpanEnd(nextSpan)
@@ -259,7 +261,7 @@ class ParagraphStyles(
       }
 
       for (span in spans) {
-        extendStyleOnWholeParagraph(s, span as EnrichedSpan, conflictingType, paragraphEnd)
+        extendStyleOnWholeParagraph(s, span as EnrichedInputSpan, conflictingType, paragraphEnd)
       }
     }
 
@@ -294,7 +296,7 @@ class ParagraphStyles(
 
   private fun <T> extendStyleOnWholeParagraph(
     s: Editable,
-    span: EnrichedSpan,
+    span: EnrichedInputSpan,
     type: Class<T>,
     paragraphEnd: Int,
   ) {
@@ -325,7 +327,7 @@ class ParagraphStyles(
           for (span in spans) {
             // handle conflicts when entering paragraph with some paragraph style applied
             deleteConflictingAndBlockingStyles(s, style, start, end)
-            extendStyleOnWholeParagraph(s, span as EnrichedSpan, config.clazz, end)
+            extendStyleOnWholeParagraph(s, span as EnrichedInputSpan, config.clazz, end)
           }
         }
 
@@ -341,9 +343,12 @@ class ParagraphStyles(
           continue
         }
 
+        // If removing text at the beginning of the line, we want to remove the span for the whole paragraph
         if (isBackspace) {
-          endCursorPosition -= 1
+          val currentParagraphBounds = s.getParagraphBounds(endCursorPosition)
+          removeSpansForRange(s, currentParagraphBounds.first, currentParagraphBounds.second, config.clazz)
           spanState.setStart(style, null)
+          continue
         } else {
           s.insert(endCursorPosition, EnrichedConstants.ZWS_STRING)
           endCursorPosition += 1

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

@@ -1,17 +1,17 @@
-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.EnrichedConstants
-import com.swmansion.enriched.utils.getSafeSpanBoundaries
-import com.swmansion.enriched.utils.removeZWS
+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,
@@ -49,7 +49,7 @@ class ParametrizedStyles(
     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)
     }
@@ -61,7 +61,7 @@ class ParametrizedStyles(
     }
 
     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)
 
@@ -86,7 +86,7 @@ class ParametrizedStyles(
     val regex = view.linkRegex ?: return
     val contextText = spannable.subSequence(start, end).toString()
 
-    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)
     }
@@ -97,7 +97,7 @@ class ParametrizedStyles(
       var wordStart = wordMatch.range.first
 
       // Do not include zero-width space in link detection
-      if (word.startsWith("\u200B")) {
+      if (word.startsWith(EnrichedConstants.ZWS_STRING)) {
         word = word.substring(1)
         wordStart += 1
       }
@@ -111,7 +111,7 @@ class ParametrizedStyles(
         val spanStart = start + wordStart + linkStart
         val spanEnd = start + wordStart + linkEnd
 
-        val span = EnrichedLinkSpan(matcher.group(), view.htmlStyle)
+        val span = EnrichedInputLinkSpan(matcher.group(), view.htmlStyle)
         val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(spanStart, spanEnd)
 
         spannable.setSpan(
@@ -209,7 +209,7 @@ class ParametrizedStyles(
     val mentionIndicatorRegex = Regex("^($indicatorsPattern)")
     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)
     }
@@ -266,7 +266,7 @@ class ParametrizedStyles(
     if (start == originalEnd) {
       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)
       }
@@ -275,7 +275,7 @@ class ParametrizedStyles(
     }
 
     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)
@@ -303,7 +303,7 @@ class ParametrizedStyles(
 
     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)
@@ -314,7 +314,7 @@ class ParametrizedStyles(
     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)

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

@@ -1,9 +1,9 @@
-package com.swmansion.enriched.utils
+package com.swmansion.enriched.textinput.utils
 
 import android.text.Editable
 import android.text.Spannable
 import android.text.SpannableStringBuilder
-import com.swmansion.enriched.watchers.EnrichedSpanWatcher
+import com.swmansion.enriched.textinput.watchers.EnrichedSpanWatcher
 
 class EnrichedEditableFactory(
   private val watcher: EnrichedSpanWatcher,

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

@@ -1,16 +1,17 @@
-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(
@@ -190,8 +191,8 @@ class EnrichedSelection(
     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)
@@ -208,9 +209,9 @@ class EnrichedSelection(
       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)
         }
 
@@ -247,7 +248,7 @@ class EnrichedSelection(
 
   private fun emitLinkDetectedEvent(
     spannable: Spannable,
-    span: EnrichedLinkSpan?,
+    span: EnrichedInputLinkSpan?,
     start: Int,
     end: Int,
   ) {
@@ -278,7 +279,7 @@ class EnrichedSelection(
 
   private fun emitMentionDetectedEvent(
     spannable: Spannable,
-    span: EnrichedMentionSpan?,
+    span: EnrichedInputMentionSpan?,
     start: Int,
     end: Int,
   ) {