diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt index f61fa85d7b8..ed607aa289c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt @@ -112,7 +112,6 @@ public class ReactModalHostView(context: ThemedReactContext) : private var createNewDialog = false init { - context.addLifecycleEventListener(this) dialogRootViewGroup = DialogRootViewGroup(context) } @@ -131,9 +130,14 @@ public class ReactModalHostView(context: ThemedReactContext) : dialogRootViewGroup.id = id } + protected override fun onAttachedToWindow() { + super.onAttachedToWindow() + (context as ThemedReactContext).addLifecycleEventListener(this) + } + protected override fun onDetachedFromWindow() { super.onDetachedFromWindow() - dismiss() + onDropInstance() } public override fun addView(child: View?, index: Int) {