From 378979e3cc46fc7d1d0b7b9f80669285c929d552 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 7 Oct 2024 22:06:23 +0200
Subject: [PATCH 01/10] fix(iOS): header snapshots not working

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

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 04abae0cfb..bf6ca4a658 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -768,7 +768,6 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   [self replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView];
   [_reactSubviews removeObject:(RNSScreenStackHeaderSubview *)childComponentView];
   [childComponentView removeFromSuperview];
-  [self updateViewControllerIfNeeded];
 }
 
 - (void)replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView

From 341558b70a5b10d5c8fa5230c3a45ecca0a33f3c Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 8 Oct 2024 15:41:44 +0200
Subject: [PATCH 02/10] updated repro

---
 apps/src/tests/Test556.tsx | 105 ++++++++++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 30 deletions(-)

diff --git a/apps/src/tests/Test556.tsx b/apps/src/tests/Test556.tsx
index 652de6cc7b..25ac688051 100644
--- a/apps/src/tests/Test556.tsx
+++ b/apps/src/tests/Test556.tsx
@@ -1,13 +1,17 @@
 import * as React from 'react';
 import { Button, StyleSheet, Text, View } from 'react-native';
 import { NavigationContainer, ParamListBase } from '@react-navigation/native';
-import { NativeStackNavigationProp, createNativeStackNavigator } from '@react-navigation/native-stack';
+import {
+  NativeStackNavigationProp,
+  createNativeStackNavigator,
+} from '@react-navigation/native-stack';
+import { Square } from '../shared';
 
 const Stack = createNativeStackNavigator();
 
 type ScreenBaseProps = {
   navigation: NativeStackNavigationProp<ParamListBase>;
-}
+};
 
 export default function App() {
   return (
@@ -16,30 +20,48 @@ export default function App() {
         screenOptions={{
           animation: 'fade',
         }}>
-        <Stack.Screen name="First" component={First} options={{
-          headerTitle: () => (
-            <View style={[styles.container, { backgroundColor: 'goldenrod' }]}>
-              <Text>Hello there!</Text>
-            </View>
-          ),
-          headerRight: () => (
-            <View style={[styles.container, { backgroundColor: 'lightblue' }]}>
-              <Text>Right-1</Text>
-            </View>
-          ),
-        }} />
-        <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.Screen
+          name="First"
+          component={First}
+          options={{
+            headerTitle: () => (
+              <View
+                style={[styles.container, { backgroundColor: 'goldenrod' }]}>
+                <Text>Hello there!</Text>
+              </View>
+            ),
+            headerRight: () => (
+              <View
+                style={[styles.container, { backgroundColor: 'lightblue' }]}>
+                <Text>Right-1</Text>
+              </View>
+            ),
+          }}
+        />
+        <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>
   );
@@ -55,11 +77,34 @@ function First({ navigation }: ScreenBaseProps) {
 }
 
 function Second({ navigation }: ScreenBaseProps) {
+  const [backButtonVisible, setBackButtonVisible] = React.useState(true);
+
   return (
-    <Button
-      title="Tap me for first screen"
-      onPress={() => navigation.popTo('First')}
-    />
+    <>
+      <Button
+        title="Toggle left subview"
+        onPress={() => {
+          setBackButtonVisible(prev => !prev);
+          navigation.setOptions({
+            headerLeft: backButtonVisible
+              ? () => (
+                  <View
+                    style={[
+                      styles.container,
+                      { backgroundColor: 'mediumblue' },
+                    ]}>
+                    <Text>Left</Text>
+                  </View>
+                )
+              : undefined,
+          });
+        }}
+      />
+      <Button
+        title="Tap me for first screen"
+        onPress={() => navigation.popTo('First')}
+      />
+    </>
   );
 }
 

From 79aed338ed9e428db00be5d836f4e78c6dcd3b40 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Fri, 11 Oct 2024 12:19:09 +0200
Subject: [PATCH 03/10] added condition for unmounting

---
 ios/RNSScreenStackHeaderConfig.mm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index af6ee85498..7f6d704377 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -165,9 +165,14 @@ - (void)updateViewControllerIfNeeded
   // we want updates sent to the VC directly below modal too since it is also visible
   BOOL isPresentingVC = nextVC != nil && vc.presentedViewController == nextVC && vc == nav.topViewController;
 
+  // If the corresponding screenView's screenContentWrapper does not have any children we can assume
+  // it's being unmounted. Updating this viewController is then unnecessary and disrupts snapshots.
+  // See https://github.com/software-mansion/react-native-screens/pull/2393
+  BOOL isUnmountingScreen = self.screenView.subviews[0].subviews.count == 0;
+
   BOOL isInFullScreenModal = nav == nil && _screenView.stackPresentation == RNSScreenStackPresentationFullScreenModal;
   // if nav is nil, it means we can be in a fullScreen modal, so there is no nextVC, but we still want to update
-  if (vc != nil && (nextVC == vc || isInFullScreenModal || isPresentingVC)) {
+  if (vc != nil && (nextVC == vc || isInFullScreenModal || isPresentingVC) && !isUnmountingScreen) {
     [RNSScreenStackHeaderConfig updateViewController:self.screenView.controller withConfig:self animated:YES];
     // As the header might have change in `updateViewController` we need to ensure that header height
     // returned by the `onHeaderHeightChange` event is correct.
@@ -828,6 +833,7 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   [self replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView];
   [_reactSubviews removeObject:(RNSScreenStackHeaderSubview *)childComponentView];
   [childComponentView removeFromSuperview];
+  [self updateViewControllerIfNeeded];
 }
 
 - (void)replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView

From fdd9a459e70e5f9981ed90d59ec643dc8d3d5042 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Fri, 11 Oct 2024 14:02:06 +0200
Subject: [PATCH 04/10] using contentwrapper class

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

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 7f6d704377..5562134098 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -22,6 +22,7 @@
 #import <React/RCTImageSource.h>
 #import "RNSConvert.h"
 #import "RNSScreen.h"
+#import "RNSScreenContentWrapper.h"
 #import "RNSScreenStackHeaderConfig.h"
 #import "RNSSearchBar.h"
 #import "RNSUIBarButtonItem.h"
@@ -165,10 +166,11 @@ - (void)updateViewControllerIfNeeded
   // we want updates sent to the VC directly below modal too since it is also visible
   BOOL isPresentingVC = nextVC != nil && vc.presentedViewController == nextVC && vc == nav.topViewController;
 
-  // If the corresponding screenView's screenContentWrapper does not have any children we can assume
+  // If the corresponding screen's content wrapper does not have any children we can assume
   // it's being unmounted. Updating this viewController is then unnecessary and disrupts snapshots.
   // See https://github.com/software-mansion/react-native-screens/pull/2393
-  BOOL isUnmountingScreen = self.screenView.subviews[0].subviews.count == 0;
+  RNSScreenContentWrapper *contentWrapper = _screenView.subviews[0];
+  BOOL isUnmountingScreen = !contentWrapper.subviews.count;
 
   BOOL isInFullScreenModal = nav == nil && _screenView.stackPresentation == RNSScreenStackPresentationFullScreenModal;
   // if nav is nil, it means we can be in a fullScreen modal, so there is no nextVC, but we still want to update

From f568df2489c3b1f5a2b0db39451635a3e700697c Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Fri, 11 Oct 2024 14:07:23 +0200
Subject: [PATCH 05/10] checking for different indexes

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

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 5562134098..96d78acafc 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -169,8 +169,14 @@ - (void)updateViewControllerIfNeeded
   // If the corresponding screen's content wrapper does not have any children we can assume
   // it's being unmounted. Updating this viewController is then unnecessary and disrupts snapshots.
   // See https://github.com/software-mansion/react-native-screens/pull/2393
-  RNSScreenContentWrapper *contentWrapper = _screenView.subviews[0];
-  BOOL isUnmountingScreen = !contentWrapper.subviews.count;
+  BOOL isUnmountingScreen = NO;
+  for (UIView *subview in _screenView.subviews) {
+    if ([subview isKindOfClass:[RNSScreenContentWrapper class]]) {
+      RNSScreenContentWrapper *contentWrapper = (RNSScreenContentWrapper *)subview;
+      isUnmountingScreen = contentWrapper.subviews.count == 0;
+      break;
+    }
+  }
 
   BOOL isInFullScreenModal = nav == nil && _screenView.stackPresentation == RNSScreenStackPresentationFullScreenModal;
   // if nav is nil, it means we can be in a fullScreen modal, so there is no nextVC, but we still want to update

From 09aaf91a0fd3a3c8ff9ad15bccbe5c843b274d84 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 14 Oct 2024 12:31:57 +0200
Subject: [PATCH 06/10] moved condition to unmountChildComponentView

---
 ios/RNSScreenStackHeaderConfig.mm | 37 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 96d78acafc..0ab6d8027d 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -166,21 +166,9 @@ - (void)updateViewControllerIfNeeded
   // we want updates sent to the VC directly below modal too since it is also visible
   BOOL isPresentingVC = nextVC != nil && vc.presentedViewController == nextVC && vc == nav.topViewController;
 
-  // If the corresponding screen's content wrapper does not have any children we can assume
-  // it's being unmounted. Updating this viewController is then unnecessary and disrupts snapshots.
-  // See https://github.com/software-mansion/react-native-screens/pull/2393
-  BOOL isUnmountingScreen = NO;
-  for (UIView *subview in _screenView.subviews) {
-    if ([subview isKindOfClass:[RNSScreenContentWrapper class]]) {
-      RNSScreenContentWrapper *contentWrapper = (RNSScreenContentWrapper *)subview;
-      isUnmountingScreen = contentWrapper.subviews.count == 0;
-      break;
-    }
-  }
-
   BOOL isInFullScreenModal = nav == nil && _screenView.stackPresentation == RNSScreenStackPresentationFullScreenModal;
   // if nav is nil, it means we can be in a fullScreen modal, so there is no nextVC, but we still want to update
-  if (vc != nil && (nextVC == vc || isInFullScreenModal || isPresentingVC) && !isUnmountingScreen) {
+  if (vc != nil && (nextVC == vc || isInFullScreenModal || isPresentingVC)) {
     [RNSScreenStackHeaderConfig updateViewController:self.screenView.controller withConfig:self animated:YES];
     // As the header might have change in `updateViewController` we need to ensure that header height
     // returned by the `onHeaderHeightChange` event is correct.
@@ -836,12 +824,27 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  // 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];
+  // If the corresponding screen's content wrapper does not have any children we can assume
+  // it's being unmounted. Updating this viewController is then unnecessary and disrupts snapshots.
+  // See https://github.com/software-mansion/react-native-screens/pull/2393
+  BOOL isUnmountingScreen = NO;
+  for (UIView *subview in _screenView.subviews) {
+    if ([subview isKindOfClass:[RNSScreenContentWrapper class]]) {
+      RNSScreenContentWrapper *contentWrapper = (RNSScreenContentWrapper *)subview;
+      isUnmountingScreen = contentWrapper.subviews.count == 0;
+      break;
+    }
+  }
+  if (isUnmountingScreen) {
+    // 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];
-  [self updateViewControllerIfNeeded];
+  if (!isUnmountingScreen) {
+    [self updateViewControllerIfNeeded];
+  }
 }
 
 - (void)replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView

From daf17ca6301698a3baaeb66b5d33272315ab8801 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 14 Oct 2024 16:18:30 +0200
Subject: [PATCH 07/10] added isGoingToBeRemoved screenView property

---
 ios/RNSScreen.h                   |  2 ++
 ios/RNSScreen.mm                  |  8 ++++++++
 ios/RNSScreenStack.mm             |  1 +
 ios/RNSScreenStackHeaderConfig.mm | 17 +++--------------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ios/RNSScreen.h b/ios/RNSScreen.h
index 87a80d059d..3594b42119 100644
--- a/ios/RNSScreen.h
+++ b/ios/RNSScreen.h
@@ -100,6 +100,7 @@ namespace react = facebook::react;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;
 @property (weak, nonatomic) RNSScreenStackHeaderConfig *config;
 @property (nonatomic, readonly) BOOL hasHeaderConfig;
+@property (nonatomic) BOOL isGoingToBeRemoved;
 #else
 @property (nonatomic, copy) RCTDirectEventBlock onAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onDisappear;
@@ -124,6 +125,7 @@ namespace react = facebook::react;
 - (void)updateBounds;
 - (void)notifyDismissedWithCount:(int)dismissCount;
 - (instancetype)initWithFrame:(CGRect)frame;
+- (void)onWillReceiveRemoveMutation;
 #else
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 #endif // RCT_NEW_ARCH_ENABLED
diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 6d069499f0..396e9a815d 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -123,6 +123,9 @@ - (void)initCommonProps
 #endif // !TARGET_OS_TV
   _sheetsScrollView = nil;
   _didSetSheetAllowedDetentsOnController = NO;
+#ifdef RCT_NEW_ARCH_ENABLED
+  _isGoingToBeRemoved = NO;
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (UIViewController *)reactViewController
@@ -1082,6 +1085,11 @@ - (BOOL)hasHeaderConfig
   return _config != nil;
 }
 
+- (void)onWillReceiveRemoveMutation
+{
+  _isGoingToBeRemoved = YES;
+}
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSScreenComponentDescriptor>();
diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index dacdc5f355..196cdf5805 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -1208,6 +1208,7 @@ - (void)mountingTransactionWillMount:(const facebook::react::MountingTransaction
     if (mutation.type == react::ShadowViewMutation::Delete) {
       RNSScreenView *_Nullable toBeRemovedChild = [self childScreenForTag:mutation.oldChildShadowView.tag];
       if (toBeRemovedChild != nil) {
+        [toBeRemovedChild onWillReceiveRemoveMutation];
         _toBeDeletedScreens.push_back(toBeRemovedChild);
       }
     }
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 0ab6d8027d..21cb4190e2 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -22,7 +22,6 @@
 #import <React/RCTImageSource.h>
 #import "RNSConvert.h"
 #import "RNSScreen.h"
-#import "RNSScreenContentWrapper.h"
 #import "RNSScreenStackHeaderConfig.h"
 #import "RNSSearchBar.h"
 #import "RNSUIBarButtonItem.h"
@@ -824,25 +823,15 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  // If the corresponding screen's content wrapper does not have any children we can assume
-  // it's being unmounted. Updating this viewController is then unnecessary and disrupts snapshots.
-  // See https://github.com/software-mansion/react-native-screens/pull/2393
-  BOOL isUnmountingScreen = NO;
-  for (UIView *subview in _screenView.subviews) {
-    if ([subview isKindOfClass:[RNSScreenContentWrapper class]]) {
-      RNSScreenContentWrapper *contentWrapper = (RNSScreenContentWrapper *)subview;
-      isUnmountingScreen = contentWrapper.subviews.count == 0;
-      break;
-    }
-  }
-  if (isUnmountingScreen) {
+  BOOL isGoingToBeRemoved = _screenView.isGoingToBeRemoved;
+  if (isGoingToBeRemoved) {
     // 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];
-  if (!isUnmountingScreen) {
+  if (!isGoingToBeRemoved) {
     [self updateViewControllerIfNeeded];
   }
 }

From 78dbeb308295791295282f8184901b0fce5251b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Du=C5=BCy?=
 <91994767+alduzy@users.noreply.github.com>
Date: Tue, 15 Oct 2024 10:16:46 +0200
Subject: [PATCH 08/10] Update ios/RNSScreen.h

Co-authored-by: Kacper Kafara <kacper.kafara@swmansion.com>
---
 ios/RNSScreen.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ios/RNSScreen.h b/ios/RNSScreen.h
index 3594b42119..e776f1592f 100644
--- a/ios/RNSScreen.h
+++ b/ios/RNSScreen.h
@@ -125,7 +125,10 @@ namespace react = facebook::react;
 - (void)updateBounds;
 - (void)notifyDismissedWithCount:(int)dismissCount;
 - (instancetype)initWithFrame:(CGRect)frame;
-- (void)onWillReceiveRemoveMutation;
+/// Tell `Screen` that it will be unmounted in next transaction.
+/// The component needs this so that we can later decide whether to 
+/// replace it with snapshot or not. 
+- (void)willBeUnmountedInUpcomingTransaction
 #else
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 #endif // RCT_NEW_ARCH_ENABLED

From 29ab1b7c665260f0764d5e130ec4a403e667e9a5 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 15 Oct 2024 10:23:05 +0200
Subject: [PATCH 09/10] changed names

---
 ios/RNSScreen.h                   | 8 ++++----
 ios/RNSScreen.mm                  | 6 +++---
 ios/RNSScreenStack.mm             | 2 +-
 ios/RNSScreenStackHeaderConfig.mm | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ios/RNSScreen.h b/ios/RNSScreen.h
index e776f1592f..09f578f363 100644
--- a/ios/RNSScreen.h
+++ b/ios/RNSScreen.h
@@ -100,7 +100,7 @@ namespace react = facebook::react;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;
 @property (weak, nonatomic) RNSScreenStackHeaderConfig *config;
 @property (nonatomic, readonly) BOOL hasHeaderConfig;
-@property (nonatomic) BOOL isGoingToBeRemoved;
+@property (nonatomic) BOOL markedForUnmountInCurrentTransaction;
 #else
 @property (nonatomic, copy) RCTDirectEventBlock onAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onDisappear;
@@ -126,9 +126,9 @@ namespace react = facebook::react;
 - (void)notifyDismissedWithCount:(int)dismissCount;
 - (instancetype)initWithFrame:(CGRect)frame;
 /// Tell `Screen` that it will be unmounted in next transaction.
-/// The component needs this so that we can later decide whether to 
-/// replace it with snapshot or not. 
-- (void)willBeUnmountedInUpcomingTransaction
+/// The component needs this so that we can later decide whether to
+/// replace it with snapshot or not.
+- (void)willBeUnmountedInUpcomingTransaction;
 #else
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 #endif // RCT_NEW_ARCH_ENABLED
diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
index 396e9a815d..309a338f6b 100644
--- a/ios/RNSScreen.mm
+++ b/ios/RNSScreen.mm
@@ -124,7 +124,7 @@ - (void)initCommonProps
   _sheetsScrollView = nil;
   _didSetSheetAllowedDetentsOnController = NO;
 #ifdef RCT_NEW_ARCH_ENABLED
-  _isGoingToBeRemoved = NO;
+  _markedForUnmountInCurrentTransaction = NO;
 #endif // RCT_NEW_ARCH_ENABLED
 }
 
@@ -1085,9 +1085,9 @@ - (BOOL)hasHeaderConfig
   return _config != nil;
 }
 
-- (void)onWillReceiveRemoveMutation
+- (void)willBeUnmountedInUpcomingTransaction
 {
-  _isGoingToBeRemoved = YES;
+  _markedForUnmountInCurrentTransaction = YES;
 }
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index 196cdf5805..98903d1762 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -1208,7 +1208,7 @@ - (void)mountingTransactionWillMount:(const facebook::react::MountingTransaction
     if (mutation.type == react::ShadowViewMutation::Delete) {
       RNSScreenView *_Nullable toBeRemovedChild = [self childScreenForTag:mutation.oldChildShadowView.tag];
       if (toBeRemovedChild != nil) {
-        [toBeRemovedChild onWillReceiveRemoveMutation];
+        [toBeRemovedChild willBeUnmountedInUpcomingTransaction];
         _toBeDeletedScreens.push_back(toBeRemovedChild);
       }
     }
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 21cb4190e2..8525d34cc8 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -823,7 +823,7 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  BOOL isGoingToBeRemoved = _screenView.isGoingToBeRemoved;
+  BOOL isGoingToBeRemoved = _screenView.markedForUnmountInCurrentTransaction;
   if (isGoingToBeRemoved) {
     // 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

From 583547f1d86636264a2e8588e73f1ed3a5daf904 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Tue, 15 Oct 2024 11:03:05 +0200
Subject: [PATCH 10/10] Slight final adjustments

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

diff --git a/ios/RNSScreen.h b/ios/RNSScreen.h
index 09f578f363..a536f029eb 100644
--- a/ios/RNSScreen.h
+++ b/ios/RNSScreen.h
@@ -100,7 +100,8 @@ namespace react = facebook::react;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;
 @property (weak, nonatomic) RNSScreenStackHeaderConfig *config;
 @property (nonatomic, readonly) BOOL hasHeaderConfig;
-@property (nonatomic) BOOL markedForUnmountInCurrentTransaction;
+@property (nonatomic, readonly, getter=isMarkedForUnmountInCurrentTransaction)
+    BOOL markedForUnmountInCurrentTransaction;
 #else
 @property (nonatomic, copy) RCTDirectEventBlock onAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onDisappear;
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 8525d34cc8..ff329e4161 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -823,7 +823,7 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  BOOL isGoingToBeRemoved = _screenView.markedForUnmountInCurrentTransaction;
+  BOOL isGoingToBeRemoved = _screenView.isMarkedForUnmountInCurrentTransaction;
   if (isGoingToBeRemoved) {
     // 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