react-native-enriched 0.3.0 → 0.4.0

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/EnrichedUnorderedListSpan.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.spans
+package com.swmansion.enriched.common.spans
 
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -7,17 +7,15 @@ import android.text.Spanned
 import android.text.TextPaint
 import android.text.style.LeadingMarginSpan
 import android.text.style.MetricAffectingSpan
-import com.swmansion.enriched.spans.interfaces.EnrichedParagraphSpan
-import com.swmansion.enriched.styles.HtmlStyle
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedParagraphSpan
 
 // https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/core/java/android/text/style/BulletSpan.java
-class EnrichedUnorderedListSpan(
-  private val htmlStyle: HtmlStyle,
+open class EnrichedUnorderedListSpan(
+  private val enrichedStyle: EnrichedStyle,
 ) : MetricAffectingSpan(),
   LeadingMarginSpan,
   EnrichedParagraphSpan {
-  override val dependsOnHtmlStyle: Boolean = true
-
   override fun updateMeasureState(p0: TextPaint) {
     // Do nothing, but inform layout that this span affects text metrics
   }
@@ -26,7 +24,7 @@ class EnrichedUnorderedListSpan(
     // Do nothing, but inform layout that this span affects text metrics
   }
 
-  override fun getLeadingMargin(p0: Boolean): Int = htmlStyle.ulBulletSize + htmlStyle.ulGapWidth + htmlStyle.ulMarginLeft
+  override fun getLeadingMargin(p0: Boolean): Int = enrichedStyle.ulBulletSize + enrichedStyle.ulGapWidth + enrichedStyle.ulMarginLeft
 
   override fun drawLeadingMargin(
     canvas: Canvas,
@@ -47,12 +45,12 @@ class EnrichedUnorderedListSpan(
     if (spannedText.getSpanStart(this) == start) {
       val style = paint.style
       val oldColor = paint.color
-      paint.color = htmlStyle.ulBulletColor
+      paint.color = enrichedStyle.ulBulletColor
       paint.style = Paint.Style.FILL
 
-      val bulletRadius = htmlStyle.ulBulletSize / 2f
+      val bulletRadius = enrichedStyle.ulBulletSize / 2f
       val yPosition = (top + bottom) / 2f
-      val xPosition = x + dir * bulletRadius + htmlStyle.ulMarginLeft
+      val xPosition = x + dir * bulletRadius + enrichedStyle.ulMarginLeft
 
       canvas.drawCircle(xPosition, yPosition, bulletRadius, paint)
 
@@ -60,6 +58,4 @@ class EnrichedUnorderedListSpan(
       paint.style = style
     }
   }
-
-  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedUnorderedListSpan = EnrichedUnorderedListSpan(htmlStyle)
 }

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/interfaces/EnrichedBlockSpan.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.spans.interfaces
+package com.swmansion.enriched.common.spans.interfaces
 
 interface EnrichedBlockSpan :
   EnrichedSpan,

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/interfaces/EnrichedHeadingSpan.kt

@@ -1,3 +1,3 @@
-package com.swmansion.enriched.spans.interfaces
+package com.swmansion.enriched.common.spans.interfaces
 
 interface EnrichedHeadingSpan : EnrichedParagraphSpan

package/android/src/main/java/com/swmansion/enriched/common/spans/interfaces/EnrichedInlineSpan.kt

@@ -0,0 +1,3 @@
+package com.swmansion.enriched.common.spans.interfaces
+
+interface EnrichedInlineSpan : EnrichedSpan

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/interfaces/EnrichedParagraphSpan.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.spans.interfaces
+package com.swmansion.enriched.common.spans.interfaces
 
 interface EnrichedParagraphSpan :
   EnrichedSpan,

package/android/src/main/java/com/swmansion/enriched/common/spans/interfaces/EnrichedSpan.kt

@@ -0,0 +1,3 @@
+package com.swmansion.enriched.common.spans.interfaces
+
+interface EnrichedSpan

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/interfaces/EnrichedZeroWidthSpaceSpan.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.spans.interfaces
+package com.swmansion.enriched.common.spans.interfaces
 
 // Spans that are prefixed with zero-width space (\u200B) to ensure that they are visible even when empty.
 interface EnrichedZeroWidthSpaceSpan

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

@@ -1,11 +1,11 @@
-package com.swmansion.enriched
+package com.swmansion.enriched.textinput
 
 import android.view.KeyEvent
 import android.view.inputmethod.InputConnection
 import android.view.inputmethod.InputConnectionWrapper
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.swmansion.enriched.events.OnInputKeyPressEvent
+import com.swmansion.enriched.textinput.events.OnInputKeyPressEvent
 
 // This class is based on the implementation from Facebook React Native to provide 'onKeyPress' API on android.
 // Original source:

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

@@ -0,0 +1,83 @@
+package com.swmansion.enriched.textinput
+
+import com.swmansion.enriched.common.parser.EnrichedSpanFactory
+import com.swmansion.enriched.common.spans.EnrichedCheckboxListSpan
+import com.swmansion.enriched.common.spans.EnrichedImageSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputBlockQuoteSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputBoldSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputCheckboxListSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputCodeBlockSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputH1Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH2Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH3Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH4Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH5Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH6Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputImageSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputInlineCodeSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputItalicSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputLinkSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputMentionSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputOrderedListSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputStrikeThroughSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputUnderlineSpan
+import com.swmansion.enriched.textinput.spans.EnrichedInputUnorderedListSpan
+import com.swmansion.enriched.textinput.styles.HtmlStyle
+
+class EnrichedTextInputSpannableFactory : EnrichedSpanFactory<HtmlStyle> {
+  override fun createBoldSpan(style: HtmlStyle) = EnrichedInputBoldSpan(style)
+
+  override fun createItalicSpan(style: HtmlStyle) = EnrichedInputItalicSpan(style)
+
+  override fun createUnderlineSpan(style: HtmlStyle) = EnrichedInputUnderlineSpan(style)
+
+  override fun createStrikeThroughSpan(style: HtmlStyle) = EnrichedInputStrikeThroughSpan(style)
+
+  override fun createInlineCodeSpan(style: HtmlStyle) = EnrichedInputInlineCodeSpan(style)
+
+  override fun createLinkSpan(
+    url: String,
+    style: HtmlStyle,
+  ) = EnrichedInputLinkSpan(url, style)
+
+  override fun createMentionSpan(
+    text: String,
+    indicator: String,
+    attributes: Map<String, String>,
+    style: HtmlStyle,
+  ) = EnrichedInputMentionSpan(text, indicator, attributes, style)
+
+  override fun createImageSpan(
+    source: String,
+    width: Int,
+    height: Int,
+  ): EnrichedImageSpan = EnrichedInputImageSpan.createEnrichedImageSpan(source, width, height)
+
+  override fun createH1Span(style: HtmlStyle) = EnrichedInputH1Span(style)
+
+  override fun createH2Span(style: HtmlStyle) = EnrichedInputH2Span(style)
+
+  override fun createH3Span(style: HtmlStyle) = EnrichedInputH3Span(style)
+
+  override fun createH4Span(style: HtmlStyle) = EnrichedInputH4Span(style)
+
+  override fun createH5Span(style: HtmlStyle) = EnrichedInputH5Span(style)
+
+  override fun createH6Span(style: HtmlStyle) = EnrichedInputH6Span(style)
+
+  override fun createOrderedListSpan(
+    index: Int,
+    style: HtmlStyle,
+  ) = EnrichedInputOrderedListSpan(index, style)
+
+  override fun createUnorderedListSpan(style: HtmlStyle) = EnrichedInputUnorderedListSpan(style)
+
+  override fun createCheckboxListSpan(
+    isChecked: Boolean,
+    style: HtmlStyle,
+  ) = EnrichedInputCheckboxListSpan(isChecked, style)
+
+  override fun createBlockQuoteSpan(style: HtmlStyle) = EnrichedInputBlockQuoteSpan(style)
+
+  override fun createCodeBlockSpan(style: HtmlStyle) = EnrichedInputCodeBlockSpan(style)
+}

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

@@ -1,4 +1,4 @@
-package com.swmansion.enriched
+package com.swmansion.enriched.textinput
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -21,6 +21,9 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
 import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.widget.AppCompatEditText
+import androidx.core.view.ViewCompat
+import androidx.core.view.inputmethod.EditorInfoCompat
+import androidx.core.view.inputmethod.InputConnectionCompat
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.ReactConstants
@@ -30,29 +33,34 @@ import com.facebook.react.uimanager.UIManagerHelper
 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.events.MentionHandler
-import com.swmansion.enriched.events.OnInputBlurEvent
-import com.swmansion.enriched.events.OnInputFocusEvent
-import com.swmansion.enriched.events.OnRequestHtmlResultEvent
-import com.swmansion.enriched.spans.EnrichedH1Span
-import com.swmansion.enriched.spans.EnrichedH2Span
-import com.swmansion.enriched.spans.EnrichedH3Span
-import com.swmansion.enriched.spans.EnrichedImageSpan
-import com.swmansion.enriched.spans.EnrichedSpans
-import com.swmansion.enriched.spans.interfaces.EnrichedSpan
-import com.swmansion.enriched.styles.HtmlStyle
-import com.swmansion.enriched.styles.InlineStyles
-import com.swmansion.enriched.styles.ListStyles
-import com.swmansion.enriched.styles.ParagraphStyles
-import com.swmansion.enriched.styles.ParametrizedStyles
-import com.swmansion.enriched.utils.EnrichedConstants
-import com.swmansion.enriched.utils.EnrichedEditableFactory
-import com.swmansion.enriched.utils.EnrichedParser
-import com.swmansion.enriched.utils.EnrichedSelection
-import com.swmansion.enriched.utils.EnrichedSpanState
-import com.swmansion.enriched.utils.mergeSpannables
-import com.swmansion.enriched.watchers.EnrichedSpanWatcher
-import com.swmansion.enriched.watchers.EnrichedTextWatcher
+import com.swmansion.enriched.common.EnrichedConstants
+import com.swmansion.enriched.common.parser.EnrichedParser
+import com.swmansion.enriched.textinput.events.MentionHandler
+import com.swmansion.enriched.textinput.events.OnInputBlurEvent
+import com.swmansion.enriched.textinput.events.OnInputFocusEvent
+import com.swmansion.enriched.textinput.events.OnRequestHtmlResultEvent
+import com.swmansion.enriched.textinput.spans.EnrichedInputH1Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH2Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH3Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH4Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH5Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputH6Span
+import com.swmansion.enriched.textinput.spans.EnrichedInputImageSpan
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
+import com.swmansion.enriched.textinput.spans.interfaces.EnrichedInputSpan
+import com.swmansion.enriched.textinput.styles.HtmlStyle
+import com.swmansion.enriched.textinput.styles.InlineStyles
+import com.swmansion.enriched.textinput.styles.ListStyles
+import com.swmansion.enriched.textinput.styles.ParagraphStyles
+import com.swmansion.enriched.textinput.styles.ParametrizedStyles
+import com.swmansion.enriched.textinput.utils.EnrichedEditableFactory
+import com.swmansion.enriched.textinput.utils.EnrichedSelection
+import com.swmansion.enriched.textinput.utils.EnrichedSpanState
+import com.swmansion.enriched.textinput.utils.RichContentReceiver
+import com.swmansion.enriched.textinput.utils.mergeSpannables
+import com.swmansion.enriched.textinput.utils.setCheckboxClickListener
+import com.swmansion.enriched.textinput.watchers.EnrichedSpanWatcher
+import com.swmansion.enriched.textinput.watchers.EnrichedTextWatcher
 import java.util.regex.Pattern
 import java.util.regex.PatternSyntaxException
 import kotlin.math.ceil
@@ -99,6 +107,7 @@ class EnrichedTextInputView : AppCompatEditText {
   private var defaultValueDirty: Boolean = false
 
   private var inputMethodManager: InputMethodManager? = null
+  private val spannableFactory = EnrichedTextInputSpannableFactory()
 
   constructor(context: Context) : super(context) {
     prepareComponent()
@@ -133,6 +142,11 @@ class EnrichedTextInputView : AppCompatEditText {
 
   init {
     inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    ViewCompat.setOnReceiveContentListener(
+      this,
+      RichContentReceiver.MIME_TYPES,
+      RichContentReceiver(this, context as ReactContext),
+    )
   }
 
   private fun prepareComponent() {
@@ -152,9 +166,12 @@ class EnrichedTextInputView : AppCompatEditText {
     // Ensure that every time new editable is created, it has EnrichedSpanWatcher attached
     val spanWatcher = EnrichedSpanWatcher(this)
     this.spanWatcher = spanWatcher
-    setEditableFactory(EnrichedEditableFactory(spanWatcher))
 
+    setEditableFactory(EnrichedEditableFactory(spanWatcher))
     addTextChangedListener(EnrichedTextWatcher(this))
+
+    // Handle checkbox list item clicks
+    this.setCheckboxClickListener()
   }
 
   // https://github.com/facebook/react-native/blob/36df97f500aa0aa8031098caf7526db358b6ddc1/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt#L295C1-L296C1
@@ -225,11 +242,6 @@ class EnrichedTextInputView : AppCompatEditText {
         handleCustomCopy()
         return true
       }
-
-      android.R.id.paste -> {
-        handleCustomPaste()
-        return true
-      }
     }
     return super.onTextContextMenuItem(id)
   }
@@ -249,16 +261,11 @@ class EnrichedTextInputView : AppCompatEditText {
     }
   }
 
-  private fun handleCustomPaste() {
-    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-    if (!clipboard.hasPrimaryClip()) return
-
-    val clip = clipboard.primaryClip
-    val item = clip?.getItemAt(0)
-    val htmlText = item?.htmlText
+  fun handleTextPaste(item: ClipData.Item) {
+    val htmlText = item.htmlText
     val currentText = text as Spannable
-    val start = selection?.start ?: 0
-    val end = selection?.end ?: 0
+    val start = selectionStart.coerceAtLeast(0)
+    val end = selectionEnd.coerceAtLeast(0)
 
     if (htmlText != null) {
       val parsedText = parseText(htmlText)
@@ -269,8 +276,7 @@ class EnrichedTextInputView : AppCompatEditText {
       }
     }
 
-    // Currently, we do not support pasting images
-    if (item?.text == null) return
+    if (item.text == null) return
     val lengthBefore = currentText.length
     val finalText = currentText.mergeSpannables(start, end, item.text.toString())
     setValue(finalText)
@@ -291,7 +297,7 @@ class EnrichedTextInputView : AppCompatEditText {
     if (!isHtml) return text
 
     try {
-      val parsed = EnrichedParser.fromHtml(text.toString(), htmlStyle, null)
+      val parsed = EnrichedParser.fromHtml(text.toString(), htmlStyle, spannableFactory)
       val withoutLastNewLine = parsed.trimEnd('\n')
       return withoutLastNewLine
     } catch (e: Exception) {
@@ -352,7 +358,7 @@ class EnrichedTextInputView : AppCompatEditText {
   private fun observeAsyncImages() {
     val liveText = text ?: return
 
-    val spans = liveText.getSpans(0, liveText.length, EnrichedImageSpan::class.java)
+    val spans = liveText.getSpans(0, liveText.length, EnrichedInputImageSpan::class.java)
 
     for (span in spans) {
       span.observeAsyncDrawableLoaded(liveText)
@@ -543,6 +549,7 @@ class EnrichedTextInputView : AppCompatEditText {
       EnrichedSpans.BLOCK_QUOTE -> paragraphStyles?.toggleStyle(EnrichedSpans.BLOCK_QUOTE)
       EnrichedSpans.ORDERED_LIST -> listStyles?.toggleStyle(EnrichedSpans.ORDERED_LIST)
       EnrichedSpans.UNORDERED_LIST -> listStyles?.toggleStyle(EnrichedSpans.UNORDERED_LIST)
+      EnrichedSpans.CHECKBOX_LIST -> listStyles?.toggleStyle(EnrichedSpans.CHECKBOX_LIST)
       else -> Log.w("EnrichedTextInputView", "Unknown style: $name")
     }
 
@@ -571,6 +578,7 @@ class EnrichedTextInputView : AppCompatEditText {
         EnrichedSpans.BLOCK_QUOTE -> paragraphStyles?.removeStyle(EnrichedSpans.BLOCK_QUOTE, start, end)
         EnrichedSpans.ORDERED_LIST -> listStyles?.removeStyle(EnrichedSpans.ORDERED_LIST, start, end)
         EnrichedSpans.UNORDERED_LIST -> listStyles?.removeStyle(EnrichedSpans.UNORDERED_LIST, start, end)
+        EnrichedSpans.CHECKBOX_LIST -> listStyles?.removeStyle(EnrichedSpans.CHECKBOX_LIST, start, end)
         EnrichedSpans.LINK -> parametrizedStyles?.removeStyle(EnrichedSpans.LINK, start, end)
         EnrichedSpans.IMAGE -> parametrizedStyles?.removeStyle(EnrichedSpans.IMAGE, start, end)
         EnrichedSpans.MENTION -> parametrizedStyles?.removeStyle(EnrichedSpans.MENTION, start, end)
@@ -598,6 +606,7 @@ class EnrichedTextInputView : AppCompatEditText {
         EnrichedSpans.BLOCK_QUOTE -> paragraphStyles?.getStyleRange()
         EnrichedSpans.ORDERED_LIST -> listStyles?.getStyleRange()
         EnrichedSpans.UNORDERED_LIST -> listStyles?.getStyleRange()
+        EnrichedSpans.CHECKBOX_LIST -> listStyles?.getStyleRange()
         EnrichedSpans.LINK -> parametrizedStyles?.getStyleRange()
         EnrichedSpans.IMAGE -> parametrizedStyles?.getStyleRange()
         EnrichedSpans.MENTION -> parametrizedStyles?.getStyleRange()
@@ -657,6 +666,13 @@ class EnrichedTextInputView : AppCompatEditText {
     toggleStyle(name)
   }
 
+  fun toggleCheckboxListItem(checked: Boolean) {
+    val isValid = verifyStyle(EnrichedSpans.CHECKBOX_LIST)
+    if (!isValid) return
+
+    listStyles?.toggleCheckboxListStyle(checked)
+  }
+
   fun addLink(
     start: Int,
     end: Int,
@@ -752,21 +768,42 @@ class EnrichedTextInputView : AppCompatEditText {
     scrollTo(scrollX, targetScrollY)
   }
 
+  private fun isHeadingBold(
+    style: HtmlStyle,
+    span: EnrichedInputSpan,
+  ): Boolean =
+    when (span) {
+      is EnrichedInputH1Span -> style.h1Bold
+      is EnrichedInputH2Span -> style.h2Bold
+      is EnrichedInputH3Span -> style.h3Bold
+      is EnrichedInputH4Span -> style.h4Bold
+      is EnrichedInputH5Span -> style.h5Bold
+      is EnrichedInputH6Span -> style.h6Bold
+      else -> false
+    }
+
+  private fun shouldRemoveBoldFromHeading(
+    span: EnrichedInputSpan,
+    prevStyle: HtmlStyle,
+    nextStyle: HtmlStyle,
+  ): Boolean {
+    val wasBold = isHeadingBold(prevStyle, span)
+    val isNowBold = isHeadingBold(nextStyle, span)
+
+    return !wasBold && isNowBold
+  }
+
   private fun reApplyHtmlStyleForSpans(
     previousHtmlStyle: HtmlStyle,
     nextHtmlStyle: HtmlStyle,
   ) {
-    val shouldRemoveBoldSpanFromH1Span = !previousHtmlStyle.h1Bold && nextHtmlStyle.h1Bold
-    val shouldRemoveBoldSpanFromH2Span = !previousHtmlStyle.h2Bold && nextHtmlStyle.h2Bold
-    val shouldRemoveBoldSpanFromH3Span = !previousHtmlStyle.h3Bold && nextHtmlStyle.h3Bold
-
     val spannable = text as? Spannable ?: return
     if (spannable.isEmpty()) return
 
     var shouldEmitStateChange = false
 
     runAsATransaction {
-      val spans = spannable.getSpans(0, spannable.length, EnrichedSpan::class.java)
+      val spans = spannable.getSpans(0, spannable.length, EnrichedInputSpan::class.java)
       for (span in spans) {
         if (!span.dependsOnHtmlStyle) continue
 
@@ -776,9 +813,8 @@ class EnrichedTextInputView : AppCompatEditText {
 
         if (start == -1 || end == -1) continue
 
-        if ((span is EnrichedH1Span && shouldRemoveBoldSpanFromH1Span) || (span is EnrichedH2Span && shouldRemoveBoldSpanFromH2Span) ||
-          (span is EnrichedH3Span && shouldRemoveBoldSpanFromH3Span)
-        ) {
+        // Check if we need to remove explicit bold spans
+        if (shouldRemoveBoldFromHeading(span, previousHtmlStyle, nextHtmlStyle)) {
           val isRemoved = removeStyle(EnrichedSpans.BOLD, start, end)
           if (isRemoved) shouldEmitStateChange = true
         }

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

@@ -1,4 +1,4 @@
-package com.swmansion.enriched
+package com.swmansion.enriched.textinput
 
 import com.facebook.react.bridge.Arguments
 

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

@@ -1,4 +1,4 @@
-package com.swmansion.enriched
+package com.swmansion.enriched.textinput
 
 import android.content.Context
 import com.facebook.react.bridge.ReadableArray
@@ -15,21 +15,21 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.EnrichedTextInputViewManagerDelegate
 import com.facebook.react.viewmanagers.EnrichedTextInputViewManagerInterface
 import com.facebook.yoga.YogaMeasureMode
-import com.swmansion.enriched.events.OnChangeHtmlEvent
-import com.swmansion.enriched.events.OnChangeSelectionEvent
-import com.swmansion.enriched.events.OnChangeStateDeprecatedEvent
-import com.swmansion.enriched.events.OnChangeStateEvent
-import com.swmansion.enriched.events.OnChangeTextEvent
-import com.swmansion.enriched.events.OnInputBlurEvent
-import com.swmansion.enriched.events.OnInputFocusEvent
-import com.swmansion.enriched.events.OnInputKeyPressEvent
-import com.swmansion.enriched.events.OnLinkDetectedEvent
-import com.swmansion.enriched.events.OnMentionDetectedEvent
-import com.swmansion.enriched.events.OnMentionEvent
-import com.swmansion.enriched.events.OnRequestHtmlResultEvent
-import com.swmansion.enriched.spans.EnrichedSpans
-import com.swmansion.enriched.styles.HtmlStyle
-import com.swmansion.enriched.utils.jsonStringToStringMap
+import com.swmansion.enriched.textinput.events.OnChangeHtmlEvent
+import com.swmansion.enriched.textinput.events.OnChangeSelectionEvent
+import com.swmansion.enriched.textinput.events.OnChangeStateEvent
+import com.swmansion.enriched.textinput.events.OnChangeTextEvent
+import com.swmansion.enriched.textinput.events.OnInputBlurEvent
+import com.swmansion.enriched.textinput.events.OnInputFocusEvent
+import com.swmansion.enriched.textinput.events.OnInputKeyPressEvent
+import com.swmansion.enriched.textinput.events.OnLinkDetectedEvent
+import com.swmansion.enriched.textinput.events.OnMentionDetectedEvent
+import com.swmansion.enriched.textinput.events.OnMentionEvent
+import com.swmansion.enriched.textinput.events.OnPasteImagesEvent
+import com.swmansion.enriched.textinput.events.OnRequestHtmlResultEvent
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
+import com.swmansion.enriched.textinput.styles.HtmlStyle
+import com.swmansion.enriched.textinput.utils.jsonStringToStringMap
 
 @ReactModule(name = EnrichedTextInputViewManager.NAME)
 class EnrichedTextInputViewManager :
@@ -65,13 +65,13 @@ class EnrichedTextInputViewManager :
     map.put(OnChangeTextEvent.EVENT_NAME, mapOf("registrationName" to OnChangeTextEvent.EVENT_NAME))
     map.put(OnChangeHtmlEvent.EVENT_NAME, mapOf("registrationName" to OnChangeHtmlEvent.EVENT_NAME))
     map.put(OnChangeStateEvent.EVENT_NAME, mapOf("registrationName" to OnChangeStateEvent.EVENT_NAME))
-    map.put(OnChangeStateDeprecatedEvent.EVENT_NAME, mapOf("registrationName" to OnChangeStateDeprecatedEvent.EVENT_NAME))
     map.put(OnLinkDetectedEvent.EVENT_NAME, mapOf("registrationName" to OnLinkDetectedEvent.EVENT_NAME))
     map.put(OnMentionDetectedEvent.EVENT_NAME, mapOf("registrationName" to OnMentionDetectedEvent.EVENT_NAME))
     map.put(OnMentionEvent.EVENT_NAME, mapOf("registrationName" to OnMentionEvent.EVENT_NAME))
     map.put(OnChangeSelectionEvent.EVENT_NAME, mapOf("registrationName" to OnChangeSelectionEvent.EVENT_NAME))
     map.put(OnRequestHtmlResultEvent.EVENT_NAME, mapOf("registrationName" to OnRequestHtmlResultEvent.EVENT_NAME))
     map.put(OnInputKeyPressEvent.EVENT_NAME, mapOf("registrationName" to OnInputKeyPressEvent.EVENT_NAME))
+    map.put(OnPasteImagesEvent.EVENT_NAME, mapOf("registrationName" to OnPasteImagesEvent.EVENT_NAME))
 
     return map
   }
@@ -340,6 +340,13 @@ class EnrichedTextInputViewManager :
     view?.verifyAndToggleStyle(EnrichedSpans.UNORDERED_LIST)
   }
 
+  override fun toggleCheckboxList(
+    view: EnrichedTextInputView?,
+    isChecked: Boolean,
+  ) {
+    view?.toggleCheckboxListItem(isChecked)
+  }
+
   override fun addLink(
     view: EnrichedTextInputView?,
     start: Int,

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

@@ -1,4 +1,4 @@
-package com.swmansion.enriched
+package com.swmansion.enriched.textinput
 
 import android.content.Context
 import android.graphics.Typeface
@@ -15,8 +15,8 @@ import com.facebook.react.views.text.ReactTypefaceUtils.parseFontStyle
 import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
 import com.facebook.yoga.YogaMeasureMode
 import com.facebook.yoga.YogaMeasureOutput
-import com.swmansion.enriched.styles.HtmlStyle
-import com.swmansion.enriched.utils.EnrichedParser
+import com.swmansion.enriched.common.parser.EnrichedParser
+import com.swmansion.enriched.textinput.styles.HtmlStyle
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
 
@@ -112,7 +112,8 @@ object MeasurementStore {
 
     try {
       val htmlStyle = HtmlStyle(defaultView, props.getMap("htmlStyle"))
-      val parsed = EnrichedParser.fromHtml(defaultValue, htmlStyle, null)
+      val factory = EnrichedTextInputSpannableFactory()
+      val parsed = EnrichedParser.fromHtml(defaultValue, htmlStyle, factory)
       return parsed.trimEnd('\n')
     } catch (e: Exception) {
       Log.w("MeasurementStore", "Error parsing initial HTML text: ${e.message}")

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

@@ -1,8 +1,8 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.swmansion.enriched.EnrichedTextInputView
+import com.swmansion.enriched.textinput.EnrichedTextInputView
 
 class MentionHandler(
   private val view: EnrichedTextInputView,

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnChangeHtmlEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnChangeSelectionEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnChangeStateEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnChangeTextEvent.kt

@@ -1,10 +1,10 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import android.text.Editable
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.swmansion.enriched.utils.EnrichedConstants
+import com.swmansion.enriched.common.EnrichedConstants
 
 class OnChangeTextEvent(
   surfaceId: Int,

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnInputBlurEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnInputFocusEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnInputKeyPressEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnLinkDetectedEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/enriched/{events → textinput/events}/OnMentionDetectedEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

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

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.events
+package com.swmansion.enriched.textinput.events
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap