Merge pull request #3709 from rdjuric/weirdScrollBarFix

Fix: ScrollBar staying in the middle of the modal (iOS)

src/components/Modal/index.ios.js

@@ -1,15 +1,21 @@
 import React from 'react';
+import {SafeAreaView} from 'react-native';
 import withWindowDimensions from '../withWindowDimensions';
 import BaseModal from './BaseModal';
 import {propTypes, defaultProps} from './ModalPropTypes';
 
+// Only want to use <SafeAreaView> on iOS. Avoids ScrollBar in the middle of the modal.
+// https://github.com/facebook/react-native/issues/26610
 const Modal = props => (
-    <BaseModal
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-    >
-        {props.children}
-    </BaseModal>
+    <SafeAreaView>
+        <BaseModal
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        >
+            {props.children}
+        </BaseModal>
+    </SafeAreaView>
+
 );
 
 Modal.propTypes = propTypes;