From 33aa83a0e6f63d3d50d4803074ad9e2243439100 Mon Sep 17 00:00:00 2001
From: Fabrizio Cucci <fabriziocucci@meta.com>
Date: Wed, 12 Jun 2024 05:38:02 -0700
Subject: [PATCH] Stop ReactSurface in ReactDelegate::onHostDestroy
 (bridgeless) (#44873)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/44873

Changelog:
[Android][Fixed] - Unmount React root when activity is destroyed on bridgless

Reviewed By: javache

Differential Revision: D58411605

fbshipit-source-id: ff9940efd4cf5da5887d79d99bcf3721e16d6725
---
 .../src/main/java/com/facebook/react/ReactDelegate.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java
index 3c56c106444f60..8d3871dfe6c54d 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java
@@ -134,6 +134,10 @@ public void onHostPause() {
 
   public void onHostDestroy() {
     if (ReactFeatureFlags.enableBridgelessArchitecture) {
+      if (mReactSurface != null) {
+        mReactSurface.stop();
+        mReactSurface = null;
+      }
       mReactHost.onHostDestroy(mActivity);
     } else {
       if (mReactRootView != null) {