react-native 0.0.0-17be3a003 → 0.0.0-18697adec

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"

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp

@@ -12,9 +12,10 @@ namespace facebook {
 namespace react {
 
 LegacyViewManagerInteropViewProps::LegacyViewManagerInteropViewProps(
+    const PropsParserContext &context,
     const LegacyViewManagerInteropViewProps &sourceProps,
     const RawProps &rawProps)
-    : ViewProps(sourceProps, rawProps),
+    : ViewProps(context, sourceProps, rawProps),
       otherProps(
           mergeDynamicProps(sourceProps.otherProps, (folly::dynamic)rawProps)) {
 }

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h

@@ -7,6 +7,7 @@
 
 #include <folly/dynamic.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <unordered_map>
 
 namespace facebook {
@@ -16,6 +17,7 @@ class LegacyViewManagerInteropViewProps final : public ViewProps {
  public:
   LegacyViewManagerInteropViewProps() = default;
   LegacyViewManagerInteropViewProps(
+      const PropsParserContext &context,
       const LegacyViewManagerInteropViewProps &sourceProps,
       const RawProps &rawProps);
 

package/ReactCommon/react/renderer/components/root/BUCK

@@ -76,5 +76,6 @@ fb_xplat_cxx_test(
         ":root",
         "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
+        react_native_xplat_target("react/renderer/element:element"),
     ],
 )

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

@@ -13,10 +13,20 @@
 namespace facebook {
 namespace react {
 
-RootProps::RootProps(RootProps const &sourceProps, RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps) {}
+// Note that a default/empty context may be passed here from RootShadowNode.
+// If that's a problem and the context is necesary here, refactor RootShadowNode
+// first.
+RootProps::RootProps(
+    const PropsParserContext &context,
+    RootProps const &sourceProps,
+    RawProps const &rawProps)
+    : ViewProps(context, sourceProps, rawProps) {}
 
+// Note that a default/empty context may be passed here from RootShadowNode.
+// If that's a problem and the context is necesary here, refactor RootShadowNode
+// first.
 RootProps::RootProps(
+    const PropsParserContext &context,
     RootProps const &sourceProps,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext)

package/ReactCommon/react/renderer/components/root/RootProps.h

@@ -12,6 +12,7 @@
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -19,8 +20,12 @@ namespace react {
 class RootProps final : public ViewProps {
  public:
   RootProps() = default;
-  RootProps(RootProps const &sourceProps, RawProps const &rawProps);
   RootProps(
+      const PropsParserContext &context,
+      RootProps const &sourceProps,
+      RawProps const &rawProps);
+  RootProps(
+      const PropsParserContext &context,
       RootProps const &sourceProps,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext);

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

@@ -39,15 +39,21 @@ Transform RootShadowNode::getTransform() const {
 }
 
 RootShadowNode::Unshared RootShadowNode::clone(
+    PropsParserContext const &propsParserContext,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext) const {
   auto props = std::make_shared<RootProps const>(
-      getConcreteProps(), layoutConstraints, layoutContext);
+      propsParserContext, getConcreteProps(), layoutConstraints, layoutContext);
   auto newRootShadowNode = std::make_shared<RootShadowNode>(
       *this,
       ShadowNodeFragment{
           /* .props = */ props,
       });
+
+  if (layoutConstraints != getConcreteProps().layoutConstraints) {
+    newRootShadowNode->dirtyLayout();
+  }
+
   return newRootShadowNode;
 }
 

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

@@ -12,6 +12,7 @@
 #include <react/renderer/components/root/RootProps.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -51,6 +52,7 @@ class RootShadowNode final
    * Clones the node with given `layoutConstraints` and `layoutContext`.
    */
   RootShadowNode::Unshared clone(
+      PropsParserContext const &propsParserContext,
       LayoutConstraints const &layoutConstraints,
       LayoutContext const &layoutContext) const;
 

package/ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp

@@ -5,10 +5,42 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
+#include <react/renderer/components/root/RootComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/element/ComponentBuilder.h>
 
 #include <gtest/gtest.h>
+#include <react/renderer/element/Element.h>
+#include <react/renderer/element/testUtils.h>
 
-TEST(RootShadowNodeTest, testSomething) {
-  // TODO
+namespace facebook::react {
+
+TEST(RootShadowNodeTest, cloneWithLayoutConstraints) {
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  auto builder = simpleComponentBuilder();
+  std::shared_ptr<RootShadowNode> rootShadowNode;
+  LayoutConstraints defaultLayoutConstraints = {};
+
+  auto element =
+      Element<RootShadowNode>().reference(rootShadowNode).tag(1).props([&] {
+        auto sharedProps = std::make_shared<RootProps>();
+        sharedProps->layoutConstraints = defaultLayoutConstraints;
+        return sharedProps;
+      });
+
+  builder.build(element);
+
+  EXPECT_FALSE(rootShadowNode->getIsLayoutClean());
+  EXPECT_TRUE(rootShadowNode->layoutIfNeeded());
+  EXPECT_TRUE(rootShadowNode->getIsLayoutClean());
+
+  auto clonedWithDiffentLayoutConstraints = rootShadowNode->clone(
+      parserContext, LayoutConstraints{{0, 0}, {10, 10}}, {});
+
+  EXPECT_FALSE(clonedWithDiffentLayoutConstraints->getIsLayoutClean());
+  EXPECT_TRUE(clonedWithDiffentLayoutConstraints->layoutIfNeeded());
 }
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/components/safeareaview/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/scrollview/Android.mk

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
+LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
 
 include $(BUILD_SHARED_LIBRARY)
 

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

@@ -17,158 +17,204 @@ namespace facebook {
 namespace react {
 
 ScrollViewProps::ScrollViewProps(
+    const PropsParserContext &context,
     ScrollViewProps const &sourceProps,
     RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
+    : ViewProps(context, sourceProps, rawProps),
       alwaysBounceHorizontal(convertRawProp(
+          context,
           rawProps,
           "alwaysBounceHorizontal",
           sourceProps.alwaysBounceHorizontal,
           {})),
       alwaysBounceVertical(convertRawProp(
+          context,
           rawProps,
           "alwaysBounceVertical",
           sourceProps.alwaysBounceVertical,
           {})),
-      bounces(convertRawProp(rawProps, "bounces", sourceProps.bounces, true)),
+      bounces(convertRawProp(
+          context,
+          rawProps,
+          "bounces",
+          sourceProps.bounces,
+          true)),
       bouncesZoom(convertRawProp(
+          context,
           rawProps,
           "bouncesZoom",
           sourceProps.bouncesZoom,
           true)),
       canCancelContentTouches(convertRawProp(
+          context,
           rawProps,
           "canCancelContentTouches",
           sourceProps.canCancelContentTouches,
           true)),
       centerContent(convertRawProp(
+          context,
           rawProps,
           "centerContent",
           sourceProps.centerContent,
           {})),
       automaticallyAdjustContentInsets(convertRawProp(
+          context,
           rawProps,
           "automaticallyAdjustContentInsets",
           sourceProps.automaticallyAdjustContentInsets,
           {})),
+      automaticallyAdjustsScrollIndicatorInsets(convertRawProp(
+          context,
+          rawProps,
+          "automaticallyAdjustsScrollIndicatorInsets",
+          sourceProps.automaticallyAdjustsScrollIndicatorInsets,
+          true)),
       decelerationRate(convertRawProp(
+          context,
           rawProps,
           "decelerationRate",
           sourceProps.decelerationRate,
           (Float)0.998)),
       directionalLockEnabled(convertRawProp(
+          context,
           rawProps,
           "directionalLockEnabled",
           sourceProps.directionalLockEnabled,
           {})),
       indicatorStyle(convertRawProp(
+          context,
           rawProps,
           "indicatorStyle",
           sourceProps.indicatorStyle,
           {})),
       keyboardDismissMode(convertRawProp(
+          context,
           rawProps,
           "keyboardDismissMode",
           sourceProps.keyboardDismissMode,
           {})),
       maximumZoomScale(convertRawProp(
+          context,
           rawProps,
           "maximumZoomScale",
           sourceProps.maximumZoomScale,
           (Float)1.0)),
       minimumZoomScale(convertRawProp(
+          context,
           rawProps,
           "minimumZoomScale",
           sourceProps.minimumZoomScale,
           (Float)1.0)),
       scrollEnabled(convertRawProp(
+          context,
           rawProps,
           "scrollEnabled",
           sourceProps.scrollEnabled,
           true)),
       pagingEnabled(convertRawProp(
+          context,
           rawProps,
           "pagingEnabled",
           sourceProps.pagingEnabled,
           {})),
       pinchGestureEnabled(convertRawProp(
+          context,
           rawProps,
           "pinchGestureEnabled",
           sourceProps.pinchGestureEnabled,
           true)),
       scrollsToTop(convertRawProp(
+          context,
           rawProps,
           "scrollsToTop",
           sourceProps.scrollsToTop,
           true)),
       showsHorizontalScrollIndicator(convertRawProp(
+          context,
           rawProps,
           "showsHorizontalScrollIndicator",
           sourceProps.showsHorizontalScrollIndicator,
           true)),
       showsVerticalScrollIndicator(convertRawProp(
+          context,
           rawProps,
           "showsVerticalScrollIndicator",
           sourceProps.showsVerticalScrollIndicator,
           true)),
       scrollEventThrottle(convertRawProp(
+          context,
           rawProps,
           "scrollEventThrottle",
           sourceProps.scrollEventThrottle,
           {})),
       zoomScale(convertRawProp(
+          context,
           rawProps,
           "zoomScale",
           sourceProps.zoomScale,
           (Float)1.0)),
       contentInset(convertRawProp(
+          context,
           rawProps,
           "contentInset",
           sourceProps.contentInset,
           {})),
       contentOffset(convertRawProp(
+          context,
           rawProps,
           "contentOffset",
           sourceProps.contentOffset,
           {})),
       scrollIndicatorInsets(convertRawProp(
+          context,
           rawProps,
           "scrollIndicatorInsets",
           sourceProps.scrollIndicatorInsets,
           {})),
       snapToInterval(convertRawProp(
+          context,
           rawProps,
           "snapToInterval",
           sourceProps.snapToInterval,
           {})),
       snapToAlignment(convertRawProp(
+          context,
           rawProps,
           "snapToAlignment",
           sourceProps.snapToAlignment,
           {})),
       disableIntervalMomentum(convertRawProp(
+          context,
           rawProps,
           "disableIntervalMomentum",
           sourceProps.disableIntervalMomentum,
           {})),
       snapToOffsets(convertRawProp(
+          context,
           rawProps,
           "snapToOffsets",
           sourceProps.snapToOffsets,
           {})),
       snapToStart(convertRawProp(
+          context,
           rawProps,
           "snapToStart",
           sourceProps.snapToStart,
           true)),
-      snapToEnd(
-          convertRawProp(rawProps, "snapToEnd", sourceProps.snapToEnd, true)),
+      snapToEnd(convertRawProp(
+          context,
+          rawProps,
+          "snapToEnd",
+          sourceProps.snapToEnd,
+          true)),
       contentInsetAdjustmentBehavior(convertRawProp(
+          context,
           rawProps,
           "contentInsetAdjustmentBehavior",
           sourceProps.contentInsetAdjustmentBehavior,
           {ContentInsetAdjustmentBehavior::Never})),
       scrollToOverflowEnabled(convertRawProp(
+          context,
           rawProps,
           "scrollToOverflowEnabled",
           sourceProps.scrollToOverflowEnabled,
@@ -206,6 +252,10 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
               "automaticallyAdjustContentInsets",
               automaticallyAdjustContentInsets,
               defaultScrollViewProps.automaticallyAdjustContentInsets),
+          debugStringConvertibleItem(
+              "automaticallyAdjustsScrollIndicatorInsets",
+              automaticallyAdjustsScrollIndicatorInsets,
+              defaultScrollViewProps.automaticallyAdjustsScrollIndicatorInsets),
           debugStringConvertibleItem(
               "decelerationRate",
               decelerationRate,