Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove experimental prop endDraggingSensitivityVelocityMultiplier from ScrollView (#43554)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/43554

changelog: [internal]

The prop endDraggingSensitivityVelocityMultiplier makes the API more complicated and provides only limited benefit. Let's remove it for the sake of simplicity.

Reviewed By: christophpurrer

Differential Revision: D53853298

fbshipit-source-id: d2663f2f6eef1dde3136debe8965ee871f4e043d
This commit is contained in:
Samuel Susla
2024-03-19 08:26:24 -07:00
committed by Facebook GitHub Bot
parent 5a80935cf2
commit ec6d0272af
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+2 -7
View File
@@ -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;
}
}
}
packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m
-1
View File
@@ -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)
packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
-9
View File
@@ -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
packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h
-1
View File
@@ -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{};