From dd33cdb588c5634392647588f855bd89e6ad2530 Mon Sep 17 00:00:00 2001
From: adrianryt <adrianryt3@gmail.com>
Date: Wed, 25 Sep 2024 16:41:28 +0200
Subject: [PATCH 1/2] Always set zIndex to undefined for InnerScreen

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>
---
 apps/src/tests/Test2232.tsx | 2 +-
 src/components/Screen.tsx   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/src/tests/Test2232.tsx b/apps/src/tests/Test2232.tsx
index 7cc4d2020d..4ad2eaf79a 100644
--- a/apps/src/tests/Test2232.tsx
+++ b/apps/src/tests/Test2232.tsx
@@ -35,7 +35,7 @@ const App = () => (
         component={SettingsScreen}
         options={{
           headerTintColor: 'hotpink',
-          headerBackTitleVisible: false,
+          headerBackButtonDisplayMode: 'minimal',
           headerTitle: () => (
             <View style={{ gap: 16, flexDirection: 'row' }}>
               <Square color="green" size={20} />
diff --git a/src/components/Screen.tsx b/src/components/Screen.tsx
index 122a9042b2..e1692281d8 100644
--- a/src/components/Screen.tsx
+++ b/src/components/Screen.tsx
@@ -95,6 +95,7 @@ export const InnerScreen = React.forwardRef<View, ScreenProps>(
         isNativeStack,
         gestureResponseDistance,
         onGestureCancel,
+        style,
         ...props
       } = rest;
 
@@ -125,6 +126,7 @@ export const InnerScreen = React.forwardRef<View, ScreenProps>(
         <DelayedFreeze freeze={freezeOnBlur && activityState === 0}>
           <AnimatedScreen
             {...props}
+            style={[style, { zIndex: undefined }]}
             activityState={activityState}
             sheetAllowedDetents={sheetAllowedDetents}
             sheetLargestUndimmedDetent={sheetLargestUndimmedDetent}

From 0c92390967d29f604ae5fdc5f39c5bf8d2cc0f8e Mon Sep 17 00:00:00 2001
From: adrianryt <adrianryt3@gmail.com>
Date: Thu, 26 Sep 2024 13:59:05 +0200
Subject: [PATCH 2/2] Add code comment

---
 src/components/Screen.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/Screen.tsx b/src/components/Screen.tsx
index e1692281d8..a5eec05b76 100644
--- a/src/components/Screen.tsx
+++ b/src/components/Screen.tsx
@@ -126,6 +126,10 @@ export const InnerScreen = React.forwardRef<View, ScreenProps>(
         <DelayedFreeze freeze={freezeOnBlur && activityState === 0}>
           <AnimatedScreen
             {...props}
+            // Hierarchy of screens is handled on the native side and setting zIndex value causes this issue:
+            // https://github.com/software-mansion/react-native-screens/issues/2345
+            // With below change of zIndex, we force RN diffing mechanism to NOT include detaching and attaching mutation in one transaction.
+            // Detailed information can be found here https://github.com/software-mansion/react-native-screens/pull/2351
             style={[style, { zIndex: undefined }]}
             activityState={activityState}
             sheetAllowedDetents={sheetAllowedDetents}