From 5e246309e006aebe934fe9273253702f29e5d38e Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Wed, 27 Dec 2023 18:33:02 +0100
Subject: [PATCH 1/4] Fix simple scenario when top-level vc is dismissed

---
 ios/RNSScreenStack.mm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index be79f080d0..1361862ac5 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -501,15 +501,27 @@ - (void)setModalViewControllers:(NSArray<UIViewController *> *)controllers
     }
   }
 
-  // changeRootController does not have presentedViewController but it does not mean that no modals are in presentation,
-  // so we need to find top-level controller manually
+  // changeRootController does not have presentedViewController but it does not mean that no modals are in presentation;
+  // modals could be presented by another stack (nested / outer), third-party view controller or they could be using
+  // UIModalPresentationCurrentContext / UIModalPresentationOverCurrentContext presentation styles; in the last case
+  // for some reason system asks top-level (react root) vc to present instead of our stack, despite the fact that
+  // `definesPresentationContext` returns `YES` for UINavigationController.
+  // So we first need to find top-level controller manually:
   UIViewController *reactRootVc = [self findReactRootViewController];
   UIViewController *topMostVc = [RNSScreenStackView findTopMostPresentedViewControllerFromViewController:reactRootVc];
 
   if (topMostVc != reactRootVc) {
     changeRootController = topMostVc;
+
+    // Here we handle just the simplest case where the top level VC was dismissed. In any more complex
+    // scenario we will still have problems, see: https://github.com/software-mansion/react-native-screens/issues/1813
+    if ([_presentedModals containsObject:topMostVc] && ![controllers containsObject:topMostVc]) {
+      [changeRootController dismissViewControllerAnimated:YES completion:finish];
+      return;
+    }
   }
 
+  // We didn't detect any controllers for dismissal, thus we start presenting new vcs
   finish();
 }
 

From 466cef495f8b3e43f372e7639399b997393dfd5b Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Wed, 27 Dec 2023 18:40:40 +0100
Subject: [PATCH 2/4] Add code to Example application that will allow for
 testing this change

---
 Example/src/screens/Modals.tsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Example/src/screens/Modals.tsx b/Example/src/screens/Modals.tsx
index 47badffbc5..a98f7c3bae 100644
--- a/Example/src/screens/Modals.tsx
+++ b/Example/src/screens/Modals.tsx
@@ -11,6 +11,7 @@ type StackParamList = {
   Modal: undefined;
   FullscreenModal: undefined;
   Alert: undefined;
+  ContainedModal: undefined;
 };
 
 interface MainScreenProps {
@@ -25,6 +26,10 @@ const MainScreen = ({ navigation }: MainScreenProps): JSX.Element => (
       onPress={() => navigation.navigate('FullscreenModal')}
     />
     <Button title="Open alert" onPress={() => navigation.navigate('Alert')} />
+    <Button
+      title="Open contained modal"
+      onPress={() => navigation.navigate('ContainedModal')}
+    />
     <Button onPress={() => navigation.pop()} title="🔙 Back to Examples" />
   </View>
 );
@@ -41,6 +46,10 @@ const ModalScreen = ({ navigation }: ModalScreenProps): JSX.Element => (
       onPress={() => navigation.push('FullscreenModal')}
     />
     <Button title="Open alert" onPress={() => navigation.navigate('Alert')} />
+    <Button
+      title="Open contained modal"
+      onPress={() => navigation.navigate('ContainedModal')}
+    />
     <Button title="Go back" onPress={() => navigation.goBack()} />
   </View>
 );
@@ -68,6 +77,11 @@ const App = (): JSX.Element => (
       component={ModalScreen}
       options={{ stackPresentation: 'fullScreenModal' }}
     />
+    <Stack.Screen
+      name="ContainedModal"
+      component={ModalScreen}
+      options={{ stackPresentation: 'containedModal' }}
+    />
     <Stack.Screen
       name="Alert"
       component={Alert}

From 7d085b905cb85ffc972021347c28e9200e35d95f Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Wed, 27 Dec 2023 18:44:46 +0100
Subject: [PATCH 3/4] Reorder tests in TE App.js

---
 TestsExample/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TestsExample/App.js b/TestsExample/App.js
index 8e348b1297..90d1085d49 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -90,9 +90,9 @@ import Test1683 from './src/Test1683';
 import Test1726 from './src/Test1726';
 import Test1791 from './src/Test1791';
 import Test1802 from './src/Test1802';
+import Test1829 from './src/Test1829';
 import Test1844 from './src/Test1844';
 import Test1864 from './src/Test1864';
-import Test1829 from './src/Test1829';
 import Test1981 from './src/Test1981';
 
 enableFreeze(true);

From 26554f24923f48a75ab5399a9d3cff9144d75550 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Tue, 2 Jan 2024 14:17:48 +0100
Subject: [PATCH 4/4] Fix casing

---
 ios/RNSScreenStack.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index 1361862ac5..71dbaee5fc 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -521,7 +521,7 @@ - (void)setModalViewControllers:(NSArray<UIViewController *> *)controllers
     }
   }
 
-  // We didn't detect any controllers for dismissal, thus we start presenting new vcs
+  // We didn't detect any controllers for dismissal, thus we start presenting new VCs
   finish();
 }