react-native-enriched 0.3.0 → 0.4.1

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

@@ -1,20 +1,18 @@
-package com.swmansion.enriched.utils
+package com.swmansion.enriched.textinput.utils
 
 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
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.events.OnChangeStateEvent
+import com.swmansion.enriched.textinput.spans.EnrichedSpans
 
 class EnrichedSpanState(
   private val view: EnrichedTextInputView,
 ) {
   private var previousPayload: WritableMap? = null
-  private var previousDeprecatedPayload: WritableMap? = null
 
   var boldStart: Int? = null
     private set
@@ -46,6 +44,8 @@ class EnrichedSpanState(
     private set
   var unorderedListStart: Int? = null
     private set
+  var checkboxListStart: Int? = null
+    private set
   var linkStart: Int? = null
     private set
   var imageStart: Int? = null
@@ -128,6 +128,11 @@ class EnrichedSpanState(
     emitStateChangeEvent()
   }
 
+  fun setCheckboxListStart(start: Int?) {
+    this.checkboxListStart = start
+    emitStateChangeEvent()
+  }
+
   fun setLinkStart(start: Int?) {
     this.linkStart = start
     emitStateChangeEvent()
@@ -161,6 +166,7 @@ class EnrichedSpanState(
         EnrichedSpans.BLOCK_QUOTE -> blockQuoteStart
         EnrichedSpans.ORDERED_LIST -> orderedListStart
         EnrichedSpans.UNORDERED_LIST -> unorderedListStart
+        EnrichedSpans.CHECKBOX_LIST -> checkboxListStart
         EnrichedSpans.LINK -> linkStart
         EnrichedSpans.IMAGE -> imageStart
         EnrichedSpans.MENTION -> mentionStart
@@ -190,6 +196,7 @@ class EnrichedSpanState(
       EnrichedSpans.BLOCK_QUOTE -> setBlockQuoteStart(start)
       EnrichedSpans.ORDERED_LIST -> setOrderedListStart(start)
       EnrichedSpans.UNORDERED_LIST -> setUnorderedListStart(start)
+      EnrichedSpans.CHECKBOX_LIST -> setCheckboxListStart(start)
       EnrichedSpans.LINK -> setLinkStart(start)
       EnrichedSpans.IMAGE -> setImageStart(start)
       EnrichedSpans.MENTION -> setMentionStart(start)
@@ -201,53 +208,9 @@ class EnrichedSpanState(
     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,
@@ -269,6 +232,7 @@ class EnrichedSpanState(
         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 (checkboxListStart != null) EnrichedSpans.CHECKBOX_LIST else null,
         if (linkStart != null) EnrichedSpans.LINK else null,
         if (imageStart != null) EnrichedSpans.IMAGE else null,
         if (mentionStart != null) EnrichedSpans.MENTION else null,
@@ -292,6 +256,7 @@ class EnrichedSpanState(
     payload.putMap("link", getStyleState(activeStyles, EnrichedSpans.LINK))
     payload.putMap("image", getStyleState(activeStyles, EnrichedSpans.IMAGE))
     payload.putMap("mention", getStyleState(activeStyles, EnrichedSpans.MENTION))
+    payload.putMap("checkboxList", getStyleState(activeStyles, EnrichedSpans.CHECKBOX_LIST))
 
     // Do not emit event if payload is the same
     if (previousPayload == payload) {

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

@@ -1,10 +1,10 @@
-package com.swmansion.enriched.utils
+package com.swmansion.enriched.textinput.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
+import com.swmansion.enriched.common.spans.interfaces.EnrichedBlockSpan
+import com.swmansion.enriched.common.spans.interfaces.EnrichedParagraphSpan
 
 fun Spannable.getSafeSpanBoundaries(
   start: Int,

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

@@ -1,6 +1,7 @@
-package com.swmansion.enriched.utils
+package com.swmansion.enriched.textinput.utils
 
 import android.text.SpannableStringBuilder
+import com.swmansion.enriched.common.EnrichedConstants
 
 // Removes zero-width spaces from the given range in the SpannableStringBuilder without affecting spans
 fun SpannableStringBuilder.removeZWS(

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

@@ -0,0 +1,127 @@
+package com.swmansion.enriched.textinput.utils
+
+import android.content.ClipData
+import android.content.Context
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.view.View
+import android.webkit.MimeTypeMap
+import androidx.core.view.ContentInfoCompat
+import androidx.core.view.OnReceiveContentListener
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.events.OnPasteImagesEvent
+import java.io.File
+import java.io.FileOutputStream
+import kotlin.io.copyTo
+
+class RichContentReceiver(
+  private val view: EnrichedTextInputView,
+  private val context: ReactContext,
+) : OnReceiveContentListener {
+  override fun onReceiveContent(
+    view: View,
+    contentInfo: ContentInfoCompat,
+  ): ContentInfoCompat? {
+    val split = contentInfo.partition { item: ClipData.Item -> item.uri != null }
+    val uriContent = split.first
+    val remaining = split.second
+
+    if (uriContent != null) {
+      processClipDataInBackground(uriContent.clip)
+    }
+
+    if (remaining != null && remaining.clip.itemCount > 0) {
+      val item = remaining.clip.getItemAt(0)
+
+      this.view.handleTextPaste(item)
+    }
+
+    return null
+  }
+
+  private fun processClipDataInBackground(clip: ClipData) {
+    Thread {
+      val results = mutableListOf<OnPasteImagesEvent.Companion.PastedImage>()
+
+      for (i in 0 until clip.itemCount) {
+        val item = clip.getItemAt(i)
+        val uri = item.uri ?: continue
+        val mimeType = getMimeTypeFromUri(uri) ?: continue
+
+        if (mimeType.startsWith("image/")) {
+          val result = saveUriToTempFile(context, uri, mimeType)
+          if (result != null) {
+            results.add(result)
+          }
+        }
+      }
+
+      if (results.isNotEmpty()) {
+        Handler(Looper.getMainLooper()).post {
+          emitOnPasteImageEvent(results)
+        }
+      }
+    }.start()
+  }
+
+  private fun emitOnPasteImageEvent(images: List<OnPasteImagesEvent.Companion.PastedImage>) {
+    val surfaceId = UIManagerHelper.getSurfaceId(context)
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
+    dispatcher?.dispatchEvent(OnPasteImagesEvent(surfaceId, view.id, images, false))
+  }
+
+  private fun saveUriToTempFile(
+    context: Context,
+    uri: Uri,
+    mimeType: String,
+  ): OnPasteImagesEvent.Companion.PastedImage? {
+    return try {
+      val resolver = context.contentResolver
+      val ext = MimeTypeMap.getFileExtensionFromUrl(uri.toString())
+      val file = File.createTempFile("temp", ".$ext", context.cacheDir)
+
+      // Copy Stream
+      resolver.openInputStream(uri).use { input ->
+        if (input == null) return null
+        FileOutputStream(file).use { output ->
+          input.copyTo(output)
+        }
+      }
+
+      // Decode Dimensions
+      val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+      BitmapFactory.decodeFile(file.absolutePath, options)
+
+      OnPasteImagesEvent.Companion.PastedImage(
+        uri = "file://${file.absolutePath}",
+        type = mimeType,
+        width = options.outWidth.toDouble(),
+        height = options.outHeight.toDouble(),
+      )
+    } catch (e: Exception) {
+      Log.e("RichContentReceiver", "Failed to save URI: $uri", e)
+      null
+    }
+  }
+
+  private fun getMimeTypeFromUri(uri: Uri): String? {
+    var mimeType = context.contentResolver.getType(uri)
+
+    if (mimeType == null) {
+      val extension = MimeTypeMap.getFileExtensionFromUrl(uri.toString())
+
+      mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+    }
+
+    return mimeType
+  }
+
+  companion object {
+    val MIME_TYPES = arrayOf("image/*", "text/*")
+  }
+}

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

@@ -0,0 +1,106 @@
+package com.swmansion.enriched.textinput.utils
+
+import android.annotation.SuppressLint
+import android.text.Selection
+import android.text.Spannable
+import android.text.Spanned
+import android.util.Log
+import android.view.MotionEvent
+import android.widget.TextView
+import com.swmansion.enriched.textinput.spans.EnrichedInputCheckboxListSpan
+import org.json.JSONObject
+
+fun jsonStringToStringMap(json: String): Map<String, String> {
+  val result = mutableMapOf<String, String>()
+  try {
+    val jsonObject = JSONObject(json)
+    for (key in jsonObject.keys()) {
+      val value = jsonObject.opt(key)
+      if (value is String) {
+        result[key] = value
+      }
+    }
+  } catch (e: Exception) {
+    Log.w("ReactNativeEnrichedView", "Failed to parse JSON string to Map: $json", e)
+  }
+
+  return result
+}
+
+// Sets a touch listener on TextView which is responsible for detecting touches on checkbox icons
+// We don't use ClickableSpan because it works fine only when LinkMovementMethod is set on TextView
+// Which breaks text selection and other features
+@SuppressLint("ClickableViewAccessibility")
+fun TextView.setCheckboxClickListener() {
+  var isDownOnCheckbox = false
+
+  setOnTouchListener { v, event ->
+    val tv = v as TextView
+    val layout = tv.layout ?: return@setOnTouchListener false
+    val spannable = tv.text as? Spanned ?: return@setOnTouchListener false
+
+    // Get touch coordinates relative to the text content
+    val x = event.x.toInt() - tv.totalPaddingLeft + tv.scrollX
+    val y = event.y.toInt() - tv.totalPaddingTop + tv.scrollY
+
+    // Identify the line and whether it's the first line of the span
+    val line = layout.getLineForVertical(y)
+    val lineStart = layout.getLineStart(line)
+
+    // Find spans for specific line
+    val spans = spannable.getSpans(lineStart, lineStart, EnrichedInputCheckboxListSpan::class.java)
+    if (spans.isEmpty()) return@setOnTouchListener false
+
+    // There should be only one span per line as we don't support nested lists
+    val span = spans[0]
+    val isFirstLine = spannable.getSpanStart(span) == lineStart
+    val marginWidth = span.getLeadingMargin(true)
+
+    // Check if touch is on checkbox icon area (which is in the leading margin on the first line)
+    val isInHotZone = isFirstLine && x in 0..marginWidth
+
+    when (event.action) {
+      MotionEvent.ACTION_DOWN -> {
+        if (isInHotZone) {
+          isDownOnCheckbox = true
+          return@setOnTouchListener true
+        }
+      }
+
+      MotionEvent.ACTION_UP -> {
+        if (isDownOnCheckbox && isInHotZone) {
+          val spannable = tv.text as? Spannable
+          if (spannable != null) {
+            val start = spannable.getSpanStart(span)
+            val end = spannable.getSpanEnd(span)
+            val flags = spannable.getSpanFlags(span)
+            span.isChecked = !span.isChecked
+
+            // Reapply span so changes are visible without need to redraw entire TextView
+            spannable.removeSpan(span)
+            spannable.setSpan(span, start, end, flags)
+
+            // For focused input, ensure cursor is active for affected paragraph
+            if (tv.isFocused) {
+              val currentCursor = Selection.getSelectionEnd(spannable)
+              if (currentCursor < start || currentCursor > end) {
+                Selection.setSelection(spannable, end)
+              }
+            }
+          }
+
+          isDownOnCheckbox = false
+          return@setOnTouchListener true
+        }
+        isDownOnCheckbox = false
+      }
+
+      MotionEvent.ACTION_CANCEL -> {
+        isDownOnCheckbox = false
+      }
+    }
+
+    // Let TextView handle other touches (e.g., for selection)
+    false
+  }
+}

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

@@ -1,17 +1,17 @@
-package com.swmansion.enriched.watchers
+package com.swmansion.enriched.textinput.watchers
 
 import android.text.SpanWatcher
 import android.text.Spannable
 import android.text.style.ParagraphStyle
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.swmansion.enriched.EnrichedTextInputView
-import com.swmansion.enriched.events.OnChangeHtmlEvent
-import com.swmansion.enriched.spans.EnrichedOrderedListSpan
-import com.swmansion.enriched.spans.interfaces.EnrichedHeadingSpan
-import com.swmansion.enriched.spans.interfaces.EnrichedSpan
-import com.swmansion.enriched.utils.EnrichedParser
-import com.swmansion.enriched.utils.getSafeSpanBoundaries
+import com.swmansion.enriched.common.parser.EnrichedParser
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.events.OnChangeHtmlEvent
+import com.swmansion.enriched.textinput.spans.EnrichedInputOrderedListSpan
+import com.swmansion.enriched.textinput.spans.interfaces.EnrichedInputSpan
+import com.swmansion.enriched.textinput.utils.getSafeSpanBoundaries
 
 class EnrichedSpanWatcher(
   private val view: EnrichedTextInputView,
@@ -56,7 +56,7 @@ class EnrichedSpanWatcher(
     text: Spannable,
     end: Int,
   ) {
-    if (what is EnrichedOrderedListSpan) {
+    if (what is EnrichedInputOrderedListSpan) {
       view.listStyles?.updateOrderedListIndexes(text, end)
     }
   }
@@ -86,7 +86,7 @@ class EnrichedSpanWatcher(
     if (!view.shouldEmitHtml) return
 
     // Emit event only if we change one of ours spans
-    if (what != null && what !is EnrichedSpan) return
+    if (what != null && what !is EnrichedInputSpan) return
 
     val html = EnrichedParser.toHtml(s)
     if (html == previousHtml) return

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

@@ -1,11 +1,11 @@
-package com.swmansion.enriched.watchers
+package com.swmansion.enriched.textinput.watchers
 
 import android.text.Editable
 import android.text.TextWatcher
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.swmansion.enriched.EnrichedTextInputView
-import com.swmansion.enriched.events.OnChangeTextEvent
+import com.swmansion.enriched.textinput.EnrichedTextInputView
+import com.swmansion.enriched.textinput.events.OnChangeTextEvent
 
 class EnrichedTextWatcher(
   private val view: EnrichedTextInputView,

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

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-set(LIB_LITERAL RNEnrichedTextInputViewSpec)
+set(LIB_LITERAL ReactNativeEnrichedSpec)
 set(LIB_TARGET_NAME react_codegen_${LIB_LITERAL})
 
 set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)

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

@@ -0,0 +1,11 @@
+#include "ReactNativeEnrichedSpec.h"
+
+namespace facebook::react {
+
+std::shared_ptr<TurboModule> ReactNativeEnrichedSpec_ModuleProvider(
+    const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+
+  return nullptr;
+}
+
+} // namespace facebook::react

package/android/src/main/new_arch/ReactNativeEnrichedSpec.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+#include <react/renderer/components/ReactNativeEnrichedSpec/EnrichedTextInputComponentDescriptor.h>
+
+namespace facebook::react {
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> ReactNativeEnrichedSpec_ModuleProvider(
+    const std::string &moduleName, const JavaTurboModule::InitParams &params);
+
+} // namespace facebook::react

package/android/src/main/new_arch/react/renderer/components/{RNEnrichedTextInputViewSpec → ReactNativeEnrichedSpec}/EnrichedTextInputMeasurementManager.h

@@ -2,7 +2,7 @@
 
 #include "ComponentDescriptors.h"
 
-#include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
+#include <react/renderer/components/ReactNativeEnrichedSpec/Props.h>
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/utils/ContextContainer.h>
 

package/android/src/main/new_arch/react/renderer/components/{RNEnrichedTextInputViewSpec → ReactNativeEnrichedSpec}/EnrichedTextInputShadowNode.h

@@ -3,8 +3,8 @@
 #include "EnrichedTextInputMeasurementManager.h"
 #include "EnrichedTextInputState.h"
 
-#include <react/renderer/components/RNEnrichedTextInputViewSpec/EventEmitters.h>
-#include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
+#include <react/renderer/components/ReactNativeEnrichedSpec/EventEmitters.h>
+#include <react/renderer/components/ReactNativeEnrichedSpec/Props.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {

package/android/src/main/new_arch/react/renderer/components/{RNEnrichedTextInputViewSpec → ReactNativeEnrichedSpec}/conversions.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <folly/dynamic.h>
-#include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
+#include <react/renderer/components/ReactNativeEnrichedSpec/Props.h>
 #include <react/renderer/core/propsConversions.h>
 
 #if REACT_NATIVE_MINOR_VERSION >= 81

package/ios/EnrichedTextInputView.h

@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
                             url:(NSString *)url
                           range:(NSRange)range;
 - (void)emitOnMentionEvent:(NSString *)indicator text:(nullable NSString *)text;
+- (void)emitOnPasteImagesEvent:(NSArray<NSDictionary *> *)images;
 - (void)anyTextMayHaveBeenModified;
 - (BOOL)handleStyleBlocksAndConflicts:(StyleType)type range:(NSRange)range;
 - (NSArray<NSNumber *> *)getPresentStyleTypesFrom:(NSArray<NSNumber *> *)types