diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp index 802ef8265a7b9b..873b481c4ff76c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp @@ -38,7 +38,16 @@ HostPlatformScrollViewProps::HostPlatformScrollViewProps( rawProps, "nestedScrollEnabled", sourceProps.nestedScrollEnabled, - true)) + true)), + fadingEdgeLength( + ReactNativeFeatureFlags::enableCppPropsIteratorSetter() + ? sourceProps.fadingEdgeLength + : convertRawProp( + context, + rawProps, + "fadingEdgeLength", + sourceProps.fadingEdgeLength, + nullptr)) {} @@ -57,6 +66,7 @@ void HostPlatformScrollViewProps::setProp( switch (hash) { RAW_SET_PROP_SWITCH_CASE_BASIC(sendMomentumEvents); RAW_SET_PROP_SWITCH_CASE_BASIC(nestedScrollEnabled); + RAW_SET_PROP_SWITCH_CASE_BASIC(fadingEdgeLength); } } @@ -348,6 +358,10 @@ folly::dynamic HostPlatformScrollViewProps::getDiffProps( result["nestedScrollEnabled"] = nestedScrollEnabled; } + if (fadingEdgeLength != oldProps->fadingEdgeLength) { + result["fadingEdgeLength"] = fadingEdgeLength; + } + return result; } diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h index 8ffa0e0253f074..ce584b383fc327 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h @@ -32,6 +32,7 @@ class HostPlatformScrollViewProps : public BaseScrollViewProps { bool sendMomentumEvents{}; bool nestedScrollEnabled{}; + folly::dynamic fadingEdgeLength{}; #pragma mark - DebugStringConvertible