react-native-tvos 0.84.1-0 → 0.85.0-0

package/ReactCommon/react/renderer/components/root/RootShadowNode.cpp

@@ -59,7 +59,7 @@ RootShadowNode::Unshared RootShadowNode::clone(
 
 void RootShadowNode::setInstanceHandle(
     InstanceHandle::Shared instanceHandle) const {
-  getFamily().setInstanceHandle(instanceHandle);
+  getFamilyShared()->setInstanceHandle(instanceHandle);
 }
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.cpp

@@ -32,6 +32,24 @@ BaseScrollViewProps::BaseScrollViewProps(
                     "showsScrollIndex",
                     sourceProps.showsScrollIndex,
                     {})),
+      snapToItemPadding(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.snapToItemPadding
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "snapToItemPadding",
+                    sourceProps.snapToItemPadding,
+                    (Float)0)),
+      scrollAnimationEnabled(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.scrollAnimationEnabled
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "scrollAnimationEnabled",
+                    sourceProps.scrollAnimationEnabled,
+                    true)),
 #endif
       alwaysBounceHorizontal(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
@@ -400,6 +418,8 @@ void BaseScrollViewProps::setProp(
   switch (hash) {
 #if TARGET_OS_TV
     RAW_SET_PROP_SWITCH_CASE_BASIC(showsScrollIndex);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(snapToItemPadding);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(scrollAnimationEnabled);
 #endif
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceHorizontal);
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceVertical);

package/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h

@@ -31,6 +31,8 @@ class BaseScrollViewProps : public ViewProps {
 
 #if TARGET_OS_TV
   bool showsScrollIndex{true};
+  Float snapToItemPadding{0};
+  bool scrollAnimationEnabled{true};
 #endif
   bool alwaysBounceHorizontal{};
   bool alwaysBounceVertical{};

package/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h

@@ -28,7 +28,7 @@ class ScrollViewState final {
 
   Point contentOffset;
   Rect contentBoundingRect;
-  int scrollAwayPaddingTop;
+  int scrollAwayPaddingTop{0};
 
   /*
    * View Culling has to be disabled when accessibility features are used.

package/ReactCommon/react/renderer/components/scrollview/conversions.h

@@ -30,6 +30,10 @@ inline void fromRawValue(const PropsParserContext &context, const RawValue &valu
     result = ScrollViewSnapToAlignment::End;
     return;
   }
+  if (string == "item") {
+    result = ScrollViewSnapToAlignment::Item;
+    return;
+  }
   abort();
 }
 
@@ -117,6 +121,8 @@ inline std::string toString(const ScrollViewSnapToAlignment &value)
       return "center";
     case ScrollViewSnapToAlignment::End:
       return "end";
+    case ScrollViewSnapToAlignment::Item:
+      return "item";
   }
 }
 

package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp

@@ -65,7 +65,16 @@ HostPlatformScrollViewProps::HostPlatformScrollViewProps(
                     rawProps,
                     "endFillColor",
                     sourceProps.endFillColor,
-                    clearColor())) {}
+                    clearColor())),
+      snapToItemPadding(
+          ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
+              ? sourceProps.snapToItemPadding
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "snapToItemPadding",
+                    sourceProps.snapToItemPadding,
+                    {})) {}
 
 void HostPlatformScrollViewProps::setProp(
     const PropsParserContext& context,
@@ -85,6 +94,7 @@ void HostPlatformScrollViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(fadingEdgeLength);
     RAW_SET_PROP_SWITCH_CASE_BASIC(overScrollMode);
     RAW_SET_PROP_SWITCH_CASE_BASIC(endFillColor);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(snapToItemPadding);
   }
 }
 
@@ -327,6 +337,9 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps(
       case ScrollViewSnapToAlignment::End:
         result["snapToAlignment"] = "end";
         break;
+      case ScrollViewSnapToAlignment::Item:
+        result["snapToAlignment"] = "item";
+        break;
     }
   }
 
@@ -396,6 +409,10 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps(
     result["endFillColor"] = *endFillColor;
   }
 
+  if (snapToItemPadding != oldProps->snapToItemPadding) {
+    result["snapToItemPadding"] = snapToItemPadding;
+  }
+
   return result;
 }
 

package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h

@@ -33,6 +33,8 @@ class HostPlatformScrollViewProps : public BaseScrollViewProps {
   std::string overScrollMode{"auto"};
   SharedColor endFillColor{clearColor()};
 
+  Float snapToItemPadding{0};
+
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE

package/ReactCommon/react/renderer/components/scrollview/primitives.h

@@ -12,7 +12,7 @@
 
 namespace facebook::react {
 
-enum class ScrollViewSnapToAlignment { Start, Center, End };
+enum class ScrollViewSnapToAlignment { Start, Center, End, Item };
 
 enum class ScrollViewIndicatorStyle { Default, Black, White };
 
@@ -25,16 +25,7 @@ class ScrollViewMaintainVisibleContentPosition final {
   int minIndexForVisible{0};
   std::optional<int> autoscrollToTopThreshold{};
 
-  bool operator==(const ScrollViewMaintainVisibleContentPosition &rhs) const
-  {
-    return std::tie(this->minIndexForVisible, this->autoscrollToTopThreshold) ==
-        std::tie(rhs.minIndexForVisible, rhs.autoscrollToTopThreshold);
-  }
-
-  bool operator!=(const ScrollViewMaintainVisibleContentPosition &rhs) const
-  {
-    return !(*this == rhs);
-  }
+  bool operator==(const ScrollViewMaintainVisibleContentPosition &rhs) const = default;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/scrollview/tests/ScrollViewTest.cpp

@@ -5,10 +5,90 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
+#include <react/renderer/components/scrollview/ScrollViewState.h>
 
 #include <gtest/gtest.h>
 
-TEST(ScrollViewTest, testSomething) {
-  // TODO
+namespace facebook::react {
+
+TEST(ScrollViewStateTest, defaultConstructor) {
+  ScrollViewState state;
+
+  EXPECT_EQ(state.contentOffset.x, 0);
+  EXPECT_EQ(state.contentOffset.y, 0);
+  EXPECT_EQ(state.scrollAwayPaddingTop, 0);
+  EXPECT_FALSE(state.disableViewCulling);
+}
+
+TEST(ScrollViewStateTest, parameterizedConstructor) {
+  Point contentOffset{.x = 10.0f, .y = 20.0f};
+  Rect contentBoundingRect{
+      .origin = {.x = 0.0f, .y = 0.0f},
+      .size = {.width = 100.0f, .height = 200.0f}};
+  int scrollAwayPaddingTop = 5;
+
+  ScrollViewState state(
+      contentOffset, contentBoundingRect, scrollAwayPaddingTop);
+
+  EXPECT_EQ(state.contentOffset.x, 10.0f);
+  EXPECT_EQ(state.contentOffset.y, 20.0f);
+  EXPECT_EQ(state.scrollAwayPaddingTop, 5);
+  EXPECT_FALSE(state.disableViewCulling);
 }
+
+TEST(ScrollViewStateTest, getContentSize) {
+  Point contentOffset{.x = 0.0f, .y = 0.0f};
+  Rect contentBoundingRect{
+      .origin = {.x = 0.0f, .y = 0.0f},
+      .size = {.width = 150.0f, .height = 300.0f}};
+  int scrollAwayPaddingTop = 0;
+
+  ScrollViewState state(
+      contentOffset, contentBoundingRect, scrollAwayPaddingTop);
+
+  Size contentSize = state.getContentSize();
+  EXPECT_EQ(contentSize.width, 150.0f);
+  EXPECT_EQ(contentSize.height, 300.0f);
+}
+
+TEST(ScrollViewStateTest, disableViewCulling) {
+  ScrollViewState state;
+
+  // Default should be false
+  EXPECT_FALSE(state.disableViewCulling);
+
+  // Can be set to true
+  state.disableViewCulling = true;
+  EXPECT_TRUE(state.disableViewCulling);
+}
+
+TEST(ScrollViewStateTest, contentOffsetWithNegativeValues) {
+  Point contentOffset{.x = -10.0f, .y = -20.0f};
+  Rect contentBoundingRect{
+      .origin = {.x = 0.0f, .y = 0.0f},
+      .size = {.width = 100.0f, .height = 200.0f}};
+  int scrollAwayPaddingTop = 0;
+
+  ScrollViewState state(
+      contentOffset, contentBoundingRect, scrollAwayPaddingTop);
+
+  EXPECT_EQ(state.contentOffset.x, -10.0f);
+  EXPECT_EQ(state.contentOffset.y, -20.0f);
+}
+
+TEST(ScrollViewStateTest, zeroSizeContentBoundingRect) {
+  Point contentOffset{.x = 0.0f, .y = 0.0f};
+  Rect contentBoundingRect{
+      .origin = {.x = 0.0f, .y = 0.0f},
+      .size = {.width = 0.0f, .height = 0.0f}};
+  int scrollAwayPaddingTop = 0;
+
+  ScrollViewState state(
+      contentOffset, contentBoundingRect, scrollAwayPaddingTop);
+
+  Size contentSize = state.getContentSize();
+  EXPECT_EQ(contentSize.width, 0.0f);
+  EXPECT_EQ(contentSize.height, 0.0f);
+}
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
+#include <react/utils/ContextContainer.h>
+
+namespace facebook::react {
+
+constexpr const char *const TextLayoutManagerKey = "TextLayoutManager";
+
+template <typename ShadowNodeT>
+class BaseParagraphComponentDescriptor : public ConcreteComponentDescriptor<ShadowNodeT> {
+ public:
+  explicit BaseParagraphComponentDescriptor(const ComponentDescriptorParameters &parameters)
+      : ConcreteComponentDescriptor<ShadowNodeT>(parameters),
+        textLayoutManager_(getManagerByName<TextLayoutManager>(this->contextContainer_, TextLayoutManagerKey))
+  {
+  }
+
+  ComponentName getComponentName() const override
+  {
+    return ShadowNodeT::Name();
+  }
+
+ protected:
+  void adopt(ShadowNode &shadowNode) const override
+  {
+    ConcreteComponentDescriptor<ShadowNodeT>::adopt(shadowNode);
+
+    auto &paragraphShadowNode = static_cast<ShadowNodeT &>(shadowNode);
+
+    // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content
+    // and communicate text rendering metrics to mounting layer.
+    paragraphShadowNode.setTextLayoutManager(textLayoutManager_);
+  }
+
+ private:
+  // Every `ParagraphShadowNode` has a reference to a shared `TextLayoutManager`
+  const std::shared_ptr<const TextLayoutManager> textLayoutManager_;
+};
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/text/BaseTextProps.cpp

@@ -380,19 +380,19 @@ void BaseTextProps::appendTextAttributesProps(
   if (textAttributes.fontWeight != oldProps->textAttributes.fontWeight) {
     result["fontWeight"] = textAttributes.fontWeight.has_value()
         ? toString(textAttributes.fontWeight.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.fontStyle != oldProps->textAttributes.fontStyle) {
     result["fontStyle"] = textAttributes.fontStyle.has_value()
         ? toString(textAttributes.fontStyle.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.fontVariant != oldProps->textAttributes.fontVariant) {
     result["fontVariant"] = textAttributes.fontVariant.has_value()
         ? toString(textAttributes.fontVariant.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.allowFontScaling !=
@@ -412,7 +412,7 @@ void BaseTextProps::appendTextAttributesProps(
       oldProps->textAttributes.dynamicTypeRamp) {
     result["dynamicTypeRamp"] = textAttributes.dynamicTypeRamp.has_value()
         ? toString(textAttributes.dynamicTypeRamp.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (!floatEquality(
@@ -424,7 +424,7 @@ void BaseTextProps::appendTextAttributesProps(
   if (textAttributes.textTransform != oldProps->textAttributes.textTransform) {
     result["textTransform"] = textAttributes.textTransform.has_value()
         ? toString(textAttributes.textTransform.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (!floatEquality(
@@ -435,7 +435,7 @@ void BaseTextProps::appendTextAttributesProps(
   if (textAttributes.alignment != oldProps->textAttributes.alignment) {
     result["textAlign"] = textAttributes.alignment.has_value()
         ? toString(textAttributes.alignment.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.baseWritingDirection !=
@@ -443,7 +443,7 @@ void BaseTextProps::appendTextAttributesProps(
     result["baseWritingDirection"] =
         textAttributes.baseWritingDirection.has_value()
         ? toString(textAttributes.baseWritingDirection.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.lineBreakStrategy !=
@@ -451,13 +451,13 @@ void BaseTextProps::appendTextAttributesProps(
     result["lineBreakStrategyIOS"] =
         textAttributes.lineBreakStrategy.has_value()
         ? toString(textAttributes.lineBreakStrategy.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.lineBreakMode != oldProps->textAttributes.lineBreakMode) {
     result["lineBreakModeIOS"] = textAttributes.lineBreakMode.has_value()
         ? toString(textAttributes.lineBreakMode.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.textDecorationColor !=
@@ -470,7 +470,7 @@ void BaseTextProps::appendTextAttributesProps(
     result["textDecorationLine"] =
         textAttributes.textDecorationLineType.has_value()
         ? toString(textAttributes.textDecorationLineType.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.textDecorationStyle !=
@@ -478,14 +478,14 @@ void BaseTextProps::appendTextAttributesProps(
     result["textDecorationStyle"] =
         textAttributes.textDecorationStyle.has_value()
         ? toString(textAttributes.textDecorationStyle.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.textShadowOffset !=
       oldProps->textAttributes.textShadowOffset) {
     result["textShadowOffset"] = textAttributes.textShadowOffset.has_value()
         ? toDynamic(textAttributes.textShadowOffset.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (!floatEquality(
@@ -515,13 +515,13 @@ void BaseTextProps::appendTextAttributesProps(
       oldProps->textAttributes.accessibilityRole) {
     result["accessibilityRole"] = textAttributes.accessibilityRole.has_value()
         ? toString(textAttributes.accessibilityRole.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (textAttributes.role != oldProps->textAttributes.role) {
     result["role"] = textAttributes.role.has_value()
         ? toString(textAttributes.role.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (!floatEquality(

package/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h

@@ -7,41 +7,16 @@
 
 #pragma once
 
+#include <react/renderer/components/text/BaseParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/ParagraphShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
-#include <react/utils/ContextContainer.h>
 
 namespace facebook::react {
-
-extern const char TextLayoutManagerKey[];
-
 /*
  * Descriptor for <Paragraph> component.
  */
-class ParagraphComponentDescriptor final : public ConcreteComponentDescriptor<ParagraphShadowNode> {
+class ParagraphComponentDescriptor final : public BaseParagraphComponentDescriptor<ParagraphShadowNode> {
  public:
-  explicit ParagraphComponentDescriptor(const ComponentDescriptorParameters &parameters)
-      : ConcreteComponentDescriptor<ParagraphShadowNode>(parameters),
-        textLayoutManager_(getManagerByName<TextLayoutManager>(contextContainer_, TextLayoutManagerKey))
-  {
-  }
-
- protected:
-  void adopt(ShadowNode &shadowNode) const override
-  {
-    ConcreteComponentDescriptor::adopt(shadowNode);
-
-    auto &paragraphShadowNode = static_cast<ParagraphShadowNode &>(shadowNode);
-
-    // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content
-    // and communicate text rendering metrics to mounting layer.
-    paragraphShadowNode.setTextLayoutManager(textLayoutManager_);
-  }
-
- private:
-  // Every `ParagraphShadowNode` has a reference to a shared `TextLayoutManager`
-  const std::shared_ptr<const TextLayoutManager> textLayoutManager_;
+  using BaseParagraphComponentDescriptor::BaseParagraphComponentDescriptor;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp

@@ -144,7 +144,7 @@ void ParagraphShadowNode::setTextLayoutManager(
 template <typename ParagraphStateT>
 void ParagraphShadowNode::updateStateIfNeeded(
     const Content& content,
-    const MeasuredPreparedLayout& layout) {
+    const MeasuredPreparedTextLayout& layout) {
   ensureUnsealed();
 
   auto& state = static_cast<const ParagraphStateT&>(getStateData());
@@ -182,10 +182,10 @@ void ParagraphShadowNode::updateStateIfNeeded(const Content& content) {
           textLayoutManager_});
 }
 
-MeasuredPreparedLayout* ParagraphShadowNode::findUsableLayout() {
-  MeasuredPreparedLayout* ret = nullptr;
+MeasuredPreparedTextLayout* ParagraphShadowNode::findUsableLayout() {
+  MeasuredPreparedTextLayout* ret = nullptr;
 
-  if constexpr (TextLayoutManagerExtended::supportsPreparedLayout()) {
+  if constexpr (TextLayoutManagerExtended::supportsPreparedTextLayout()) {
     // We consider the layout to be reusable, if our content measurement,
     // combined with padding/border (not snapped) exactly corresponds to the
     // measurement of the node, before layout rounding. We may not find a
@@ -222,7 +222,7 @@ Size ParagraphShadowNode::rawContentSize() {
 Size ParagraphShadowNode::measureContent(
     const LayoutContext& layoutContext,
     const LayoutConstraints& layoutConstraints) const {
-  if constexpr (TextLayoutManagerExtended::supportsPreparedLayout()) {
+  if constexpr (TextLayoutManagerExtended::supportsPreparedTextLayout()) {
     for (const auto& layout : measuredLayouts_) {
       if (layout.layoutConstraints == layoutConstraints) {
         return layout.measurement.size;
@@ -238,7 +238,7 @@ Size ParagraphShadowNode::measureContent(
       .surfaceId = getSurfaceId(),
   };
 
-  if constexpr (TextLayoutManagerExtended::supportsPreparedLayout()) {
+  if constexpr (TextLayoutManagerExtended::supportsPreparedTextLayout()) {
     if (ReactNativeFeatureFlags::enablePreparedTextLayout()) {
       TextLayoutManagerExtended tme(*textLayoutManager_);
 
@@ -251,12 +251,12 @@ Size ParagraphShadowNode::measureContent(
           preparedLayout, textLayoutContext, layoutConstraints);
 
       measuredLayouts_.push_back(
-          MeasuredPreparedLayout{
+          MeasuredPreparedTextLayout{
               .layoutConstraints = layoutConstraints,
               .measurement = measurement,
-              // PreparedLayout is not trivially copyable on all platforms
+              // PreparedTextLayout is not trivially copyable on all platforms
               // NOLINTNEXTLINE(performance-move-const-arg)
-              .preparedLayout = std::move(preparedLayout)});
+              .preparedTextLayout = std::move(preparedLayout)});
       assert_valid_size(measurement.size, layoutConstraints);
       return measurement.size;
     }
@@ -316,7 +316,7 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   auto measuredLayout = findUsableLayout();
 
   if constexpr (
-      TextLayoutManagerExtended::supportsPreparedLayout() &&
+      TextLayoutManagerExtended::supportsPreparedTextLayout() &&
       std::is_constructible_v<
           ParagraphState,
           decltype(content.attributedString),

package/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h

@@ -26,7 +26,7 @@ extern const char ParagraphComponentName[];
  * containing and displaying text. Text content is represented as nested <Text>
  * and <RawText> components.
  */
-class ParagraphShadowNode final
+class ParagraphShadowNode
     : public ConcreteViewShadowNode<ParagraphComponentName, ParagraphProps, ParagraphEventEmitter, ParagraphState>,
       public BaseTextShadowNode {
  public:
@@ -106,7 +106,7 @@ class ParagraphShadowNode final
    * `TextLayoutManager`) if needed.
    */
   template <typename ParagraphStateT>
-  void updateStateIfNeeded(const Content &content, const MeasuredPreparedLayout &layout);
+  void updateStateIfNeeded(const Content &content, const MeasuredPreparedTextLayout &layout);
 
   /*
    * Creates a `State` object (with `AttributedText` and
@@ -118,7 +118,7 @@ class ParagraphShadowNode final
    * Returns any previously prepared layout, generated for measurement, which
    * may be used, given the currently assigned layout to the ShadowNode
    */
-  MeasuredPreparedLayout *findUsableLayout();
+  MeasuredPreparedTextLayout *findUsableLayout();
 
   /**
    * Returns the final measure of the content frame, before layout rounding
@@ -136,7 +136,7 @@ class ParagraphShadowNode final
    * Intermediate layout results generated during measurement, that may be
    * reused by the platform.
    */
-  mutable std::vector<MeasuredPreparedLayout> measuredLayouts_;
+  mutable std::vector<MeasuredPreparedTextLayout> measuredLayouts_;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/text/SelectableParagraphComponentDescriptor.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/text/BaseParagraphComponentDescriptor.h>
+#include <react/renderer/components/text/SelectableParagraphShadowNode.h>
+
+namespace facebook::react {
+/*
+ * Descriptor for <SelectableParagraph> component, which may render to a
+ * different native view than <Paragraph>.
+ */
+class SelectableParagraphComponentDescriptor final
+    : public BaseParagraphComponentDescriptor<SelectableParagraphShadowNode> {
+ public:
+  using BaseParagraphComponentDescriptor::BaseParagraphComponentDescriptor;
+};
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/text/SelectableParagraphShadowNode.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/text/ParagraphShadowNode.h>
+
+namespace facebook::react {
+
+/*
+ * ShadowNode for selectable Paragraph components, which may map to different native component than Paragraph.
+ */
+class SelectableParagraphShadowNode : public ParagraphShadowNode {
+ public:
+  using ParagraphShadowNode::ParagraphShadowNode;
+
+  static constexpr ComponentName Name()
+  {
+    return "SelectableParagraph";
+  }
+
+  static ComponentHandle Handle()
+  {
+    return ComponentHandle(Name());
+  }
+};
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.cpp

@@ -160,7 +160,7 @@ folly::dynamic HostPlatformParagraphProps::getDiffProps(
     result["textAlignVertical"] =
         paragraphAttributes.textAlignVertical.has_value()
         ? toString(paragraphAttributes.textAlignVertical.value())
-        : nullptr;
+        : folly::dynamic(nullptr);
   }
 
   if (isSelectable != oldProps->isSelectable) {

package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.cpp

@@ -25,7 +25,7 @@ MapBuffer ParagraphState::getMapBuffer() const {
 }
 
 jni::local_ref<jobject> ParagraphState::getJNIReference() const {
-  return jni::make_local(measuredLayout.preparedLayout.get());
+  return jni::make_local(measuredLayout.preparedTextLayout.get());
 }
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h

@@ -55,13 +55,13 @@ class ParagraphState final {
   /**
    * A fully prepared representation of a text layout to mount
    */
-  MeasuredPreparedLayout measuredLayout;
+  MeasuredPreparedTextLayout measuredLayout;
 
   ParagraphState(
       AttributedString attributedString,
       ParagraphAttributes paragraphAttributes,
       std::weak_ptr<const TextLayoutManager> layoutManager,
-      MeasuredPreparedLayout measuredLayout)
+      MeasuredPreparedTextLayout measuredLayout)
       : attributedString(std::move(attributedString)),
         paragraphAttributes(std::move(paragraphAttributes)),
         layoutManager(std::move(layoutManager)),