Revert "fix: remove workaround for removing clipped subviews (software-mansion#2596)"

This reverts commit 2aa278c.

Author: GaylordP

android/src/main/java/com/swmansion/rnscreens/Screen.kt

@@ -17,9 +17,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.PixelUtil
+import com.facebook.react.uimanager.ReactClippingViewGroup
 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.ReactHorizontalScrollView
+import com.facebook.react.views.scroll.ReactScrollView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
@@ -401,6 +404,29 @@ class Screen(
                 }
 
                 if (child is ViewGroup) {
+                    // The children are miscounted when there's removeClippedSubviews prop
+                    // set to true (which is the default for FlatLists).
+                    // Unless the child is a ScrollView it's safe to assume that it's true
+                    // and add a simple view for each possibly clipped item to make it work as expected.
+                    // See https://github.com/software-mansion/react-native-screens/pull/2495
+
+                    if (child is ReactClippingViewGroup &&
+                        child.removeClippedSubviews &&
+                        child !is ReactScrollView &&
+                        child !is ReactHorizontalScrollView
+                    ) {
+                        // We need to workaround the issue until our changes land in core.
+                        // Some views do not accept any children or have set amount and they throw
+                        // when we want to brute-forcefully manipulate that.
+                        // Is this ugly? Very. Do we have better option before changes land in core?
+                        // I'm not aware of any.
+                        try {
+                            for (j in 0 until child.childCount) {
+                                child.addView(View(context))
+                            }
+                        } catch (_: Exception) {
+                        }
+                    }
                     startTransitionRecursive(child)
                 }
             }

apps/src/tests/Test2282.tsx

@@ -135,17 +135,12 @@ function ExtraNestedFlatlist(props: Partial<FlatListProps<number>>) {
 
 const Stack = createNativeStackNavigator();
 
-/**
- * You can use either the App component with `ListScreen` or `ListScreenSimplified`,
- * of `AppSimple` component which has little to no navigation and attempts to reproduce the issue
- */
-
 export default function App(): React.JSX.Element {
   return (
     <NavigationContainer>
       <Stack.Navigator screenOptions={{ animation: 'slide_from_right' }}>
         <Stack.Screen name="Home" component={Home} />
-        <Stack.Screen name="List" component={ListScreenSimplified}/> {/* <- Exchange here for ListScreen for more complex case */}
+        <Stack.Screen name="List" component={ListScreenSimplified}/>
       </Stack.Navigator>
     </NavigationContainer>
   );