expo-dev-menu 5.0.12 → 5.0.13

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 5.0.13 — 2024-05-08
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed DevMenu getting unresponsive after reloading bundle. ([#28664](https://github.com/expo/expo/pull/28664) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 5.0.12 — 2024-05-04
 
 ### 🐛 Bug fixes

package/android/build.gradle

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

package/ios/DevClientRootViewFactory.mm

@@ -2,6 +2,8 @@
 
 #import "DevClientRootViewFactory.h"
 #import <EXDevMenu/DevMenuRCTBridge.h>
+#import <EXDevMenu/DevMenuLoadingView.h>
+#import <EXDevMenu/DevMenuRCTDevSettings.h>
 
 #if __has_include(<React-RCTAppDelegate/RCTAppDelegate.h>)
 #import <React-RCTAppDelegate/RCTAppDelegate.h>
@@ -34,6 +36,15 @@
   self.bridge = [[DevMenuRCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
 }
 
+- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
+{
+  NSMutableArray<id<RCTBridgeModule>> *modules = [NSMutableArray new];
+  [modules addObject:[[DevMenuLoadingView alloc] init]];
+  [modules addObject:[[DevMenuRCTDevSettings alloc] init]];
+
+  return modules;
+}
+
 #pragma mark - RCTCxxBridgeDelegate
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
 {

package/ios/DevMenuAppInstance.swift

@@ -45,12 +45,6 @@ class DevMenuAppInstance: DevMenuRCTAppDelegate {
     return jsSourceUrl()
   }
 
-  override func extraModules(for bridge: RCTBridge) -> [RCTBridgeModule] {
-    var modules: [RCTBridgeModule] = [DevMenuLoadingView.init()]
-    modules.append(DevMenuRCTDevSettings.init())
-    return modules
-  }
-
   override func bridge(_ bridge: RCTBridge, didNotFindModule moduleName: String) -> Bool {
     return moduleName == "DevMenu"
   }

package/ios/DevMenuRCTBridge.h

@@ -6,6 +6,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface RCTRootViewFactory ()
+
+- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge;
+
+@end
+
 @interface DevMenuRCTCxxBridge : RCTCxxBridge
 
 - (NSArray<Class> *)filterModuleList:(NSArray<Class> *)modules;

package/ios/Modules/DevMenuExtensions.swift

@@ -78,6 +78,7 @@ open class DevMenuExtensions: NSObject, DevMenuExtensionProtocol {
     reload.label = { "Reload" }
     reload.glyphName = { "reload" }
     reload.importance = DevMenuScreenItem.ImportanceHighest
+    reload.registerKeyCommand(input: "r", modifiers: []) // "r" without modifiers
     return reload
   }
 

package/ios/Tests/DevMenuAppInstanceTest.swift

@@ -51,7 +51,7 @@ class DevMenuAppInstanceTest: QuickSpec {
         bridge: mockedBridge
       )
 
-      let extraModules = appInstance.extraModules(for: mockedBridge)
+      let extraModules = appInstance.rootViewFactory.extraModules(for: mockedBridge)
 
       expect(extraModules.first { type(of: $0).moduleName() == "DevLoadingView" }).toNot(beNil())
       expect(extraModules.first { type(of: $0).moduleName() == "DevSettings" }).toNot(beNil())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "5.0.12",
+  "version": "5.0.13",
   "description": "Expo/React Native module with the developer menu.",
   "main": "build/DevMenu.js",
   "types": "build/DevMenu.d.ts",
@@ -70,5 +70,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "a8060e820f0af06873d2278134d4d84081f8dcd2"
+  "gitHead": "2d46c18795300bad8ac2ad9491c3c0541a1c67e9"
 }