diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java index 87e56527fa4..9bba8d915c8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java @@ -9,10 +9,10 @@ package com.facebook.react.uimanager; import android.content.Context; import android.view.View; +import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.common.logging.FLog; -import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.BaseJavaModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContext; @@ -211,7 +211,16 @@ public abstract class ViewManager T view = null; @Nullable Stack recyclableViews = getRecyclableViewStack(reactContext.getSurfaceId(), true); if (recyclableViews != null && !recyclableViews.empty()) { - view = recycleView(reactContext, recyclableViews.pop()); + T recyclableView = recyclableViews.pop(); + + // When view recycling isn't enabled for all components, a recyclable view could still be + // attached to a non-recyclable view. This guarantees that recycled view have been removed + // from their parent. + if (ReactNativeFeatureFlags.enableViewRecycling() && recyclableView.getParent() != null) { + ((ViewGroup) recyclableView.getParent()).removeView(recyclableView); + } + + view = recycleView(reactContext, recyclableView); } else { view = createViewInstance(reactContext); } @@ -260,16 +269,6 @@ public abstract class ViewManager if (recyclableViews != null) { T recyclableView = prepareToRecycleView(themedReactContext, view); if (recyclableView != null) { - Assertions.assertCondition( - recyclableView.getParent() == null, - "Recycled view [" - + view.getId() - + "] should not be attached to a parent. View: " - + view - + " Parent: " - + recyclableView.getParent() - + " ThemedReactContext: " - + themedReactContext); recyclableViews.push(recyclableView); } }