npm - react-native-enriched - Versions diffs - 0.4.1 → 0.5.1 - Mend

react-native-enriched 0.4.1 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

package/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputView.kt CHANGED Viewed

@@ -15,16 +15,18 @@ import android.util.AttributeSet
 import android.util.Log
 import android.util.Patterns
 import android.util.TypedValue
+import android.view.ActionMode
 import android.view.Gravity
+import android.view.Menu
+import android.view.MenuItem
 import android.view.MotionEvent
 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.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.uimanager.PixelUtil
@@ -34,8 +36,10 @@ 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.common.EnrichedConstants
+import com.swmansion.enriched.common.GumboNormalizer
 import com.swmansion.enriched.common.parser.EnrichedParser
 import com.swmansion.enriched.textinput.events.MentionHandler
+import com.swmansion.enriched.textinput.events.OnContextMenuItemPressEvent
 import com.swmansion.enriched.textinput.events.OnInputBlurEvent
 import com.swmansion.enriched.textinput.events.OnInputFocusEvent
 import com.swmansion.enriched.textinput.events.OnRequestHtmlResultEvent
@@ -46,6 +50,8 @@ 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.EnrichedInputLinkSpan
+import com.swmansion.enriched.textinput.spans.EnrichedLineHeightSpan
 import com.swmansion.enriched.textinput.spans.EnrichedSpans
 import com.swmansion.enriched.textinput.spans.interfaces.EnrichedInputSpan
 import com.swmansion.enriched.textinput.styles.HtmlStyle
@@ -94,8 +100,10 @@ class EnrichedTextInputView : AppCompatEditText {
   var shouldEmitHtml: Boolean = false
   var shouldEmitOnChangeText: Boolean = false
   var experimentalSynchronousEvents: Boolean = false
+  var useHtmlNormalizer: Boolean = false
   var fontSize: Float? = null
+  private var lineHeight: Float? = null
   private var autoFocus = false
   private var typefaceDirty = false
   private var didAttachToWindow = false
@@ -108,6 +116,7 @@ class EnrichedTextInputView : AppCompatEditText {
   private var inputMethodManager: InputMethodManager? = null
   private val spannableFactory = EnrichedTextInputSpannableFactory()
+  private var contextMenuItems: List<Pair<Int, String>> = emptyList()
   constructor(context: Context) : super(context) {
     prepareComponent()
@@ -271,7 +280,7 @@ class EnrichedTextInputView : AppCompatEditText {
       val parsedText = parseText(htmlText)
       if (parsedText is Spannable) {
         val finalText = currentText.mergeSpannables(start, end, parsedText)
-        setValue(finalText)
+        setValue(finalText, false)
         return
       }
     }
@@ -292,26 +301,45 @@ class EnrichedTextInputView : AppCompatEditText {
     setSelection(selection?.start ?: text?.length ?: 0)
   }
-  private fun parseText(text: CharSequence): CharSequence {
-    val isHtml = text.startsWith("<html>") && text.endsWith("</html>")
-    if (!isHtml) return text
+  private fun normalizeHtmlIfNeeded(text: CharSequence): CharSequence {
+    if (!useHtmlNormalizer) return text
+    val normalized = GumboNormalizer.normalizeHtml(text.toString()) ?: return text
-    try {
-      val parsed = EnrichedParser.fromHtml(text.toString(), htmlStyle, spannableFactory)
-      val withoutLastNewLine = parsed.trimEnd('\n')
-      return withoutLastNewLine
+    return try {
+      val parsed = EnrichedParser.fromHtml(normalized, htmlStyle, spannableFactory)
+      parsed.trimEnd('\n')
     } catch (e: Exception) {
-      Log.e("EnrichedTextInputView", "Error parsing HTML: ${e.message}")
-      return text
+      Log.e(TAG, "Error parsing normalized HTML: ${e.message}")
+      text
+    }
+  }
+  private fun parseText(text: CharSequence): CharSequence {
+    val isInternalHtml = text.startsWith("<html>") && text.endsWith("</html>")
+    if (isInternalHtml) {
+      try {
+        val parsed = EnrichedParser.fromHtml(text.toString(), htmlStyle, spannableFactory)
+        return parsed.trimEnd('\n')
+      } catch (e: Exception) {
+        Log.e(TAG, "Error parsing HTML: ${e.message}")
+        return normalizeHtmlIfNeeded(text)
+      }
     }
+    return normalizeHtmlIfNeeded(text)
   }
-  fun setValue(value: CharSequence?) {
+  fun setValue(
+    value: CharSequence?,
+    shouldParseHtml: Boolean = true,
+  ) {
     if (value == null) return
     runAsATransaction {
-      val newText = parseText(value)
+      val newText = if (shouldParseHtml) parseText(value) else value
       setText(newText)
+      applyLineSpacing()
       observeAsyncImages()
@@ -389,8 +417,7 @@ class EnrichedTextInputView : AppCompatEditText {
   fun setCursorColor(colorInt: Int?) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      val cursorDrawable = textCursorDrawable
-      if (cursorDrawable == null) return
+      val cursorDrawable = textCursorDrawable ?: return
       if (colorInt != null) {
         cursorDrawable.colorFilter = BlendModeColorFilter(colorInt, BlendMode.SRC_IN)
@@ -424,6 +451,28 @@ class EnrichedTextInputView : AppCompatEditText {
     forceScrollToSelection()
   }
+  fun setLineHeight(height: Float) {
+    lineHeight = if (height == 0f) null else height
+    applyLineSpacing()
+    layoutManager.invalidateLayout()
+    forceScrollToSelection()
+  }
+  private fun applyLineSpacing() {
+    val spannable = text as? Spannable ?: return
+    spannable
+      .getSpans(0, spannable.length, EnrichedLineHeightSpan::class.java)
+      .forEach { spannable.removeSpan(it) }
+    val lh = lineHeight ?: return
+    spannable.setSpan(
+      EnrichedLineHeightSpan(lh),
+      0,
+      spannable.length,
+      Spannable.SPAN_INCLUSIVE_INCLUSIVE,
+    )
+  }
   fun setFontFamily(family: String?) {
     if (family != fontFamily) {
       fontFamily = family
@@ -490,12 +539,100 @@ class EnrichedTextInputView : AppCompatEditText {
     try {
       linkRegex = Pattern.compile("(?s).*?($patternStr).*", flags)
-    } catch (e: PatternSyntaxException) {
-      Log.w("EnrichedTextInputView", "Invalid link regex pattern: $patternStr")
+    } catch (_: PatternSyntaxException) {
+      Log.w(TAG, "Invalid link regex pattern: $patternStr")
       linkRegex = Patterns.WEB_URL
     }
   }
+  fun setContextMenuItems(items: ReadableArray?) {
+    if (items == null) {
+      contextMenuItems = emptyList()
+      return
+    }
+    val result = mutableListOf<Pair<Int, String>>()
+    for (i in 0 until items.size()) {
+      val item = items.getMap(i) ?: continue
+      val text = item.getString("text") ?: continue
+      result.add(Pair(i, text))
+    }
+    contextMenuItems = result
+  }
+  override fun startActionMode(
+    callback: ActionMode.Callback?,
+    type: Int,
+  ): ActionMode? {
+    if (contextMenuItems.isEmpty()) {
+      return super.startActionMode(callback, type)
+    }
+    val wrappedCallback =
+      object : ActionMode.Callback2() {
+        override fun onCreateActionMode(
+          mode: ActionMode,
+          menu: Menu,
+        ): Boolean {
+          val result = callback?.onCreateActionMode(mode, menu) ?: false
+          for ((index, text) in contextMenuItems) {
+            menu.add(Menu.NONE, CONTEXT_MENU_ITEM_ID + index, Menu.NONE, text)
+          }
+          return result
+        }
+        override fun onPrepareActionMode(
+          mode: ActionMode,
+          menu: Menu,
+        ) = callback?.onPrepareActionMode(mode, menu) ?: false
+        override fun onActionItemClicked(
+          mode: ActionMode,
+          menuItem: MenuItem,
+        ): Boolean {
+          val itemId = menuItem.itemId
+          if (itemId < CONTEXT_MENU_ITEM_ID) {
+            return callback?.onActionItemClicked(mode, menuItem) ?: false
+          }
+          val selStart = selection?.start ?: 0
+          val selEnd = selection?.end ?: 0
+          val itemText = contextMenuItems.getOrNull(itemId - CONTEXT_MENU_ITEM_ID)?.second ?: return false
+          emitContextMenuItemPressEvent(itemText)
+          mode.finish()
+          post {
+            // Ensures selection is not lost after the action mode is finished
+            if (selStart in 0..selEnd) {
+              setSelection(selStart, selEnd)
+            }
+          }
+          return true
+        }
+        override fun onDestroyActionMode(mode: ActionMode) {
+          callback?.onDestroyActionMode(mode)
+        }
+      }
+    return super.startActionMode(wrappedCallback, type)
+  }
+  private fun emitContextMenuItemPressEvent(itemText: String) {
+    val start = selection?.start ?: return
+    val end = selection.end
+    val styleState = spanState?.getStyleStatePayload() ?: return
+    val selectedText = text?.subSequence(start, end)?.toString() ?: ""
+    val reactContext = context as ReactContext
+    val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
+    dispatcher?.dispatchEvent(
+      OnContextMenuItemPressEvent(surfaceId, id, itemText, selectedText, start, end, styleState, experimentalSynchronousEvents),
+    )
+  }
   // https://github.com/facebook/react-native/blob/36df97f500aa0aa8031098caf7526db358b6ddc1/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt#L283C2-L284C1
   // After the text changes inside an EditText, TextView checks if a layout() has been requested.
   // If it has, it will not scroll the text to the end of the new text inserted, but wait for the
@@ -550,7 +687,7 @@ class EnrichedTextInputView : AppCompatEditText {
       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")
+      else -> Log.w(TAG, "Unknown style: $name")
     }
     layoutManager.invalidateLayout()
@@ -685,6 +822,13 @@ class EnrichedTextInputView : AppCompatEditText {
     parametrizedStyles?.setLinkSpan(start, end, text, url)
   }
+  fun removeLink(
+    start: Int,
+    end: Int,
+  ) {
+    parametrizedStyles?.removeLinkSpans(start, end)
+  }
   fun addImage(
     src: String,
     width: Float,
@@ -719,7 +863,7 @@ class EnrichedTextInputView : AppCompatEditText {
     val html =
       try {
         EnrichedParser.toHtmlWithDefault(text)
-      } catch (e: Exception) {
+      } catch (_: Exception) {
         null
       }
@@ -846,6 +990,8 @@ class EnrichedTextInputView : AppCompatEditText {
   }
   companion object {
+    const val TAG = "EnrichedTextInputView"
     const val CLIPBOARD_TAG = "react-native-enriched-clipboard"
+    private const val CONTEXT_MENU_ITEM_ID = 10000
   }
 }

package/android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputViewManager.kt CHANGED Viewed

@@ -19,6 +19,7 @@ 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.OnContextMenuItemPressEvent
 import com.swmansion.enriched.textinput.events.OnInputBlurEvent
 import com.swmansion.enriched.textinput.events.OnInputFocusEvent
 import com.swmansion.enriched.textinput.events.OnInputKeyPressEvent
@@ -72,6 +73,7 @@ class EnrichedTextInputViewManager :
     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))
+    map.put(OnContextMenuItemPressEvent.EVENT_NAME, mapOf("registrationName" to OnContextMenuItemPressEvent.EVENT_NAME))
     return map
   }
@@ -173,6 +175,14 @@ class EnrichedTextInputViewManager :
     view?.setFontSize(size)
   }
+  @ReactProp(name = "lineHeight", defaultFloat = 0f)
+  override fun setLineHeight(
+    view: EnrichedTextInputView?,
+    height: Float,
+  ) {
+    view?.setLineHeight(height)
+  }
   @ReactProp(name = "fontFamily")
   override fun setFontFamily(
     view: EnrichedTextInputView?,
@@ -257,6 +267,20 @@ class EnrichedTextInputViewManager :
     view?.experimentalSynchronousEvents = value
   }
+  override fun setContextMenuItems(
+    view: EnrichedTextInputView?,
+    value: ReadableArray?,
+  ) {
+    view?.setContextMenuItems(value)
+  }
+  override fun setUseHtmlNormalizer(
+    view: EnrichedTextInputView?,
+    value: Boolean,
+  ) {
+    view?.useHtmlNormalizer = value
+  }
   override fun focus(view: EnrichedTextInputView?) {
     view?.requestFocusProgrammatically()
   }
@@ -357,6 +381,14 @@ class EnrichedTextInputViewManager :
     view?.addLink(start, end, text, url)
   }
+  override fun removeLink(
+    view: EnrichedTextInputView?,
+    start: Int,
+    end: Int,
+  ) {
+    view?.removeLink(start, end)
+  }
   override fun addImage(
     view: EnrichedTextInputView?,
     src: String,

package/android/src/main/java/com/swmansion/enriched/textinput/MeasurementStore.kt CHANGED Viewed

@@ -5,6 +5,7 @@ import android.graphics.Typeface
 import android.graphics.text.LineBreaker
 import android.os.Build
 import android.text.Spannable
+import android.text.SpannableString
 import android.text.StaticLayout
 import android.text.TextPaint
 import android.util.Log
@@ -16,6 +17,7 @@ import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
 import com.facebook.yoga.YogaMeasureMode
 import com.facebook.yoga.YogaMeasureOutput
 import com.swmansion.enriched.common.parser.EnrichedParser
+import com.swmansion.enriched.textinput.spans.EnrichedLineHeightSpan
 import com.swmansion.enriched.textinput.styles.HtmlStyle
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
@@ -141,16 +143,31 @@ object MeasurementStore {
   ): Long {
     val defaultView = EnrichedTextInputView(context)
-    val text = getInitialText(defaultView, props)
+    val rawText = getInitialText(defaultView, props)
     val fontSize = getInitialFontSize(defaultView, props)
+    val lineHeight = props?.getDouble("lineHeight")?.toFloat() ?: 0f
     val fontFamily = props?.getString("fontFamily")
     val fontStyle = parseFontStyle(props?.getString("fontStyle"))
     val fontWeight = parseFontWeight(props?.getString("fontWeight"))
+    val text: CharSequence =
+      if (lineHeight > 0f) {
+        val spannable = SpannableString(rawText)
+        spannable.setSpan(
+          EnrichedLineHeightSpan(lineHeight),
+          0,
+          spannable.length,
+          Spannable.SPAN_INCLUSIVE_INCLUSIVE,
+        )
+        spannable
+      } else {
+        rawText
+      }
     val typeface = applyStyles(defaultView.typeface, fontStyle, fontWeight, fontFamily, context.assets)
     val paintParams = PaintParams(typeface, fontSize)
-    val size = measure(width, text, PaintParams(typeface, fontSize))
+    val size = measure(width, text, paintParams)
     if (id != null) {
       data[id] = MeasurementParams(true, width, size, text, paintParams)

package/android/src/main/java/com/swmansion/enriched/textinput/events/OnContextMenuItemPressEvent.kt ADDED Viewed

@@ -0,0 +1,35 @@
+package com.swmansion.enriched.textinput.events
+import android.util.Log
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+class OnContextMenuItemPressEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val itemText: String,
+  private val selectedText: String,
+  private val selectionStart: Int,
+  private val selectionEnd: Int,
+  private val styleState: WritableMap,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnContextMenuItemPressEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
+  override fun getEventData(): WritableMap {
+    val eventData: WritableMap = Arguments.createMap()
+    eventData.putString("itemText", itemText)
+    eventData.putString("selectedText", selectedText)
+    eventData.putInt("selectionStart", selectionStart)
+    eventData.putInt("selectionEnd", selectionEnd)
+    eventData.putMap("styleState", styleState)
+    return eventData
+  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
+  companion object {
+    const val EVENT_NAME: String = "onContextMenuItemPress"
+  }
+}

package/android/src/main/java/com/swmansion/enriched/textinput/spans/EnrichedLineHeightSpan.kt ADDED Viewed

@@ -0,0 +1,44 @@
+package com.swmansion.enriched.textinput.spans
+import android.graphics.Paint
+import android.text.Spannable
+import android.text.TextPaint
+import android.text.style.LineHeightSpan
+import android.text.style.MetricAffectingSpan
+import com.facebook.react.uimanager.PixelUtil
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+class EnrichedLineHeightSpan(
+  val lineHeight: Float,
+) : MetricAffectingSpan(),
+  LineHeightSpan {
+  override fun updateDrawState(p0: TextPaint?) {
+    // Do nothing but inform TextView that line height should be recalculated
+  }
+  override fun updateMeasureState(p0: TextPaint) {
+    // Do nothing but inform TextView that line height should be recalculated
+  }
+  override fun chooseHeight(
+    text: CharSequence,
+    start: Int,
+    end: Int,
+    spanstartv: Int,
+    v: Int,
+    fm: Paint.FontMetricsInt,
+  ) {
+    val spannable = text as? Spannable ?: return
+    // Do not modify line height for headings
+    // In the future we may consider adding custom lineHeight support for each paragraph style
+    if (spannable.getSpans(start, end, EnrichedHeadingSpan::class.java).isNotEmpty()) return
+    val lineHeightPx = PixelUtil.toPixelFromSP(lineHeight)
+    val currentHeight = (fm.descent - fm.ascent).toFloat()
+    if (lineHeightPx <= currentHeight) return
+    val extra = (lineHeightPx - currentHeight).toInt()
+    fm.ascent -= extra
+    fm.top = minOf(fm.top, fm.ascent)
+  }
+}

package/android/src/main/java/com/swmansion/enriched/textinput/styles/ParametrizedStyles.kt CHANGED Viewed

@@ -69,6 +69,22 @@ class ParametrizedStyles(
     isSettingLinkSpan = false
   }
+  fun removeLinkSpans(
+    start: Int,
+    end: Int,
+  ) {
+    val spannable = view.text as SpannableStringBuilder
+    val textLength = spannable.length
+    val clampedStart = minOf(start, end).coerceIn(0, textLength)
+    val clampedEnd = maxOf(start, end).coerceIn(0, textLength)
+    val spans = spannable.getSpans(clampedStart, clampedEnd, EnrichedInputLinkSpan::class.java)
+    for (span in spans) {
+      spannable.removeSpan(span)
+    }
+    view.selection?.validateStyles()
+  }
   fun afterTextChanged(
     s: Editable,
     startCursorPosition: Int,

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

@@ -203,18 +203,7 @@ class EnrichedSpanState(
     }
   }
-  private fun emitStateChangeEvent() {
-    val context = view.context as ReactContext
-    val surfaceId = UIManagerHelper.getSurfaceId(context)
-    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatchPayload(dispatcher, surfaceId)
-  }
-  private fun dispatchPayload(
-    dispatcher: EventDispatcher?,
-    surfaceId: Int,
-  ) {
+  fun getStyleStatePayload(): WritableMap {
     val activeStyles =
       listOfNotNull(
         if (boldStart != null) EnrichedSpans.BOLD else null,
@@ -258,6 +247,23 @@ class EnrichedSpanState(
     payload.putMap("mention", getStyleState(activeStyles, EnrichedSpans.MENTION))
     payload.putMap("checkboxList", getStyleState(activeStyles, EnrichedSpans.CHECKBOX_LIST))
+    return payload
+  }
+  private fun emitStateChangeEvent() {
+    val context = view.context as ReactContext
+    val surfaceId = UIManagerHelper.getSurfaceId(context)
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
+    dispatchPayload(dispatcher, surfaceId)
+  }
+  private fun dispatchPayload(
+    dispatcher: EventDispatcher?,
+    surfaceId: Int,
+  ) {
+    val payload = getStyleStatePayload()
     // Do not emit event if payload is the same
     if (previousPayload == payload) {
       return

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

@@ -8,8 +8,13 @@ set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/generated/jni)
 set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
+set(LIB_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../cpp)
 file(GLOB LIB_MODULE_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/${LIB_LITERAL}/*.cpp)
 file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
+file(GLOB LIB_CPP_SRCS CONFIGURE_DEPENDS ${LIB_CPP_DIR}/parser/GumboParser.cpp ${LIB_CPP_DIR}/parser/GumboNormalizer.c)
+set_source_files_properties(${LIB_CPP_DIR}/parser/GumboNormalizer.c PROPERTIES LANGUAGE C COMPILE_FLAGS "-std=c99")
 if(NOT DEFINED REACT_NATIVE_MINOR_VERSION)
   set(REACT_NATIVE_MINOR_VERSION ${ReactAndroid_VERSION_MINOR})
@@ -23,6 +28,7 @@ add_library(
         ${LIB_MODULE_SRCS}
         ${LIB_CUSTOM_SRCS}
         ${LIB_CODEGEN_SRCS}
+        ${LIB_CPP_SRCS}
 )
 target_include_directories(
@@ -33,6 +39,8 @@ target_include_directories(
         ${LIB_ANDROID_GENERATED_JNI_DIR}
         ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}
         ${LIB_CPP_DIR}
+        ${LIB_CPP_DIR}/parser
+        ${LIB_CPP_DIR}/GumboParser
 )
 find_package(fbjni REQUIRED CONFIG)
@@ -45,19 +53,7 @@ target_link_libraries(
         ReactAndroid::reactnative
 )
-if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
-  target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)
-else()
-  target_compile_options(
-          ${LIB_TARGET_NAME}
-          PRIVATE
-          -DLOG_TAG=\"ReactNative\"
-          -fexceptions
-          -frtti
-          -Wall
-          -std=c++20
-  )
-endif()
+target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)
 target_include_directories(
         ${CMAKE_PROJECT_NAME}

package/android/src/main/new_arch/GumboNormalizerJni.cpp ADDED Viewed

@@ -0,0 +1,14 @@
+#include "GumboParser.hpp"
+#include <jni.h>
+#include <string>
+extern "C" JNIEXPORT jstring JNICALL
+Java_com_swmansion_enriched_common_GumboNormalizer_normalizeHtml(
+    JNIEnv *env, jclass /*cls*/, jstring htmlJString) {
+  const char *htmlChars = env->GetStringUTFChars(htmlJString, nullptr);
+  std::string result = GumboParser::normalizeHtml(htmlChars);
+  env->ReleaseStringUTFChars(htmlJString, htmlChars);
+  if (result.empty())
+    return nullptr;
+  return env->NewStringUTF(result.c_str());
+}

package/android/src/main/new_arch/react/renderer/components/ReactNativeEnrichedSpec/conversions.h CHANGED Viewed

@@ -1,15 +1,10 @@
 #pragma once
 #include <folly/dynamic.h>
+#include <react/renderer/components/FBReactNativeSpec/Props.h>
 #include <react/renderer/components/ReactNativeEnrichedSpec/Props.h>
 #include <react/renderer/core/propsConversions.h>
-#if REACT_NATIVE_MINOR_VERSION >= 81
-#include <react/renderer/components/FBReactNativeSpec/Props.h>
-#else
-#include <react/renderer/components/rncore/Props.h>
-#endif
 namespace facebook::react {
 #ifdef RN_SERIALIZABLE_STATE
@@ -22,25 +17,11 @@ inline folly::dynamic toDynamic(const EnrichedTextInputViewProps &props) {
   serializedProps["fontWeight"] = props.fontWeight;
   serializedProps["fontStyle"] = props.fontStyle;
   serializedProps["fontFamily"] = props.fontFamily;
+  serializedProps["lineHeight"] = props.lineHeight;
   serializedProps["htmlStyle"] = toDynamic(props.htmlStyle);
   return serializedProps;
 }
-#elif REACT_NATIVE_MINOR_VERSION >= 79
-inline folly::dynamic toDynamic(const EnrichedTextInputViewProps &props) {
-  folly::dynamic serializedProps = folly::dynamic::object();
-  serializedProps["defaultValue"] = props.defaultValue;
-  serializedProps["placeholder"] = props.placeholder;
-  serializedProps["fontSize"] = props.fontSize;
-  serializedProps["fontWeight"] = props.fontWeight;
-  serializedProps["fontStyle"] = props.fontStyle;
-  serializedProps["fontFamily"] = props.fontFamily;
-  // Ideally we should also serialize htmlStyle, but toDynamic function is not
-  // generated in this RN version
-  // As RN 0.79 and 0.80 is no longer supported, we can skip it for now
-  return serializedProps;
-}
 #endif
 } // namespace facebook::react