diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp index 4536d914592..ca8b33fb240 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp @@ -371,7 +371,27 @@ ScrollViewProps::ScrollViewProps( rawProps, "isInvertedVirtualizedList", sourceProps.isInvertedVirtualizedList, - {})) {} + {})), + sendMomentumEvents( + ReactNativeFeatureFlags::enableCppPropsIteratorSetter() + ? sourceProps.sendMomentumEvents + : convertRawProp( + context, + rawProps, + "sendMomentumEvents", + sourceProps.sendMomentumEvents, + true)), + nestedScrollEnabled( + ReactNativeFeatureFlags::enableCppPropsIteratorSetter() + ? sourceProps.nestedScrollEnabled + : convertRawProp( + context, + rawProps, + "nestedScrollEnabled", + sourceProps.nestedScrollEnabled, + true)) + +{} void ScrollViewProps::setProp( const PropsParserContext& context, @@ -424,6 +444,8 @@ void ScrollViewProps::setProp( RAW_SET_PROP_SWITCH_CASE_BASIC(contentInsetAdjustmentBehavior); RAW_SET_PROP_SWITCH_CASE_BASIC(scrollToOverflowEnabled); RAW_SET_PROP_SWITCH_CASE_BASIC(isInvertedVirtualizedList); + RAW_SET_PROP_SWITCH_CASE_BASIC(sendMomentumEvents); + RAW_SET_PROP_SWITCH_CASE_BASIC(nestedScrollEnabled); } } @@ -558,7 +580,15 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const { debugStringConvertibleItem( "isInvertedVirtualizedList", snapToEnd, - defaultScrollViewProps.isInvertedVirtualizedList)}; + defaultScrollViewProps.isInvertedVirtualizedList), + debugStringConvertibleItem( + "sendMomentumEvents", + sendMomentumEvents, + defaultScrollViewProps.sendMomentumEvents), + debugStringConvertibleItem( + "nestedScrollEnabled", + nestedScrollEnabled, + defaultScrollViewProps.nestedScrollEnabled)}; } #endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h index 8516d4ab0dc..4bf8a991ce6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h @@ -74,6 +74,9 @@ class ScrollViewProps final : public ViewProps { bool scrollToOverflowEnabled{false}; bool isInvertedVirtualizedList{false}; + bool sendMomentumEvents{}; + bool nestedScrollEnabled{}; + #pragma mark - DebugStringConvertible #if RN_DEBUG_STRING_CONVERTIBLE