react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactCommon/react/renderer/attributedstring/conversions.h

@@ -16,6 +16,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/conversions.h>
 #include <react/renderer/core/propsConversions.h>
@@ -52,7 +53,10 @@ inline std::string toString(const EllipsizeMode &ellipsisMode) {
   return "tail";
 }
 
-inline void fromRawValue(const RawValue &value, EllipsizeMode &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    EllipsizeMode &result) {
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -92,10 +96,13 @@ inline std::string toString(const TextBreakStrategy &textBreakStrategy) {
 
   LOG(ERROR) << "Unsupported TextBreakStrategy value";
   react_native_assert(false);
-  return "simple";
+  return "highQuality";
 }
 
-inline void fromRawValue(const RawValue &value, TextBreakStrategy &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    TextBreakStrategy &result) {
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -109,17 +116,20 @@ inline void fromRawValue(const RawValue &value, TextBreakStrategy &result) {
       // sane default
       LOG(ERROR) << "Unsupported TextBreakStrategy value: " << string;
       react_native_assert(false);
-      result = TextBreakStrategy::Simple;
+      result = TextBreakStrategy::HighQuality;
     }
     return;
   }
 
   LOG(ERROR) << "Unsupported TextBreakStrategy type";
   react_native_assert(false);
-  result = TextBreakStrategy::Simple;
+  result = TextBreakStrategy::HighQuality;
 }
 
-inline void fromRawValue(const RawValue &value, FontWeight &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    FontWeight &result) {
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -165,7 +175,10 @@ inline std::string toString(const FontWeight &fontWeight) {
   return folly::to<std::string>((int)fontWeight);
 }
 
-inline void fromRawValue(const RawValue &value, FontStyle &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    FontStyle &result) {
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -206,7 +219,10 @@ inline std::string toString(const FontStyle &fontStyle) {
   return "normal";
 }
 
-inline void fromRawValue(const RawValue &value, FontVariant &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    FontVariant &result) {
   react_native_assert(value.hasType<std::vector<std::string>>());
   result = FontVariant::Default;
   if (value.hasType<std::vector<std::string>>()) {
@@ -260,7 +276,62 @@ inline std::string toString(const FontVariant &fontVariant) {
   return result;
 }
 
-inline void fromRawValue(const RawValue &value, TextAlignment &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    TextTransform &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "none") {
+      result = TextTransform::None;
+    } else if (string == "uppercase") {
+      result = TextTransform::Uppercase;
+    } else if (string == "lowercase") {
+      result = TextTransform::Lowercase;
+    } else if (string == "capitalize") {
+      result = TextTransform::Capitalize;
+    } else if (string == "unset") {
+      result = TextTransform::Unset;
+    } else {
+      LOG(ERROR) << "Unsupported TextTransform value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = TextTransform::None;
+    }
+    return;
+  }
+
+  LOG(ERROR) << "Unsupported TextTransform type";
+  react_native_assert(false);
+  // sane default for prod
+  result = TextTransform::None;
+}
+
+inline std::string toString(const TextTransform &textTransform) {
+  switch (textTransform) {
+    case TextTransform::None:
+      return "none";
+    case TextTransform::Uppercase:
+      return "uppercase";
+    case TextTransform::Lowercase:
+      return "lowercase";
+    case TextTransform::Capitalize:
+      return "capitalize";
+    case TextTransform::Unset:
+      return "unset";
+  }
+
+  LOG(ERROR) << "Unsupported TextTransform value";
+  react_native_assert(false);
+  // sane default for prod
+  return "none";
+}
+
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    TextAlignment &result) {
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -307,7 +378,10 @@ inline std::string toString(const TextAlignment &textAlignment) {
   return "auto";
 }
 
-inline void fromRawValue(const RawValue &value, WritingDirection &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    WritingDirection &result) {
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -347,6 +421,7 @@ inline std::string toString(const WritingDirection &writingDirection) {
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextDecorationLineType &result) {
   react_native_assert(value.hasType<std::string>());
@@ -398,6 +473,7 @@ inline std::string toString(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextDecorationLineStyle &result) {
   react_native_assert(value.hasType<std::string>());
@@ -441,6 +517,7 @@ inline std::string toString(
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextDecorationLinePattern &result) {
   react_native_assert(value.hasType<std::string>());
@@ -541,6 +618,8 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) {
       return "switch";
     case AccessibilityRole::Tab:
       return "tab";
+    case AccessibilityRole::TabBar:
+      return "tabbar";
     case AccessibilityRole::Tablist:
       return "tablist";
     case AccessibilityRole::Timer:
@@ -555,7 +634,10 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) {
   return "none";
 }
 
-inline void fromRawValue(const RawValue &value, AccessibilityRole &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    AccessibilityRole &result) {
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -607,6 +689,8 @@ inline void fromRawValue(const RawValue &value, AccessibilityRole &result) {
       result = AccessibilityRole::Switch;
     } else if (string == "tab") {
       result = AccessibilityRole::Tab;
+    } else if (string == "tabbar") {
+      result = AccessibilityRole::TabBar;
     } else if (string == "tablist") {
       result = AccessibilityRole::Tablist;
     } else if (string == "timer") {
@@ -628,52 +712,109 @@ inline void fromRawValue(const RawValue &value, AccessibilityRole &result) {
   result = AccessibilityRole::None;
 }
 
+inline std::string toString(const HyphenationFrequency &hyphenationFrequency) {
+  switch (hyphenationFrequency) {
+    case HyphenationFrequency::None:
+      return "none";
+    case HyphenationFrequency::Normal:
+      return "normal";
+    case HyphenationFrequency::Full:
+      return "full";
+  }
+
+  LOG(ERROR) << "Unsupported HyphenationFrequency value";
+  react_native_assert(false);
+  return "none";
+}
+
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    HyphenationFrequency &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "none") {
+      result = HyphenationFrequency::None;
+    } else if (string == "normal") {
+      result = HyphenationFrequency::Normal;
+    } else if (string == "full") {
+      result = HyphenationFrequency::Full;
+    } else {
+      // sane default
+      LOG(ERROR) << "Unsupported HyphenationFrequency value: " << string;
+      react_native_assert(false);
+      result = HyphenationFrequency::None;
+    }
+    return;
+  }
+
+  LOG(ERROR) << "Unsupported HyphenationFrequency type";
+  react_native_assert(false);
+  result = HyphenationFrequency::None;
+}
+
 inline ParagraphAttributes convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     ParagraphAttributes const &sourceParagraphAttributes,
     ParagraphAttributes const &defaultParagraphAttributes) {
   auto paragraphAttributes = ParagraphAttributes{};
 
   paragraphAttributes.maximumNumberOfLines = convertRawProp(
+      context,
       rawProps,
       "numberOfLines",
       sourceParagraphAttributes.maximumNumberOfLines,
       defaultParagraphAttributes.maximumNumberOfLines);
   paragraphAttributes.ellipsizeMode = convertRawProp(
+      context,
       rawProps,
       "ellipsizeMode",
       sourceParagraphAttributes.ellipsizeMode,
       defaultParagraphAttributes.ellipsizeMode);
   paragraphAttributes.textBreakStrategy = convertRawProp(
+      context,
       rawProps,
       "textBreakStrategy",
       sourceParagraphAttributes.textBreakStrategy,
       defaultParagraphAttributes.textBreakStrategy);
   paragraphAttributes.adjustsFontSizeToFit = convertRawProp(
+      context,
       rawProps,
       "adjustsFontSizeToFit",
       sourceParagraphAttributes.adjustsFontSizeToFit,
       defaultParagraphAttributes.adjustsFontSizeToFit);
   paragraphAttributes.minimumFontSize = convertRawProp(
+      context,
       rawProps,
       "minimumFontSize",
       sourceParagraphAttributes.minimumFontSize,
       defaultParagraphAttributes.minimumFontSize);
   paragraphAttributes.maximumFontSize = convertRawProp(
+      context,
       rawProps,
       "maximumFontSize",
       sourceParagraphAttributes.maximumFontSize,
       defaultParagraphAttributes.maximumFontSize);
   paragraphAttributes.includeFontPadding = convertRawProp(
+      context,
       rawProps,
       "includeFontPadding",
       sourceParagraphAttributes.includeFontPadding,
       defaultParagraphAttributes.includeFontPadding);
+  paragraphAttributes.android_hyphenationFrequency = convertRawProp(
+      context,
+      rawProps,
+      "android_hyphenationFrequency",
+      sourceParagraphAttributes.android_hyphenationFrequency,
+      defaultParagraphAttributes.android_hyphenationFrequency);
 
   return paragraphAttributes;
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     RawValue const &value,
     AttributedString::Range &result) {
   auto map = (better::map<std::string, int>)value;
@@ -703,6 +844,9 @@ inline folly::dynamic toDynamic(
   values("textBreakStrategy", toString(paragraphAttributes.textBreakStrategy));
   values("adjustsFontSizeToFit", paragraphAttributes.adjustsFontSizeToFit);
   values("includeFontPadding", paragraphAttributes.includeFontPadding);
+  values(
+      "android_hyphenationFrequency",
+      toString(paragraphAttributes.android_hyphenationFrequency));
 
   return values;
 }
@@ -765,6 +909,9 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
   if (!std::isnan(textAttributes.letterSpacing)) {
     _textAttributes("letterSpacing", textAttributes.letterSpacing);
   }
+  if (textAttributes.textTransform.hasValue()) {
+    _textAttributes("textTransform", toString(*textAttributes.textTransform));
+  }
   if (!std::isnan(textAttributes.lineHeight)) {
     _textAttributes("lineHeight", textAttributes.lineHeight);
   }
@@ -897,6 +1044,7 @@ constexpr static Key PA_KEY_ELLIPSIZE_MODE = 1;
 constexpr static Key PA_KEY_TEXT_BREAK_STRATEGY = 2;
 constexpr static Key PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
 constexpr static Key PA_KEY_INCLUDE_FONT_PADDING = 4;
+constexpr static Key PA_KEY_HYPHENATION_FREQUENCY = 5;
 
 inline MapBuffer toMapBuffer(const ParagraphAttributes &paragraphAttributes) {
   auto builder = MapBufferBuilder();
@@ -911,6 +1059,9 @@ inline MapBuffer toMapBuffer(const ParagraphAttributes &paragraphAttributes) {
       PA_KEY_ADJUST_FONT_SIZE_TO_FIT, paragraphAttributes.adjustsFontSizeToFit);
   builder.putBool(
       PA_KEY_INCLUDE_FONT_PADDING, paragraphAttributes.includeFontPadding);
+  builder.putString(
+      PA_KEY_HYPHENATION_FREQUENCY,
+      toString(paragraphAttributes.android_hyphenationFrequency));
 
   return builder.build();
 }

package/ReactCommon/react/renderer/attributedstring/primitives.h

@@ -53,7 +53,11 @@ enum class EllipsizeMode {
   Middle // Truncate middle of line: "ab...yz".
 };
 
-enum class TextBreakStrategy { Simple, Balanced, HighQuality };
+enum class TextBreakStrategy {
+  Simple, // Simple strategy.
+  HighQuality, // High-quality strategy, including hyphenation.
+  Balanced // Balances line lengths.
+};
 
 enum class TextAlignment {
   Natural, // Indicates the default alignment for script.
@@ -112,11 +116,26 @@ enum class AccessibilityRole {
   Spinbutton,
   Switch,
   Tab,
+  TabBar,
   Tablist,
   Timer,
   Toolbar,
 };
 
+enum class TextTransform {
+  None,
+  Uppercase,
+  Lowercase,
+  Capitalize,
+  Unset,
+};
+
+enum class HyphenationFrequency {
+  None, // No hyphenation.
+  Normal, // Less frequent hyphenation.
+  Full // Standard amount of hyphenation.
+};
+
 } // namespace react
 } // namespace facebook
 
@@ -197,4 +216,18 @@ struct hash<facebook::react::AccessibilityRole> {
     return hash<int>()(static_cast<int>(v));
   }
 };
+
+template <>
+struct hash<facebook::react::TextTransform> {
+  size_t operator()(const facebook::react::TextTransform &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
+template <>
+struct hash<facebook::react::HyphenationFrequency> {
+  size_t operator()(const facebook::react::HyphenationFrequency &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
 } // namespace std

package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp

@@ -68,8 +68,8 @@ ComponentDescriptorProviderRegistry::createComponentDescriptorRegistry(
     ComponentDescriptorParameters const &parameters) const {
   std::shared_lock<better::shared_mutex> lock(mutex_);
 
-  auto registry =
-      std::make_shared<ComponentDescriptorRegistry const>(parameters, *this);
+  auto registry = std::make_shared<ComponentDescriptorRegistry const>(
+      parameters, *this, parameters.contextContainer);
 
   for (auto const &pair : componentDescriptorProviders_) {
     registry->add(pair.second);

package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h

@@ -12,6 +12,7 @@
 #include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 #include <react/renderer/core/ComponentDescriptor.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {

package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp

@@ -11,6 +11,7 @@
 
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 
 namespace facebook {
@@ -18,8 +19,11 @@ namespace react {
 
 ComponentDescriptorRegistry::ComponentDescriptorRegistry(
     ComponentDescriptorParameters const &parameters,
-    ComponentDescriptorProviderRegistry const &providerRegistry)
-    : parameters_(parameters), providerRegistry_(providerRegistry) {}
+    ComponentDescriptorProviderRegistry const &providerRegistry,
+    ContextContainer::Shared contextContainer)
+    : parameters_(parameters),
+      providerRegistry_(providerRegistry),
+      contextContainer_(contextContainer) {}
 
 void ComponentDescriptorRegistry::add(
     ComponentDescriptorProvider componentDescriptorProvider) const {
@@ -60,9 +64,9 @@ ComponentDescriptor const &ComponentDescriptorRegistry::at(
 
   auto it = _registryByName.find(unifiedComponentName);
   if (it == _registryByName.end()) {
-    mutex_.unlock_shared();
+    lock.unlock();
     providerRegistry_.request(unifiedComponentName.c_str());
-    mutex_.lock_shared();
+    lock.lock();
 
     it = _registryByName.find(unifiedComponentName);
 
@@ -132,8 +136,10 @@ SharedShadowNode ComponentDescriptorRegistry::createNode(
   auto const fragment = ShadowNodeFamilyFragment{tag, surfaceId, nullptr};
   auto family =
       componentDescriptor.createFamily(fragment, std::move(eventTarget));
-  auto const props =
-      componentDescriptor.cloneProps(nullptr, RawProps(propsDynamic));
+  auto const props = componentDescriptor.cloneProps(
+      PropsParserContext{surfaceId, *contextContainer_.get()},
+      nullptr,
+      RawProps(propsDynamic));
   auto const state =
       componentDescriptor.createInitialState(ShadowNodeFragment{props}, family);
 

package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h

@@ -14,6 +14,7 @@
 
 #include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 #include <react/renderer/core/ComponentDescriptor.h>
+#include <react/utils/ContextContainer.h>
 
 namespace facebook {
 namespace react {
@@ -37,7 +38,8 @@ class ComponentDescriptorRegistry {
    */
   ComponentDescriptorRegistry(
       ComponentDescriptorParameters const &parameters,
-      ComponentDescriptorProviderRegistry const &providerRegistry);
+      ComponentDescriptorProviderRegistry const &providerRegistry,
+      ContextContainer::Shared contextContainer);
 
   /*
    * This is broken. Please do not use.
@@ -85,6 +87,7 @@ class ComponentDescriptorRegistry {
   ComponentDescriptor::Shared _fallbackComponentDescriptor;
   ComponentDescriptorParameters parameters_{};
   ComponentDescriptorProviderRegistry const &providerRegistry_;
+  ContextContainer::Shared contextContainer_;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp

@@ -14,6 +14,7 @@ std::string componentNameByReactViewName(std::string viewName) {
   // We need this function only for the transition period;
   // eventually, all names will be unified.
 
+  // TODO T97384889: unify component names between JS - Android - iOS - C++
   std::string rctPrefix("RCT");
   if (std::mismatch(rctPrefix.begin(), rctPrefix.end(), viewName.begin())
           .first == rctPrefix.end()) {
@@ -28,7 +29,7 @@ std::string componentNameByReactViewName(std::string viewName) {
   }
 
   // TODO T63839307: remove this condition after deleting TextInlineImage from
-  // non-Fabric code
+  // old renderer code
   if (viewName == "TextInlineImage") {
     return "Image";
   }

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

@@ -21,7 +21,7 @@ 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_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer
+LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 

package/ReactCommon/react/renderer/components/image/ImageProps.cpp

@@ -12,26 +12,45 @@
 namespace facebook {
 namespace react {
 
-ImageProps::ImageProps(const ImageProps &sourceProps, const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      sources(convertRawProp(rawProps, "source", sourceProps.sources, {})),
+ImageProps::ImageProps(
+    const PropsParserContext &context,
+    const ImageProps &sourceProps,
+    const RawProps &rawProps)
+    : ViewProps(context, sourceProps, rawProps),
+      sources(
+          convertRawProp(context, rawProps, "source", sourceProps.sources, {})),
       defaultSources(convertRawProp(
+          context,
           rawProps,
           "defaultSource",
           sourceProps.defaultSources,
           {})),
       resizeMode(convertRawProp(
+          context,
           rawProps,
           "resizeMode",
           sourceProps.resizeMode,
           ImageResizeMode::Stretch)),
-      blurRadius(
-          convertRawProp(rawProps, "blurRadius", sourceProps.blurRadius, {})),
-      capInsets(
-          convertRawProp(rawProps, "capInsets", sourceProps.capInsets, {})),
-      tintColor(
-          convertRawProp(rawProps, "tintColor", sourceProps.tintColor, {})),
+      blurRadius(convertRawProp(
+          context,
+          rawProps,
+          "blurRadius",
+          sourceProps.blurRadius,
+          {})),
+      capInsets(convertRawProp(
+          context,
+          rawProps,
+          "capInsets",
+          sourceProps.capInsets,
+          {})),
+      tintColor(convertRawProp(
+          context,
+          rawProps,
+          "tintColor",
+          sourceProps.tintColor,
+          {})),
       internal_analyticTag(convertRawProp(
+          context,
           rawProps,
           "internal_analyticTag",
           sourceProps.internal_analyticTag,

package/ReactCommon/react/renderer/components/image/ImageProps.h

@@ -6,6 +6,7 @@
  */
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
 
@@ -16,7 +17,10 @@ namespace react {
 class ImageProps final : public ViewProps {
  public:
   ImageProps() = default;
-  ImageProps(const ImageProps &sourceProps, const RawProps &rawProps);
+  ImageProps(
+      const PropsParserContext &context,
+      const ImageProps &sourceProps,
+      const RawProps &rawProps);
 
 #pragma mark - Props
 

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

@@ -11,13 +11,17 @@
 #include <folly/dynamic.h>
 #include <glog/logging.h>
 #include <react/debug/react_native_assert.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/conversions.h>
 #include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {
 
-inline void fromRawValue(const RawValue &value, ImageSource &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    ImageSource &result) {
   if (value.hasType<std::string>()) {
     result = {
         /* .type = */ ImageSource::Type::Remote,
@@ -89,7 +93,10 @@ inline std::string toString(const ImageSource &value) {
   return "{uri: " + value.uri + "}";
 }
 
-inline void fromRawValue(const RawValue &value, ImageResizeMode &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    ImageResizeMode &result) {
   react_native_assert(value.hasType<std::string>());
   if (!value.hasType<std::string>()) {
     LOG(ERROR) << "Unsupported ImageResizeMode type";

package/ReactCommon/react/renderer/components/inputaccessory/BUCK

@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (APPLE),
+    platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK

@@ -37,7 +37,7 @@ rn_xplat_cxx_library(
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (APPLE),
+    platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm

@@ -10,7 +10,6 @@
 #include <React/RCTComponentData.h>
 #include <React/RCTEventDispatcher.h>
 #include <React/RCTModuleData.h>
-#include <React/RCTUIManager.h>
 #include <react/utils/ContextContainer.h>
 #include <react/utils/ManagedObjectWrapper.h>
 #include "LegacyViewManagerInteropState.h"