From 59efb325e27894e91680e1fb190bd5c9fb8a83ba Mon Sep 17 00:00:00 2001
From: hikouki <ame.kh000@gmail.com>
Date: Thu, 23 Aug 2018 19:03:48 +0900
Subject: [PATCH] add nestedScrollEnabled props for andorid in react-native
 types.

---
 types/react-native/index.d.ts     | 5 +++++
 types/react-native/test/index.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index d664018786..3ac47ae968 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -6210,6 +6210,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
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 4e21cb5c72..a1f3658651 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -390,7 +390,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>;