expo-dev-menu-interface 1.8.0 → 1.8.2

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.8.0'
+version = '1.8.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -13,7 +13,7 @@ android {
   namespace "expo.interfaces.devmenu"
   defaultConfig {
     versionCode 6
-    versionName '1.8.0'
+    versionName '1.8.2'
   }
 }
 

package/android/src/main/java/expo/interfaces/devmenu/DevMenuDelegateInterface.kt

@@ -1,7 +1,6 @@
 package expo.interfaces.devmenu
 
 import android.os.Bundle
-import com.facebook.react.ReactInstanceManager
 
 interface DevMenuDelegateInterface {
   /**
@@ -10,9 +9,9 @@ interface DevMenuDelegateInterface {
   fun appInfo(): Bundle?
 
   /**
-   * Returns a `ReactInstanceManager` ot the currently shown app. It is a context of what the dev menu displays.
+   * Returns a [ReactHostWrapper] ot the currently shown app. It is a context of what the dev menu displays.
    */
-  fun reactInstanceManager(): ReactInstanceManager
+  fun reactHost(): ReactHostWrapper
 
   fun supportsDevelopment(): Boolean {
     return true

package/android/src/main/java/expo/interfaces/devmenu/DevMenuManagerInterface.kt

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.MotionEvent
-import com.facebook.react.ReactNativeHost
 import com.facebook.react.bridge.ReadableMap
 import expo.interfaces.devmenu.items.DevMenuDataSourceItem
 import kotlinx.coroutines.CoroutineScope
@@ -48,9 +47,9 @@ interface DevMenuManagerInterface {
   fun setDelegate(newDelegate: DevMenuDelegateInterface)
 
   /**
-   * Initializes the dev menu manager to work with react native host.
+   * Initializes the dev menu manager to work with react host.
    */
-  fun initializeWithReactNativeHost(reactNativeHost: ReactNativeHost)
+  fun initializeWithReactHost(reactHost: ReactHostWrapper)
 
   /**
    * Finds and dispatches action with provided [actionId].
@@ -77,7 +76,7 @@ interface DevMenuManagerInterface {
   /**
    * @return the dev menu application host.
    */
-  fun getMenuHost(): ReactNativeHost
+  fun getMenuHost(): ReactHostWrapper
 
   /**
    * Synchronizes [ReactInstanceManager] from delegate with one saved in [DevMenuManger].

package/android/src/main/java/expo/interfaces/devmenu/ReactHostWrapper.kt

@@ -0,0 +1,120 @@
+@file:Suppress("DEPRECATION")
+
+package expo.interfaces.devmenu
+
+import com.facebook.react.JSEngineResolutionAlgorithm
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactInstanceEventListener
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.common.LifecycleState
+import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.facebook.react.runtime.ReactHostImpl
+
+/**
+ * An abstract wrapper to host [ReactNativeHost] and [ReactHost],
+ * so that call-sites do not have to handle the difference between legacy bridge and bridgeless mode.
+ */
+class ReactHostWrapper(reactNativeHost: ReactNativeHost, reactHost: ReactHost?) {
+  lateinit var reactNativeHost: ReactNativeHost
+  lateinit var reactHost: ReactHost
+
+  init {
+    if (ReactFeatureFlags.enableBridgelessArchitecture) {
+      this.reactHost = requireNotNull(reactHost)
+    } else {
+      this.reactNativeHost = reactNativeHost
+    }
+  }
+
+  override fun hashCode(): Int {
+    return if (isBridgelessMode) {
+      reactHost.hashCode()
+    } else {
+      reactNativeHost.hashCode()
+    }
+  }
+
+  val currentReactContext: ReactContext?
+    get() {
+      return if (isBridgelessMode) {
+        reactHost.currentReactContext
+      } else {
+        reactNativeHost.reactInstanceManager.currentReactContext
+      }
+    }
+
+  val lifecycleState: LifecycleState
+    get() {
+      return if (isBridgelessMode) {
+        reactHost.lifecycleState
+      } else {
+        reactNativeHost.reactInstanceManager.lifecycleState
+      }
+    }
+
+  val hasInstance: Boolean
+    get() {
+      if (isBridgelessMode) {
+        return currentReactContext?.hasActiveReactInstance() ?: false
+      }
+      return reactNativeHost.hasInstance() && currentReactContext?.hasActiveReactInstance() ?: false
+    }
+
+  val devSupportManager: DevSupportManager?
+    get() {
+      return if (isBridgelessMode) {
+        reactHost.devSupportManager
+      } else {
+        reactNativeHost.reactInstanceManager.devSupportManager
+      }
+    }
+
+  val isBridgelessMode = ReactFeatureFlags.enableBridgelessArchitecture
+
+  val jsExecutorName: String
+    get() {
+      if (isBridgelessMode) {
+        return if (reactHost.jsEngineResolutionAlgorithm == JSEngineResolutionAlgorithm.JSC) {
+          "JSC"
+        } else {
+          "Hermes"
+        }
+      }
+
+      return reactNativeHost.reactInstanceManager.jsExecutorName
+    }
+
+  fun addReactInstanceEventListener(listener: ReactInstanceEventListener) {
+    if (isBridgelessMode) {
+      (reactHost as ReactHostImpl).addReactInstanceEventListener(listener)
+    } else {
+      reactNativeHost.reactInstanceManager.addReactInstanceEventListener(listener)
+    }
+  }
+
+  fun removeReactInstanceEventListener(listener: ReactInstanceEventListener) {
+    if (isBridgelessMode) {
+      (reactHost as ReactHostImpl).removeReactInstanceEventListener(listener)
+    } else {
+      reactNativeHost.reactInstanceManager.removeReactInstanceEventListener(listener)
+    }
+  }
+
+  fun start() {
+    if (isBridgelessMode) {
+      (reactHost as ReactHostImpl).start()
+    } else {
+      reactNativeHost.reactInstanceManager.createReactContextInBackground()
+    }
+  }
+
+  fun destroy(reason: String = "DevLauncher reloading app") {
+    if (isBridgelessMode) {
+      reactHost.destroy(reason, null)
+    } else {
+      reactNativeHost.clear()
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu-interface",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Interface for expo-dev-menu",
   "main": "index.js",
   "keywords": [
@@ -25,5 +25,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "4165b8d72e1b9a1889c2767534cc619e21468110"
+  "gitHead": "0897aeadb926491a457bcd67d83360956994ee82"
 }