From a2de7397990a0b641ad60158796713ff3845ed6e Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 30 Jul 2024 09:25:43 +0200
Subject: [PATCH 01/15] added repro

---
 apps/App.tsx                |  8 ++---
 apps/src/tests/Test2219.tsx | 66 +++++++++++++++++++++++++++++++++++++
 apps/src/tests/index.ts     |  1 +
 3 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 apps/src/tests/Test2219.tsx

diff --git a/apps/App.tsx b/apps/App.tsx
index 23a9af9c45..60f45c3180 100644
--- a/apps/App.tsx
+++ b/apps/App.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { enableFreeze } from 'react-native-screens';
-import Example from './Example';
-// import * as Test from './src/tests';
+// import Example from './Example';
+import * as Test from './src/tests';
 
 enableFreeze(true);
 
 export default function App() {
-  return <Example />;
-  // return <Test.Test42 />;
+  // return <Example />;
+  return <Test.Test2219 />;
 }
diff --git a/apps/src/tests/Test2219.tsx b/apps/src/tests/Test2219.tsx
new file mode 100644
index 0000000000..e16a2da292
--- /dev/null
+++ b/apps/src/tests/Test2219.tsx
@@ -0,0 +1,66 @@
+import * as React from 'react';
+import { Button, Pressable, StyleSheet, Text, View } from 'react-native';
+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>
+      <Stack.Navigator
+        screenOptions={{
+          animation: 'fade',
+        }}>
+        <Stack.Screen
+          name="First"
+          component={First}
+          options={{
+            headerTitle: () => (
+              <View
+                style={[styles.container, { backgroundColor: 'goldenrod' }]}>
+                <Text>Hello there!</Text>
+              </View>
+            ),
+            headerLeft: () => (
+              <Pressable
+                style={[styles.container, { backgroundColor: 'lightblue' }]}
+                onPressIn={() => console.log('does work')}>
+                <Text>Left</Text>
+              </Pressable>
+            ),
+            headerRight: () => (
+              <Pressable
+                style={[styles.container, { backgroundColor: 'lightblue' }]}
+                onPress={() => console.log('doesnt work')}>
+                <Text>Right</Text>
+              </Pressable>
+            ),
+          }}
+        />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
+
+function First({ navigation }: ScreenBaseProps) {
+  return (
+    <Button
+      title="Tap me for second screen"
+      onPress={() => navigation.navigate('Second')}
+    />
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    padding: 3,
+  },
+});
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index 07b0690531..0ac7a6dfe1 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -91,6 +91,7 @@ export { default as Test1791 } from './Test1791';
 export { default as Test1802 } from './Test1802';
 export { default as Test1829 } from './Test1829';
 export { default as Test1844 } from './Test1844';
+export { default as Test2219 } from './Test2219';
 export { default as Test1864 } from './Test1864';
 export { default as Test1970 } from './Test1970';
 export { default as Test1981 } from './Test1981';

From 4c361ceee4a6254c63bb5b03777e880aaaf7efa3 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Thu, 1 Aug 2024 10:46:29 +0200
Subject: [PATCH 02/15] updated repro

---
 apps/src/tests/Test2219.tsx | 56 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/apps/src/tests/Test2219.tsx b/apps/src/tests/Test2219.tsx
index e16a2da292..bbc649d020 100644
--- a/apps/src/tests/Test2219.tsx
+++ b/apps/src/tests/Test2219.tsx
@@ -1,45 +1,29 @@
 import * as React from 'react';
-import { Button, Pressable, StyleSheet, Text, View } from 'react-native';
-import { NavigationContainer, ParamListBase } from '@react-navigation/native';
-import {
-  NativeStackNavigationProp,
-  createNativeStackNavigator,
-} from '@react-navigation/native-stack';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
+import { NavigationContainer } from '@react-navigation/native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
 const Stack = createNativeStackNavigator();
 
-type ScreenBaseProps = {
-  navigation: NativeStackNavigationProp<ParamListBase>;
-};
-
 export default function App() {
   return (
     <NavigationContainer>
-      <Stack.Navigator
-        screenOptions={{
-          animation: 'fade',
-        }}>
+      <Stack.Navigator>
         <Stack.Screen
           name="First"
           component={First}
           options={{
-            headerTitle: () => (
-              <View
-                style={[styles.container, { backgroundColor: 'goldenrod' }]}>
-                <Text>Hello there!</Text>
-              </View>
-            ),
             headerLeft: () => (
               <Pressable
-                style={[styles.container, { backgroundColor: 'lightblue' }]}
+                style={[styles.pressable, { backgroundColor: 'goldenrod' }]}
                 onPressIn={() => console.log('does work')}>
                 <Text>Left</Text>
               </Pressable>
             ),
             headerRight: () => (
               <Pressable
-                style={[styles.container, { backgroundColor: 'lightblue' }]}
-                onPress={() => console.log('doesnt work')}>
+                style={[styles.pressable, { backgroundColor: 'lightblue' }]}
+                onPress={() => console.log('does not work')}>
                 <Text>Right</Text>
               </Pressable>
             ),
@@ -50,17 +34,31 @@ export default function App() {
   );
 }
 
-function First({ navigation }: ScreenBaseProps) {
+function First() {
   return (
-    <Button
-      title="Tap me for second screen"
-      onPress={() => navigation.navigate('Second')}
-    />
+    <View style={styles.container}>
+      <Pressable
+        onPressIn={() => console.log('does work')}
+        style={[styles.pressable, { backgroundColor: 'lightblue' }]}>
+        <Text>Tap me for second screen by press in</Text>
+      </Pressable>
+      <Pressable
+        onPress={() => console.log('does not work')}
+        style={[styles.pressable, { backgroundColor: 'goldenrod' }]}>
+        <Text>Tap me for second screen by press</Text>
+      </Pressable>
+    </View>
   );
 }
 
 const styles = StyleSheet.create({
+  pressable: {
+    padding: 5,
+  },
   container: {
-    padding: 3,
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: 24,
   },
 });

From b9a09bef999ee88fda43c7538efb49cc7092dad5 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Thu, 1 Aug 2024 15:42:45 +0200
Subject: [PATCH 03/15] more detailed repro

---
 apps/src/tests/Test2219.tsx | 78 +++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 25 deletions(-)

diff --git a/apps/src/tests/Test2219.tsx b/apps/src/tests/Test2219.tsx
index bbc649d020..583555a078 100644
--- a/apps/src/tests/Test2219.tsx
+++ b/apps/src/tests/Test2219.tsx
@@ -1,32 +1,55 @@
 import * as React from 'react';
-import { Pressable, StyleSheet, Text, View } from 'react-native';
+import {
+  Pressable,
+  PressableProps,
+  StyleSheet,
+  Text,
+  View,
+} from 'react-native';
 import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
 const Stack = createNativeStackNavigator();
 
+interface CustomButtonProps extends PressableProps {
+  title: string;
+}
+
+const CustomButton = (props: CustomButtonProps) => (
+  <Pressable
+    style={({ pressed }) => [
+      styles.pressable,
+      { backgroundColor: pressed ? 'goldenrod' : 'lightblue' },
+    ]}
+    {...props}>
+    <Text>{props.title}</Text>
+  </Pressable>
+);
+
 export default function App() {
+  const [count, setCount] = React.useState(0);
+
   return (
     <NavigationContainer>
       <Stack.Navigator>
         <Stack.Screen
-          name="First"
-          component={First}
+          name="Screen"
+          component={Screen}
           options={{
             headerLeft: () => (
-              <Pressable
-                style={[styles.pressable, { backgroundColor: 'goldenrod' }]}
-                onPressIn={() => console.log('does work')}>
-                <Text>Left</Text>
-              </Pressable>
+              <CustomButton
+                title="PressIn (-)"
+                onPressIn={() => setCount(prev => prev - 1)}
+              />
             ),
             headerRight: () => (
-              <Pressable
-                style={[styles.pressable, { backgroundColor: 'lightblue' }]}
-                onPress={() => console.log('does not work')}>
-                <Text>Right</Text>
-              </Pressable>
+              <CustomButton
+                onPress={() => setCount(prev => prev + 1)}
+                title="Press (+)"
+              />
             ),
+            title: count.toString(),
+            headerTitleAlign: 'center',
           }}
         />
       </Stack.Navigator>
@@ -34,26 +57,31 @@ export default function App() {
   );
 }
 
-function First() {
+function Screen() {
+  const [count, setCount] = React.useState(0);
   return (
     <View style={styles.container}>
-      <Pressable
-        onPressIn={() => console.log('does work')}
-        style={[styles.pressable, { backgroundColor: 'lightblue' }]}>
-        <Text>Tap me for second screen by press in</Text>
-      </Pressable>
-      <Pressable
-        onPress={() => console.log('does not work')}
-        style={[styles.pressable, { backgroundColor: 'goldenrod' }]}>
-        <Text>Tap me for second screen by press</Text>
-      </Pressable>
+      <Text style={styles.count}>{count}</Text>
+      <CustomButton
+        onPressIn={() => setCount(prev => prev - 1)}
+        title="PressIn (-)"
+      />
+      <CustomButton
+        onPress={() => setCount(prev => prev + 1)}
+        title="Press (+)"
+      />
     </View>
   );
 }
 
 const styles = StyleSheet.create({
   pressable: {
-    padding: 5,
+    paddingVertical: 5,
+    paddingHorizontal: 10,
+  },
+  count: {
+    fontSize: 48,
+    fontWeight: 'bold',
   },
   container: {
     flex: 1,

From 4c8a4afcbffcceeae06ca737d8970fe4de29d38f Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 7 Aug 2024 15:14:08 +0200
Subject: [PATCH 04/15] using simple buttons

---
 apps/src/tests/Test2219.tsx | 40 +++----------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/apps/src/tests/Test2219.tsx b/apps/src/tests/Test2219.tsx
index 583555a078..6c33ff4b40 100644
--- a/apps/src/tests/Test2219.tsx
+++ b/apps/src/tests/Test2219.tsx
@@ -1,31 +1,10 @@
 import * as React from 'react';
-import {
-  Pressable,
-  PressableProps,
-  StyleSheet,
-  Text,
-  View,
-} from 'react-native';
+import { Button, StyleSheet, Text, View } from 'react-native';
 import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
 const Stack = createNativeStackNavigator();
 
-interface CustomButtonProps extends PressableProps {
-  title: string;
-}
-
-const CustomButton = (props: CustomButtonProps) => (
-  <Pressable
-    style={({ pressed }) => [
-      styles.pressable,
-      { backgroundColor: pressed ? 'goldenrod' : 'lightblue' },
-    ]}
-    {...props}>
-    <Text>{props.title}</Text>
-  </Pressable>
-);
-
 export default function App() {
   const [count, setCount] = React.useState(0);
 
@@ -36,14 +15,8 @@ export default function App() {
           name="Screen"
           component={Screen}
           options={{
-            headerLeft: () => (
-              <CustomButton
-                title="PressIn (-)"
-                onPressIn={() => setCount(prev => prev - 1)}
-              />
-            ),
             headerRight: () => (
-              <CustomButton
+              <Button
                 onPress={() => setCount(prev => prev + 1)}
                 title="Press (+)"
               />
@@ -62,14 +35,7 @@ function Screen() {
   return (
     <View style={styles.container}>
       <Text style={styles.count}>{count}</Text>
-      <CustomButton
-        onPressIn={() => setCount(prev => prev - 1)}
-        title="PressIn (-)"
-      />
-      <CustomButton
-        onPress={() => setCount(prev => prev + 1)}
-        title="Press (+)"
-      />
+      <Button onPress={() => setCount(prev => prev + 1)} title="Press (+)" />
     </View>
   );
 }

From 07c699750f8c55acea1c6586d7d475b47ea842bf Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Thu, 8 Aug 2024 11:58:01 +0200
Subject: [PATCH 05/15] Add reproduction

---
 apps/src/tests/Test2219.tsx | 113 ++++++++++++++++++++++++++++++++++++
 apps/src/tests/index.ts     |   1 +
 2 files changed, 114 insertions(+)
 create mode 100644 apps/src/tests/Test2219.tsx

diff --git a/apps/src/tests/Test2219.tsx b/apps/src/tests/Test2219.tsx
new file mode 100644
index 0000000000..eced54260c
--- /dev/null
+++ b/apps/src/tests/Test2219.tsx
@@ -0,0 +1,113 @@
+import * as React from 'react';
+import { NavigationContainer } from '@react-navigation/native';
+// import { createStackNavigator } from '@react-navigation/stack';
+import { View, Text, Button, StyleSheet, Pressable } from 'react-native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+
+// const Stack = createStackNavigator();
+const Stack = createNativeStackNavigator();
+
+function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator initialRouteName="Home">
+        <Stack.Screen
+          name="Home"
+          component={HomeScreen}
+          options={{ title: 'Home' }}
+        />
+        <Stack.Screen
+          name="Details"
+          component={DetailsScreen}
+          options={({ navigation }) => ({
+            title: 'Details',
+            headerLeft: () => (
+              <Button
+                onPress={() => navigation.goBack()}
+                title="Back"
+                color="#00cc00"
+              />
+            ),
+            headerRight: () => (
+              <Pressable onPress={() => { console.log("doesnt work"); navigation.goBack() }}>
+                <Text>Doesnt work</Text>
+              </Pressable>
+            ),
+            //headerMode: "screen",
+            headerBackVisible: false,
+            // headerLeft: () => (
+            //   <Pressable onPressIn={() => { console.log("works"); navigation.goBack() }}><Text>works</Text></Pressable>
+            // )
+          })}
+        />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
+
+function HomeScreen({ navigation }) {
+  return (
+    <View style={styles.container}>
+      <Text>Home Screen</Text>
+      <Button
+        title="Go to Details"
+        onPress={() => navigation.navigate('Details')}
+        // onPress={() => {}}
+      />
+    </View>
+  );
+}
+
+function useCounter(initialValue: number) {
+  const [value, setValue] = React.useState(initialValue);
+
+  const incrementer = React.useCallback(() => {
+    setValue(old => old + 1);
+  }, [setValue]);
+
+  return [value, incrementer];
+}
+
+function DetailsScreen({ navigation }) {
+  let counter = React.useRef(0);
+  const [color, setColor] = React.useState('lightblue');
+
+  return (
+    <View style={{ ...styles.container, backgroundColor: 'goldenrod' }}>
+      <View>
+        <Pressable
+          onPressIn={() => {
+            counter.current += 1;
+            setColor('lightgreen');
+            console.log(`[${counter.current}] Details: onPressIn`);
+          }}
+          onPress={() => {
+            console.log(`[${counter.current}] Details: onPress`);
+            // navigation.goBack();
+          }}
+          onPressOut={() => {
+            setColor('lightblue');
+            console.log(`[${counter.current}] Details: onPressOut`);
+          }}
+        >
+          <View style={{ backgroundColor: color, width: 100, height: 30 }}>
+            <Text>Go back</Text>
+          </View>
+        </Pressable>
+      </View>
+    </View>
+  )
+};
+
+
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});
+
+export default App;
+
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index 2a90426c68..c3e5bc1ac5 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -101,6 +101,7 @@ export { default as Test2048 } from './Test2048';
 export { default as Test2069 } from './Test2069';
 export { default as Test2118 } from './Test2118';
 export { default as Test2184 } from './Test2184';
+export { default as Test2219 } from './Test2219';
 export { default as Test2223 } from './Test2223';
 export { default as Test2227 } from './Test2227';
 export { default as Test2229 } from './Test2229';

From 66fb594dd598406a8005367945aa7a280e7b77a9 Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Thu, 8 Aug 2024 11:58:17 +0200
Subject: [PATCH 06/15] TOREVERT: changes in App.tsx

---
 apps/App.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/App.tsx b/apps/App.tsx
index 23a9af9c45..60f45c3180 100644
--- a/apps/App.tsx
+++ b/apps/App.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { enableFreeze } from 'react-native-screens';
-import Example from './Example';
-// import * as Test from './src/tests';
+// import Example from './Example';
+import * as Test from './src/tests';
 
 enableFreeze(true);
 
 export default function App() {
-  return <Example />;
-  // return <Test.Test42 />;
+  // return <Example />;
+  return <Test.Test2219 />;
 }

From f8d325aeccf83dd74a956b620bc40998c4113c2a Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Thu, 8 Aug 2024 11:58:32 +0200
Subject: [PATCH 07/15] TOREVERT: build RN from source

---
 FabricExample/android/settings.gradle | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/FabricExample/android/settings.gradle b/FabricExample/android/settings.gradle
index 98477550f6..31ed77c6af 100644
--- a/FabricExample/android/settings.gradle
+++ b/FabricExample/android/settings.gradle
@@ -4,3 +4,13 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex -> ex.autol
 rootProject.name = 'FabricExample'
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
+
+includeBuild('../node_modules/react-native') {
+    dependencySubstitution {
+        substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid"))
+        substitute(module("com.facebook.react:react-native")).using(project(":packages:react-native:ReactAndroid"))
+        substitute(module("com.facebook.react:hermes-android")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
+        substitute(module("com.facebook.react:hermes-engine")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
+    }
+}
+

From c2391279b21b2c1a050eb39abba8af75bde5c4ce Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Thu, 8 Aug 2024 12:03:03 +0200
Subject: [PATCH 08/15] using pressables in repro

---
 apps/src/tests/Test2219.tsx | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/src/tests/Test2219.tsx b/apps/src/tests/Test2219.tsx
index 6c33ff4b40..b0c13ffa2a 100644
--- a/apps/src/tests/Test2219.tsx
+++ b/apps/src/tests/Test2219.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Button, StyleSheet, Text, View } from 'react-native';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
 import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
@@ -10,16 +10,20 @@ export default function App() {
 
   return (
     <NavigationContainer>
-      <Stack.Navigator>
+      <Stack.Navigator screenOptions={{ statusBarTranslucent: false }}>
         <Stack.Screen
           name="Screen"
           component={Screen}
           options={{
             headerRight: () => (
-              <Button
+              <Pressable
                 onPress={() => setCount(prev => prev + 1)}
-                title="Press (+)"
-              />
+                style={({ pressed }) => [
+                  styles.pressable,
+                  pressed && { backgroundColor: 'goldenrod' },
+                ]}>
+                <Text>Press (+)</Text>
+              </Pressable>
             ),
             title: count.toString(),
             headerTitleAlign: 'center',
@@ -35,7 +39,14 @@ function Screen() {
   return (
     <View style={styles.container}>
       <Text style={styles.count}>{count}</Text>
-      <Button onPress={() => setCount(prev => prev + 1)} title="Press (+)" />
+      <Pressable
+        onPress={() => setCount(prev => prev + 1)}
+        style={({ pressed }) => [
+          styles.pressable,
+          pressed && { backgroundColor: 'goldenrod' },
+        ]}>
+        <Text>Press (+)</Text>
+      </Pressable>
     </View>
   );
 }
@@ -44,6 +55,7 @@ const styles = StyleSheet.create({
   pressable: {
     paddingVertical: 5,
     paddingHorizontal: 10,
+    backgroundColor: 'red',
   },
   count: {
     fontSize: 48,

From d301a860ced3e6c894603116213a7ffee79ba598 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Fri, 9 Aug 2024 15:22:16 +0200
Subject: [PATCH 09/15] removed faulty func

---
 .../rnscreens/FabricEnabledViewGroup.kt       |  7 ++--
 .../java/com/swmansion/rnscreens/Screen.kt    | 36 ++-----------------
 .../events/HeaderHeightChangeEvent.kt         |  6 ++--
 3 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt
index 7d90accb91..9315cb2ce0 100644
--- a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt
+++ b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt
@@ -24,7 +24,7 @@ abstract class FabricEnabledViewGroup(
     protected fun updateScreenSizeFabric(
         width: Int,
         height: Int,
-        headerHeight: Double,
+        headerHeight: Int,
     ) {
         updateState(width, height, headerHeight)
     }
@@ -33,10 +33,11 @@ abstract class FabricEnabledViewGroup(
     fun updateState(
         width: Int,
         height: Int,
-        headerHeight: Double,
+        headerHeight: Int,
     ) {
         val realWidth: Float = PixelUtil.toDIPFromPixel(width.toFloat())
         val realHeight: Float = PixelUtil.toDIPFromPixel(height.toFloat())
+        val realHeaderHeight: Float = PixelUtil.toDIPFromPixel(headerHeight.toFloat())
 
         // Check incoming state values. If they're already the correct value, return early to prevent
         // infinite UpdateState/SetState loop.
@@ -54,7 +55,7 @@ abstract class FabricEnabledViewGroup(
                 putDouble("frameWidth", realWidth.toDouble())
                 putDouble("frameHeight", realHeight.toDouble())
                 putDouble("contentOffsetX", 0.0)
-                putDouble("contentOffsetY", headerHeight)
+                putDouble("contentOffsetY", realHeaderHeight.toDouble())
             }
         mStateWrapper?.updateState(map)
     }
diff --git a/android/src/main/java/com/swmansion/rnscreens/Screen.kt b/android/src/main/java/com/swmansion/rnscreens/Screen.kt
index 1ab8594ef3..af6fc35b00 100644
--- a/android/src/main/java/com/swmansion/rnscreens/Screen.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/Screen.kt
@@ -5,7 +5,6 @@ import android.content.pm.ActivityInfo
 import android.graphics.Paint
 import android.os.Parcelable
 import android.util.SparseArray
-import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
@@ -14,7 +13,6 @@ import androidx.core.view.children
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.UIManagerModule
 import com.swmansion.rnscreens.events.HeaderHeightChangeEvent
@@ -75,16 +73,13 @@ class Screen(
             val width = r - l
             val height = b - t
 
-            val headerHeight = calculateHeaderHeight()
-            val totalHeight =
-                headerHeight.first + headerHeight.second // action bar height + status bar height
             if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                updateScreenSizeFabric(width, height, totalHeight)
+                updateScreenSizeFabric(width, height, t)
             } else {
                 updateScreenSizePaper(width, height)
             }
 
-            notifyHeaderHeightChange(totalHeight)
+            notifyHeaderHeightChange(t)
         }
     }
 
@@ -318,32 +313,7 @@ class Screen(
         }
     }
 
-    private fun calculateHeaderHeight(): Pair<Double, Double> {
-        val actionBarTv = TypedValue()
-        val resolvedActionBarSize =
-            context.theme.resolveAttribute(android.R.attr.actionBarSize, actionBarTv, true)
-
-        // Check if it's possible to get an attribute from theme context and assign a value from it.
-        // Otherwise, the default value will be returned.
-        val actionBarHeight =
-            TypedValue
-                .complexToDimensionPixelSize(actionBarTv.data, resources.displayMetrics)
-                .takeIf { resolvedActionBarSize && headerConfig?.isHeaderHidden != true && headerConfig?.isHeaderTranslucent != true }
-                ?.let { PixelUtil.toDIPFromPixel(it.toFloat()).toDouble() } ?: 0.0
-
-        val statusBarHeight =
-            context.resources
-                .getIdentifier("status_bar_height", "dimen", "android")
-                // Count only status bar when action bar is visible and status bar is not hidden
-                .takeIf { it > 0 && isStatusBarHidden != true && actionBarHeight > 0 }
-                ?.let { (context.resources::getDimensionPixelSize)(it) }
-                ?.let { PixelUtil.toDIPFromPixel(it.toFloat()).toDouble() }
-                ?: 0.0
-
-        return actionBarHeight to statusBarHeight
-    }
-
-    private fun notifyHeaderHeightChange(headerHeight: Double) {
+    private fun notifyHeaderHeightChange(headerHeight: Int) {
         val screenContext = context as ReactContext
         val surfaceId = UIManagerHelper.getSurfaceId(screenContext)
         UIManagerHelper
diff --git a/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt b/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt
index 40ed2583d1..857c83a817 100644
--- a/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt
@@ -7,16 +7,16 @@ import com.facebook.react.uimanager.events.Event
 class HeaderHeightChangeEvent(
     surfaceId: Int,
     viewId: Int,
-    private val headerHeight: Double,
+    private val headerHeight: Int,
 ) : Event<HeaderHeightChangeEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // As the same header height could appear twice, use header height as a coalescing key.
-    override fun getCoalescingKey(): Short = headerHeight.toInt().toShort()
+    override fun getCoalescingKey(): Short = headerHeight.toShort()
 
     override fun getEventData(): WritableMap? =
         Arguments.createMap().apply {
-            putDouble("headerHeight", headerHeight)
+            putDouble("headerHeight", headerHeight.toDouble())
         }
 
     companion object {

From 2c11dd093ac749e10441baaccd73af3206fa61d5 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Fri, 9 Aug 2024 16:41:32 +0200
Subject: [PATCH 10/15] renamed the repro

---
 apps/App.tsx                                  | 2 +-
 apps/src/tests/{Test2219.tsx => Test1975.tsx} | 2 +-
 apps/src/tests/index.ts                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename apps/src/tests/{Test2219.tsx => Test1975.tsx} (97%)

diff --git a/apps/App.tsx b/apps/App.tsx
index 60f45c3180..c0a1b3f782 100644
--- a/apps/App.tsx
+++ b/apps/App.tsx
@@ -7,5 +7,5 @@ enableFreeze(true);
 
 export default function App() {
   // return <Example />;
-  return <Test.Test2219 />;
+  return <Test.Test1975 />;
 }
diff --git a/apps/src/tests/Test2219.tsx b/apps/src/tests/Test1975.tsx
similarity index 97%
rename from apps/src/tests/Test2219.tsx
rename to apps/src/tests/Test1975.tsx
index 762496bd84..5573db172e 100644
--- a/apps/src/tests/Test2219.tsx
+++ b/apps/src/tests/Test1975.tsx
@@ -10,7 +10,7 @@ function App() {
 
   return (
     <NavigationContainer>
-      <Stack.Navigator>
+      <Stack.Navigator screenOptions={{ statusBarTranslucent: false }}>
         <Stack.Screen
           name="Screen"
           component={Screen}
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index c3e5bc1ac5..8b7ce8607b 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -93,6 +93,7 @@ export { default as Test1829 } from './Test1829';
 export { default as Test1844 } from './Test1844';
 export { default as Test1864 } from './Test1864';
 export { default as Test1970 } from './Test1970';
+export { default as Test1975 } from './Test1975';
 export { default as Test1981 } from './Test1981';
 export { default as Test2002 } from './Test2002';
 export { default as Test2008 } from './Test2008';
@@ -101,7 +102,6 @@ export { default as Test2048 } from './Test2048';
 export { default as Test2069 } from './Test2069';
 export { default as Test2118 } from './Test2118';
 export { default as Test2184 } from './Test2184';
-export { default as Test2219 } from './Test2219';
 export { default as Test2223 } from './Test2223';
 export { default as Test2227 } from './Test2227';
 export { default as Test2229 } from './Test2229';

From 6a61a6c6fcf01bfbb06e8a2440ec31b6bb04ca9e Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Tue, 20 Aug 2024 16:04:19 +0200
Subject: [PATCH 11/15] Unset the frame origin when dimensions from JVM
 received

---
 .../components/rnscreens/RNSScreenComponentDescriptor.h      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h b/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
index 37aac4e1ac..983a128893 100644
--- a/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
+++ b/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
@@ -39,8 +39,7 @@ class RNSScreenComponentDescriptor final
 #ifdef ANDROID
     if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
       // When we receive dimensions from JVM side we can remove padding used for
-      // correction, and we can stop applying height correction for the frame.
-      // We want to leave top offset correction though intact.
+      // correction, and we can stop applying height and offset corrections for the frame.
       // TODO: In future, when we have dynamic header height we might want to
       // update Y offset correction here.
 
@@ -67,6 +66,8 @@ class RNSScreenComponentDescriptor final
       screenShadowNode.setPadding({0, 0, 0, 0});
       screenShadowNode.getFrameCorrectionModes().unset(
           FrameCorrectionModes::Mode::FrameHeightCorrection);
+      screenShadowNode.getFrameCorrectionModes().unset(
+              FrameCorrectionModes::Mode::FrameOriginCorrection);
 
       layoutableShadowNode.setSize(
           Size{stateData.frameSize.width, stateData.frameSize.height});

From 652b11c9f767044a3f65a89a7a4769ac350ab78f Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 21 Aug 2024 10:40:32 +0200
Subject: [PATCH 12/15] Simplified repro

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

diff --git a/apps/src/tests/Test1975.tsx b/apps/src/tests/Test1975.tsx
index 5573db172e..b320b8f1cf 100644
--- a/apps/src/tests/Test1975.tsx
+++ b/apps/src/tests/Test1975.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { NavigationContainer } from '@react-navigation/native';
-import { View, Text, Button, StyleSheet, Pressable } from 'react-native';
+import { View, Text, StyleSheet, Pressable } from 'react-native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
 const Stack = createNativeStackNavigator();
@@ -34,20 +34,14 @@ function App() {
           component={DetailsScreen}
           options={({ navigation }) => ({
             title: 'Details',
-            headerLeft: () => (
-              <Button
-                onPress={navigation.goBack}
-                title="Back"
-                color="#00cc00"
-              />
-            ),
             headerRight: () => (
               <Pressable
-                onPress={() => {
-                  console.log('doesnt work');
-                  navigation.goBack();
-                }}>
-                <Text>Doesnt work</Text>
+                onPress={navigation.goBack}
+                style={({ pressed }) => [
+                  styles.pressable,
+                  pressed && { backgroundColor: 'goldenrod' },
+                ]}>
+                <Text>Go Back</Text>
               </Pressable>
             ),
           })}
@@ -84,7 +78,6 @@ function DetailsScreen() {
         }}
         onPress={() => {
           console.log(`[${counter.current}] Details: onPress`);
-          // navigation.goBack();
         }}
         onPressOut={() => {
           console.log(`[${counter.current}] Details: onPressOut`);
@@ -93,7 +86,7 @@ function DetailsScreen() {
           styles.pressable,
           pressed && { backgroundColor: 'goldenrod' },
         ]}>
-        <Text>Go back</Text>
+        <Text>Press me</Text>
       </Pressable>
     </View>
   );
@@ -105,10 +98,6 @@ const styles = StyleSheet.create({
     paddingHorizontal: 10,
     backgroundColor: 'red',
   },
-  count: {
-    fontSize: 48,
-    fontWeight: 'bold',
-  },
   container: {
     flex: 1,
     alignItems: 'center',

From 867284c0a963a4ba35f774d14f845c93e65fbc6a Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Thu, 22 Aug 2024 12:19:13 +0200
Subject: [PATCH 13/15] rollback changes

---
 FabricExample/android/settings.gradle | 10 ----------
 apps/App.tsx                          |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/FabricExample/android/settings.gradle b/FabricExample/android/settings.gradle
index 31ed77c6af..98477550f6 100644
--- a/FabricExample/android/settings.gradle
+++ b/FabricExample/android/settings.gradle
@@ -4,13 +4,3 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex -> ex.autol
 rootProject.name = 'FabricExample'
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
-
-includeBuild('../node_modules/react-native') {
-    dependencySubstitution {
-        substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid"))
-        substitute(module("com.facebook.react:react-native")).using(project(":packages:react-native:ReactAndroid"))
-        substitute(module("com.facebook.react:hermes-android")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
-        substitute(module("com.facebook.react:hermes-engine")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
-    }
-}
-
diff --git a/apps/App.tsx b/apps/App.tsx
index c0a1b3f782..23a9af9c45 100644
--- a/apps/App.tsx
+++ b/apps/App.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { enableFreeze } from 'react-native-screens';
-// import Example from './Example';
-import * as Test from './src/tests';
+import Example from './Example';
+// import * as Test from './src/tests';
 
 enableFreeze(true);
 
 export default function App() {
-  // return <Example />;
-  return <Test.Test1975 />;
+  return <Example />;
+  // return <Test.Test42 />;
 }

From ea2d08d7fa69bd4a74ecc9241efeb5e902948215 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Thu, 22 Aug 2024 19:16:43 +0200
Subject: [PATCH 14/15] paper fix

---
 .../java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt b/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt
index 260cbe90f9..d575094dc8 100644
--- a/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt
+++ b/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt
@@ -12,7 +12,7 @@ abstract class FabricEnabledViewGroup(
     protected fun updateScreenSizeFabric(
         width: Int,
         height: Int,
-        headerHeight: Double,
+        headerHeight: Int,
     ) {
         // do nothing
     }

From 204bef3e2e6c9a3eabd3e58cac90cc458423a55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Du=C5=BCy?=
 <91994767+alduzy@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:19:16 +0200
Subject: [PATCH 15/15] fix(Android): jumping content on fabric (#2313)

## Description

This PR applies modifications to a previous fix:
https://github.com/software-mansion/react-native-screens/pull/2169 for
fabric only, which has stopped working since RN `0.75`.

In RN `0.74` the `adopt` in `RNSScreenComponentDescriptior.h` was once
called without `stateData` but with children and we could then check if
the `ScreenStackHeaderConfig` is present among them and make adjustments
based on it.

When working on
https://github.com/software-mansion/react-native-screens/pull/2292 it
became clear that the fix does not work anymore. Now the `adopt` is
called either with no children and no `stateData` or with both.
The solution is to move the code to `appendChild` in
`RNSScreenShadowNode.cpp` so we can perform the adjustments as soon as
the children append.

## Changes

- moved code from `adopt` in `RNSScreenComponentDescriptior.h` to newly
added `appendChild` override in `RNSScreenShadowNode.cpp`

## Screenshots / GIFs

### Before


https://github.com/user-attachments/assets/6b76864b-58bb-4c6e-9f5b-a01bb0c88d2a

### After


https://github.com/user-attachments/assets/98931e77-3877-4f67-8b28-f49d2e0f42ff


## Test code and steps to reproduce

- Use `TestHeader` to test this change

## Checklist

- [ ] Included code example that can be used to test this change
- [ ] Updated TS types
- [ ] Updated documentation: <!-- For adding new props to native-stack
-->
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/native-stack/README.md
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/src/types.tsx
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/src/native-stack/types.tsx
- [ ] Ensured that CI passes

---------

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>
---
 .../rnscreens/RNSScreenComponentDescriptor.h  | 101 +-----------------
 .../rnscreens/RNSScreenShadowNode.cpp         | 101 ++++++++++++++++++
 .../rnscreens/RNSScreenShadowNode.h           |   2 +
 3 files changed, 106 insertions(+), 98 deletions(-)

diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h b/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
index 983a128893..be47334120 100644
--- a/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
+++ b/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
@@ -19,9 +19,6 @@ class RNSScreenComponentDescriptor final
  public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
-  static constexpr const char *kScreenDummyLayoutHelperClass =
-      "com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper";
-
   void adopt(ShadowNode &shadowNode) const override {
     react_native_assert(dynamic_cast<RNSScreenShadowNode *>(&shadowNode));
     auto &screenShadowNode = static_cast<RNSScreenShadowNode &>(shadowNode);
@@ -39,7 +36,8 @@ class RNSScreenComponentDescriptor final
 #ifdef ANDROID
     if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
       // When we receive dimensions from JVM side we can remove padding used for
-      // correction, and we can stop applying height and offset corrections for the frame.
+      // correction, and we can stop applying height and offset corrections for
+      // the frame.
       // TODO: In future, when we have dynamic header height we might want to
       // update Y offset correction here.
 
@@ -67,37 +65,10 @@ class RNSScreenComponentDescriptor final
       screenShadowNode.getFrameCorrectionModes().unset(
           FrameCorrectionModes::Mode::FrameHeightCorrection);
       screenShadowNode.getFrameCorrectionModes().unset(
-              FrameCorrectionModes::Mode::FrameOriginCorrection);
+          FrameCorrectionModes::Mode::FrameOriginCorrection);
 
       layoutableShadowNode.setSize(
           Size{stateData.frameSize.width, stateData.frameSize.height});
-    } else {
-      // This code path should be executed only on the very first (few)
-      // layout(s), when we haven't received state update from JVM side yet.
-
-      auto headerConfigChildOpt = findHeaderConfigChild(layoutableShadowNode);
-
-      // During creation of the shadow node children are not attached yet.
-      // We also do not want to set any padding in case.
-      if (headerConfigChildOpt) {
-        const auto &headerConfigChild = headerConfigChildOpt->get();
-        const auto &headerProps =
-            *std::static_pointer_cast<const RNSScreenStackHeaderConfigProps>(
-                headerConfigChild->getProps());
-
-        const auto headerHeight = headerProps.hidden
-            ? 0.f
-            : findHeaderHeight(
-                  headerProps.titleFontSize, headerProps.title.empty())
-                  .value_or(0.f);
-
-        screenShadowNode.setPadding({0, 0, 0, headerHeight});
-        screenShadowNode.setHeaderHeight(headerHeight);
-        screenShadowNode.getFrameCorrectionModes().set(
-            FrameCorrectionModes::Mode(
-                FrameCorrectionModes::Mode::FrameHeightCorrection |
-                FrameCorrectionModes::Mode::FrameOriginCorrection));
-      }
     }
 #else
     if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
@@ -107,72 +78,6 @@ class RNSScreenComponentDescriptor final
 #endif // ANDROID
     ConcreteComponentDescriptor::adopt(shadowNode);
   }
-
-  std::optional<std::reference_wrapper<const ShadowNode::Shared>>
-  findHeaderConfigChild(
-      const YogaLayoutableShadowNode &screenShadowNode) const {
-    for (const ShadowNode::Shared &child : screenShadowNode.getChildren()) {
-      if (std::strcmp(
-              child->getComponentName(), "RNSScreenStackHeaderConfig") == 0) {
-        return {std::cref(child)};
-      }
-    }
-    return {};
-  }
-
-#ifdef ANDROID
-  std::optional<float> findHeaderHeight(
-      const int fontSize,
-      const bool isTitleEmpty) const {
-    JNIEnv *env = facebook::jni::Environment::current();
-
-    if (env == nullptr) {
-      LOG(ERROR) << "[RNScreens] Failed to retrieve env\n";
-      return {};
-    }
-
-    jclass layoutHelperClass = env->FindClass(kScreenDummyLayoutHelperClass);
-
-    if (layoutHelperClass == nullptr) {
-      LOG(ERROR) << "[RNScreens] Failed to find class with id "
-                 << kScreenDummyLayoutHelperClass;
-      return {};
-    }
-
-    jmethodID computeDummyLayoutID =
-        env->GetMethodID(layoutHelperClass, "computeDummyLayout", "(IZ)F");
-
-    if (computeDummyLayoutID == nullptr) {
-      LOG(ERROR)
-          << "[RNScreens] Failed to retrieve computeDummyLayout method ID";
-      return {};
-    }
-
-    jmethodID getInstanceMethodID = env->GetStaticMethodID(
-        layoutHelperClass,
-        "getInstance",
-        "()Lcom/swmansion/rnscreens/utils/ScreenDummyLayoutHelper;");
-
-    if (getInstanceMethodID == nullptr) {
-      LOG(ERROR) << "[RNScreens] Failed to retrieve getInstanceMethodID";
-      return {};
-    }
-
-    jobject packageInstance =
-        env->CallStaticObjectMethod(layoutHelperClass, getInstanceMethodID);
-
-    if (packageInstance == nullptr) {
-      LOG(ERROR)
-          << "[RNScreens] Failed to retrieve packageInstance or the package instance was null on JVM side";
-      return {};
-    }
-
-    jfloat headerHeight = env->CallFloatMethod(
-        packageInstance, computeDummyLayoutID, fontSize, isTitleEmpty);
-
-    return {headerHeight};
-  }
-#endif // ANDROID
 };
 
 } // namespace react
diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp b/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp
index e97dc1a7de..506babc08b 100644
--- a/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp
+++ b/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp
@@ -15,6 +15,107 @@ Point RNSScreenShadowNode::getContentOriginOffset(
   return {contentOffset.x, contentOffset.y};
 }
 
+std::optional<std::reference_wrapper<const ShadowNode::Shared>>
+findHeaderConfigChild(const YogaLayoutableShadowNode &screenShadowNode) {
+  for (const ShadowNode::Shared &child : screenShadowNode.getChildren()) {
+    if (std::strcmp(child->getComponentName(), "RNSScreenStackHeaderConfig") ==
+        0) {
+      return {std::cref(child)};
+    }
+  }
+  return {};
+}
+
+static constexpr const char *kScreenDummyLayoutHelperClass =
+    "com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper";
+
+#ifdef ANDROID
+std::optional<float> findHeaderHeight(
+    const int fontSize,
+    const bool isTitleEmpty) {
+  JNIEnv *env = facebook::jni::Environment::current();
+
+  if (env == nullptr) {
+    LOG(ERROR) << "[RNScreens] Failed to retrieve env\n";
+    return {};
+  }
+
+  jclass layoutHelperClass = env->FindClass(kScreenDummyLayoutHelperClass);
+
+  if (layoutHelperClass == nullptr) {
+    LOG(ERROR) << "[RNScreens] Failed to find class with id "
+               << kScreenDummyLayoutHelperClass;
+    return {};
+  }
+
+  jmethodID computeDummyLayoutID =
+      env->GetMethodID(layoutHelperClass, "computeDummyLayout", "(IZ)F");
+
+  if (computeDummyLayoutID == nullptr) {
+    LOG(ERROR) << "[RNScreens] Failed to retrieve computeDummyLayout method ID";
+    return {};
+  }
+
+  jmethodID getInstanceMethodID = env->GetStaticMethodID(
+      layoutHelperClass,
+      "getInstance",
+      "()Lcom/swmansion/rnscreens/utils/ScreenDummyLayoutHelper;");
+
+  if (getInstanceMethodID == nullptr) {
+    LOG(ERROR) << "[RNScreens] Failed to retrieve getInstanceMethodID";
+    return {};
+  }
+
+  jobject packageInstance =
+      env->CallStaticObjectMethod(layoutHelperClass, getInstanceMethodID);
+
+  if (packageInstance == nullptr) {
+    LOG(ERROR)
+        << "[RNScreens] Failed to retrieve packageInstance or the package instance was null on JVM side";
+    return {};
+  }
+
+  jfloat headerHeight = env->CallFloatMethod(
+      packageInstance, computeDummyLayoutID, fontSize, isTitleEmpty);
+
+  return {headerHeight};
+}
+#endif // ANDROID
+
+void RNSScreenShadowNode::appendChild(const ShadowNode::Shared &child) {
+  YogaLayoutableShadowNode::appendChild(child);
+#ifdef ANDROID
+  const auto &stateData = getStateData();
+  if (stateData.frameSize.width == 0 || stateData.frameSize.height == 0) {
+    // This code path should be executed only on the very first (few)
+    // layout(s), when we haven't received state update from JVM side yet.
+    auto headerConfigChildOpt = findHeaderConfigChild(*this);
+    auto &screenShadowNode = static_cast<RNSScreenShadowNode &>(*this);
+
+    // During creation of the shadow node children are not attached yet.
+    // We also do not want to set any padding in case.
+    if (headerConfigChildOpt) {
+      const auto &headerConfigChild = headerConfigChildOpt->get();
+      const auto &headerProps =
+          *std::static_pointer_cast<const RNSScreenStackHeaderConfigProps>(
+              headerConfigChild->getProps());
+
+      const auto headerHeight = headerProps.hidden
+          ? 0.f
+          : findHeaderHeight(
+                headerProps.titleFontSize, headerProps.title.empty())
+                .value_or(0.f);
+
+      screenShadowNode.setPadding({0, 0, 0, headerHeight});
+      screenShadowNode.setHeaderHeight(headerHeight);
+      screenShadowNode.getFrameCorrectionModes().set(FrameCorrectionModes::Mode(
+          FrameCorrectionModes::Mode::FrameHeightCorrection |
+          FrameCorrectionModes::Mode::FrameOriginCorrection));
+    }
+  }
+#endif // ANDROID
+}
+
 void RNSScreenShadowNode::layout(facebook::react::LayoutContext layoutContext) {
   YogaLayoutableShadowNode::layout(layoutContext);
 
diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.h b/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.h
index a6c5dc076e..6b4b72ec0e 100644
--- a/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.h
+++ b/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.h
@@ -28,6 +28,8 @@ class JSI_EXPORT RNSScreenShadowNode final : public ConcreteViewShadowNode<
 
   Point getContentOriginOffset(bool includeTransform) const override;
 
+  void appendChild(const ShadowNode::Shared &child) override;
+
   void layout(LayoutContext layoutContext) override;
 
 #pragma mark - Custom interface