react-native-enriched 0.2.0 → 0.2.1

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

@@ -5,9 +5,8 @@ import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.util.Log
 import com.swmansion.enriched.EnrichedTextInputView
-import com.swmansion.enriched.spans.EnrichedBlockQuoteSpan
-import com.swmansion.enriched.spans.EnrichedCodeBlockSpan
 import com.swmansion.enriched.spans.EnrichedSpans
+import com.swmansion.enriched.spans.interfaces.EnrichedSpan
 import com.swmansion.enriched.utils.getParagraphBounds
 import com.swmansion.enriched.utils.getSafeSpanBoundaries
 
@@ -194,16 +193,84 @@ class ParagraphStyles(private val view: EnrichedTextInputView) {
     s.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
   }
 
+  private fun handleConflictsDuringNewlineDeletion(s: Editable, style: String, paragraphStart: Int, paragraphEnd: Int): Boolean {
+    val spanState = view.spanState ?: return false
+    val mergingConfig = EnrichedSpans.getMergingConfigForStyle(style, view.htmlStyle) ?: return false
+    var isConflicting = false
+    val stylesToCheck = mergingConfig.blockingStyles + mergingConfig.conflictingStyles
+
+    for (styleToCheck in stylesToCheck) {
+      val conflictingType = EnrichedSpans.allSpans[styleToCheck]?.clazz ?: continue
+
+      val spans = s.getSpans(paragraphStart, paragraphEnd, conflictingType)
+      if (spans.isEmpty()) {
+        continue
+      }
+      isConflicting = true
+
+      val isParagraphStyle = EnrichedSpans.paragraphSpans[styleToCheck] != null
+      if (!isParagraphStyle) {
+        continue
+      }
+
+      for (span in spans) {
+        extendStyleOnWholeParagraph(s, span as EnrichedSpan, conflictingType, paragraphEnd)
+      }
+    }
+
+    if (isConflicting) {
+      val styleStart =  spanState.getStart(style) ?: return false
+      spanState.setStart(style, null)
+      removeStyle(style, styleStart, paragraphEnd)
+      return true
+    }
+
+    return false
+  }
+
+
+  private fun deleteConflictingAndBlockingStyles(s: Editable, style: String, paragraphStart: Int, paragraphEnd: Int) {
+    val mergingConfig = EnrichedSpans.getMergingConfigForStyle(style, view.htmlStyle) ?: return
+    val stylesToCheck = mergingConfig.blockingStyles + mergingConfig.conflictingStyles
+
+    for (styleToCheck in stylesToCheck) {
+      val conflictingType = EnrichedSpans.allSpans[styleToCheck]?.clazz ?: continue
+
+      val spans = s.getSpans(paragraphStart, paragraphEnd, conflictingType)
+      for (span in spans) {
+        s.removeSpan(span)
+      }
+    }
+  }
+
+  private fun <T>extendStyleOnWholeParagraph(s: Editable, span: EnrichedSpan, type: Class<T>, paragraphEnd: Int) {
+    val currStyleStart = s.getSpanStart(span)
+    s.removeSpan(span)
+    val (safeStart, safeEnd) = s.getSafeSpanBoundaries(currStyleStart, paragraphEnd)
+    setSpan(s, type, safeStart, safeEnd)
+  }
+
   fun afterTextChanged(s: Editable, endPosition: Int, previousTextLength: Int) {
     var endCursorPosition = endPosition
     val isBackspace = s.length < previousTextLength
     val isNewLine = endCursorPosition == 0 || endCursorPosition > 0 && s[endCursorPosition - 1] == '\n'
+    val spanState = view.spanState ?: return
 
     for ((style, config) in EnrichedSpans.paragraphSpans) {
-      val spanState = view.spanState ?: continue
       val styleStart = spanState.getStart(style)
 
       if (styleStart == null) {
+        if (isBackspace) {
+          val (start, end) = s.getParagraphBounds(endCursorPosition)
+          val spans = s.getSpans(start, end, config.clazz)
+
+          for (span in spans) {
+            // handle conflicts when entering paragraph with some paragraph style applied
+            deleteConflictingAndBlockingStyles(s, style, start, end)
+            extendStyleOnWholeParagraph(s, span as EnrichedSpan, config.clazz, end)
+          }
+        }
+
         if (config.isContinuous) {
           mergeAdjacentStyleSpans(s, endCursorPosition, config.clazz)
         }
@@ -218,7 +285,7 @@ class ParagraphStyles(private val view: EnrichedTextInputView) {
 
         if (isBackspace) {
           endCursorPosition -= 1
-          view.spanState.setStart(style, null)
+          spanState.setStart(style, null)
         } else {
           s.insert(endCursorPosition, "\u200B")
           endCursorPosition += 1
@@ -226,6 +293,15 @@ class ParagraphStyles(private val view: EnrichedTextInputView) {
       }
 
       var (start, end) = s.getParagraphBounds(styleStart, endCursorPosition)
+
+      // handle conflicts when deleting newline from paragraph style (going back to previous line)
+      if (isBackspace && styleStart != start) {
+        val isConflicting = handleConflictsDuringNewlineDeletion(s, style, start, end)
+        if (isConflicting) {
+          continue
+        }
+      }
+
       val isNotEndLineSpan = isSpanEnabledInNextLine(s, end, config.clazz)
       val spans = s.getSpans(start, end, config.clazz)
 

package/android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java

@@ -105,6 +105,14 @@ public class EnrichedParser {
     String normalizedBlockQuote = normalizedCodeBlock.replaceAll("</blockquote>\\n<br>", "</blockquote>");
     return "<html>\n" + normalizedBlockQuote + "</html>";
   }
+
+  public static String toHtmlWithDefault(CharSequence text) {
+    if (text instanceof Spanned) {
+      return toHtml((Spanned) text);
+    }
+    return "<html>\n<p></p>\n</html>";
+  }
+
   /**
    * Returns an HTML escaped representation of the given plain text.
    */

package/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;
 }

package/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

package/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
-

package/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

package/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

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputShadowNode.cpp

@@ -4,30 +4,32 @@
 
 namespace facebook::react {
 extern const char EnrichedTextInputComponentName[] = "EnrichedTextInputView";
-    void EnrichedTextInputShadowNode::setMeasurementsManager(
-            const std::shared_ptr<EnrichedTextInputMeasurementManager>&
-            measurementsManager) {
-        ensureUnsealed();
-        measurementsManager_ = measurementsManager;
-    }
+void EnrichedTextInputShadowNode::setMeasurementsManager(
+    const std::shared_ptr<EnrichedTextInputMeasurementManager>
+        &measurementsManager) {
+  ensureUnsealed();
+  measurementsManager_ = measurementsManager;
+}
 
-    // Mark layout as dirty after state has been updated
-    // Once layout is marked as dirty, `measureContent` will be called in order to recalculate layout
-    void EnrichedTextInputShadowNode::dirtyLayoutIfNeeded() {
-        const auto state = this->getStateData();
-        const auto counter = state.getForceHeightRecalculationCounter();
+// Mark layout as dirty after state has been updated
+// Once layout is marked as dirty, `measureContent` will be called in order to
+// recalculate layout
+void EnrichedTextInputShadowNode::dirtyLayoutIfNeeded() {
+  const auto state = this->getStateData();
+  const auto counter = state.getForceHeightRecalculationCounter();
 
-        if (forceHeightRecalculationCounter_ != counter) {
-            forceHeightRecalculationCounter_ = counter;
+  if (forceHeightRecalculationCounter_ != counter) {
+    forceHeightRecalculationCounter_ = counter;
 
-            dirtyLayout();
-        }
-    }
+    dirtyLayout();
+  }
+}
 
-    Size EnrichedTextInputShadowNode::measureContent(
-            const LayoutContext &layoutContext,
-            const LayoutConstraints &layoutConstraints) const {
-        return measurementsManager_->measure(getSurfaceId(), getTag(), getConcreteProps(), layoutConstraints);
-    }
+Size EnrichedTextInputShadowNode::measureContent(
+    const LayoutContext &layoutContext,
+    const LayoutConstraints &layoutConstraints) const {
+  return measurementsManager_->measure(getSurfaceId(), getTag(),
+                                       getConcreteProps(), layoutConstraints);
+}
 
 } // namespace facebook::react

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputShadowNode.h

@@ -3,9 +3,9 @@
 #include "EnrichedTextInputMeasurementManager.h"
 #include "EnrichedTextInputState.h"
 
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
 #include <react/renderer/components/RNEnrichedTextInputViewSpec/EventEmitters.h>
+#include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {
 
@@ -13,42 +13,41 @@ JSI_EXPORT extern const char EnrichedTextInputComponentName[];
 /*
  * `ShadowNode` for <EnrichedTextInputView> component.
  */
-class EnrichedTextInputShadowNode final : public ConcreteViewShadowNode<
-        EnrichedTextInputComponentName,
-        EnrichedTextInputViewProps,
-        EnrichedTextInputViewEventEmitter,
-        EnrichedTextInputState> {
+class EnrichedTextInputShadowNode final
+    : public ConcreteViewShadowNode<
+          EnrichedTextInputComponentName, EnrichedTextInputViewProps,
+          EnrichedTextInputViewEventEmitter, EnrichedTextInputState> {
 public:
-    using ConcreteViewShadowNode::ConcreteViewShadowNode;
-
-    // This constructor is called when we "update" shadow node, e.g. after updating shadow node's state
-    EnrichedTextInputShadowNode(
-            ShadowNode const &sourceShadowNode,
-            ShadowNodeFragment const &fragment)
-        : ConcreteViewShadowNode(sourceShadowNode, fragment) {
-            dirtyLayoutIfNeeded();
-    }
-
-    static ShadowNodeTraits BaseTraits() {
-        auto traits = ConcreteViewShadowNode::BaseTraits();
-        traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
-        traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
-        return traits;
-    }
-
-    // Associates a shared `EnrichedTextInputMeasurementManager` with the node.
-    void setMeasurementsManager(
-            const std::shared_ptr<EnrichedTextInputMeasurementManager>&
-            measurementsManager);
-
-    void dirtyLayoutIfNeeded();
-
-    Size measureContent(
-            const LayoutContext& layoutContext,
-            const LayoutConstraints& layoutConstraints) const override;
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  // This constructor is called when we "update" shadow node, e.g. after
+  // updating shadow node's state
+  EnrichedTextInputShadowNode(ShadowNode const &sourceShadowNode,
+                              ShadowNodeFragment const &fragment)
+      : ConcreteViewShadowNode(sourceShadowNode, fragment) {
+    dirtyLayoutIfNeeded();
+  }
+
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
+    return traits;
+  }
+
+  // Associates a shared `EnrichedTextInputMeasurementManager` with the node.
+  void setMeasurementsManager(
+      const std::shared_ptr<EnrichedTextInputMeasurementManager>
+          &measurementsManager);
+
+  void dirtyLayoutIfNeeded();
+
+  Size
+  measureContent(const LayoutContext &layoutContext,
+                 const LayoutConstraints &layoutConstraints) const override;
 
 private:
-    int forceHeightRecalculationCounter_;
-    std::shared_ptr<EnrichedTextInputMeasurementManager> measurementsManager_;
+  int forceHeightRecalculationCounter_;
+  std::shared_ptr<EnrichedTextInputMeasurementManager> measurementsManager_;
 };
 } // namespace facebook::react

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputState.cpp

@@ -2,8 +2,8 @@
 
 namespace facebook::react {
 
-    int EnrichedTextInputState::getForceHeightRecalculationCounter() const {
-        return forceHeightRecalculationCounter_;
-    }
-
+int EnrichedTextInputState::getForceHeightRecalculationCounter() const {
+  return forceHeightRecalculationCounter_;
 }
+
+} // namespace facebook::react

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputState.h

@@ -4,22 +4,21 @@
 
 namespace facebook::react {
 
-    class EnrichedTextInputState {
-    public:
-        EnrichedTextInputState()
-                : forceHeightRecalculationCounter_(0) {}
+class EnrichedTextInputState {
+public:
+  EnrichedTextInputState() : forceHeightRecalculationCounter_(0) {}
 
-        // Used by Kotlin to set current text value
-        EnrichedTextInputState(EnrichedTextInputState const &previousState, folly::dynamic data)
-                : forceHeightRecalculationCounter_((int)data["forceHeightRecalculationCounter"].getInt()){};
-        folly::dynamic getDynamic() const {
-            return {};
-        };
+  // Used by Kotlin to set current text value
+  EnrichedTextInputState(EnrichedTextInputState const &previousState,
+                         folly::dynamic data)
+      : forceHeightRecalculationCounter_(
+            (int)data["forceHeightRecalculationCounter"].getInt()){};
+  folly::dynamic getDynamic() const { return {}; };
 
-        int getForceHeightRecalculationCounter() const;
+  int getForceHeightRecalculationCounter() const;
 
-    private:
-        const int forceHeightRecalculationCounter_{};
-    };
+private:
+  const int forceHeightRecalculationCounter_{};
+};
 
 } // namespace facebook::react

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/conversions.h

@@ -2,25 +2,24 @@
 
 #include <folly/dynamic.h>
 #include <react/renderer/components/FBReactNativeSpec/Props.h>
-#include <react/renderer/core/propsConversions.h>
 #include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
+#include <react/renderer/core/propsConversions.h>
 
 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);
+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;
+  return serializedProps;
 }
 #endif