From 1f204d17c05bc0eb802030c38c7d5af01e24c2fd Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 7 Aug 2024 16:10:16 +0200
Subject: [PATCH 1/5] added repro

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

diff --git a/apps/App.tsx b/apps/App.tsx
index 23a9af9c45..1b84e1995f 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.Test2282 />;
 }
diff --git a/apps/src/tests/Test2282.tsx b/apps/src/tests/Test2282.tsx
new file mode 100644
index 0000000000..c5f98cf42f
--- /dev/null
+++ b/apps/src/tests/Test2282.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { FlatList, Button, Text } from 'react-native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { NavigationContainer } from '@react-navigation/native';
+
+const Stack = createNativeStackNavigator();
+
+const List = () => {
+  return (
+    <FlatList
+      renderItem={({ item }) => {
+        return <Text key={item.toString()}>{item}</Text>;
+      }}
+      data={[1, 2, 3]}
+    />
+  );
+};
+
+const First = ({ navigation }: any) => (
+  <>
+    <List />
+    <Button onPress={() => navigation.navigate('Second')} title="Navigate" />
+  </>
+);
+
+const Second = ({ navigation }: any) => (
+  <>
+    <List />
+    <Button onPress={navigation.goBack} title="Go back" />
+  </>
+);
+
+export default function App() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator>
+        <Stack.Screen name="First" component={First} />
+        <Stack.Screen name="Second" component={Second} />
+      </Stack.Navigator>
+    </NavigationContainer>
+  );
+}
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index 2a90426c68..1d40af75ef 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -109,5 +109,6 @@ export { default as Test2232 } from './Test2232';
 export { default as Test2235 } from './Test2235';
 export { default as Test2252 } from './Test2252';
 export { default as Test2271 } from './Test2271';
+export { default as Test2282 } from './Test2282';
 export { default as TestScreenAnimation } from './TestScreenAnimation';
 export { default as TestHeader } from './TestHeader';

From 11fdaaecf567430f9af1be0362c88a4110e40617 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 7 Aug 2024 17:41:30 +0200
Subject: [PATCH 2/5] simplified repro

---
 apps/src/tests/Test2282.tsx | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/apps/src/tests/Test2282.tsx b/apps/src/tests/Test2282.tsx
index c5f98cf42f..7ec7a64032 100644
--- a/apps/src/tests/Test2282.tsx
+++ b/apps/src/tests/Test2282.tsx
@@ -5,27 +5,17 @@ import { NavigationContainer } from '@react-navigation/native';
 
 const Stack = createNativeStackNavigator();
 
-const List = () => {
-  return (
-    <FlatList
-      renderItem={({ item }) => {
-        return <Text key={item.toString()}>{item}</Text>;
-      }}
-      data={[1, 2, 3]}
-    />
-  );
-};
-
 const First = ({ navigation }: any) => (
-  <>
-    <List />
-    <Button onPress={() => navigation.navigate('Second')} title="Navigate" />
-  </>
+  <Button onPress={() => navigation.navigate('Second')} title="Navigate" />
 );
 
 const Second = ({ navigation }: any) => (
   <>
-    <List />
+    <FlatList
+      renderItem={({ item }) => <Text>{item}</Text>}
+      data={[1, 2, 3]}
+      keyExtractor={item => item.toString()}
+    />
     <Button onPress={navigation.goBack} title="Go back" />
   </>
 );

From e30fc788bdfc2d1e30bfa90e7c1044a4ea204893 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Wed, 7 Aug 2024 17:43:53 +0200
Subject: [PATCH 3/5] left one item in repro

---
 apps/src/tests/Test2282.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/src/tests/Test2282.tsx b/apps/src/tests/Test2282.tsx
index 7ec7a64032..0f1f0e1d58 100644
--- a/apps/src/tests/Test2282.tsx
+++ b/apps/src/tests/Test2282.tsx
@@ -13,7 +13,7 @@ const Second = ({ navigation }: any) => (
   <>
     <FlatList
       renderItem={({ item }) => <Text>{item}</Text>}
-      data={[1, 2, 3]}
+      data={[1]}
       keyExtractor={item => item.toString()}
     />
     <Button onPress={navigation.goBack} title="Go back" />

From 555e169aa31fcd98d73bce6ac3658fd1f6934282 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 19 Aug 2024 17:04:48 +0200
Subject: [PATCH 4/5] Condition based fix

---
 .../src/main/java/com/swmansion/rnscreens/Screen.kt    | 10 ++++++++++
 apps/src/tests/Test2282.tsx                            |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/com/swmansion/rnscreens/Screen.kt b/android/src/main/java/com/swmansion/rnscreens/Screen.kt
index a601100985..01a7bc5ef1 100644
--- a/android/src/main/java/com/swmansion/rnscreens/Screen.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/Screen.kt
@@ -19,6 +19,7 @@ import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.scroll.ReactScrollView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.swmansion.rnscreens.events.HeaderHeightChangeEvent
 import com.swmansion.rnscreens.events.SheetDetentChangedEvent
@@ -384,6 +385,15 @@ class Screen(
                     startTransitionRecursive(child.toolbar)
                 }
                 if (child is ViewGroup) {
+                    // The children are miscounted when there's a FlatList with
+                    // removeCLippedSubviews set to true (default).
+                    // We add a simple view for each item in the list to make it work as expected.
+                    // See https://github.com/software-mansion/react-native-screens/issues/2282
+                    if (it is ReactScrollView && it.removeClippedSubviews) {
+                        for (j in 0 until child.childCount) {
+                            child.addView(View(context))
+                        }
+                    }
                     startTransitionRecursive(child)
                 }
             }
diff --git a/apps/src/tests/Test2282.tsx b/apps/src/tests/Test2282.tsx
index 0f1f0e1d58..6ee9b61b66 100644
--- a/apps/src/tests/Test2282.tsx
+++ b/apps/src/tests/Test2282.tsx
@@ -13,7 +13,7 @@ const Second = ({ navigation }: any) => (
   <>
     <FlatList
       renderItem={({ item }) => <Text>{item}</Text>}
-      data={[1]}
+      data={[1,2,3,4,5,6]}
       keyExtractor={item => item.toString()}
     />
     <Button onPress={navigation.goBack} title="Go back" />

From 444acaeda3e132fb985b1545daac32691cb92bf9 Mon Sep 17 00:00:00 2001
From: alduzy <alduzy@gmail.com>
Date: Mon, 19 Aug 2024 17:33:10 +0200
Subject: [PATCH 5/5] switch back to Example in the App

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

diff --git a/apps/App.tsx b/apps/App.tsx
index 1b84e1995f..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.Test2282 />;
+  return <Example />;
+  // return <Test.Test42 />;
 }