react-native 0.0.0-201c10733 → 0.0.0-268efb102

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

@@ -34,6 +34,7 @@ class TextShadowNode : public ConcreteShadowNode<
 #ifdef ANDROID
     traits.set(ShadowNodeTraits::Trait::FormsView);
 #endif
+    traits.set(ShadowNodeTraits::Trait::Text);
 
     return traits;
   }
@@ -57,5 +58,27 @@ class TextShadowNode : public ConcreteShadowNode<
 #endif
 };
 
+template <>
+inline TextShadowNode const &traitCast<TextShadowNode const &>(
+    ShadowNode const &shadowNode) {
+  bool castable = shadowNode.getTraits().check(ShadowNodeTraits::Trait::Text);
+  react_native_assert(castable);
+  (void)castable;
+  return static_cast<TextShadowNode const &>(shadowNode);
+}
+
+template <>
+inline TextShadowNode const *traitCast<TextShadowNode const *>(
+    ShadowNode const *shadowNode) {
+  if (!shadowNode) {
+    return nullptr;
+  }
+  bool castable = shadowNode->getTraits().check(ShadowNodeTraits::Trait::Text);
+  if (!castable) {
+    return nullptr;
+  }
+  return static_cast<TextShadowNode const *>(shadowNode);
+}
+
 } // namespace react
 } // namespace facebook

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

@@ -8,6 +8,10 @@
 #include <folly/dynamic.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/text/ParagraphState.h>
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
 
 namespace facebook {
 namespace react {
@@ -21,6 +25,24 @@ inline folly::dynamic toDynamic(ParagraphState const &paragraphState) {
   newState["hash"] = newState["attributedString"]["hash"];
   return newState;
 }
+
+// constants for Text State serialization
+constexpr static Key TX_STATE_KEY_ATTRIBUTED_STRING = 0;
+constexpr static Key TX_STATE_KEY_PARAGRAPH_ATTRIBUTES = 1;
+// Used for TextInput
+constexpr static Key TX_STATE_KEY_HASH = 2;
+constexpr static Key TX_STATE_KEY_MOST_RECENT_EVENT_COUNT = 3;
+
+inline MapBuffer toMapBuffer(ParagraphState const &paragraphState) {
+  auto builder = MapBufferBuilder();
+  auto attStringMapBuffer = toMapBuffer(paragraphState.attributedString);
+  builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer);
+  auto paMapBuffer = toMapBuffer(paragraphState.paragraphAttributes);
+  builder.putMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES, paMapBuffer);
+  // TODO: Used for TextInput
+  builder.putInt(TX_STATE_KEY_HASH, 1234);
+  return builder.build();
+}
 #endif
 
 } // namespace react

package/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp

@@ -9,6 +9,7 @@
 
 #include <assert.h>
 #include <gtest/gtest.h>
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/primitives.h>
@@ -40,12 +41,14 @@ TEST(ParagraphLocalDataTest, testSomething) {
 
   auto result = toDynamic(paragraphState)["attributedString"];
 
-  assert(result["string"] == fragment.string);
+  react_native_assert(result["string"] == fragment.string);
   auto textAttribute = result["fragments"][0]["textAttributes"];
-  assert(textAttribute["foregroundColor"] == toDynamic(text.foregroundColor));
-  assert(textAttribute["opacity"] == text.opacity);
-  assert(textAttribute["fontStyle"] == toString(*text.fontStyle));
-  assert(textAttribute["fontWeight"] == toString(*text.fontWeight));
+  react_native_assert(
+      textAttribute["foregroundColor"] == toDynamic(text.foregroundColor));
+  react_native_assert(textAttribute["opacity"] == text.opacity);
+  react_native_assert(textAttribute["fontStyle"] == toString(*text.fontStyle));
+  react_native_assert(
+      textAttribute["fontWeight"] == toString(*text.fontWeight));
 }
 
 #endif

package/ReactCommon/react/renderer/components/textinput/Android.mk

@@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := react_render_components_textinput
+LOCAL_MODULE := rrc_textinput
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/*.cpp)
 
@@ -17,11 +17,11 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"
 
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_components_text libreact_render_components_image libreact_render_components_view libreact_utils
+LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -41,4 +41,6 @@ $(call import-module,react/renderer/components/image)
 $(call import-module,react/renderer/components/view)
 $(call import-module,react/renderer/components/text)
 $(call import-module,react/utils)
+$(call import-module,react/debug)
 $(call import-module,yogajni)
+$(call import-module,react/renderer/mapbuffer)

package/ReactCommon/react/renderer/components/textinput/BUCK

@@ -1,4 +1,3 @@
-load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -8,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "get_preprocessor_flags_for_build_mode",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
@@ -36,10 +36,13 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     cxx_tests = [":tests"],
+    fbandroid_deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
@@ -58,7 +61,7 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
-        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -70,6 +73,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/uimanager:uimanager"),
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/imagemanager:imagemanager"),
+        react_native_xplat_target("react/utils:utils"),
     ],
 )
 
@@ -80,7 +84,7 @@ fb_xplat_cxx_test(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h

@@ -7,14 +7,17 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include "AndroidTextInputShadowNode.h"
 
+#include <fbjni/fbjni.h>
+
 #include <yoga/CompactValue.h>
 #include <yoga/YGEnums.h>
 #include <yoga/YGValue.h>
 
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
 namespace facebook {
 namespace react {
 
@@ -76,7 +79,6 @@ class AndroidTextInputComponentDescriptor final
             {},
             {},
             {},
-            textLayoutManager_,
             ((YGValue)theme[YGEdgeStart]).value,
             ((YGValue)theme[YGEdgeEnd]).value,
             ((YGValue)theme[YGEdgeTop]).value,
@@ -85,8 +87,9 @@ class AndroidTextInputComponentDescriptor final
   }
 
  protected:
-  void adopt(UnsharedShadowNode shadowNode) const override {
-    assert(std::dynamic_pointer_cast<AndroidTextInputShadowNode>(shadowNode));
+  void adopt(ShadowNode::Unshared const &shadowNode) const override {
+    react_native_assert(
+        std::dynamic_pointer_cast<AndroidTextInputShadowNode>(shadowNode));
     auto textInputShadowNode =
         std::static_pointer_cast<AndroidTextInputShadowNode>(shadowNode);
 

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp

@@ -37,215 +37,182 @@ static bool hasValue(
 }
 
 AndroidTextInputProps::AndroidTextInputProps(
+    const PropsParserContext &context,
     const AndroidTextInputProps &sourceProps,
     const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      autoCompleteType(convertRawProp(
+    : ViewProps(context, sourceProps, rawProps),
+      BaseTextProps(context, sourceProps, rawProps),
+      autoComplete(convertRawProp(
+          context,
           rawProps,
-          "autoCompleteType",
-          sourceProps.autoCompleteType,
+          "autoComplete",
+          sourceProps.autoComplete,
           {})),
-      returnKeyLabel(convertRawProp(
-          rawProps,
+      returnKeyLabel(convertRawProp(context, rawProps,
           "returnKeyLabel",
           sourceProps.returnKeyLabel,
           {})),
-      numberOfLines(convertRawProp(
-          rawProps,
+      numberOfLines(convertRawProp(context, rawProps,
           "numberOfLines",
           sourceProps.numberOfLines,
           {0})),
-      disableFullscreenUI(convertRawProp(
-          rawProps,
+      disableFullscreenUI(convertRawProp(context, rawProps,
           "disableFullscreenUI",
           sourceProps.disableFullscreenUI,
           {false})),
-      textBreakStrategy(convertRawProp(
-          rawProps,
+      textBreakStrategy(convertRawProp(context, rawProps,
           "textBreakStrategy",
           sourceProps.textBreakStrategy,
           {})),
-      underlineColorAndroid(convertRawProp(
-          rawProps,
+      underlineColorAndroid(convertRawProp(context, rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      inlineImageLeft(convertRawProp(
-          rawProps,
+      inlineImageLeft(convertRawProp(context, rawProps,
           "inlineImageLeft",
           sourceProps.inlineImageLeft,
           {})),
-      inlineImagePadding(convertRawProp(
-          rawProps,
+      inlineImagePadding(convertRawProp(context, rawProps,
           "inlineImagePadding",
           sourceProps.inlineImagePadding,
           {0})),
-      importantForAutofill(convertRawProp(
-          rawProps,
+      importantForAutofill(convertRawProp(context, rawProps,
           "importantForAutofill",
           sourceProps.importantForAutofill,
           {})),
-      showSoftInputOnFocus(convertRawProp(
-          rawProps,
+      showSoftInputOnFocus(convertRawProp(context, rawProps,
           "showSoftInputOnFocus",
           sourceProps.showSoftInputOnFocus,
           {false})),
-      autoCapitalize(convertRawProp(
-          rawProps,
+      autoCapitalize(convertRawProp(context, rawProps,
           "autoCapitalize",
           sourceProps.autoCapitalize,
           {})),
-      autoCorrect(convertRawProp(
-          rawProps,
+      autoCorrect(convertRawProp(context, rawProps,
           "autoCorrect",
           sourceProps.autoCorrect,
           {false})),
-      autoFocus(convertRawProp(
-          rawProps,
+      autoFocus(convertRawProp(context, rawProps,
           "autoFocus",
           sourceProps.autoFocus,
           {false})),
-      allowFontScaling(convertRawProp(
-          rawProps,
+      allowFontScaling(convertRawProp(context, rawProps,
           "allowFontScaling",
           sourceProps.allowFontScaling,
           {false})),
-      maxFontSizeMultiplier(convertRawProp(
-          rawProps,
+      maxFontSizeMultiplier(convertRawProp(context, rawProps,
           "maxFontSizeMultiplier",
           sourceProps.maxFontSizeMultiplier,
           {0.0})),
       editable(
-          convertRawProp(rawProps, "editable", sourceProps.editable, {false})),
-      keyboardType(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "editable", sourceProps.editable, {false})),
+      keyboardType(convertRawProp(context, rawProps,
           "keyboardType",
           sourceProps.keyboardType,
           {})),
-      returnKeyType(convertRawProp(
-          rawProps,
+      returnKeyType(convertRawProp(context, rawProps,
           "returnKeyType",
           sourceProps.returnKeyType,
           {})),
       maxLength(
-          convertRawProp(rawProps, "maxLength", sourceProps.maxLength, {0})),
-      multiline(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "maxLength", sourceProps.maxLength, {0})),
+      multiline(convertRawProp(context, rawProps,
           "multiline",
           sourceProps.multiline,
           {false})),
       placeholder(
-          convertRawProp(rawProps, "placeholder", sourceProps.placeholder, {})),
-      placeholderTextColor(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "placeholder", sourceProps.placeholder, {})),
+      placeholderTextColor(convertRawProp(context, rawProps,
           "placeholderTextColor",
           sourceProps.placeholderTextColor,
           {})),
-      secureTextEntry(convertRawProp(
-          rawProps,
+      secureTextEntry(convertRawProp(context, rawProps,
           "secureTextEntry",
           sourceProps.secureTextEntry,
           {false})),
-      selectionColor(convertRawProp(
-          rawProps,
+      selectionColor(convertRawProp(context, rawProps,
           "selectionColor",
           sourceProps.selectionColor,
           {})),
       selection(
-          convertRawProp(rawProps, "selection", sourceProps.selection, {})),
-      value(convertRawProp(rawProps, "value", sourceProps.value, {})),
-      defaultValue(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "selection", sourceProps.selection, {})),
+      value(convertRawProp(context, rawProps, "value", sourceProps.value, {})),
+      defaultValue(convertRawProp(context, rawProps,
           "defaultValue",
           sourceProps.defaultValue,
           {})),
-      selectTextOnFocus(convertRawProp(
-          rawProps,
+      selectTextOnFocus(convertRawProp(context, rawProps,
           "selectTextOnFocus",
           sourceProps.selectTextOnFocus,
           {false})),
-      blurOnSubmit(convertRawProp(
-          rawProps,
+      blurOnSubmit(convertRawProp(context, rawProps,
           "blurOnSubmit",
           sourceProps.blurOnSubmit,
           {false})),
-      caretHidden(convertRawProp(
-          rawProps,
+      caretHidden(convertRawProp(context, rawProps,
           "caretHidden",
           sourceProps.caretHidden,
           {false})),
-      contextMenuHidden(convertRawProp(
-          rawProps,
+      contextMenuHidden(convertRawProp(context, rawProps,
           "contextMenuHidden",
           sourceProps.contextMenuHidden,
           {false})),
-      textShadowColor(convertRawProp(
-          rawProps,
+      textShadowColor(convertRawProp(context, rawProps,
           "textShadowColor",
           sourceProps.textShadowColor,
           {})),
-      textShadowRadius(convertRawProp(
-          rawProps,
+      textShadowRadius(convertRawProp(context, rawProps,
           "textShadowRadius",
           sourceProps.textShadowRadius,
           {0.0})),
-      textDecorationLine(convertRawProp(
-          rawProps,
+      textDecorationLine(convertRawProp(context, rawProps,
           "textDecorationLine",
           sourceProps.textDecorationLine,
           {})),
       fontStyle(
-          convertRawProp(rawProps, "fontStyle", sourceProps.fontStyle, {})),
-      textShadowOffset(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "fontStyle", sourceProps.fontStyle, {})),
+      textShadowOffset(convertRawProp(context, rawProps,
           "textShadowOffset",
           sourceProps.textShadowOffset,
           {})),
-      lineHeight(convertRawProp(
-          rawProps,
+      lineHeight(convertRawProp(context, rawProps,
           "lineHeight",
           sourceProps.lineHeight,
           {0.0})),
-      textTransform(convertRawProp(
-          rawProps,
+      textTransform(convertRawProp(context, rawProps,
           "textTransform",
           sourceProps.textTransform,
           {})),
-      color(convertRawProp(rawProps, "color", sourceProps.color, {0})),
-      letterSpacing(convertRawProp(
-          rawProps,
+      color(0 /*convertRawProp(context, rawProps, "color", sourceProps.color, {0})*/),
+      letterSpacing(convertRawProp(context, rawProps,
           "letterSpacing",
           sourceProps.letterSpacing,
           {0.0})),
       fontSize(
-          convertRawProp(rawProps, "fontSize", sourceProps.fontSize, {0.0})),
+          convertRawProp(context, rawProps, "fontSize", sourceProps.fontSize, {0.0})),
       textAlign(
-          convertRawProp(rawProps, "textAlign", sourceProps.textAlign, {})),
-      includeFontPadding(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "textAlign", sourceProps.textAlign, {})),
+      includeFontPadding(convertRawProp(context, rawProps,
           "includeFontPadding",
           sourceProps.includeFontPadding,
           {false})),
       fontWeight(
-          convertRawProp(rawProps, "fontWeight", sourceProps.fontWeight, {})),
+          convertRawProp(context, rawProps, "fontWeight", sourceProps.fontWeight, {})),
       fontFamily(
-          convertRawProp(rawProps, "fontFamily", sourceProps.fontFamily, {})),
-      textAlignVertical(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "fontFamily", sourceProps.fontFamily, {})),
+      textAlignVertical(convertRawProp(context, rawProps,
           "textAlignVertical",
           sourceProps.textAlignVertical,
           {})),
       cursorColor(
-          convertRawProp(rawProps, "cursorColor", sourceProps.cursorColor, {})),
-      mostRecentEventCount(convertRawProp(
-          rawProps,
+          convertRawProp(context, rawProps, "cursorColor", sourceProps.cursorColor, {})),
+      mostRecentEventCount(convertRawProp(context, rawProps,
           "mostRecentEventCount",
           sourceProps.mostRecentEventCount,
           {0})),
-      text(convertRawProp(rawProps, "text", sourceProps.text, {})),
+      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
       paragraphAttributes(
-          convertRawProp(rawProps, sourceProps.paragraphAttributes, {})),
+          convertRawProp(context, rawProps, sourceProps.paragraphAttributes, {})),
       // See AndroidTextInputComponentDescriptor for usage
       // TODO T63008435: can these, and this feature, be removed entirely?
       hasPadding(hasValue(rawProps, sourceProps.hasPadding, "", "padding", "")),
@@ -294,7 +261,7 @@ AndroidTextInputProps::AndroidTextInputProps(
 // TODO T53300085: support this in codegen; this was hand-written
 folly::dynamic AndroidTextInputProps::getDynamic() const {
   folly::dynamic props = folly::dynamic::object();
-  props["autoCompleteType"] = autoCompleteType;
+  props["autoComplete"] = autoComplete;
   props["returnKeyLabel"] = returnKeyLabel;
   props["numberOfLines"] = numberOfLines;
   props["disableFullscreenUI"] = disableFullscreenUI;
@@ -332,7 +299,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["textShadowOffset"] = toDynamic(textShadowOffset);
   props["lineHeight"] = lineHeight;
   props["textTransform"] = textTransform;
-  props["color"] = color;
+  props["color"] = toDynamic(color);
   props["letterSpacing"] = letterSpacing;
   props["fontSize"] = fontSize;
   props["textAlign"] = textAlign;

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h

@@ -16,6 +16,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -31,17 +32,18 @@ struct AndroidTextInputSelectionStruct {
 };
 
 static inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AndroidTextInputSelectionStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto start = map.find("start");
   if (start != map.end()) {
-    fromRawValue(start->second, result.start);
+    fromRawValue(context, start->second, result.start);
   }
   auto end = map.find("end");
   if (end != map.end()) {
-    fromRawValue(end->second, result.end);
+    fromRawValue(context, end->second, result.end);
   }
 }
 
@@ -56,17 +58,18 @@ struct AndroidTextInputTextShadowOffsetStruct {
 };
 
 static inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AndroidTextInputTextShadowOffsetStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto width = map.find("width");
   if (width != map.end()) {
-    fromRawValue(width->second, result.width);
+    fromRawValue(context, width->second, result.width);
   }
   auto height = map.find("height");
   if (height != map.end()) {
-    fromRawValue(height->second, result.height);
+    fromRawValue(context, height->second, result.height);
   }
 }
 
@@ -96,6 +99,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
  public:
   AndroidTextInputProps() = default;
   AndroidTextInputProps(
+      const PropsParserContext &context,
       const AndroidTextInputProps &sourceProps,
       const RawProps &rawProps);
 
@@ -103,7 +107,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
 
 #pragma mark - Props
 
-  const std::string autoCompleteType{};
+  const std::string autoComplete{};
   const std::string returnKeyLabel{};
   const int numberOfLines{0};
   const bool disableFullscreenUI{false};
@@ -141,7 +145,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
   const AndroidTextInputTextShadowOffsetStruct textShadowOffset{};
   const Float lineHeight{0.0};
   const std::string textTransform{};
-  const int color{0};
+  const SharedColor color{0};
   const Float letterSpacing{0.0};
   const Float fontSize{0.0};
   const std::string textAlign{};

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp

@@ -8,6 +8,7 @@
 #include "AndroidTextInputShadowNode.h"
 
 #include <fbjni/fbjni.h>
+#include <react/debug/react_native_assert.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
@@ -118,16 +119,10 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   auto reactTreeAttributedString = getAttributedString();
   auto const &state = getStateData();
 
-  assert(textLayoutManager_);
-  assert(
-      (!state.layoutManager || state.layoutManager == textLayoutManager_) &&
-      "`StateData` refers to a different `TextLayoutManager`");
-
   // Tree is often out of sync with the value of the TextInput.
   // This is by design - don't change the value of the TextInput in the State,
   // and therefore in Java, unless the tree itself changes.
-  if (state.reactTreeAttributedString == reactTreeAttributedString &&
-      state.layoutManager == textLayoutManager_) {
+  if (state.reactTreeAttributedString == reactTreeAttributedString) {
     return;
   }
 
@@ -162,7 +157,6 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
       getConcreteProps().paragraphAttributes,
       defaultTextAttributes,
       ShadowView(*this),
-      textLayoutManager_,
       state.defaultThemePaddingStart,
       state.defaultThemePaddingEnd,
       state.defaultThemePaddingTop,

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h

@@ -24,11 +24,11 @@ extern const char AndroidTextInputComponentName[];
 /*
  * `ShadowNode` for <AndroidTextInput> component.
  */
-class AndroidTextInputShadowNode : public ConcreteViewShadowNode<
-                                       AndroidTextInputComponentName,
-                                       AndroidTextInputProps,
-                                       AndroidTextInputEventEmitter,
-                                       AndroidTextInputState> {
+class AndroidTextInputShadowNode final : public ConcreteViewShadowNode<
+                                             AndroidTextInputComponentName,
+                                             AndroidTextInputProps,
+                                             AndroidTextInputEventEmitter,
+                                             AndroidTextInputState> {
  public:
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp

@@ -20,7 +20,6 @@ AndroidTextInputState::AndroidTextInputState(
     ParagraphAttributes const &paragraphAttributes,
     TextAttributes const &defaultTextAttributes,
     ShadowView const &defaultParentShadowView,
-    SharedTextLayoutManager const &layoutManager,
     float defaultThemePaddingStart,
     float defaultThemePaddingEnd,
     float defaultThemePaddingTop,
@@ -32,7 +31,6 @@ AndroidTextInputState::AndroidTextInputState(
       paragraphAttributes(paragraphAttributes),
       defaultTextAttributes(defaultTextAttributes),
       defaultParentShadowView(defaultParentShadowView),
-      layoutManager(layoutManager),
       defaultThemePaddingStart(defaultThemePaddingStart),
       defaultThemePaddingEnd(defaultThemePaddingEnd),
       defaultThemePaddingTop(defaultThemePaddingTop),
@@ -54,7 +52,6 @@ AndroidTextInputState::AndroidTextInputState(
       paragraphAttributes(previousState.paragraphAttributes),
       defaultTextAttributes(previousState.defaultTextAttributes),
       defaultParentShadowView(previousState.defaultParentShadowView),
-      layoutManager(previousState.layoutManager),
       defaultThemePaddingStart(data.getDefault(
                                        "themePaddingStart",
                                        previousState.defaultThemePaddingStart)