kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-06-18 12:38:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Call super if shouldDisableScrollInteraction false (#23647)

Browse Source 
Summary:
Allow iOS to handle `touchesShouldCancelInContentView` on RCTScrollView if we aren't disabling the scroll interaction.

[iOS] [Changed] - RCTScrollView allows iOS to handle touchesShouldCancelInContentView
Pull Request resolved: https://github.com/facebook/react-native/pull/23647

Differential Revision: D14214248

Pulled By: hramos

fbshipit-source-id: 6e1bab3085aed6cabb93fb5dc988afe3911817e8
This commit is contained in:
ericlewis
2019-02-25 14:28:16 -08:00
committed by Facebook Github Bot
parent 918620bdcb
commit 78b167c735
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
React/Views/ScrollView/RCTScrollView.m
View File

@@ -280,8 +280,13 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
*/
- (BOOL)touchesShouldCancelInContentView:(__unused UIView *)view
{
//TODO: shouldn't this call super if _shouldDisableScrollInteraction returns NO?
return ![self _shouldDisableScrollInteraction];
BOOL shouldDisableScrollInteraction = [self _shouldDisableScrollInteraction];
if (shouldDisableScrollInteraction == NO) {
[super touchesShouldCancelInContentView:view];
}
return !shouldDisableScrollInteraction;
}
/*