react-native-enriched 0.1.6 → 0.2.1

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
 

package/android/src/main/res/drawable/broken_image.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM240,503L400,343L560,503L720,343L760,383L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,463L240,503ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,496L720,456L560,616L400,456L240,616L200,576L200,760Q200,760 200,760Q200,760 200,760ZM200,760L200,760Q200,760 200,760Q200,760 200,760L200,496L200,576L200,463L200,383L200,200Q200,200 200,200Q200,200 200,200L200,200Q200,200 200,200Q200,200 200,200L200,463L200,463L200,576L200,576L200,760Q200,760 200,760Q200,760 200,760Z"/>
+</vector>

package/ios/EnrichedTextInputView.h

@@ -1,30 +1,45 @@
 #pragma once
-#import <React/RCTViewComponentView.h>
-#import <UIKit/UIKit.h>
+#import "BaseStyleProtocol.h"
 #import "InputConfig.h"
 #import "InputParser.h"
-#import "BaseStyleProtocol.h"
 #import "InputTextView.h"
+#import "MediaAttachment.h"
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
 
 #ifndef EnrichedTextInputViewNativeComponent_h
 #define EnrichedTextInputViewNativeComponent_h
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface EnrichedTextInputView : RCTViewComponentView {
-  @public InputTextView *textView;
-  @public NSRange recentlyChangedRange;
-  @public InputConfig *config;
-  @public InputParser *parser;
-  @public NSMutableDictionary<NSAttributedStringKey, id> *defaultTypingAttributes;
-  @public NSDictionary<NSNumber *, id<BaseStyleProtocol>> *stylesDict;
-  @public BOOL blockEmitting;
+@interface EnrichedTextInputView
+    : RCTViewComponentView <MediaAttachmentDelegate> {
+@public
+  InputTextView *textView;
+@public
+  NSRange recentlyChangedRange;
+@public
+  InputConfig *config;
+@public
+  InputParser *parser;
+@public
+  NSMutableDictionary<NSAttributedStringKey, id> *defaultTypingAttributes;
+@public
+  NSDictionary<NSNumber *, id<BaseStyleProtocol>> *stylesDict;
+  NSDictionary<NSNumber *, NSArray<NSNumber *> *> *conflictingStyles;
+  NSDictionary<NSNumber *, NSArray<NSNumber *> *> *blockingStyles;
+@public
+  BOOL blockEmitting;
 }
 - (CGSize)measureSize:(CGFloat)maxWidth;
-- (void)emitOnLinkDetectedEvent:(NSString *)text url:(NSString *)url range:(NSRange)range;
+- (void)emitOnLinkDetectedEvent:(NSString *)text
+                            url:(NSString *)url
+                          range:(NSRange)range;
 - (void)emitOnMentionEvent:(NSString *)indicator text:(nullable NSString *)text;
 - (void)anyTextMayHaveBeenModified;
 - (BOOL)handleStyleBlocksAndConflicts:(StyleType)type range:(NSRange)range;
+- (NSArray<NSNumber *> *)getPresentStyleTypesFrom:(NSArray<NSNumber *> *)types
+                                            range:(NSRange)range;
 @end
 
 NS_ASSUME_NONNULL_END