react-native-tvos 0.71.12-0 → 0.72.4-0rc0

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

@@ -8,8 +8,8 @@
 #include "AndroidTextInputProps.h"
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/CoreFeatures.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook::react {
 
@@ -134,8 +134,6 @@ AndroidTextInputProps::AndroidTextInputProps(
           "selectionColor",
           sourceProps.selectionColor,
           {})),
-      selection(CoreFeatures::enablePropIteratorSetter? sourceProps.selection :
-          convertRawProp(context, rawProps, "selection", sourceProps.selection, {})),
       value(CoreFeatures::enablePropIteratorSetter? sourceProps.value : convertRawProp(context, rawProps, "value", sourceProps.value, {})),
       defaultValue(CoreFeatures::enablePropIteratorSetter? sourceProps.defaultValue : convertRawProp(context, rawProps,
           "defaultValue",
@@ -269,6 +267,8 @@ void AndroidTextInputProps::setProp(
   ViewProps::setProp(context, hash, propName, value);
   BaseTextProps::setProp(context, hash, propName, value);
 
+  static auto defaults = AndroidTextInputProps{};
+
   // ParagraphAttributes has its own switch statement - to keep all
   // of these fields together, and because there are some collisions between
   // propnames parsed here and outside of ParagraphAttributes. For example,
@@ -323,55 +323,58 @@ void AndroidTextInputProps::setProp(
   }
 
   switch (hash) {
-    RAW_SET_PROP_SWITCH_CASE_BASIC(autoComplete, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(returnKeyLabel, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(numberOfLines, 0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(disableFullscreenUI, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textBreakStrategy, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(underlineColorAndroid, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImageLeft, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImagePadding, 0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(importantForAutofill, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(showSoftInputOnFocus, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(autoCapitalize, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(autoCorrect, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(autoFocus, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(allowFontScaling, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(maxFontSizeMultiplier, (Float)0.0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(editable, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(keyboardType, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(returnKeyType, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(maxLength, 0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(multiline, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(placeholder, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(placeholderTextColor, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(secureTextEntry, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(selectionColor, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(selection, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(this->value, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(defaultValue, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(selectTextOnFocus, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(submitBehavior, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(caretHidden, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(contextMenuHidden, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowColor, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowRadius, (Float)0.0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textDecorationLine, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(fontStyle, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowOffset, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(lineHeight, (Float)0.0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textTransform, {});
-    // RAW_SET_PROP_SWITCH_CASE_BASIC(color, {0}); // currently not being parsed
-    RAW_SET_PROP_SWITCH_CASE_BASIC(letterSpacing, (Float)0.0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(fontSize, (Float)0.0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textAlign, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(includeFontPadding, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(fontWeight, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(fontFamily, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(textAlignVertical, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(cursorColor, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(mostRecentEventCount, 0);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(text, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoComplete);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(returnKeyLabel);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(numberOfLines);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(disableFullscreenUI);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textBreakStrategy);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(underlineColorAndroid);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImageLeft);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImagePadding);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(importantForAutofill);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(showSoftInputOnFocus);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoCapitalize);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoCorrect);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoFocus);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(allowFontScaling);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(maxFontSizeMultiplier);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(editable);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(keyboardType);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(returnKeyType);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(maxLength);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(multiline);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(placeholder);
+    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(defaultValue);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(selectTextOnFocus);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(submitBehavior);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(caretHidden);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(contextMenuHidden);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowColor);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowRadius);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textDecorationLine);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontStyle);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowOffset);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(lineHeight);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textTransform);
+    // RAW_SET_PROP_SWITCH_CASE_BASIC(color);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(letterSpacing);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontSize);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textAlign);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(includeFontPadding);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontWeight);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontFamily);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textAlignVertical);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(cursorColor);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(mostRecentEventCount);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(text);
+
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("value"): {
+      fromRawValue(context, value, this->value, {});
+      return;
+    }
 
     // Paddings are not parsed at this level of the component (they're parsed in
     // ViewProps) but we do need to know if they're present or not. See
@@ -443,7 +446,6 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["placeholderTextColor"] = toAndroidRepr(placeholderTextColor);
   props["secureTextEntry"] = secureTextEntry;
   props["selectionColor"] = toAndroidRepr(selectionColor);
-  props["selection"] = toDynamic(selection);
   props["value"] = value;
   props["defaultValue"] = defaultValue;
   props["selectTextOnFocus"] = selectTextOnFocus;

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

@@ -12,7 +12,6 @@
 // #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/Geometry.h>
 
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/conversions.h>
@@ -28,32 +27,6 @@
 namespace facebook {
 namespace react {
 
-struct AndroidTextInputSelectionStruct {
-  int start;
-  int end;
-};
-
-static inline void fromRawValue(
-    const PropsParserContext &context,
-    const RawValue &value,
-    AndroidTextInputSelectionStruct &result) {
-  auto map = (butter::map<std::string, RawValue>)value;
-
-  auto start = map.find("start");
-  if (start != map.end()) {
-    fromRawValue(context, start->second, result.start);
-  }
-  auto end = map.find("end");
-  if (end != map.end()) {
-    fromRawValue(context, end->second, result.end);
-  }
-}
-
-static inline std::string toString(
-    const AndroidTextInputSelectionStruct &value) {
-  return "[Object AndroidTextInputSelectionStruct]";
-}
-
 struct AndroidTextInputTextShadowOffsetStruct {
   double width;
   double height;
@@ -88,13 +61,6 @@ inline folly::dynamic toDynamic(
   dynamicValue["height"] = value.height;
   return dynamicValue;
 }
-
-inline folly::dynamic toDynamic(const AndroidTextInputSelectionStruct &value) {
-  folly::dynamic dynamicValue = folly::dynamic::object();
-  dynamicValue["start"] = value.start;
-  dynamicValue["end"] = value.end;
-  return dynamicValue;
-}
 #endif
 
 class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
@@ -139,7 +105,6 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
   SharedColor placeholderTextColor{};
   bool secureTextEntry{false};
   SharedColor selectionColor{};
-  AndroidTextInputSelectionStruct selection{};
   std::string value{};
   std::string defaultValue{};
   bool selectTextOnFocus{false};

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

@@ -197,7 +197,8 @@ Size AndroidTextInputShadowNode::measureContent(
       ->measure(
           AttributedStringBox{attributedString},
           getConcreteProps().paragraphAttributes,
-          layoutConstraints)
+          layoutConstraints,
+          nullptr)
       .size;
 }
 

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

@@ -12,6 +12,8 @@ load(
     "subdir_glob",
 )
 
+oncall("react_native")
+
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
@@ -28,6 +30,7 @@ rn_xplat_cxx_library(
     exported_headers = subdir_glob(
         [
             ("", "*.h"),
+            ("react/renderer/components/iostextinput", "*.h"),
         ],
         # TODO(shergin) T26519801 Figure out better directories structure
         prefix = "react/renderer/components/iostextinput",

package/ReactCommon/react/renderer/components/textinput/iostextinput/{TextInputEventEmitter.cpp → react/renderer/components/iostextinput/TextInputEventEmitter.cpp}

@@ -36,6 +36,23 @@ static jsi::Value textInputMetricsPayload(
   return payload;
 };
 
+static jsi::Value textInputMetricsContentSizePayload(
+    jsi::Runtime &runtime,
+    TextInputMetrics const &textInputMetrics) {
+  auto payload = jsi::Object(runtime);
+
+  {
+    auto contentSize = jsi::Object(runtime);
+    contentSize.setProperty(
+        runtime, "width", textInputMetrics.contentSize.width);
+    contentSize.setProperty(
+        runtime, "height", textInputMetrics.contentSize.height);
+    payload.setProperty(runtime, "contentSize", contentSize);
+  }
+
+  return payload;
+};
+
 static jsi::Value keyPressMetricsPayload(
     jsi::Runtime &runtime,
     KeyPressMetrics const &keyPressMetrics) {
@@ -82,7 +99,8 @@ void TextInputEventEmitter::onChangeSync(
 
 void TextInputEventEmitter::onContentSizeChange(
     TextInputMetrics const &textInputMetrics) const {
-  dispatchTextInputEvent("contentSizeChange", textInputMetrics);
+  dispatchTextInputContentSizeChangeEvent(
+      "contentSizeChange", textInputMetrics);
 }
 
 void TextInputEventEmitter::onSelectionChange(
@@ -137,4 +155,16 @@ void TextInputEventEmitter::dispatchTextInputEvent(
       priority);
 }
 
+void TextInputEventEmitter::dispatchTextInputContentSizeChangeEvent(
+    std::string const &name,
+    TextInputMetrics const &textInputMetrics,
+    EventPriority priority) const {
+  dispatchEvent(
+      name,
+      [textInputMetrics](jsi::Runtime &runtime) {
+        return textInputMetricsContentSizePayload(runtime, textInputMetrics);
+      },
+      priority);
+}
+
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/textinput/iostextinput/{TextInputEventEmitter.h → react/renderer/components/iostextinput/TextInputEventEmitter.h}

@@ -54,6 +54,11 @@ class TextInputEventEmitter : public ViewEventEmitter {
       std::string const &name,
       TextInputMetrics const &textInputMetrics,
       EventPriority priority = EventPriority::AsynchronousBatched) const;
+
+  void dispatchTextInputContentSizeChangeEvent(
+      std::string const &name,
+      TextInputMetrics const &textInputMetrics,
+      EventPriority priority = EventPriority::AsynchronousBatched) const;
 };
 
 } // namespace react

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

@@ -9,8 +9,8 @@
 
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/iostextinput/propsConversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook::react {
 

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

@@ -110,7 +110,8 @@ Size TextInputShadowNode::measureContent(
       ->measure(
           attributedStringBoxToMeasure(layoutContext),
           getConcreteProps().getEffectiveParagraphAttributes(),
-          layoutConstraints)
+          layoutConstraints,
+          nullptr)
       .size;
 }
 

package/ReactCommon/react/renderer/components/textinput/iostextinput/{propsConversions.h → react/renderer/components/iostextinput/propsConversions.h}

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/debug/react_native_expect.h>
 #include <react/renderer/components/iostextinput/primitives.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
@@ -158,16 +159,16 @@ inline void fromRawValue(
         result.end = pair.second;
       } else {
         LOG(ERROR) << "Unsupported Selection map key: " << pair.first;
-        react_native_assert(false);
+        react_native_expect(false);
       }
     }
     return;
   }
 
-  react_native_assert(value.hasType<std::vector<int>>());
+  react_native_expect(value.hasType<std::vector<int>>());
   if (value.hasType<std::vector<int>>()) {
     auto array = (std::vector<int>)value;
-    react_native_assert(array.size() == 2);
+    react_native_expect(array.size() == 2);
     if (array.size() >= 2) {
       result = {array.at(0), array.at(1)};
     } else {

package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h

@@ -30,7 +30,7 @@ class UnimplementedViewComponentDescriptor final
   ComponentName getComponentName() const override;
 
   /*
-   * In addtion to base implementation, stores a component name inside cloned
+   * In addition to base implementation, stores a component name inside cloned
    * `Props` object.
    */
   Props::Shared cloneProps(

package/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h

@@ -69,9 +69,9 @@ inline static bool operator!=(
 struct AccessibilityState {
   bool disabled{false};
   bool selected{false};
-  enum { Unchecked, Checked, Mixed, None } checked{None};
   bool busy{false};
   bool expanded{false};
+  enum { Unchecked, Checked, Mixed, None } checked{None};
 };
 
 constexpr bool operator==(
@@ -124,14 +124,14 @@ constexpr bool operator!=(
   return !(rhs == lhs);
 }
 
-enum class ImportantForAccessibility {
+enum class ImportantForAccessibility : uint8_t {
   Auto,
   Yes,
   No,
   NoHideDescendants,
 };
 
-enum class AccessibilityLiveRegion {
+enum class AccessibilityLiveRegion : uint8_t {
   None,
   Polite,
   Assertive,

package/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp

@@ -192,8 +192,8 @@ AccessibilityProps::AccessibilityProps(
     AccessibilityTraits traits;
     std::string roleString;
     if (rawPropValue == nullptr || !rawPropValue->hasValue()) {
-      traits = AccessibilityTraits::None;
-      roleString = "";
+      traits = sourceProps.accessibilityTraits;
+      roleString = sourceProps.accessibilityRole;
     } else {
       fromRawValue(context, *rawPropValue, traits);
       fromRawValue(context, *rawPropValue, roleString);
@@ -208,25 +208,26 @@ void AccessibilityProps::setProp(
     RawPropsPropNameHash hash,
     const char * /*propName*/,
     RawValue const &value) {
+  static auto defaults = AccessibilityProps{};
+
   switch (hash) {
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessible, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityState, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabel, std::string{""});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabelledBy, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityHint, std::string{""});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLanguage, std::string{""});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityValue, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityActions, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityViewIsModal, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityElementsHidden, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityIgnoresInvertColors, false);
-    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityTap, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityMagicTap, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityEscape, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityAction, {});
-    RAW_SET_PROP_SWITCH_CASE_BASIC(
-        importantForAccessibility, ImportantForAccessibility::Auto);
-    RAW_SET_PROP_SWITCH_CASE(testId, "testID", std::string{""});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessible);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityState);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabel);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLabelledBy);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityHint);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityLanguage);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityValue);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityActions);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityViewIsModal);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityElementsHidden);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(accessibilityIgnoresInvertColors);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityTap);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityMagicTap);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityEscape);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(onAccessibilityAction);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(importantForAccessibility);
+    RAW_SET_PROP_SWITCH_CASE(testId, "testID");
     case CONSTEXPR_RAW_PROPS_KEY_HASH("accessibilityRole"): {
       AccessibilityTraits traits = AccessibilityTraits::None;
       std::string roleString;

package/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp

@@ -8,8 +8,6 @@
 #include "AccessibilityPropsMapBuffer.h"
 #include "AccessibilityProps.h"
 
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
-
 namespace facebook {
 namespace react {
 

package/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.h

@@ -7,12 +7,14 @@
 
 #pragma once
 
+#ifdef ANDROID
+
 #include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 
 namespace facebook {
 namespace react {
 
-#ifdef ANDROID
 constexpr MapBuffer::Key AP_ACCESSIBILITY_ACTIONS = 0;
 constexpr MapBuffer::Key AP_ACCESSIBILITY_HINT = 1;
 constexpr MapBuffer::Key AP_ACCESSIBILITY_LABEL = 2;
@@ -27,7 +29,7 @@ constexpr MapBuffer::Key AP_IMPORTANT_FOR_ACCESSIBILITY = 19;
 // AccessibilityAction values
 constexpr MapBuffer::Key ACCESSIBILITY_ACTION_NAME = 0;
 constexpr MapBuffer::Key ACCESSIBILITY_ACTION_LABEL = 1;
-#endif
 
 } // namespace react
 } // namespace facebook
+#endif

package/ReactCommon/react/renderer/components/view/BUCK

@@ -60,6 +60,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("logger:logger"),
     ],

package/ReactCommon/react/renderer/components/view/PointerEvent.h

@@ -9,7 +9,7 @@
 
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Geometry.h>
+#include <react/renderer/graphics/Point.h>
 
 namespace facebook {
 namespace react {

package/ReactCommon/react/renderer/components/view/Touch.h

@@ -9,7 +9,7 @@
 
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/Geometry.h>
+#include <react/renderer/graphics/Point.h>
 
 namespace facebook {
 namespace react {