expo-dev-menu-interface 1.9.0 → 1.9.2

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.9.0'
+version = '1.9.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.9.0'
+    versionName '1.9.2'
   }
 }
 

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

@@ -1,5 +1,3 @@
-@file:Suppress("DEPRECATION")
-
 package expo.interfaces.devmenu
 
 import com.facebook.react.JSEngineResolutionAlgorithm
@@ -8,35 +6,27 @@ 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
+import expo.modules.rncompatibility.ReactNativeFeatureFlags
 import java.lang.reflect.Field
 
 /**
  * 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?) {
+class ReactHostWrapper(reactNativeHost: ReactNativeHost, reactHostProvider: () -> ReactHost?) {
   lateinit var reactNativeHost: ReactNativeHost
   lateinit var reactHost: ReactHost
 
   init {
-    if (ReactFeatureFlags.enableBridgelessArchitecture) {
-      this.reactHost = requireNotNull(reactHost)
+    if (ReactNativeFeatureFlags.enableBridgelessArchitecture) {
+      this.reactHost = requireNotNull(reactHostProvider())
     } else {
       this.reactNativeHost = reactNativeHost
     }
   }
 
-  override fun hashCode(): Int {
-    return if (isBridgelessMode) {
-      reactHost.hashCode()
-    } else {
-      reactNativeHost.hashCode()
-    }
-  }
-
   val currentReactContext: ReactContext?
     get() {
       return if (isBridgelessMode) {
@@ -72,7 +62,7 @@ class ReactHostWrapper(reactNativeHost: ReactNativeHost, reactHost: ReactHost?)
       }
     }
 
-  val isBridgelessMode = ReactFeatureFlags.enableBridgelessArchitecture
+  val isBridgelessMode = ReactNativeFeatureFlags.enableBridgelessArchitecture
 
   val jsExecutorName: String
     get() {
@@ -123,4 +113,24 @@ class ReactHostWrapper(reactNativeHost: ReactNativeHost, reactHost: ReactHost?)
       reactNativeHost.clear()
     }
   }
+
+  override fun hashCode(): Int {
+    return if (isBridgelessMode) {
+      reactHost.hashCode()
+    } else {
+      reactNativeHost.hashCode()
+    }
+  }
+
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (javaClass != other?.javaClass) return false
+
+    other as ReactHostWrapper
+
+    if (reactNativeHost != other.reactNativeHost) return false
+    if (reactHost != other.reactHost) return false
+
+    return true
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu-interface",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Interface for expo-dev-menu",
   "main": "index.js",
   "keywords": [
@@ -25,5 +25,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "7c7d2362fff23bec26cd145ed34edd9c403551bd"
+  "gitHead": "6cbc7c671f769d36e4294f25a9445281912e45fd"
 }