fix transitioning

akylbek-hostaways · Nov 22, 2024 · 3c64132 · 3c64132
1 parent f5f700f
commit 3c64132
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ve/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java b/...ve/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactClippingViewManager.java
@@ -74,7 +74,7 @@ public void removeViewAt(T parent, int index) {
         if (child.getParent() != null) {
           parent.removeView(child);
         }
-        parent.removeViewWithSubviewClippingEnabled(child);
+        parent.removeViewWithSubviewClippingEnabled(child, true);
       }
     } else {
       parent.removeViewAt(index);

diff --git a/...react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/...react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -695,15 +695,15 @@ public void run() {
     }
   }
 
-  /*package*/ void removeViewWithSubviewClippingEnabled(View view) {
+  /*package*/ void removeViewWithSubviewClippingEnabled(View view, boolean viewRemovedFromParent) {
     UiThreadUtil.assertOnUiThread();
 
     Assertions.assertCondition(mRemoveClippedSubviews);
     Assertions.assertNotNull(mClippingRect);
     Assertions.assertNotNull(mAllChildren);
     view.removeOnLayoutChangeListener(mChildrenLayoutChangeListener);
     int index = indexOfChildInAllChildren(view);
-    if (mAllChildren[index].getParent() != null) {
+    if (!viewRemovedFromParent && mAllChildren[index].getParent() != null) {
       int clippedSoFar = 0;
       for (int i = 0; i < index; i++) {
         if (mAllChildren[i].getParent() == null) {