Merge branch 'main' into add-imperative-html-method

Author: qoobes

.github/workflows/ci.yml

@@ -20,9 +20,12 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
-      - name: Lint files
+      - name: Run ESLint (JS/TS)
         run: yarn lint
 
+      - name: Run clang-format (C/C++ style check)
+        run: yarn lint-clang
+
       - name: Typecheck files
         run: yarn typecheck
 

README.md

@@ -1,4 +1,4 @@
-<img src="https://github.com/user-attachments/assets/abc75d3b-495b-4a76-a72f-d87ce3ca1ff9" alt="react-native-enriched by Software Mansion" width="100%">
+<img src="https://github.com/user-attachments/assets/b010571e-e4a3-4d92-a409-4f9fe614025d" alt="react-native-enriched by Software Mansion" width="100%">
 
 # react-native-enriched
 
@@ -40,7 +40,7 @@ We can help you build your next dream product –
 ## Prerequisites
 
 - `react-native-enriched` currently supports only Android and iOS platforms
-- It works only with [the React Native New Architecture (Fabric)](https://reactnative.dev/architecture/landing-page) and supports following React Native releases: `0.79`, `0.80`, `0.81` and `0.82`
+- It works only with [the React Native New Architecture (Fabric)](https://reactnative.dev/architecture/landing-page) and supports following React Native releases: `0.79`, `0.80`, `0.81`, `0.82` and `0.83`
 
 ## Installation
 
@@ -152,9 +152,6 @@ Supported styles:
 - ordered list
 - unordered list
 
-> [!NOTE]
-> The iOS doesn't support codeblocks just yet, but it's planned in the near future!
-
 Each of the styles can be toggled the same way as in the example from [usage section](#usage); call a proper `toggle` function on the component ref.
 
 Each call toggles the style within the current text selection. We can still divide styles into two categories based on how they treat the selection:
@@ -212,9 +209,6 @@ You can insert an image into the input using [setImage](docs/API_REFERENCE.md#se
 
 The image will be put into a single line in the input and will affect the line's height as well as input's height. Keep in mind, that image will replace currently selected text or insert into the cursor position if there is no text selection.
 
-> [!NOTE]
-> The iOS doesn't support inline images just yet, but it's planned in the near future!
-
 ## Style Detection
 
 All of the above styles can be detected with the use of [onChangeState](docs/API_REFERENCE.md#onchangestate) event payload.

android/src/main/java/com/swmansion/enriched/events/MentionHandler.kt

@@ -9,8 +9,8 @@ class MentionHandler(private val view: EnrichedTextInputView) {
   private var previousIndicator: String? = null
 
   fun reset() {
+    endMention()
     previousText = null
-    previousIndicator = null
   }
 
   fun endMention() {

android/src/main/java/com/swmansion/enriched/styles/InlineStyles.kt

@@ -2,7 +2,6 @@ package com.swmansion.enriched.styles
 
 import android.text.Editable
 import android.text.Spannable
-import android.util.Log
 import com.swmansion.enriched.EnrichedTextInputView
 import com.swmansion.enriched.spans.EnrichedSpans
 import com.swmansion.enriched.utils.getSafeSpanBoundaries
@@ -57,6 +56,8 @@ class InlineStyles(private val view: EnrichedTextInputView) {
       var finalEnd: Int? = null
       if (spanStart == -1 || spanEnd == -1) continue
 
+      spannable.removeSpan(span)
+
       if (start == spanStart && end == spanEnd) {
         setSpanOnFinish = false
       } else if (start > spanStart && end < spanEnd) {

android/src/main/java/com/swmansion/enriched/styles/ParagraphStyles.kt

@@ -67,7 +67,7 @@ class ParagraphStyles(private val view: EnrichedTextInputView) {
       spannable.removeSpan(previousSpan)
     }
 
-    if (nextSpan != null) {
+    if (nextSpan != null && start != end) {
       newEnd = spannable.getSpanEnd(nextSpan)
       spannable.removeSpan(nextSpan)
     }

android/src/main/new_arch/RNEnrichedTextInputViewSpec.cpp

@@ -1,9 +1,10 @@
 
 /**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ * This code was generated by
+ * [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  *
  * @generated by codegen project: GenerateModuleJniCpp.js
  */
@@ -12,9 +13,8 @@
 
 namespace facebook::react {
 
-
-
-std::shared_ptr<TurboModule> RNEnrichedTextInputViewSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+std::shared_ptr<TurboModule> RNEnrichedTextInputViewSpec_ModuleProvider(
+    const std::string &moduleName, const JavaTurboModule::InitParams &params) {
 
   return nullptr;
 }

android/src/main/new_arch/RNEnrichedTextInputViewSpec.h

@@ -1,9 +1,10 @@
 
 /**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ * This code was generated by
+ * [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
  *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
  *
  * @generated by codegen project: GenerateModuleJniH.js
  */
@@ -18,9 +19,8 @@
 
 namespace facebook::react {
 
-
-
 JSI_EXPORT
-std::shared_ptr<TurboModule> RNEnrichedTextInputViewSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+std::shared_ptr<TurboModule> RNEnrichedTextInputViewSpec_ModuleProvider(
+    const std::string &moduleName, const JavaTurboModule::InitParams &params);
 
 } // namespace facebook::react

android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputComponentDescriptor.h

@@ -8,28 +8,28 @@
 namespace facebook::react {
 
 class EnrichedTextInputComponentDescriptor final
-        : public ConcreteComponentDescriptor<EnrichedTextInputShadowNode> {
+    : public ConcreteComponentDescriptor<EnrichedTextInputShadowNode> {
 public:
-    EnrichedTextInputComponentDescriptor(
-            const ComponentDescriptorParameters& parameters)
-        : ConcreteComponentDescriptor(parameters),
-            measurementsManager_(
-                std::make_shared<EnrichedTextInputMeasurementManager>(
-                        contextContainer_)) {}
-
-    void adopt(ShadowNode& shadowNode) const override {
-        ConcreteComponentDescriptor::adopt(shadowNode);
-        auto& editorShadowNode = static_cast<EnrichedTextInputShadowNode&>(shadowNode);
-
-        // `EnrichedTextInputShadowNode` uses
-        // `EnrichedTextInputMeasurementManager` to provide measurements to Yoga.
-        editorShadowNode.setMeasurementsManager(measurementsManager_);
-    }
+  EnrichedTextInputComponentDescriptor(
+      const ComponentDescriptorParameters &parameters)
+      : ConcreteComponentDescriptor(parameters),
+        measurementsManager_(
+            std::make_shared<EnrichedTextInputMeasurementManager>(
+                contextContainer_)) {}
+
+  void adopt(ShadowNode &shadowNode) const override {
+    ConcreteComponentDescriptor::adopt(shadowNode);
+    auto &editorShadowNode =
+        static_cast<EnrichedTextInputShadowNode &>(shadowNode);
+
+    // `EnrichedTextInputShadowNode` uses
+    // `EnrichedTextInputMeasurementManager` to provide measurements to Yoga.
+    editorShadowNode.setMeasurementsManager(measurementsManager_);
+  }
 
 private:
-    const std::shared_ptr<EnrichedTextInputMeasurementManager>
-            measurementsManager_;
+  const std::shared_ptr<EnrichedTextInputMeasurementManager>
+      measurementsManager_;
 };
 
 } // namespace facebook::react
-

android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputMeasurementManager.cpp

@@ -9,56 +9,45 @@ using namespace facebook::jni;
 
 namespace facebook::react {
 
-    Size EnrichedTextInputMeasurementManager::measure(
-            SurfaceId surfaceId,
-            int viewTag,
-            const EnrichedTextInputViewProps& props,
-            LayoutConstraints layoutConstraints) const {
-        const jni::global_ref<jobject>& fabricUIManager =
-                contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-
-        static const auto measure = facebook::jni::findClassStatic(
-                "com/facebook/react/fabric/FabricUIManager")
-                ->getMethod<jlong(
-                        jint,
-                        jstring,
-                        ReadableMap::javaobject,
-                        ReadableMap::javaobject,
-                        ReadableMap::javaobject,
-                        jfloat,
-                        jfloat,
-                        jfloat,
-                        jfloat)>("measure");
-
-        auto minimumSize = layoutConstraints.minimumSize;
-        auto maximumSize = layoutConstraints.maximumSize;
-
-        local_ref<JString> componentName = make_jstring("EnrichedTextInputView");
-
-        // Prepare extraData map with viewTag
-        folly::dynamic extraData = folly::dynamic::object();
-        extraData["viewTag"] = viewTag;
-        local_ref<ReadableNativeMap::javaobject> extraDataRNM = ReadableNativeMap::newObjectCxxArgs(extraData);
-        local_ref<ReadableMap::javaobject> extraDataRM = make_local(reinterpret_cast<ReadableMap::javaobject>(extraDataRNM.get()));
-
-        // Prepare layout metrics affecting props
-        auto serializedProps = toDynamic(props);
-        local_ref<ReadableNativeMap::javaobject> propsRNM = ReadableNativeMap::newObjectCxxArgs(serializedProps);
-        local_ref<ReadableMap::javaobject> propsRM = make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
-
-        auto measurement = yogaMeassureToSize(measure(
-                fabricUIManager,
-                surfaceId,
-                componentName.get(),
-                extraDataRM.get(),
-                propsRM.get(),
-                nullptr,
-                minimumSize.width,
-                maximumSize.width,
-                minimumSize.height,
-                maximumSize.height));
-
-        return measurement;
-    }
+Size EnrichedTextInputMeasurementManager::measure(
+    SurfaceId surfaceId, int viewTag, const EnrichedTextInputViewProps &props,
+    LayoutConstraints layoutConstraints) const {
+  const jni::global_ref<jobject> &fabricUIManager =
+      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+
+  static const auto measure =
+      facebook::jni::findClassStatic(
+          "com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<jlong(jint, jstring, ReadableMap::javaobject,
+                            ReadableMap::javaobject, ReadableMap::javaobject,
+                            jfloat, jfloat, jfloat, jfloat)>("measure");
+
+  auto minimumSize = layoutConstraints.minimumSize;
+  auto maximumSize = layoutConstraints.maximumSize;
+
+  local_ref<JString> componentName = make_jstring("EnrichedTextInputView");
+
+  // Prepare extraData map with viewTag
+  folly::dynamic extraData = folly::dynamic::object();
+  extraData["viewTag"] = viewTag;
+  local_ref<ReadableNativeMap::javaobject> extraDataRNM =
+      ReadableNativeMap::newObjectCxxArgs(extraData);
+  local_ref<ReadableMap::javaobject> extraDataRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(extraDataRNM.get()));
+
+  // Prepare layout metrics affecting props
+  auto serializedProps = toDynamic(props);
+  local_ref<ReadableNativeMap::javaobject> propsRNM =
+      ReadableNativeMap::newObjectCxxArgs(serializedProps);
+  local_ref<ReadableMap::javaobject> propsRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
+
+  auto measurement = yogaMeassureToSize(
+      measure(fabricUIManager, surfaceId, componentName.get(),
+              extraDataRM.get(), propsRM.get(), nullptr, minimumSize.width,
+              maximumSize.width, minimumSize.height, maximumSize.height));
+
+  return measurement;
+}
 
 } // namespace facebook::react

android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputMeasurementManager.h

@@ -2,26 +2,24 @@
 
 #include "ComponentDescriptors.h"
 
-#include <react/utils/ContextContainer.h>
-#include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
 
-    class EnrichedTextInputMeasurementManager {
-    public:
-        EnrichedTextInputMeasurementManager(
-                const std::shared_ptr<const ContextContainer>& contextContainer)
-                : contextContainer_(contextContainer) {}
+class EnrichedTextInputMeasurementManager {
+public:
+  EnrichedTextInputMeasurementManager(
+      const std::shared_ptr<const ContextContainer> &contextContainer)
+      : contextContainer_(contextContainer) {}
 
-        Size measure(
-                SurfaceId surfaceId,
-                int viewTag,
-                const EnrichedTextInputViewProps& props,
-                LayoutConstraints layoutConstraints) const;
+  Size measure(SurfaceId surfaceId, int viewTag,
+               const EnrichedTextInputViewProps &props,
+               LayoutConstraints layoutConstraints) const;
 
-    private:
-        const std::shared_ptr<const ContextContainer> contextContainer_;
-    };
+private:
+  const std::shared_ptr<const ContextContainer> contextContainer_;
+};
 
 } // namespace facebook::react