expo-dev-launcher 4.0.9 → 4.0.10

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 4.0.10 — 2024-05-03
+
+### 🐛 Bug fixes
+
+- [Android] Fixed `LogBox` isn't working on the new architecture. ([#28602](https://github.com/expo/expo/pull/28602) by [@lukmccall](https://github.com/lukmccall))
+
 ## 4.0.9 — 2024-05-02
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -17,7 +17,7 @@ android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "4.0.9"
+    versionName "4.0.10"
   }
 
   buildTypes {

package/android/src/main/java/com/facebook/react/runtime/NonFinalBridgelessDevSupportManager.java

@@ -27,6 +27,9 @@ import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.runtime.internal.bolts.Continuation;
 import com.facebook.react.runtime.internal.bolts.Task;
+
+import java.lang.ref.WeakReference;
+
 import javax.annotation.Nullable;
 
 //
@@ -122,6 +125,8 @@ public class NonFinalBridgelessDevSupportManager extends DevSupportManagerBase {
 
     private static ReactInstanceDevHelper createInstanceDevHelper(final ReactHostImpl reactHost) {
         return new ReactInstanceDevHelper() {
+            private WeakReference<ReactSurfaceImpl> logBoxSurface = new WeakReference<>(null);
+
             @Override
             public void onReloadWithJSDebugger(JavaJSExecutor.Factory proxyExecutorFactory) {
                 // Not implemented
@@ -160,6 +165,11 @@ public class NonFinalBridgelessDevSupportManager extends DevSupportManagerBase {
                 if (currentActivity != null && !reactHost.isSurfaceWithModuleNameAttached(appKey)) {
                     ReactSurfaceImpl reactSurface =
                             ReactSurfaceImpl.createWithView(currentActivity, appKey, new Bundle());
+
+                    if (appKey.equals("LogBox")) {
+                        logBoxSurface = new WeakReference<>(reactSurface);
+                    }
+
                     reactSurface.attach(reactHost);
                     reactSurface.start();
 
@@ -170,7 +180,15 @@ public class NonFinalBridgelessDevSupportManager extends DevSupportManagerBase {
 
             @Override
             public void destroyRootView(View rootView) {
-                // Not implemented
+                // The log box surface is a special case and needs to be detached from the host.
+                // The detachment process should be handled by React Native, but it appears to be malfunctioning.
+                // This is a temporary solution and should be removed
+                // once we identify the root cause of the surface remaining attached after reloads.
+                ReactSurfaceImpl logBox = logBoxSurface.get();
+                if (logBox != null) {
+                  reactHost.detachSurface(logBox);
+                  logBoxSurface.clear();
+                }
             }
         };
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -31,7 +31,7 @@
   "homepage": "https://docs.expo.dev",
   "dependencies": {
     "ajv": "8.11.0",
-    "expo-dev-menu": "5.0.10",
+    "expo-dev-menu": "5.0.11",
     "expo-manifests": "~0.14.0",
     "resolve-from": "^5.0.0",
     "semver": "^7.6.0"
@@ -66,5 +66,5 @@
       "./setupTests.ts"
     ]
   },
-  "gitHead": "71b2f4339ef7b5b42ce87c1d8c17fe41c60355e0"
+  "gitHead": "be2f6412d09e8afaa06adeb7129d93a0256aa2c7"
 }