From 5a5f810994cdfc190a04f1178ad5cb58e0d78061 Mon Sep 17 00:00:00 2001
From: tboba <tymoteusz.boba@gmail.com>
Date: Thu, 11 Jul 2024 15:31:14 +0200
Subject: [PATCH 1/8] Add first approach of setting view controllers

---
 ios/RNSScreenStack.mm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index 15a7cfe1fb..89d4e2068c 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -626,7 +626,13 @@ - (void)setPushViewControllers:(NSArray<UIViewController *> *)controllers
       NSMutableArray *newControllers = [NSMutableArray arrayWithArray:controllers];
       [newControllers removeLastObject];
 
+#ifdef RCT_NEW_ARCH_ENABLED
+      if (newControllers.count <= _controller.viewControllers.count) {
+        [_controller setViewControllers:newControllers animated:NO];
+      }
+#else
       [_controller setViewControllers:newControllers animated:NO];
+#endif // RTC_NEW_ARCH_ENABLED
       [_controller pushViewController:top animated:YES];
     } else {
       // don't really know what this case could be, but may need to handle it

From 2de7646a908855c4723c2ac8443c20d81f25702a Mon Sep 17 00:00:00 2001
From: tboba <tymoteusz.boba@gmail.com>
Date: Tue, 16 Jul 2024 17:06:06 +0200
Subject: [PATCH 2/8] Add mountingTransactionDidMount method

---
 apps/src/tests/Test2235.tsx | 85 +++++++++++++++++++++++++++++++++++++
 apps/src/tests/index.ts     |  1 +
 ios/RNSScreenStack.mm       | 33 ++++++++------
 3 files changed, 107 insertions(+), 12 deletions(-)
 create mode 100644 apps/src/tests/Test2235.tsx

diff --git a/apps/src/tests/Test2235.tsx b/apps/src/tests/Test2235.tsx
new file mode 100644
index 0000000000..6632aeb645
--- /dev/null
+++ b/apps/src/tests/Test2235.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import {
+  createNativeStackNavigator,
+  NativeStackNavigationProp,
+} from '@react-navigation/native-stack';
+import { Button } from '../shared';
+import { NavigationContainer } from '@react-navigation/native';
+
+type StackParamList = {
+  Main: undefined;
+  Detail: undefined;
+  Detail2: undefined;
+};
+
+interface MainScreenProps {
+  navigation: NativeStackNavigationProp<StackParamList, 'Main'>;
+}
+
+const MainScreen = ({ navigation }: MainScreenProps): React.JSX.Element => (
+  <View style={{ ...styles.container, backgroundColor: 'moccasin' }}>
+    <Button
+      testID="simple-native-stack-go-to-detail"
+      title="Go to detail"
+      onPress={() => {
+        navigation.navigate('Detail');
+        navigation.navigate('Detail2');
+      }}
+    />
+  </View>
+);
+
+interface DetailScreenProps {
+  navigation: NativeStackNavigationProp<StackParamList, 'Detail'>;
+}
+
+const DetailScreen = ({ navigation }: DetailScreenProps): React.JSX.Element => (
+  <View style={{ ...styles.container, backgroundColor: 'thistle' }}>
+    <Button
+      title="Go back"
+      onPress={() => navigation.goBack()}
+      testID="simple-native-stack-detail-go-back"
+    />
+  </View>
+);
+
+const DetailScreen2 = ({
+  navigation,
+}: DetailScreenProps): React.JSX.Element => (
+  <View style={{ ...styles.container, backgroundColor: 'yellow' }}>
+    <Button
+      title="Go back"
+      onPress={() => navigation.goBack()}
+      testID="simple-native-stack-detail-go-back"
+    />
+  </View>
+);
+
+const Stack = createNativeStackNavigator<StackParamList>();
+
+const App = (): React.JSX.Element => (
+  <NavigationContainer>
+    <Stack.Navigator
+      screenOptions={{
+        headerBackVisible: false,
+      }}>
+      <Stack.Screen
+        name="Main"
+        component={MainScreen}
+        options={{ title: 'Simple Native Stack' }}
+      />
+      <Stack.Screen name="Detail" component={DetailScreen} />
+      <Stack.Screen name="Detail2" component={DetailScreen2} />
+    </Stack.Navigator>
+  </NavigationContainer>
+);
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    paddingTop: 10,
+  },
+});
+
+export default App;
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index 36d3f12ca9..3fc71ae525 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -105,5 +105,6 @@ export { default as Test2184 } from './Test2184';
 export { default as Test2223 } from './Test2223';
 export { default as Test2227 } from './Test2227';
 export { default as Test2229 } from './Test2229';
+export { default as Test2235 } from './Test2235';
 export { default as TestScreenAnimation } from './TestScreenAnimation';
 export { default as TestHeader } from './TestHeader';
diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index 89d4e2068c..58a877c011 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -626,13 +626,7 @@ - (void)setPushViewControllers:(NSArray<UIViewController *> *)controllers
       NSMutableArray *newControllers = [NSMutableArray arrayWithArray:controllers];
       [newControllers removeLastObject];
 
-#ifdef RCT_NEW_ARCH_ENABLED
-      if (newControllers.count <= _controller.viewControllers.count) {
-        [_controller setViewControllers:newControllers animated:NO];
-      }
-#else
       [_controller setViewControllers:newControllers animated:NO];
-#endif // RTC_NEW_ARCH_ENABLED
       [_controller pushViewController:top animated:YES];
     } else {
       // don't really know what this case could be, but may need to handle it
@@ -1123,9 +1117,8 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
   [_reactSubviews insertObject:(RNSScreenView *)childComponentView atIndex:index];
   ((RNSScreenView *)childComponentView).reactSuperview = self;
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self maybeAddToParentAndUpdateContainer];
-  });
+  // Child update operation is performed in the mountingTransactionDidMount method to prevent error while
+  // navigating to `n` different screens at the same time.
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
@@ -1158,9 +1151,6 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   screenChildComponent.reactSuperview = nil;
   [_reactSubviews removeObject:screenChildComponent];
   [screenChildComponent removeFromSuperview];
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self maybeAddToParentAndUpdateContainer];
-  });
 }
 
 - (void)takeSnapshot
@@ -1184,6 +1174,25 @@ - (void)mountingTransactionWillMount:(react::MountingTransaction const &)transac
   }
 }
 
+- (void)mountingTransactionDidMount:(const facebook::react::MountingTransaction &)transaction
+               withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
+{
+  for (auto &mutation : transaction.getMutations()) {
+    if (mutation.parentShadowView.componentName != nil &&
+        strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") == 0) {
+      if (mutation.type == react::ShadowViewMutation::Type::Update ||
+          mutation.type == react::ShadowViewMutation::Type::Remove) {
+        // we need to wait until children have their layout set. At this point they don't have the layout
+        // set yet, however the layout call is already enqueued on ui thread. Enqueuing update call on the
+        // ui queue will guarantee that the update will run after layout.
+        dispatch_async(dispatch_get_main_queue(), ^{
+          [self maybeAddToParentAndUpdateContainer];
+        });
+      }
+    }
+  }
+}
+
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];

From 7d1aa58ea059fd2b052cf5c05910f522c3f0c97a Mon Sep 17 00:00:00 2001
From: tboba <tymoteusz.boba@gmail.com>
Date: Tue, 16 Jul 2024 17:17:05 +0200
Subject: [PATCH 3/8] Add comma

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

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index 58a877c011..bc4adc7ac9 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -1117,7 +1117,7 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
   [_reactSubviews insertObject:(RNSScreenView *)childComponentView atIndex:index];
   ((RNSScreenView *)childComponentView).reactSuperview = self;
-  // Child update operation is performed in the mountingTransactionDidMount method to prevent error while
+  // Child update operation is performed in the mountingTransactionDidMount method to prevent error, while
   // navigating to `n` different screens at the same time.
 }
 

From fb9e60ff78c9bb7f7f851f2ff9dea52e10dbc5d1 Mon Sep 17 00:00:00 2001
From: tboba <tymoteusz.boba@gmail.com>
Date: Fri, 19 Jul 2024 10:00:45 +0200
Subject: [PATCH 4/8] Change code, according to code review

---
 ios/RNSScreenStack.mm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index bc4adc7ac9..b2d97a2898 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -1179,16 +1179,15 @@ - (void)mountingTransactionDidMount:(const facebook::react::MountingTransaction
 {
   for (auto &mutation : transaction.getMutations()) {
     if (mutation.parentShadowView.componentName != nil &&
-        strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") == 0) {
-      if (mutation.type == react::ShadowViewMutation::Type::Update ||
-          mutation.type == react::ShadowViewMutation::Type::Remove) {
-        // we need to wait until children have their layout set. At this point they don't have the layout
-        // set yet, however the layout call is already enqueued on ui thread. Enqueuing update call on the
-        // ui queue will guarantee that the update will run after layout.
-        dispatch_async(dispatch_get_main_queue(), ^{
-          [self maybeAddToParentAndUpdateContainer];
-        });
-      }
+        strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") == 0 &&
+        (mutation.type == react::ShadowViewMutation::Type::Update ||
+         mutation.type == react::ShadowViewMutation::Type::Remove)) {
+      // we need to wait until children have their layout set. At this point they don't have the layout
+      // set yet, however the layout call is already enqueued on ui thread. Enqueuing update call on the
+      // ui queue will guarantee that the update will run after layout.
+      dispatch_async(dispatch_get_main_queue(), ^{
+        [self maybeAddToParentAndUpdateContainer];
+      });
     }
   }
 }

From 3d89cfd66f04044c2fb3062765f7becd6dbe3f62 Mon Sep 17 00:00:00 2001
From: tboba <tymoteusz.boba@gmail.com>
Date: Fri, 26 Jul 2024 11:34:55 +0200
Subject: [PATCH 5/8] Apply changes from code review

---
 ios/RNSScreenStack.mm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index b2d97a2898..933772d2bb 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -1117,8 +1117,8 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
   [_reactSubviews insertObject:(RNSScreenView *)childComponentView atIndex:index];
   ((RNSScreenView *)childComponentView).reactSuperview = self;
-  // Child update operation is performed in the mountingTransactionDidMount method to prevent error, while
-  // navigating to `n` different screens at the same time.
+  // Container update is done after all mount operations are executed in
+  // `- [RNSScreenStackView mountingTransactionDidMount: withSurfaceTelemetry:]`
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
@@ -1177,10 +1177,10 @@ - (void)mountingTransactionWillMount:(react::MountingTransaction const &)transac
 - (void)mountingTransactionDidMount:(const facebook::react::MountingTransaction &)transaction
                withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
 {
-  for (auto &mutation : transaction.getMutations()) {
+  for (const auto &mutation : transaction.getMutations()) {
     if (mutation.parentShadowView.componentName != nil &&
         strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") == 0 &&
-        (mutation.type == react::ShadowViewMutation::Type::Update ||
+        (mutation.type == react::ShadowViewMutation::Type::Insert ||
          mutation.type == react::ShadowViewMutation::Type::Remove)) {
       // we need to wait until children have their layout set. At this point they don't have the layout
       // set yet, however the layout call is already enqueued on ui thread. Enqueuing update call on the
@@ -1188,6 +1188,7 @@ - (void)mountingTransactionDidMount:(const facebook::react::MountingTransaction
       dispatch_async(dispatch_get_main_queue(), ^{
         [self maybeAddToParentAndUpdateContainer];
       });
+      break;
     }
   }
 }

From 09bfe513030e6587788619b66ec85ae3ee78c7e3 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Fri, 26 Jul 2024 13:42:54 +0200
Subject: [PATCH 6/8] Filter mutations by tag, not component name & add nested
 stack to example

---
 apps/src/tests/Test2235.tsx | 55 ++++++++++++++++++++++++-------------
 ios/RNSScreenStack.mm       |  3 +-
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/apps/src/tests/Test2235.tsx b/apps/src/tests/Test2235.tsx
index 6632aeb645..c968e81843 100644
--- a/apps/src/tests/Test2235.tsx
+++ b/apps/src/tests/Test2235.tsx
@@ -5,22 +5,33 @@ import {
   NativeStackNavigationProp,
 } from '@react-navigation/native-stack';
 import { Button } from '../shared';
-import { NavigationContainer } from '@react-navigation/native';
+import { NavigationContainer, ParamListBase, RouteProp } from '@react-navigation/native';
 
-type StackParamList = {
-  Main: undefined;
-  Detail: undefined;
-  Detail2: undefined;
-};
-
-interface MainScreenProps {
-  navigation: NativeStackNavigationProp<StackParamList, 'Main'>;
+interface RouteProps {
+  navigation: NativeStackNavigationProp<ParamListBase>;
 }
 
-const MainScreen = ({ navigation }: MainScreenProps): React.JSX.Element => (
+const MainScreen = ({ navigation }: RouteProps): React.JSX.Element => (
+  <View style={{ ...styles.container, backgroundColor: 'moccasin' }}>
+    <Button
+      title="Push 2 screens at once"
+      onPress={() => {
+        navigation.navigate('Detail');
+        navigation.navigate('Detail2');
+      }}
+    />
+    <Button
+      title="Open nested stack"
+      onPress={() => {
+        navigation.navigate('NestedStack');
+      }}
+    />
+  </View>
+);
+
+const NestedMainScreen = ({ navigation }: RouteProps): React.JSX.Element => (
   <View style={{ ...styles.container, backgroundColor: 'moccasin' }}>
     <Button
-      testID="simple-native-stack-go-to-detail"
       title="Go to detail"
       onPress={() => {
         navigation.navigate('Detail');
@@ -30,33 +41,38 @@ const MainScreen = ({ navigation }: MainScreenProps): React.JSX.Element => (
   </View>
 );
 
-interface DetailScreenProps {
-  navigation: NativeStackNavigationProp<StackParamList, 'Detail'>;
-}
 
-const DetailScreen = ({ navigation }: DetailScreenProps): React.JSX.Element => (
+const DetailScreen = ({ navigation }: RouteProps): React.JSX.Element => (
   <View style={{ ...styles.container, backgroundColor: 'thistle' }}>
     <Button
       title="Go back"
       onPress={() => navigation.goBack()}
-      testID="simple-native-stack-detail-go-back"
     />
   </View>
 );
 
 const DetailScreen2 = ({
   navigation,
-}: DetailScreenProps): React.JSX.Element => (
+}: RouteProps): React.JSX.Element => (
   <View style={{ ...styles.container, backgroundColor: 'yellow' }}>
     <Button
       title="Go back"
       onPress={() => navigation.goBack()}
-      testID="simple-native-stack-detail-go-back"
     />
   </View>
 );
 
-const Stack = createNativeStackNavigator<StackParamList>();
+const NestedStackScreen = ({ navigation }: RouteProps): React.JSX.Element => (
+  <NestedStack.Navigator screenOptions={{ headerBackVisible: false }}>
+    <NestedStack.Screen name="NestedDetail" component={NestedMainScreen} />
+    <Stack.Screen name="Detail" component={DetailScreen} />
+    <Stack.Screen name="Detail2" component={DetailScreen2} />
+  </NestedStack.Navigator>
+)
+
+
+const Stack = createNativeStackNavigator<ParamListBase>();
+const NestedStack = createNativeStackNavigator<ParamListBase>();
 
 const App = (): React.JSX.Element => (
   <NavigationContainer>
@@ -71,6 +87,7 @@ const App = (): React.JSX.Element => (
       />
       <Stack.Screen name="Detail" component={DetailScreen} />
       <Stack.Screen name="Detail2" component={DetailScreen2} />
+      <Stack.Screen name="NestedStack" component={NestedStackScreen} />
     </Stack.Navigator>
   </NavigationContainer>
 );
diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index cfb8a3b3b9..428e3ca6cc 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -1168,8 +1168,7 @@ - (void)mountingTransactionDidMount:(const facebook::react::MountingTransaction
                withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
 {
   for (const auto &mutation : transaction.getMutations()) {
-    if (mutation.parentShadowView.componentName != nil &&
-        strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") == 0 &&
+    if (mutation.parentShadowView.tag == self.tag &&
         (mutation.type == react::ShadowViewMutation::Type::Insert ||
          mutation.type == react::ShadowViewMutation::Type::Remove)) {
       // we need to wait until children have their layout set. At this point they don't have the layout

From b9017e8a32fd0a56093d5256292ceb2d992d6cf9 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Fri, 26 Jul 2024 13:44:59 +0200
Subject: [PATCH 7/8] Add button to pop nested stack in example

---
 apps/src/tests/Test2235.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/src/tests/Test2235.tsx b/apps/src/tests/Test2235.tsx
index c968e81843..4c00670dde 100644
--- a/apps/src/tests/Test2235.tsx
+++ b/apps/src/tests/Test2235.tsx
@@ -5,7 +5,7 @@ import {
   NativeStackNavigationProp,
 } from '@react-navigation/native-stack';
 import { Button } from '../shared';
-import { NavigationContainer, ParamListBase, RouteProp } from '@react-navigation/native';
+import { NavigationContainer, ParamListBase } from '@react-navigation/native';
 
 interface RouteProps {
   navigation: NativeStackNavigationProp<ParamListBase>;
@@ -38,6 +38,12 @@ const NestedMainScreen = ({ navigation }: RouteProps): React.JSX.Element => (
         navigation.navigate('Detail2');
       }}
     />
+    <Button
+      title="Pop stack"
+      onPress={() => {
+        navigation.goBack();
+      }}
+    />
   </View>
 );
 
@@ -62,7 +68,7 @@ const DetailScreen2 = ({
   </View>
 );
 
-const NestedStackScreen = ({ navigation }: RouteProps): React.JSX.Element => (
+const NestedStackScreen = (): React.JSX.Element => (
   <NestedStack.Navigator screenOptions={{ headerBackVisible: false }}>
     <NestedStack.Screen name="NestedDetail" component={NestedMainScreen} />
     <Stack.Screen name="Detail" component={DetailScreen} />
@@ -70,7 +76,6 @@ const NestedStackScreen = ({ navigation }: RouteProps): React.JSX.Element => (
   </NestedStack.Navigator>
 )
 
-
 const Stack = createNativeStackNavigator<ParamListBase>();
 const NestedStack = createNativeStackNavigator<ParamListBase>();
 

From a925830202a70d68b5732ae935184b91db7242c8 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Fri, 26 Jul 2024 13:50:41 +0200
Subject: [PATCH 8/8] Restore react-navigation to commit from main

---
 react-navigation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-navigation b/react-navigation
index 77911917bb..fdbfe7608c 160000
--- a/react-navigation
+++ b/react-navigation
@@ -1 +1 @@
-Subproject commit 77911917bb4d1137be267a321fb8a20bba772a06
+Subproject commit fdbfe7608c3c9ba4c2c3c95dcc5a6501ec97a056