From c483533d46557379e340a44aa4e69d8461c8463f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raphae=CC=88l=20Blanchet?= <rblanchet@mirego.com>
Date: Tue, 26 Sep 2023 10:13:42 -0400
Subject: [PATCH 1/2] fix: Swipe down to dismiss screen with ScrollView on iOS

---
 TestsExample/App.js           |  1 +
 TestsExample/src/Test1884.tsx | 69 +++++++++++++++++++++++++++++++++++
 ios/RNSScreenStack.mm         | 14 +++++++
 3 files changed, 84 insertions(+)
 create mode 100644 TestsExample/src/Test1884.tsx

diff --git a/TestsExample/App.js b/TestsExample/App.js
index 00d27e0876..f6e9d5ca77 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -92,6 +92,7 @@ import Test1791 from './src/Test1791';
 import Test1802 from './src/Test1802';
 import Test1844 from './src/Test1844';
 import Test1864 from './src/Test1864';
+import Test1884 from './src/Test1884';
 
 enableFreeze(true);
 
diff --git a/TestsExample/src/Test1884.tsx b/TestsExample/src/Test1884.tsx
new file mode 100644
index 0000000000..10f1e9408e
--- /dev/null
+++ b/TestsExample/src/Test1884.tsx
@@ -0,0 +1,69 @@
+import * as React from 'react';
+import { Button, View, Text, ScrollView } from 'react-native';
+import { NavigationContainer, ParamListBase } from '@react-navigation/native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { NativeStackNavigationProp } from 'react-native-screens/native-stack';
+
+const Stack = createNativeStackNavigator();
+
+type NavProp = {
+  navigation: NativeStackNavigationProp<ParamListBase>;
+};
+
+export default function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator>
+        <Stack.Screen
+          name="home"
+          component={Home}
+          options={{ headerTitle: 'Home' }}
+        />
+        <Stack.Screen
+          name="screenA"
+          component={ScreenA}
+          options={{ headerShown: false, animation: 'slide_from_bottom', fullScreenGestureEnabled: true, gestureDirection: 'vertical' }}
+        />
+        <Stack.Screen
+          name="screenB"
+          component={ScreenB}
+          options={{ headerShown: false, animation: 'slide_from_bottom' }}
+        />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
+
+const Home = ({ navigation }: NavProp) => (
+  <View style={{ flex: 1, alignItems: 'center', paddingTop: 50 }}>
+    <Text>Home</Text>
+    <Button
+      onPress={() => navigation.navigate('screenA')}
+      title="Go to dismissable screen"
+    />
+    <Button
+      onPress={() => navigation.navigate('screenB')}
+      title="Go to undismissable screen"
+    />
+  </View>
+);
+
+const ScreenA = ({ }: NavProp) => (
+  <ScrollView contentContainerStyle={{ flex: 1 }}>
+    <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
+      <Text>Dismissable screen</Text>
+    </View>
+  </ScrollView>
+);
+
+const ScreenB = ({ navigation }: NavProp) => (
+  <ScrollView contentContainerStyle={{ flex: 1 }}>
+    <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+      <Text>Undismissable screen</Text>
+      <Button
+        onPress={() => navigation.goBack()}
+        title="Back"
+      />
+    </View>
+  </ScrollView>
+);
diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index 61fe072086..ca107d2ceb 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -911,6 +911,20 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
     BOOL isBackGesture = [panGestureRecognizer translationInView:panGestureRecognizer.view].x > 0 &&
         _controller.viewControllers.count > 1;
 
+    // Detects if we are currently at the top of the ScrollView and if the gesture is a swipe down.
+    // We consider this only if the scroll is more vertical than horizontal
+    UIScrollView *scrollView = (UIScrollView *)otherGestureRecognizer.view;
+    CGPoint translation = [panGestureRecognizer translationInView:panGestureRecognizer.view];
+    BOOL shouldDismissWithScrollDown =
+        abs(translation.y) > abs(translation.x) && translation.y > 0 && scrollView.contentOffset.y <= 0;
+    if (shouldDismissWithScrollDown) {
+      // If we detect a dismiss swipe, we cancel the other gesture recognizer and consider only the screen's one
+      // (To cancel a gesture, we need to disable and re-enable it)
+      [otherGestureRecognizer setEnabled:NO];
+      [otherGestureRecognizer setEnabled:YES];
+      return YES;
+    }
+
     if (gestureRecognizer.state == UIGestureRecognizerStateBegan || isBackGesture) {
       return NO;
     }

From 68aab63b34a7aa74b4abacd94e27cb911c68d648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raphae=CC=88l=20Blanchet?= <rblanchet@mirego.com>
Date: Tue, 26 Sep 2023 11:16:58 -0400
Subject: [PATCH 2/2] Rename Test1884 to Test1902 to fit with PR number

---
 TestsExample/App.js                             | 2 +-
 TestsExample/src/{Test1884.tsx => Test1902.tsx} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename TestsExample/src/{Test1884.tsx => Test1902.tsx} (100%)

diff --git a/TestsExample/App.js b/TestsExample/App.js
index f6e9d5ca77..f742d2ac68 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -92,7 +92,7 @@ import Test1791 from './src/Test1791';
 import Test1802 from './src/Test1802';
 import Test1844 from './src/Test1844';
 import Test1864 from './src/Test1864';
-import Test1884 from './src/Test1884';
+import Test1902 from './src/Test1902';
 
 enableFreeze(true);
 
diff --git a/TestsExample/src/Test1884.tsx b/TestsExample/src/Test1902.tsx
similarity index 100%
rename from TestsExample/src/Test1884.tsx
rename to TestsExample/src/Test1902.tsx