react-native-enriched 0.2.1 → 0.4.0

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

@@ -1,47 +1,74 @@
-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) : SpanWatcher {
+class EnrichedSpanWatcher(
+  private val view: EnrichedTextInputView,
+) : SpanWatcher {
   private var previousHtml: String? = null
 
-  override fun onSpanAdded(text: Spannable, what: Any, start: Int, end: Int) {
+  override fun onSpanAdded(
+    text: Spannable,
+    what: Any,
+    start: Int,
+    end: Int,
+  ) {
     updateNextLineLayout(what, text, end)
     updateUnorderedListSpans(what, text, end)
     emitEvent(text, what)
   }
 
-  override fun onSpanRemoved(text: Spannable, what: Any, start: Int, end: Int) {
+  override fun onSpanRemoved(
+    text: Spannable,
+    what: Any,
+    start: Int,
+    end: Int,
+  ) {
     updateNextLineLayout(what, text, end)
     updateUnorderedListSpans(what, text, end)
     emitEvent(text, what)
   }
 
-  override fun onSpanChanged(text: Spannable, what: Any, ostart: Int, oend: Int, nstart: Int, nend: Int) {
+  override fun onSpanChanged(
+    text: Spannable,
+    what: Any,
+    ostart: Int,
+    oend: Int,
+    nstart: Int,
+    nend: Int,
+  ) {
     // Do nothing for now
   }
 
-  private fun updateUnorderedListSpans(what: Any, text: Spannable, end: Int) {
-    if (what is EnrichedOrderedListSpan) {
+  private fun updateUnorderedListSpans(
+    what: Any,
+    text: Spannable,
+    end: Int,
+  ) {
+    if (what is EnrichedInputOrderedListSpan) {
       view.listStyles?.updateOrderedListIndexes(text, end)
     }
   }
 
   // After adding/removing heading span, we have to manually set empty paragraph span to the following text
   // This allows us to update the layout (as it's not updated automatically - looks like an Android issue)
-  private fun updateNextLineLayout(what: Any, text: Spannable, end: Int) {
-    class EmptySpan : ParagraphStyle {}
+  private fun updateNextLineLayout(
+    what: Any,
+    text: Spannable,
+    end: Int,
+  ) {
+    class EmptySpan : ParagraphStyle
 
     if (what is EnrichedHeadingSpan) {
       val finalStart = (end + 1)
@@ -51,12 +78,15 @@ class EnrichedSpanWatcher(private val view: EnrichedTextInputView) : SpanWatcher
     }
   }
 
-  fun emitEvent(s: Spannable, what: Any?) {
+  fun emitEvent(
+    s: Spannable,
+    what: Any?,
+  ) {
     // Do not parse spannable and emit event if onChangeHtml is not provided
     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
@@ -65,11 +95,13 @@ class EnrichedSpanWatcher(private val view: EnrichedTextInputView) : SpanWatcher
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatcher?.dispatchEvent(OnChangeHtmlEvent(
-      surfaceId,
-      view.id,
-      html,
-      view.experimentalSynchronousEvents,
-    ))
+    dispatcher?.dispatchEvent(
+      OnChangeHtmlEvent(
+        surfaceId,
+        view.id,
+        html,
+        view.experimentalSynchronousEvents,
+      ),
+    )
   }
 }

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

@@ -1,21 +1,35 @@
-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) : TextWatcher {
+class EnrichedTextWatcher(
+  private val view: EnrichedTextInputView,
+) : TextWatcher {
   private var endCursorPosition: Int = 0
+  private var startCursorPosition: Int = 0
   private var previousTextLength: Int = 0
 
-  override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+  override fun beforeTextChanged(
+    s: CharSequence?,
+    start: Int,
+    count: Int,
+    after: Int,
+  ) {
     previousTextLength = s?.length ?: 0
   }
 
-  override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+  override fun onTextChanged(
+    s: CharSequence?,
+    start: Int,
+    before: Int,
+    count: Int,
+  ) {
+    startCursorPosition = start
     endCursorPosition = start + count
     view.layoutManager.invalidateLayout()
     view.isRemovingMany = !view.isDuringTransaction && before > count + 1
@@ -33,19 +47,28 @@ class EnrichedTextWatcher(private val view: EnrichedTextInputView) : TextWatcher
     view.inlineStyles?.afterTextChanged(s, endCursorPosition)
     view.paragraphStyles?.afterTextChanged(s, endCursorPosition, previousTextLength)
     view.listStyles?.afterTextChanged(s, endCursorPosition, previousTextLength)
-    view.parametrizedStyles?.afterTextChanged(s, endCursorPosition)
+    view.parametrizedStyles?.afterTextChanged(s, startCursorPosition, endCursorPosition)
   }
 
-  private fun emitEvents(s: Editable) {
+  private fun emitChangeText(editable: Editable) {
+    if (!view.shouldEmitOnChangeText) {
+      return
+    }
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)
-    dispatcher?.dispatchEvent(OnChangeTextEvent(
-      surfaceId,
-      view.id,
-      s,
-      view.experimentalSynchronousEvents,
-    ))
+    dispatcher?.dispatchEvent(
+      OnChangeTextEvent(
+        surfaceId,
+        view.id,
+        editable,
+        view.experimentalSynchronousEvents,
+      ),
+    )
+  }
+
+  private fun emitEvents(s: Editable) {
+    emitChangeText(s)
     view.spanWatcher?.emitEvent(s, null)
   }
 }

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}/../../..)
@@ -11,6 +11,12 @@ set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/
 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)
 
+if(NOT DEFINED REACT_NATIVE_MINOR_VERSION)
+  set(REACT_NATIVE_MINOR_VERSION ${ReactAndroid_VERSION_MINOR})
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}")
+
 add_library(
         ${LIB_TARGET_NAME}
         SHARED

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/ReactNativeEnrichedSpec/conversions.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <folly/dynamic.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
+inline folly::dynamic toDynamic(const EnrichedTextInputViewProps &props) {
+  // Serialize only metrics affecting 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;
+  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

package/ios/EnrichedTextInputView.h

@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 @public
   NSDictionary<NSNumber *, id<BaseStyleProtocol>> *stylesDict;
   NSDictionary<NSNumber *, NSArray<NSNumber *> *> *conflictingStyles;
-  NSDictionary<NSNumber *, NSArray<NSNumber *> *> *blockingStyles;
+  NSMutableDictionary<NSNumber *, NSArray<NSNumber *> *> *blockingStyles;
 @public
   BOOL blockEmitting;
 }
@@ -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