diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index 265ad7a922b..46b55e4ea38 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -107,7 +107,6 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol __weak UIView *_firstVisibleView; CGFloat _endDraggingSensitivityMultiplier; - CGFloat _endDraggingSensitivityVelocityMultiplier; } + (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(UIView *)view @@ -137,7 +136,6 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol [self.scrollViewDelegateSplitter addDelegate:self]; _scrollEventThrottle = 0; - _endDraggingSensitivityVelocityMultiplier = 0; _endDraggingSensitivityMultiplier = 1; } @@ -236,7 +234,6 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol } _endDraggingSensitivityMultiplier = newScrollViewProps.endDraggingSensitivityMultiplier; - _endDraggingSensitivityVelocityMultiplier = newScrollViewProps.endDraggingSensitivityVelocityMultiplier; if (oldScrollViewProps.scrollEventThrottle != newScrollViewProps.scrollEventThrottle) { // Zero means "send value only once per significant logical event". @@ -444,12 +441,10 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset { - if (fabs(_endDraggingSensitivityMultiplier - 1) > 0.0001f || - fabs(_endDraggingSensitivityVelocityMultiplier) > 0.0001f) { + if (fabs(_endDraggingSensitivityMultiplier - 1) > 0.0001f) { if (targetContentOffset->y > 0) { const CGFloat travel = targetContentOffset->y - scrollView.contentOffset.y; - targetContentOffset->y = scrollView.contentOffset.y + travel * _endDraggingSensitivityMultiplier + - velocity.y * _endDraggingSensitivityVelocityMultiplier; + targetContentOffset->y = scrollView.contentOffset.y + travel * _endDraggingSensitivityMultiplier; } } } diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m index 9ce23ade7c8..878825656f2 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m +++ b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m @@ -69,7 +69,6 @@ RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustContentInsets, BOOL) RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustKeyboardInsets, BOOL) RCT_EXPORT_VIEW_PROPERTY(decelerationRate, CGFloat) RCT_EXPORT_VIEW_PROPERTY(endDraggingSensitivityMultiplier, CGFloat) -RCT_EXPORT_VIEW_PROPERTY(endDraggingSensitivityVelocityMultiplier, CGFloat) RCT_EXPORT_VIEW_PROPERTY(directionalLockEnabled, BOOL) RCT_EXPORT_VIEW_PROPERTY(indicatorStyle, UIScrollViewIndicatorStyle) RCT_EXPORT_VIEW_PROPERTY(keyboardDismissMode, UIScrollViewKeyboardDismissMode) 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 19a44907658..bb0239ea08f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp @@ -109,15 +109,6 @@ ScrollViewProps::ScrollViewProps( "endDraggingSensitivityMultiplier", sourceProps.endDraggingSensitivityMultiplier, 1)), - endDraggingSensitivityVelocityMultiplier( - CoreFeatures::enablePropIteratorSetter - ? sourceProps.endDraggingSensitivityVelocityMultiplier - : convertRawProp( - context, - rawProps, - "endDraggingSensitivityVelocityMultiplier", - sourceProps.endDraggingSensitivityVelocityMultiplier, - 0)), directionalLockEnabled( CoreFeatures::enablePropIteratorSetter ? sourceProps.directionalLockEnabled 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 2eb7465d6f3..ef8799caeb7 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h @@ -42,7 +42,6 @@ class ScrollViewProps final : public ViewProps { bool automaticallyAdjustsScrollIndicatorInsets{true}; Float decelerationRate{0.998f}; Float endDraggingSensitivityMultiplier{1}; - Float endDraggingSensitivityVelocityMultiplier{0}; bool directionalLockEnabled{}; ScrollViewIndicatorStyle indicatorStyle{}; ScrollViewKeyboardDismissMode keyboardDismissMode{};