From 9888c2a3c61d4b77faae33a4a23340e3def2aace Mon Sep 17 00:00:00 2001 From: hushicai Date: Thu, 1 Nov 2018 17:50:17 +0800 Subject: [PATCH] [fix] scrolling of nested ScrollViews Use of 'pan-x' and 'pan-y' on ScrollView prevents the browser handling scrolling of a parent ScrollView that is scrollable along the other axis. Fix #1160 Close #1161 --- packages/react-native-web/src/exports/ScrollView/index.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/react-native-web/src/exports/ScrollView/index.js b/packages/react-native-web/src/exports/ScrollView/index.js index 95afca8a..7136623f 100644 --- a/packages/react-native-web/src/exports/ScrollView/index.js +++ b/packages/react-native-web/src/exports/ScrollView/index.js @@ -279,15 +279,13 @@ const styles = StyleSheet.create({ ...commonStyle, flexDirection: 'column', overflowX: 'hidden', - overflowY: 'auto', - touchAction: 'pan-y' + overflowY: 'auto' }, baseHorizontal: { ...commonStyle, flexDirection: 'row', overflowX: 'auto', - overflowY: 'hidden', - touchAction: 'pan-x' + overflowY: 'hidden' }, contentContainerHorizontal: { flexDirection: 'row'