fix(iOS): select correct VC for nested modal presentation

FabricTestExample/App.js

@@ -87,6 +87,7 @@ import Test1671 from './src/Test1671';
 import Test1683 from './src/Test1683';
 import Test1726 from './src/Test1726';
 import Test1802 from './src/Test1802';
+import Test1829 from './src/Test1829';
 import Test1844 from './src/Test1844';
 import Test1864 from './src/Test1864';
 

FabricTestExample/src/Test1829/index.tsx

@@ -0,0 +1,15 @@
+import React from 'react';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { NavigationContainer } from '@react-navigation/native';
+
+import Stacks from './navigation/Stacks';
+
+const App = () => (
+  <SafeAreaProvider>
+    <NavigationContainer>
+      <Stacks />
+    </NavigationContainer>
+  </SafeAreaProvider>
+);
+
+export default App;

FabricTestExample/src/Test1829/navigation/Stacks.tsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+
+import HomeView from '../screens/HomeView';
+import ModalView from '../screens/ModalView';
+import BaseView from '../screens/InnerView';
+import InnerModal from '../screens/InnerModal';
+
+const RootStack = createNativeStackNavigator();
+const InnerStack = createNativeStackNavigator();
+
+const Inner = () => (
+  <InnerStack.Navigator>
+    <InnerStack.Screen name="base" component={BaseView} />
+    <InnerStack.Screen
+      name="inner-modal"
+      component={InnerModal}
+      options={{ presentation: 'modal' }}
+    />
+  </InnerStack.Navigator>
+);
+
+const Stacks = () => (
+  <RootStack.Navigator
+    screenOptions={{
+      headerShown: false,
+    }}>
+    <RootStack.Screen name="home" component={HomeView} />
+    <RootStack.Screen name="inner" component={Inner} />
+    <RootStack.Screen
+      name="modal"
+      component={ModalView}
+      options={{
+        presentation: 'modal',
+      }}
+    />
+    <RootStack.Screen
+      name="modal-2"
+      component={ModalView}
+      options={{
+        presentation: 'modal',
+      }}
+    />
+  </RootStack.Navigator>
+);
+
+export default Stacks;

FabricTestExample/src/Test1829/screens/CardView.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { TouchableOpacity, View, Text, StyleSheet } from 'react-native';
+
+const CardView = () => {
+  return <View style={styles.container} />;
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'blue',
+  },
+});
+
+export default CardView;

FabricTestExample/src/Test1829/screens/HomeView.tsx

@@ -0,0 +1,43 @@
+import React from 'react';
+import { TouchableOpacity, View, Text, StyleSheet } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+
+const HomeView = () => {
+  const navigation = useNavigation();
+  return (
+    <View style={styles.container}>
+      <TouchableOpacity onPress={() => navigation.navigate('inner')}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Open Inner Navigator</Text>
+        </View>
+      </TouchableOpacity>
+      <TouchableOpacity onPress={() => navigation.navigate('modal')}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Open Outer Modal</Text>
+        </View>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'yellow',
+  },
+  button: {
+    width: 200,
+    height: 50,
+    justifyContent: 'center',
+    alignItems: 'center',
+    borderRadius: 5,
+    backgroundColor: 'blue',
+  },
+  buttonText: {
+    color: 'white',
+  },
+});
+
+export default HomeView;

FabricTestExample/src/Test1829/screens/InnerModal.tsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import { TouchableOpacity, View, Text, StyleSheet } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+
+const HomeView = () => {
+  const navigation = useNavigation();
+  return (
+    <View style={styles.container}>
+      <Text>
+        This is the inner modal. Opening the outer modal here does not work.
+        WTF?
+      </Text>
+      <TouchableOpacity onPress={() => navigation.navigate('modal')}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Open Outer Modal</Text>
+        </View>
+      </TouchableOpacity>
+      <TouchableOpacity onPress={() => navigation.goBack()}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Back</Text>
+        </View>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'yellow',
+  },
+  button: {
+    width: 200,
+    height: 50,
+    justifyContent: 'center',
+    alignItems: 'center',
+    borderRadius: 5,
+    backgroundColor: 'blue',
+  },
+  buttonText: {
+    color: 'white',
+  },
+});
+
+export default HomeView;

FabricTestExample/src/Test1829/screens/InnerView.tsx

@@ -0,0 +1,51 @@
+import React from 'react';
+import { TouchableOpacity, View, Text, StyleSheet } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+
+const HomeView = () => {
+  const navigation = useNavigation();
+  return (
+    <View style={styles.container}>
+      <Text>
+        This is the inner navigator. Opening the outer modal here works!
+      </Text>
+      <TouchableOpacity onPress={() => navigation.navigate('inner-modal')}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Open Inner Modal</Text>
+        </View>
+      </TouchableOpacity>
+      <TouchableOpacity onPress={() => navigation.navigate('modal')}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Open Outer Modal</Text>
+        </View>
+      </TouchableOpacity>
+      <TouchableOpacity onPress={() => navigation.goBack()}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Go back</Text>
+        </View>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'yellow',
+  },
+  button: {
+    width: 200,
+    height: 50,
+    justifyContent: 'center',
+    alignItems: 'center',
+    borderRadius: 5,
+    backgroundColor: 'blue',
+  },
+  buttonText: {
+    color: 'white',
+  },
+});
+
+export default HomeView;

FabricTestExample/src/Test1829/screens/ModalView.tsx

@@ -0,0 +1,53 @@
+import React, { useEffect } from 'react';
+import { TouchableOpacity, View, Text, StyleSheet } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+
+const ModalView = () => {
+  useEffect(() => {
+    console.log('ModalView mounted');
+  }, []);
+
+  const navigation = useNavigation();
+  return (
+    <View style={styles.container}>
+      <Text>
+        This is the outer modal. If you try to open it from the inner modal, it
+        doesn't work. But if you comment out the `presentation: modal` on the
+        inner modal, it does work! In addition, if opening a modal in the same
+        navigator stack also works.
+      </Text>
+      <TouchableOpacity onPress={() => navigation.navigate('modal-2')}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Open sibling outer modal.</Text>
+        </View>
+      </TouchableOpacity>
+      <TouchableOpacity onPress={() => navigation.goBack()}>
+        <View style={styles.button}>
+          <Text style={styles.buttonText}>Back</Text>
+        </View>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'green',
+  },
+  button: {
+    width: 200,
+    height: 50,
+    justifyContent: 'center',
+    alignItems: 'center',
+    borderRadius: 5,
+    backgroundColor: 'blue',
+  },
+  buttonText: {
+    color: 'white',
+  },
+});
+
+export default ModalView;

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 Test1829 from './src/Test1829';
 
 enableFreeze(true);
 

TestsExample/src/Test1829/index.tsx

@@ -0,0 +1,15 @@
+import React from 'react';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { NavigationContainer } from '@react-navigation/native';
+
+import Stacks from './navigation/Stacks';
+
+const App = () => (
+  <SafeAreaProvider>
+    <NavigationContainer>
+      <Stacks />
+    </NavigationContainer>
+  </SafeAreaProvider>
+);
+
+export default App;

TestsExample/src/Test1829/navigation/Stacks.tsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+
+import HomeView from '../screens/HomeView';
+import ModalView from '../screens/ModalView';
+import BaseView from '../screens/InnerView';
+import InnerModal from '../screens/InnerModal';
+
+const RootStack = createNativeStackNavigator();
+const InnerStack = createNativeStackNavigator();
+
+const Inner = () => (
+  <InnerStack.Navigator>
+    <InnerStack.Screen name="base" component={BaseView} />
+    <InnerStack.Screen
+      name="inner-modal"
+      component={InnerModal}
+      options={{ presentation: 'modal' }}
+    />
+  </InnerStack.Navigator>
+);
+
+const Stacks = () => (
+  <RootStack.Navigator
+    screenOptions={{
+      headerShown: false,
+    }}>
+    <RootStack.Screen name="home" component={HomeView} />
+    <RootStack.Screen name="inner" component={Inner} />
+    <RootStack.Screen
+      name="modal"
+      component={ModalView}
+      options={{
+        presentation: 'modal',
+      }}
+    />
+    <RootStack.Screen
+      name="modal-2"
+      component={ModalView}
+      options={{
+        presentation: 'modal',
+      }}
+    />
+  </RootStack.Navigator>
+);
+
+export default Stacks;

TestsExample/src/Test1829/screens/CardView.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { TouchableOpacity, View, Text, StyleSheet } from 'react-native';
+
+const CardView = () => {
+  return <View style={styles.container} />;
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'blue',
+  },
+});
+
+export default CardView;