From 4052c5f48a1c2f7533ff4c3f39ea29f3026f1d5b Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 15 Jul 2024 11:35:54 +0200
Subject: [PATCH 01/14] Updated Test556 repro

---
 apps/src/tests/{Test556.js => Test556.tsx} | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
 rename apps/src/tests/{Test556.js => Test556.tsx} (68%)

diff --git a/apps/src/tests/Test556.js b/apps/src/tests/Test556.tsx
similarity index 68%
rename from apps/src/tests/Test556.js
rename to apps/src/tests/Test556.tsx
index ef60e3da2b..8609cb5253 100644
--- a/apps/src/tests/Test556.js
+++ b/apps/src/tests/Test556.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Button } from 'react-native';
+import { Button, Text } from 'react-native';
 import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
@@ -8,7 +8,11 @@ const Stack = createNativeStackNavigator();
 export default function App() {
   return (
     <NavigationContainer>
-      <Stack.Navigator>
+      <Stack.Navigator
+        screenOptions={{
+          animation: 'fade',
+          headerTitle: () => <Text>Simple Native Stack</Text>,
+        }}>
         <Stack.Screen name="First" component={First} />
         <Stack.Screen name="Second" component={Second} />
       </Stack.Navigator>
@@ -16,7 +20,7 @@ export default function App() {
   );
 }
 
-function First({ navigation }) {
+function First({ navigation }: any) {
   return (
     <Button
       title="Tap me for second screen"
@@ -25,10 +29,10 @@ function First({ navigation }) {
   );
 }
 
-function Second({ navigation }) {
+function Second({ navigation }: any) {
   return (
     <Button
-      title="Tap me for second screen"
+      title="Tap me for first screen"
       onPress={() => navigation.popTo('First')}
     />
   );

From b144514394641627992b689120b3de217c5fac8f Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 15 Jul 2024 11:36:37 +0200
Subject: [PATCH 02/14] Added header title snapshot

---
 ios/RNSScreen.mm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 2da6d9ad7e..0405cd07a9 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -1384,9 +1384,19 @@ - (void)hideHeaderIfNecessary
 - (void)setViewToSnapshot:(UIView *)snapshot
 {
   UIView *superView = self.view.superview;
-  [self.view removeFromSuperview];
-  self.view = snapshot;
-  [superView addSubview:self.view];
+  // if we dismissed the view natively, it will already be detached from view hierarchy
+  if (self.view.window != nil) {
+    UIView *snapshot = [self.view snapshotViewAfterScreenUpdates:NO];
+    [self.view removeFromSuperview];
+    self.view = snapshot;
+    [superView addSubview:snapshot];
+  }
+
+  if (self.navigationItem.titleView.window != nil) {
+    UIView *navSnapshot = [self.navigationItem.titleView snapshotViewAfterScreenUpdates:NO];
+    [self.navigationItem.titleView removeFromSuperview];
+    self.navigationItem.titleView = navSnapshot;
+  }
 }
 
 #else

From 66719c33db96ee347383f26a5cefe47ad9dbdf49 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 15 Jul 2024 13:18:46 +0200
Subject: [PATCH 03/14] Prevent left and right item flicker

---
 apps/src/tests/Test556.tsx |  1 +
 ios/RNSScreen.mm           | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/src/tests/Test556.tsx b/apps/src/tests/Test556.tsx
index 8609cb5253..9ee89877d5 100644
--- a/apps/src/tests/Test556.tsx
+++ b/apps/src/tests/Test556.tsx
@@ -12,6 +12,7 @@ export default function App() {
         screenOptions={{
           animation: 'fade',
           headerTitle: () => <Text>Simple Native Stack</Text>,
+          headerRight: () => <Text>Right</Text>,
         }}>
         <Stack.Screen name="First" component={First} />
         <Stack.Screen name="Second" component={Second} />
diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 0405cd07a9..3dab39d758 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -1393,9 +1393,21 @@ - (void)setViewToSnapshot:(UIView *)snapshot
   }
 
   if (self.navigationItem.titleView.window != nil) {
-    UIView *navSnapshot = [self.navigationItem.titleView snapshotViewAfterScreenUpdates:NO];
+    UIView *titleSnapshot = [self.navigationItem.titleView snapshotViewAfterScreenUpdates:NO];
     [self.navigationItem.titleView removeFromSuperview];
-    self.navigationItem.titleView = navSnapshot;
+    self.navigationItem.titleView = titleSnapshot;
+  }
+
+  if (self.navigationItem.rightBarButtonItem.customView.window != nil) {
+    UIView *rightSnapshot = [self.navigationItem.rightBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
+    [self.navigationItem.rightBarButtonItem.customView removeFromSuperview];
+    self.navigationItem.rightBarButtonItem.customView = rightSnapshot;
+  }
+
+  if (self.navigationItem.leftBarButtonItem.customView.window != nil) {
+    UIView *rightSnapshot = [self.navigationItem.leftBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
+    [self.navigationItem.leftBarButtonItem.customView removeFromSuperview];
+    self.navigationItem.leftBarButtonItem.customView = rightSnapshot;
   }
 }
 

From 9033a57d1c2348e00504e269f974eb1911d37df0 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 15 Jul 2024 14:44:55 +0200
Subject: [PATCH 04/14] Move snapshot logic to header config

---
 ios/RNSScreen.mm                  | 20 +-------------------
 ios/RNSScreenStackHeaderConfig.mm | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 3dab39d758..b0cc1bd49c 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -797,7 +797,7 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
   // subviews
   // Explanation taken from `reactSetFrame`, which is old arch equivalent of this code.
 }
-
+ 
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 {
   [super finalizeUpdates:updateMask];
@@ -1391,24 +1391,6 @@ - (void)setViewToSnapshot:(UIView *)snapshot
     self.view = snapshot;
     [superView addSubview:snapshot];
   }
-
-  if (self.navigationItem.titleView.window != nil) {
-    UIView *titleSnapshot = [self.navigationItem.titleView snapshotViewAfterScreenUpdates:NO];
-    [self.navigationItem.titleView removeFromSuperview];
-    self.navigationItem.titleView = titleSnapshot;
-  }
-
-  if (self.navigationItem.rightBarButtonItem.customView.window != nil) {
-    UIView *rightSnapshot = [self.navigationItem.rightBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
-    [self.navigationItem.rightBarButtonItem.customView removeFromSuperview];
-    self.navigationItem.rightBarButtonItem.customView = rightSnapshot;
-  }
-
-  if (self.navigationItem.leftBarButtonItem.customView.window != nil) {
-    UIView *rightSnapshot = [self.navigationItem.leftBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
-    [self.navigationItem.leftBarButtonItem.customView removeFromSuperview];
-    self.navigationItem.leftBarButtonItem.customView = rightSnapshot;
-  }
 }
 
 #else
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 268d9bb575..012de9a9a4 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -756,9 +756,28 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   [_reactSubviews removeObject:(RNSScreenStackHeaderSubview *)childComponentView];
+  [self setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView];
   [childComponentView removeFromSuperview];
 }
 
+- (void)setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView {
+    UINavigationItem *navitem = _screenView.controller.navigationItem;
+    if(childComponentView.type == RNSScreenStackHeaderSubviewTypeLeft){
+        navitem.leftBarButtonItem.customView = [self takeSnapshot:navitem.leftBarButtonItem.customView ];
+    } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeCenter){
+        navitem.titleView = [self takeSnapshot:navitem.titleView];
+    } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeRight){
+        navitem.rightBarButtonItem.customView = [self takeSnapshot:navitem.rightBarButtonItem.customView];
+    }
+}
+
+- (UIView *)takeSnapshot:(UIView *)view {
+    if (view.window != nil) {
+        return [view snapshotViewAfterScreenUpdates:NO];
+    }
+    return view;
+}
+
 static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
 {
   switch (resizeMode) {

From ab7d9e0e23d12549f1c829b4b4b122f937f9eb4d Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 15 Jul 2024 14:49:32 +0200
Subject: [PATCH 05/14] Removed window != nil check

---
 ios/RNSScreenStackHeaderConfig.mm | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 012de9a9a4..221b6f1908 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -760,22 +760,16 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   [childComponentView removeFromSuperview];
 }
 
-- (void)setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView {
-    UINavigationItem *navitem = _screenView.controller.navigationItem;
-    if(childComponentView.type == RNSScreenStackHeaderSubviewTypeLeft){
-        navitem.leftBarButtonItem.customView = [self takeSnapshot:navitem.leftBarButtonItem.customView ];
-    } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeCenter){
-        navitem.titleView = [self takeSnapshot:navitem.titleView];
-    } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeRight){
-        navitem.rightBarButtonItem.customView = [self takeSnapshot:navitem.rightBarButtonItem.customView];
-    }
-}
-
-- (UIView *)takeSnapshot:(UIView *)view {
-    if (view.window != nil) {
-        return [view snapshotViewAfterScreenUpdates:NO];
-    }
-    return view;
+- (void)setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView
+{
+  UINavigationItem *navitem = _screenView.controller.navigationItem;
+  if (childComponentView.type == RNSScreenStackHeaderSubviewTypeLeft) {
+    navitem.leftBarButtonItem.customView = [navitem.leftBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
+  } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeCenter) {
+    navitem.titleView = [navitem.titleView snapshotViewAfterScreenUpdates:NO];
+  } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeRight) {
+    navitem.rightBarButtonItem.customView = [navitem.rightBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
+  }
 }
 
 static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)

From f1d60231734e5a758882b294b0328257badcd87f Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 15 Jul 2024 15:10:02 +0200
Subject: [PATCH 06/14] Remove unwanted change

---
 ios/RNSScreen.mm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index b0cc1bd49c..9fe6021238 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -797,7 +797,6 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
   // subviews
   // Explanation taken from `reactSetFrame`, which is old arch equivalent of this code.
 }
- 
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 {
   [super finalizeUpdates:updateMask];

From 5a1eee9ea05503bece616687bb617cccef9aab10 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 15 Jul 2024 15:10:54 +0200
Subject: [PATCH 07/14] Remove unwanted change

---
 ios/RNSScreen.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 9fe6021238..bb5817e1dc 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -797,6 +797,7 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
   // subviews
   // Explanation taken from `reactSetFrame`, which is old arch equivalent of this code.
 }
+
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 {
   [super finalizeUpdates:updateMask];

From af8765fa43410016ce78108759b9f0423f4a7071 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 16 Jul 2024 18:28:16 +0200
Subject: [PATCH 08/14] Set views to snapshot before removing anything

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

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 221b6f1908..451b87ccae 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -755,8 +755,8 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  [_reactSubviews removeObject:(RNSScreenStackHeaderSubview *)childComponentView];
   [self setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView];
+  [_reactSubviews removeObject:(RNSScreenStackHeaderSubview *)childComponentView];
   [childComponentView removeFromSuperview];
 }
 

From 6772645160a643babb34c0babf328fba2123ddac Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Thu, 18 Jul 2024 19:22:18 +0200
Subject: [PATCH 09/14] Nesting header items in repro

---
 apps/src/tests/Test556.tsx | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/src/tests/Test556.tsx b/apps/src/tests/Test556.tsx
index 9ee89877d5..2c9de6d438 100644
--- a/apps/src/tests/Test556.tsx
+++ b/apps/src/tests/Test556.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Button, Text } from 'react-native';
+import { Button, StyleSheet, Text, View } from 'react-native';
 import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
@@ -11,8 +11,16 @@ export default function App() {
       <Stack.Navigator
         screenOptions={{
           animation: 'fade',
-          headerTitle: () => <Text>Simple Native Stack</Text>,
-          headerRight: () => <Text>Right</Text>,
+          headerTitle: () => (
+            <View style={styles.container}>
+              <Text>Simple Native Stack</Text>
+            </View>
+          ),
+          headerRight: () => (
+            <View style={styles.container}>
+              <Text>Right</Text>
+            </View>
+          ),
         }}>
         <Stack.Screen name="First" component={First} />
         <Stack.Screen name="Second" component={Second} />
@@ -38,3 +46,10 @@ function Second({ navigation }: any) {
     />
   );
 }
+
+const styles = StyleSheet.create({
+  container: {
+    padding: 3,
+    backgroundColor: 'cyan',
+  },
+});

From 99d3ffe08e75111e9606a8900ebbfc6e053ed71e Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Fri, 19 Jul 2024 14:55:53 +0200
Subject: [PATCH 10/14] Added switch statement

---
 ios/RNSScreenStackHeaderConfig.mm | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 451b87ccae..1b0c1fdd93 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -763,12 +763,22 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
 - (void)setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView
 {
   UINavigationItem *navitem = _screenView.controller.navigationItem;
-  if (childComponentView.type == RNSScreenStackHeaderSubviewTypeLeft) {
-    navitem.leftBarButtonItem.customView = [navitem.leftBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
-  } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeCenter) {
-    navitem.titleView = [navitem.titleView snapshotViewAfterScreenUpdates:NO];
-  } else if (childComponentView.type == RNSScreenStackHeaderSubviewTypeRight) {
-    navitem.rightBarButtonItem.customView = [navitem.rightBarButtonItem.customView snapshotViewAfterScreenUpdates:NO];
+  UIView *snapshot = [childComponentView snapshotViewAfterScreenUpdates:NO];
+
+  switch (childComponentView.type) {
+    case RNSScreenStackHeaderSubviewTypeLeft:
+      navitem.leftBarButtonItem.customView = snapshot;
+      break;
+    case RNSScreenStackHeaderSubviewTypeCenter:
+    case RNSScreenStackHeaderSubviewTypeTitle:
+      navitem.titleView = snapshot;
+      break;
+    case RNSScreenStackHeaderSubviewTypeRight:
+      navitem.rightBarButtonItem.customView = snapshot;
+      break;
+    case RNSScreenStackHeaderSubviewTypeSearchBar:
+    case RNSScreenStackHeaderSubviewTypeBackButton:
+      break;
   }
 }
 

From efc85a0db8e3631949b43f14629ed1a8f696aaca Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Fri, 19 Jul 2024 15:24:39 +0200
Subject: [PATCH 11/14] remove unwanted changes

---
 ios/RNSScreen.mm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index bb5817e1dc..2da6d9ad7e 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -1384,13 +1384,9 @@ - (void)hideHeaderIfNecessary
 - (void)setViewToSnapshot:(UIView *)snapshot
 {
   UIView *superView = self.view.superview;
-  // if we dismissed the view natively, it will already be detached from view hierarchy
-  if (self.view.window != nil) {
-    UIView *snapshot = [self.view snapshotViewAfterScreenUpdates:NO];
-    [self.view removeFromSuperview];
-    self.view = snapshot;
-    [superView addSubview:snapshot];
-  }
+  [self.view removeFromSuperview];
+  self.view = snapshot;
+  [superView addSubview:self.view];
 }
 
 #else

From cd495e388af7e0affeb8d80ccc0cec1cfcae1ca2 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Wed, 24 Jul 2024 13:47:03 +0200
Subject: [PATCH 12/14] Upgrade example by adding contrast & different text on
 different screens

---
 apps/src/tests/Test556.tsx | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/src/tests/Test556.tsx b/apps/src/tests/Test556.tsx
index 2c9de6d438..57badce960 100644
--- a/apps/src/tests/Test556.tsx
+++ b/apps/src/tests/Test556.tsx
@@ -11,19 +11,31 @@ export default function App() {
       <Stack.Navigator
         screenOptions={{
           animation: 'fade',
+        }}>
+        <Stack.Screen name="First" component={First} options={{
           headerTitle: () => (
-            <View style={styles.container}>
-              <Text>Simple Native Stack</Text>
+            <View style={[styles.container, { backgroundColor: 'goldenrod' }]}>
+              <Text>Hello there!</Text>
             </View>
           ),
           headerRight: () => (
-            <View style={styles.container}>
-              <Text>Right</Text>
+            <View style={[styles.container, { backgroundColor: 'lightblue' }]}>
+              <Text>Right-1</Text>
             </View>
           ),
-        }}>
-        <Stack.Screen name="First" component={First} />
-        <Stack.Screen name="Second" component={Second} />
+        }} />
+        <Stack.Screen name="Second" component={Second} options={{
+          headerTitle: () => (
+            <View style={[styles.container, { backgroundColor: 'mediumseagreen' }]}>
+              <Text>General Kenobi</Text>
+            </View>
+          ),
+          headerRight: () => (
+            <View style={[styles.container, { backgroundColor: 'mediumvioletred' }]}>
+              <Text>Right-2</Text>
+            </View>
+          ),
+        }} />
       </Stack.Navigator>
     </NavigationContainer>
   );
@@ -50,6 +62,5 @@ function Second({ navigation }: any) {
 const styles = StyleSheet.create({
   container: {
     padding: 3,
-    backgroundColor: 'cyan',
   },
 });

From 779fd7c2571dfc6ffaf8aa054379c01dea991de4 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Wed, 24 Jul 2024 13:49:29 +0200
Subject: [PATCH 13/14] Change "any" type to a navigation prop

---
 apps/src/tests/Test556.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/src/tests/Test556.tsx b/apps/src/tests/Test556.tsx
index 57badce960..652de6cc7b 100644
--- a/apps/src/tests/Test556.tsx
+++ b/apps/src/tests/Test556.tsx
@@ -1,10 +1,14 @@
 import * as React from 'react';
 import { Button, StyleSheet, Text, View } from 'react-native';
-import { NavigationContainer } from '@react-navigation/native';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { NavigationContainer, ParamListBase } from '@react-navigation/native';
+import { NativeStackNavigationProp, createNativeStackNavigator } from '@react-navigation/native-stack';
 
 const Stack = createNativeStackNavigator();
 
+type ScreenBaseProps = {
+  navigation: NativeStackNavigationProp<ParamListBase>;
+}
+
 export default function App() {
   return (
     <NavigationContainer>
@@ -41,7 +45,7 @@ export default function App() {
   );
 }
 
-function First({ navigation }: any) {
+function First({ navigation }: ScreenBaseProps) {
   return (
     <Button
       title="Tap me for second screen"
@@ -50,7 +54,7 @@ function First({ navigation }: any) {
   );
 }
 
-function Second({ navigation }: any) {
+function Second({ navigation }: ScreenBaseProps) {
   return (
     <Button
       title="Tap me for first screen"

From 1f55775e0778460448b70773e6675a6e7a19bb88 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Wed, 24 Jul 2024 13:56:04 +0200
Subject: [PATCH 14/14] Add comments on what code needs to be kept in sync &
 with links to explanation of why this works

---
 ios/RNSScreenStackHeaderConfig.mm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 1b0c1fdd93..ac0c006fbd 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -628,6 +628,8 @@ + (void)updateViewController:(UIViewController *)vc
   navitem.titleView = nil;
 
   for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
+    // This code should be kept in sync on Fabric with analogous switch statement in
+    // `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
     switch (subview.type) {
       case RNSScreenStackHeaderSubviewTypeLeft: {
 #if !TARGET_OS_TV
@@ -755,16 +757,20 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  [self setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView];
+  // For explanation of why we can make a snapshot here despite the fact that our children are already
+  // unmounted see https://github.com/software-mansion/react-native-screens/pull/2261
+  [self replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView];
   [_reactSubviews removeObject:(RNSScreenStackHeaderSubview *)childComponentView];
   [childComponentView removeFromSuperview];
 }
 
-- (void)setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView
+- (void)replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView
 {
   UINavigationItem *navitem = _screenView.controller.navigationItem;
   UIView *snapshot = [childComponentView snapshotViewAfterScreenUpdates:NO];
 
+  // This code should be kept in sync with analogous switch statement in
+  // `+ [RNSScreenStackHeaderConfig updateViewController: withConfig: animated:]` method.
   switch (childComponentView.type) {
     case RNSScreenStackHeaderSubviewTypeLeft:
       navitem.leftBarButtonItem.customView = snapshot;
@@ -779,6 +785,8 @@ - (void)setViewToSnapshot:(RNSScreenStackHeaderSubview *)childComponentView
     case RNSScreenStackHeaderSubviewTypeSearchBar:
     case RNSScreenStackHeaderSubviewTypeBackButton:
       break;
+    default:
+      RCTLogError(@"[RNScreens] Unhandled subview type: %ld", childComponentView.type);
   }
 }