diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java index b29e5e75d..a3e74df7b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java @@ -109,6 +109,13 @@ import com.facebook.react.uimanager.events.EventDispatcher; mOnLayoutEvents.clear(); if (!mViewsToDrop.isEmpty()) { + for (int i = 0, mViewsToDropSize = mViewsToDrop.size(); i < mViewsToDropSize; i++) { + // set parent tag to -1 to avoid trying to detach this view + FlatShadowNode shadowNode = mViewsToDrop.get(i); + if (shadowNode.mountsToView()) { + shadowNode.setNativeParentTag(-1); + } + } mOperationsQueue.enqueueDropViews(collectViewTags(mViewsToDrop)); mViewsToDrop.clear(); }