react-native-tvos 0.73.7-1 → 0.74.0-0

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

@@ -13,10 +13,9 @@
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/components/view/ViewShadowNode.h>
 #include <react/renderer/components/view/conversions.h>
-#include <react/renderer/core/TraitCast.h>
 #include <react/renderer/graphics/rounding.h>
 #include <react/renderer/telemetry/TransactionTelemetry.h>
-#include <react/utils/CoreFeatures.h>
+#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
 
 #include "ParagraphState.h"
 
@@ -30,13 +29,14 @@ ParagraphShadowNode::ParagraphShadowNode(
     const ShadowNode& sourceShadowNode,
     const ShadowNodeFragment& fragment)
     : ConcreteViewShadowNode(sourceShadowNode, fragment) {
-  if (CoreFeatures::enableCleanParagraphYogaNode) {
-    if (!fragment.children && !fragment.props) {
-      // This ParagraphShadowNode was cloned but did not change
-      // in a way that affects its layout. Let's mark it clean
-      // to stop Yoga from traversing it.
-      cleanLayout();
-    }
+  auto& sourceParagraphShadowNode =
+      dynamic_cast<const ParagraphShadowNode&>(sourceShadowNode);
+  if (!fragment.children && !fragment.props &&
+      sourceParagraphShadowNode.getIsLayoutClean()) {
+    // This ParagraphShadowNode was cloned but did not change
+    // in a way that affects its layout. Let's mark it clean
+    // to stop Yoga from traversing it.
+    cleanLayout();
   }
 }
 
@@ -83,7 +83,7 @@ Content ParagraphShadowNode::getContentWithMeasuredAttachments(
 
   for (const auto& attachment : content.attachments) {
     auto laytableShadowNode =
-        traitCast<const LayoutableShadowNode*>(attachment.shadowNode);
+        dynamic_cast<const LayoutableShadowNode*>(attachment.shadowNode);
 
     if (laytableShadowNode == nullptr) {
       continue;
@@ -152,9 +152,15 @@ Size ParagraphShadowNode::measureContent(
     attributedString.appendFragment({string, textAttributes, {}});
   }
 
+  TextLayoutContext textLayoutContext{};
+  textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
   return getStateData()
       .paragraphLayoutManager
-      .measure(attributedString, content.paragraphAttributes, layoutConstraints)
+      .measure(
+          attributedString,
+          content.paragraphAttributes,
+          textLayoutContext,
+          layoutConstraints)
       .size;
 }
 
@@ -171,8 +177,13 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
 
   updateStateIfNeeded(content);
 
+  TextLayoutContext textLayoutContext{};
+  textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
   auto measurement = getStateData().paragraphLayoutManager.measure(
-      content.attributedString, content.paragraphAttributes, layoutConstraints);
+      content.attributedString,
+      content.paragraphAttributes,
+      textLayoutContext,
+      layoutConstraints);
 
   if (getConcreteProps().onTextLayout) {
     auto linesMeasurements = getStateData().paragraphLayoutManager.measureLines(
@@ -201,7 +212,7 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   for (size_t i = 0; i < content.attachments.size(); i++) {
     auto& attachment = content.attachments.at(i);
 
-    if (traitCast<const LayoutableShadowNode*>(attachment.shadowNode) ==
+    if (dynamic_cast<const LayoutableShadowNode*>(attachment.shadowNode) ==
         nullptr) {
       // Not a layoutable `ShadowNode`, no need to lay it out.
       continue;
@@ -219,7 +230,7 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
         static_cast<ParagraphShadowNode*>(paragraphOwningShadowNode.get());
 
     auto& layoutableShadowNode =
-        traitCast<LayoutableShadowNode&>(*clonedShadowNode);
+        dynamic_cast<LayoutableShadowNode&>(*clonedShadowNode);
 
     auto attachmentFrame = measurement.attachments[i].frame;
     auto attachmentSize = roundToPixel<&ceil>(

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

@@ -41,7 +41,6 @@ class ParagraphShadowNode final : public ConcreteViewShadowNode<
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
-    traits.set(ShadowNodeTraits::Trait::TextKind);
     traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
 
 #ifdef ANDROID

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

@@ -26,14 +26,6 @@ class RawTextShadowNode : public ConcreteShadowNode<
                               RawTextProps> {
  public:
   using ConcreteShadowNode::ConcreteShadowNode;
-  static ShadowNodeTraits BaseTraits() {
-    auto traits = ConcreteShadowNode::BaseTraits();
-    traits.set(IdentifierTrait());
-    return traits;
-  }
-  static ShadowNodeTraits::Trait IdentifierTrait() {
-    return ShadowNodeTraits::Trait::RawText;
-  }
 };
 
 } // namespace facebook::react

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

@@ -29,19 +29,12 @@ class TextShadowNode : public ConcreteShadowNode<
  public:
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteShadowNode::BaseTraits();
-
 #ifdef ANDROID
     traits.set(ShadowNodeTraits::Trait::FormsView);
 #endif
-    traits.set(IdentifierTrait());
-
     return traits;
   }
 
-  static ShadowNodeTraits::Trait IdentifierTrait() {
-    return ShadowNodeTraits::Trait::Text;
-  }
-
   using ConcreteShadowNode::ConcreteShadowNode;
 
 #ifdef ANDROID

package/ReactCommon/react/renderer/components/textinput/CMakeLists.txt

@@ -12,15 +12,14 @@ add_compile_options(
         -std=c++20
         -Wall
         -Wpedantic
-        -Wno-gnu-zero-variadic-macro-arguments
         -DLOG_TAG=\"Fabric\")
 
-file(GLOB rrc_textinput_SRC CONFIGURE_DEPENDS androidtextinput/react/renderer/components/androidtextinput/*.cpp)
-add_library(rrc_textinput SHARED ${rrc_textinput_SRC})
+file(GLOB rrc_textinput_SRC CONFIGURE_DEPENDS platform/android/react/renderer/components/androidtextinput/*.cpp)
+add_library(rrc_textinput STATIC ${rrc_textinput_SRC})
 
 target_include_directories(rrc_textinput
         PUBLIC
-          ${CMAKE_CURRENT_SOURCE_DIR}/androidtextinput/
+          ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
 )
 
 target_link_libraries(rrc_textinput

package/ReactCommon/react/renderer/components/textinput/{androidtextinput → platform/android}/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h

@@ -13,7 +13,6 @@
 
 #include <yoga/YGEnums.h>
 #include <yoga/YGValue.h>
-#include <yoga/style/CompactValue.h>
 
 #include <unordered_map>
 
@@ -40,7 +39,7 @@ class AndroidTextInputComponentDescriptor final
       const ShadowNodeFamily::Shared& family) const override {
     int surfaceId = family->getSurfaceId();
 
-    yoga::Style::Edges theme;
+    ThemePadding theme;
     // TODO: figure out RTL/start/end/left/right stuff here
     if (surfaceIdToThemePaddingMap_.find(surfaceId) !=
         surfaceIdToThemePaddingMap_.end()) {
@@ -59,11 +58,10 @@ class AndroidTextInputComponentDescriptor final
               fabricUIManager, surfaceId, defaultTextInputPaddingArray)) {
         jfloat* defaultTextInputPadding =
             env->GetFloatArrayElements(defaultTextInputPaddingArray, 0);
-        theme[YGEdgeStart] = (YGValue){defaultTextInputPadding[0], YGUnitPoint};
-        theme[YGEdgeEnd] = (YGValue){defaultTextInputPadding[1], YGUnitPoint};
-        theme[YGEdgeTop] = (YGValue){defaultTextInputPadding[2], YGUnitPoint};
-        theme[YGEdgeBottom] =
-            (YGValue){defaultTextInputPadding[3], YGUnitPoint};
+        theme.start = defaultTextInputPadding[0];
+        theme.end = defaultTextInputPadding[1];
+        theme.top = defaultTextInputPadding[2];
+        theme.bottom = defaultTextInputPadding[3];
         surfaceIdToThemePaddingMap_.emplace(std::make_pair(surfaceId, theme));
         env->ReleaseFloatArrayElements(
             defaultTextInputPaddingArray, defaultTextInputPadding, JNI_ABORT);
@@ -73,14 +71,7 @@ class AndroidTextInputComponentDescriptor final
 
     return std::make_shared<AndroidTextInputShadowNode::ConcreteState>(
         std::make_shared<const AndroidTextInputState>(AndroidTextInputState(
-            0,
-            {},
-            {},
-            {},
-            ((YGValue)theme[YGEdgeStart]).value,
-            ((YGValue)theme[YGEdgeEnd]).value,
-            ((YGValue)theme[YGEdgeTop]).value,
-            ((YGValue)theme[YGEdgeBottom]).value)),
+            0, {}, {}, {}, theme.start, theme.end, theme.top, theme.bottom)),
         family);
   }
 
@@ -99,7 +90,7 @@ class AndroidTextInputComponentDescriptor final
     int surfaceId = textInputShadowNode.getSurfaceId();
     if (surfaceIdToThemePaddingMap_.find(surfaceId) !=
         surfaceIdToThemePaddingMap_.end()) {
-      yoga::Style::Edges theme = surfaceIdToThemePaddingMap_[surfaceId];
+      const auto& theme = surfaceIdToThemePaddingMap_[surfaceId];
 
       auto& textInputProps = textInputShadowNode.getConcreteProps();
 
@@ -108,29 +99,29 @@ class AndroidTextInputComponentDescriptor final
       // TODO: T62959168 account for RTL and paddingLeft when setting default
       // paddingStart, and vice-versa with paddingRight/paddingEnd.
       // For now this assumes no RTL.
-      yoga::Style::Edges result = textInputProps.yogaStyle.padding();
+      auto& style = const_cast<yoga::Style&>(textInputProps.yogaStyle);
       bool changedPadding = false;
       if (!textInputProps.hasPadding && !textInputProps.hasPaddingStart &&
           !textInputProps.hasPaddingLeft &&
           !textInputProps.hasPaddingHorizontal) {
         changedPadding = true;
-        result[YGEdgeStart] = theme[YGEdgeStart];
+        style.setPadding(yoga::Edge::Start, yoga::value::points(theme.start));
       }
       if (!textInputProps.hasPadding && !textInputProps.hasPaddingEnd &&
           !textInputProps.hasPaddingRight &&
           !textInputProps.hasPaddingHorizontal) {
         changedPadding = true;
-        result[YGEdgeEnd] = theme[YGEdgeEnd];
+        style.setPadding(yoga::Edge::End, yoga::value::points(theme.end));
       }
       if (!textInputProps.hasPadding && !textInputProps.hasPaddingTop &&
           !textInputProps.hasPaddingVertical) {
         changedPadding = true;
-        result[YGEdgeTop] = theme[YGEdgeTop];
+        style.setPadding(yoga::Edge::Top, yoga::value::points(theme.top));
       }
       if (!textInputProps.hasPadding && !textInputProps.hasPaddingBottom &&
           !textInputProps.hasPaddingVertical) {
         changedPadding = true;
-        result[YGEdgeBottom] = theme[YGEdgeBottom];
+        style.setPadding(yoga::Edge::Bottom, yoga::value::points(theme.bottom));
       }
 
       // If the TextInput initially does not have paddingLeft or paddingStart, a
@@ -141,21 +132,18 @@ class AndroidTextInputComponentDescriptor final
       if ((textInputProps.hasPadding || textInputProps.hasPaddingLeft ||
            textInputProps.hasPaddingHorizontal) &&
           !textInputProps.hasPaddingStart) {
-        result[YGEdgeStart] = YGValueUndefined;
+        style.setPadding(yoga::Edge::Start, yoga::value::undefined());
       }
       if ((textInputProps.hasPadding || textInputProps.hasPaddingRight ||
            textInputProps.hasPaddingHorizontal) &&
           !textInputProps.hasPaddingEnd) {
-        result[YGEdgeEnd] = YGValueUndefined;
+        style.setPadding(yoga::Edge::End, yoga::value::undefined());
       }
 
       // Note that this is expensive: on every adopt, we need to set the Yoga
       // props again, which normally only happens during prop parsing. Every
       // commit, state update, etc, will incur this cost.
       if (changedPadding) {
-        // Set new props on node
-        const_cast<AndroidTextInputProps&>(textInputProps).yogaStyle.padding() =
-            result;
         // Communicate new props to Yoga part of the node
         textInputShadowNode.updateYogaProps();
       }
@@ -168,13 +156,19 @@ class AndroidTextInputComponentDescriptor final
   }
 
  private:
+  struct ThemePadding {
+    float start{};
+    float end{};
+    float top{};
+    float bottom{};
+  };
+
   // TODO T68526882: Unify with Binding::UIManagerJavaDescriptor
   constexpr static auto UIManagerJavaDescriptor =
       "com/facebook/react/fabric/FabricUIManager";
 
   SharedTextLayoutManager textLayoutManager_;
-  mutable std::unordered_map<int, yoga::Style::Edges>
-      surfaceIdToThemePaddingMap_;
+  mutable std::unordered_map<int, ThemePadding> surfaceIdToThemePaddingMap_;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/{androidtextinput → platform/android}/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp

@@ -13,13 +13,9 @@
 
 namespace facebook::react {
 
-static bool hasValue(
-    const RawProps& rawProps,
-    bool defaultValue,
-    const char* name,
-    const char* prefix,
-    const char* suffix) {
-  auto rawValue = rawProps.at(name, prefix, suffix);
+static bool
+hasValue(const RawProps& rawProps, bool defaultValue, const char* name) {
+  auto rawValue = rawProps.at(name, nullptr, nullptr);
 
   // No change to prop - use default
   if (rawValue == nullptr) {
@@ -134,6 +130,10 @@ AndroidTextInputProps::AndroidTextInputProps(
           "selectionColor",
           sourceProps.selectionColor,
           {})),
+      selectionHandleColor(CoreFeatures::enablePropIteratorSetter? sourceProps.selectionHandleColor : convertRawProp(context, rawProps,
+          "selectionHandleColor",
+          sourceProps.selectionHandleColor,
+          {})),
       value(CoreFeatures::enablePropIteratorSetter? sourceProps.value : convertRawProp(context, rawProps, "value", sourceProps.value, {})),
       defaultValue(CoreFeatures::enablePropIteratorSetter? sourceProps.defaultValue : convertRawProp(context, rawProps,
           "defaultValue",
@@ -213,47 +213,35 @@ AndroidTextInputProps::AndroidTextInputProps(
           convertRawProp(context, rawProps, sourceProps.paragraphAttributes, {})),
       // See AndroidTextInputComponentDescriptor for usage
       // TODO T63008435: can these, and this feature, be removed entirely?
-      hasPadding(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPadding : hasValue(rawProps, sourceProps.hasPadding, "", "padding", "")),
+      hasPadding(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPadding : hasValue(rawProps, sourceProps.hasPadding, "padding")),
       hasPaddingHorizontal(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingHorizontal : hasValue(
           rawProps,
           sourceProps.hasPaddingHorizontal,
-          "Horizontal",
-          "padding",
-          "")),
+          "paddingHorizontal")),
       hasPaddingVertical(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingVertical : hasValue(
           rawProps,
           sourceProps.hasPaddingVertical,
-          "Vertical",
-          "padding",
-          "")),
+          "paddingVertical")),
       hasPaddingLeft(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingLeft : hasValue(
           rawProps,
           sourceProps.hasPaddingLeft,
-          "Left",
-          "padding",
-          "")),
+          "paddingLeft")),
       hasPaddingTop(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingTop :
-          hasValue(rawProps, sourceProps.hasPaddingTop, "Top", "padding", "")),
+          hasValue(rawProps, sourceProps.hasPaddingTop, "paddingTop")),
       hasPaddingRight(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingRight : hasValue(
           rawProps,
           sourceProps.hasPaddingRight,
-          "Right",
-          "padding",
-          "")),
+          "paddingRight")),
       hasPaddingBottom(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingBottom : hasValue(
           rawProps,
           sourceProps.hasPaddingBottom,
-          "Bottom",
-          "padding",
-          "")),
+          "paddingBottom")),
       hasPaddingStart(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingStart : hasValue(
           rawProps,
           sourceProps.hasPaddingStart,
-          "Start",
-          "padding",
-          "")),
+          "paddingStart")),
       hasPaddingEnd(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingEnd :
-          hasValue(rawProps, sourceProps.hasPaddingEnd, "End", "padding", "")) {
+          hasValue(rawProps, sourceProps.hasPaddingEnd, "paddingEnd")) {
 }
 
 void AndroidTextInputProps::setProp(
@@ -347,6 +335,7 @@ void AndroidTextInputProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(placeholderTextColor);
     RAW_SET_PROP_SWITCH_CASE_BASIC(secureTextEntry);
     RAW_SET_PROP_SWITCH_CASE_BASIC(selectionColor);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(selectionHandleColor);
     RAW_SET_PROP_SWITCH_CASE_BASIC(defaultValue);
     RAW_SET_PROP_SWITCH_CASE_BASIC(selectTextOnFocus);
     RAW_SET_PROP_SWITCH_CASE_BASIC(submitBehavior);
@@ -446,6 +435,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["placeholderTextColor"] = toAndroidRepr(placeholderTextColor);
   props["secureTextEntry"] = secureTextEntry;
   props["selectionColor"] = toAndroidRepr(selectionColor);
+  props["selectionHandleColor"] = toAndroidRepr(selectionHandleColor);
   props["value"] = value;
   props["defaultValue"] = defaultValue;
   props["selectTextOnFocus"] = selectTextOnFocus;

package/ReactCommon/react/renderer/components/textinput/{androidtextinput → platform/android}/react/renderer/components/androidtextinput/AndroidTextInputProps.h

@@ -50,7 +50,6 @@ static inline std::string toString(
   return "[Object AndroidTextInputTextShadowOffsetStruct]";
 }
 
-#ifdef ANDROID
 inline folly::dynamic toDynamic(
     const AndroidTextInputTextShadowOffsetStruct& value) {
   folly::dynamic dynamicValue = folly::dynamic::object();
@@ -58,7 +57,6 @@ inline folly::dynamic toDynamic(
   dynamicValue["height"] = value.height;
   return dynamicValue;
 }
-#endif
 
 class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
  public:
@@ -102,6 +100,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
   SharedColor placeholderTextColor{};
   bool secureTextEntry{false};
   SharedColor selectionColor{};
+  SharedColor selectionHandleColor{};
   std::string value{};
   std::string defaultValue{};
   bool selectTextOnFocus{false};

package/ReactCommon/react/renderer/components/textinput/{androidtextinput → platform/android}/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp

@@ -16,6 +16,7 @@
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/core/conversions.h>
+#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
 
 #include <utility>
 
@@ -157,7 +158,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
 #pragma mark - LayoutableShadowNode
 
 Size AndroidTextInputShadowNode::measureContent(
-    const LayoutContext& /*layoutContext*/,
+    const LayoutContext& layoutContext,
     const LayoutConstraints& layoutConstraints) const {
   if (getStateData().cachedAttributedStringId != 0) {
     return textLayoutManager_
@@ -183,10 +184,13 @@ Size AndroidTextInputShadowNode::measureContent(
     return {0, 0};
   }
 
+  TextLayoutContext textLayoutContext;
+  textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
   return textLayoutManager_
       ->measure(
           AttributedStringBox{attributedString},
           getConcreteProps().paragraphAttributes,
+          textLayoutContext,
           layoutConstraints,
           nullptr)
       .size;

package/ReactCommon/react/renderer/components/textinput/{androidtextinput → platform/android}/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h

@@ -31,7 +31,6 @@ class AndroidTextInputShadowNode final : public ConcreteViewShadowNode<
  public:
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
-    traits.set(ShadowNodeTraits::Trait::TextKind);
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
     return traits;
   }

package/ReactCommon/react/renderer/components/textinput/{androidtextinput → platform/android}/react/renderer/components/androidtextinput/AndroidTextInputState.cpp

@@ -9,11 +9,8 @@
 
 #include <react/renderer/components/text/conversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
-
-#ifdef ANDROID
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
-#endif
 
 #include <utility>
 
@@ -68,7 +65,6 @@ AndroidTextInputState::AndroidTextInputState(
                                         previousState.defaultThemePaddingBottom)
                                     .getDouble()){};
 
-#ifdef ANDROID
 folly::dynamic AndroidTextInputState::getDynamic() const {
   // Java doesn't need all fields, so we don't pass them all along.
   folly::dynamic newState = folly::dynamic::object();
@@ -92,7 +88,10 @@ MapBuffer AndroidTextInputState::getMapBuffer() const {
   auto builder = MapBufferBuilder();
   // See comment in getDynamic block.
   if (cachedAttributedStringId == 0) {
-    builder.putInt(TX_STATE_KEY_MOST_RECENT_EVENT_COUNT, mostRecentEventCount);
+    // TODO truncation
+    builder.putInt(
+        TX_STATE_KEY_MOST_RECENT_EVENT_COUNT,
+        static_cast<int32_t>(mostRecentEventCount));
 
     auto attStringMapBuffer = toMapBuffer(attributedString);
     builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer);
@@ -104,6 +103,4 @@ MapBuffer AndroidTextInputState::getMapBuffer() const {
   return builder.build();
 }
 
-#endif
-
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/{androidtextinput → platform/android}/react/renderer/components/androidtextinput/AndroidTextInputState.h

@@ -7,15 +7,12 @@
 
 #pragma once
 
+#include <folly/dynamic.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
-#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
-
-#ifdef ANDROID
-#include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
-#endif
+#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
 namespace facebook::react {
 

package/ReactCommon/react/renderer/components/textinput/{iostextinput → platform/ios}/react/renderer/components/iostextinput/TextInputProps.cpp

@@ -62,6 +62,12 @@ TextInputProps::TextInputProps(
           "selectionColor",
           sourceProps.selectionColor,
           {})),
+      selectionHandleColor(convertRawProp(
+          context,
+          rawProps,
+          "selectionHandleColor",
+          sourceProps.selectionHandleColor,
+          {})),
       underlineColorAndroid(convertRawProp(
           context,
           rawProps,

package/ReactCommon/react/renderer/components/textinput/{iostextinput → platform/ios}/react/renderer/components/iostextinput/TextInputProps.h

@@ -53,6 +53,7 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
    */
   const SharedColor cursorColor{};
   const SharedColor selectionColor{};
+  const SharedColor selectionHandleColor{};
   // TODO: Rename to `tintColor` and make universal.
   const SharedColor underlineColorAndroid{};
 

package/ReactCommon/react/renderer/components/textinput/{iostextinput → platform/ios}/react/renderer/components/iostextinput/TextInputShadowNode.cpp

@@ -13,6 +13,7 @@
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/core/conversions.h>
+#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
 
 namespace facebook::react {
 
@@ -59,8 +60,11 @@ AttributedString TextInputShadowNode::getAttributedString(
       layoutContext.fontSizeMultiplier);
   auto attributedString = AttributedString{};
 
-  attributedString.appendFragment(
-      AttributedString::Fragment{getConcreteProps().text, textAttributes});
+  attributedString.appendFragment(AttributedString::Fragment{
+      .string = getConcreteProps().text,
+      .textAttributes = textAttributes,
+      // TODO: Is this really meant to be by value?
+      .parentShadowView = ShadowView{}});
 
   auto attachments = Attachments{};
   BaseTextShadowNode::buildAttributedString(
@@ -106,10 +110,13 @@ void TextInputShadowNode::updateStateIfNeeded(
 Size TextInputShadowNode::measureContent(
     const LayoutContext& layoutContext,
     const LayoutConstraints& layoutConstraints) const {
+  TextLayoutContext textLayoutContext{};
+  textLayoutContext.pointScaleFactor = layoutContext.pointScaleFactor;
   return textLayoutManager_
       ->measure(
           attributedStringBoxToMeasure(layoutContext),
           getConcreteProps().getEffectiveParagraphAttributes(),
+          textLayoutContext,
           layoutConstraints,
           nullptr)
       .size;

package/ReactCommon/react/renderer/components/textinput/{iostextinput → platform/ios}/react/renderer/components/iostextinput/TextInputShadowNode.h

@@ -34,7 +34,6 @@ class TextInputShadowNode final : public ConcreteViewShadowNode<
 
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
-    traits.set(ShadowNodeTraits::Trait::TextKind);
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
     traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
     return traits;

package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputState.cpp

@@ -0,0 +1,10 @@
+/*
+ * 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.
+ */
+
+#include "TextInputState.h"
+
+namespace facebook::react {} // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/{iostextinput → platform/ios}/react/renderer/components/iostextinput/TextInputState.h

@@ -11,12 +11,6 @@
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
-#ifdef ANDROID
-#include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
-#endif
-
 namespace facebook::react {
 
 /*
@@ -54,16 +48,6 @@ class TextInputState final {
   std::shared_ptr<const TextLayoutManager> layoutManager;
 
   size_t mostRecentEventCount{0};
-
-#ifdef ANDROID
-  TextInputState(
-      const TextInputState& previousState,
-      const folly::dynamic& data);
-
-  folly::dynamic getDynamic() const;
-
-  MapBuffer getMapBuffer() const;
-#endif
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt

@@ -12,11 +12,10 @@ add_compile_options(
         -std=c++20
         -Wall
         -Wpedantic
-        -Wno-gnu-zero-variadic-macro-arguments
         -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_unimplementedview_SRC CONFIGURE_DEPENDS *.cpp)
-add_library(rrc_unimplementedview SHARED ${rrc_unimplementedview_SRC})
+add_library(rrc_unimplementedview STATIC ${rrc_unimplementedview_SRC})
 
 target_include_directories(rrc_unimplementedview PUBLIC ${REACT_COMMON_DIR})