From eb2f6b1ae5a5693482c3a41ea590e576587f3af2 Mon Sep 17 00:00:00 2001 From: Jorge Cabiedes Acosta Date: Sat, 26 Apr 2025 17:35:22 -0700 Subject: [PATCH] Fix RemoveClipped subviews algorithm Summary: For real this time, the change was lost due to some merge conflict Changelog: [Internal] Reviewed By: Abbondanzo Differential Revision: D73726167 fbshipit-source-id: 1e0cef75f59a166d795922266365b2b7b060472e --- .../main/java/com/facebook/react/views/view/ReactViewGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java index 0f67ab22f56..a3d4710a672 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java @@ -521,7 +521,7 @@ public class ReactViewGroup extends ViewGroup // therefore invalidation is not necessary. removeViewInLayout(child); needUpdateClippingRecursive = true; - } else if (shouldSkipView || (intersects && isViewClipped(child, idx))) { + } else if ((shouldSkipView || intersects) && isViewClipped(child, idx)) { int adjustedIdx = idx - clippedSoFar; Assertions.assertCondition(adjustedIdx >= 0); setViewClipped(child, false);