Merge pull request #28322 from hikouki/master

react-native: add nestedScrollEnabled props for andorid (RN0.56.0)
This commit is contained in:
Eloy Durán
2018-08-24 11:58:53 +02:00
committed by GitHub
2 changed files with 6 additions and 1 deletions

View File

@@ -6211,6 +6211,11 @@ export interface ScrollViewPropsAndroid {
* - 'never' - Never allow a user to over-scroll this view.
*/
overScrollMode?: "auto" | "always" | "never";
/**
* Enables nested scrolling for Android API level 21+. Nested scrolling is supported by default on iOS.
*/
nestedScrollEnabled?: boolean;
}
export interface ScrollViewProps

View File

@@ -391,7 +391,7 @@ class ScrollerListComponentTest extends React.Component<{}, { dataSource: ListVi
throw new Error("Expected scroll to be enabled.");
}
return <ScrollView horizontal={true} contentOffset={{x: 0, y: 0}} {...props} style={[scrollViewStyle1.scrollView, scrollViewStyle2]} />;
return <ScrollView horizontal={true} nestedScrollEnabled={true} contentOffset={{x: 0, y: 0}} {...props} style={[scrollViewStyle1.scrollView, scrollViewStyle2]} />;
}}
renderRow={({ type, data }, _, row) => {
return <Text>Filler</Text>;