expo-dev-menu-interface 1.7.2 → 1.8.1

package/android/build.gradle

@@ -1,91 +1,19 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '1.7.2'
+version = '1.8.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-if (expoModulesCorePlugin.exists()) {
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
-}
-
-buildscript {
-  // Simple helper that allows the root project to override versions declared by this library.
-  ext.safeExtGet = { prop, fallback ->
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-  }
-
-  // Ensures backward compatibility
-  ext.getKotlinVersion = {
-    if (ext.has("kotlinVersion")) {
-      ext.kotlinVersion()
-    } else {
-      ext.safeExtGet("kotlinVersion", "1.8.10")
-    }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
-  }
-}
-
-afterEvaluate {
-  publishing {
-    publications {
-      release(MavenPublication) {
-        from components.release
-      }
-    }
-    repositories {
-      maven {
-        url = mavenLocal().url
-      }
-    }
-  }
-}
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useDefaultAndroidSdkVersions()
 
 android {
-  // Remove this if and it's contents, when support for SDK49 is dropped
-  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
-
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
-    }
-
-    lintOptions {
-      abortOnError false
-    }
-  }
-
-  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
-    }
-
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.majorVersion
-    }
-  }
-
   namespace "expo.interfaces.devmenu"
   defaultConfig {
     versionCode 6
-    versionName '1.7.2'
-  }
-  publishing {
-    singleVariant("release") {
-      withSourcesJar()
-    }
+    versionName '1.8.1'
   }
 }
 
@@ -94,6 +22,5 @@ dependencies {
 
   implementation 'com.squareup.okhttp3:okhttp:3.14.9'
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
 }

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,117 @@
+@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() {
+      return 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/ios/MenuItems/DevMenuSelectionList.swift

@@ -2,11 +2,11 @@
 
 import Foundation
 
-@objc
+@objc(EXDevMenuSelectionList)
 public class DevMenuSelectionList: DevMenuScreenItem, DevMenuCallableProvider {
-  @objc
+  @objc(EXDevMenuItem)
   public class Item: NSObject, DevMenuDataSourceItem {
-    @objc
+    @objc(EXDevMenuTag)
     public class Tag: NSObject {
       @objc
       public var text: () -> String = { "" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu-interface",
-  "version": "1.7.2",
+  "version": "1.8.1",
   "description": "Interface for expo-dev-menu",
   "main": "index.js",
   "keywords": [
@@ -25,5 +25,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ca014bf2516c7644ef303f4c21fdd68de4d99f76"
+  "gitHead": "75658dcbae535ec32cbb296de1c811eba059e03a"
 }