From e22f0bebb3262f882497f8818d59f77139402d90 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@gmail.com>
Date: Fri, 20 Dec 2019 19:30:09 +0000
Subject: [PATCH] [fix] ScrollView disabling of scroll

Make sure 'scrollEnabled={false}' works on desktop browsers and no longer
relies on using 'e.preventDefault()'.

Fix #1491
---
 .../docs/src/components/ScrollView/examples/Horizontal.js    | 4 ++--
 packages/docs/src/components/ScrollView/examples/Vertical.js | 4 ++--
 .../src/exports/ScrollView/ScrollViewBase.js                 | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/docs/src/components/ScrollView/examples/Horizontal.js b/packages/docs/src/components/ScrollView/examples/Horizontal.js
index 8d4c2db6..d3726115 100644
--- a/packages/docs/src/components/ScrollView/examples/Horizontal.js
+++ b/packages/docs/src/components/ScrollView/examples/Horizontal.js
@@ -27,9 +27,9 @@ export default function Horizontal() {
         }}
       />
       <Button
-        label="Scroll to 200px"
+        label="Scroll to 50px"
         onPress={() => {
-          scrollRef.current.scrollTo({ x: 200 });
+          scrollRef.current.scrollTo({ x: 50 });
         }}
       />
       <Button
diff --git a/packages/docs/src/components/ScrollView/examples/Vertical.js b/packages/docs/src/components/ScrollView/examples/Vertical.js
index c1d48aa9..eb82a1b8 100644
--- a/packages/docs/src/components/ScrollView/examples/Vertical.js
+++ b/packages/docs/src/components/ScrollView/examples/Vertical.js
@@ -23,9 +23,9 @@ export default function Vertical() {
         }}
       />
       <Button
-        label="Scroll to 200px"
+        label="Scroll to 50px"
         onPress={() => {
-          scrollRef.current.scrollTo({ y: 200 });
+          scrollRef.current.scrollTo({ y: 50 });
         }}
       />
       <Button
diff --git a/packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js b/packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js
index e844a8e2..07737ded 100644
--- a/packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js
+++ b/packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js
@@ -125,9 +125,6 @@ export default class ScrollViewBase extends React.Component<Props> {
         if (handler) {
           handler(e);
         }
-      } else {
-        // To disable scrolling in all browsers except Chrome
-        e.preventDefault();
       }
     };
   };
@@ -185,6 +182,8 @@ export default class ScrollViewBase extends React.Component<Props> {
 // https://developers.google.com/web/updates/2017/01/scrolling-intervention
 const styles = StyleSheet.create({
   scrollDisabled: {
+    overflowX: 'hidden',
+    overflowY: 'hidden',
     touchAction: 'none'
   },
   hideScrollbar: {