expo-dev-menu 58.0.4 → 58.0.6

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 58.0.6 — 2026-09-23
+
+### 🐛 Bug fixes
+
+- [iOS] Fix a data race on `DevMenuManager`'s registered callbacks and app context that could crash the app when one app context registered its dev menu callbacks while another tore down, such as on a dev-client reload. ([#49559](https://github.com/expo/expo/pull/49559) by [@vonovak](https://github.com/vonovak))
+
+## 58.0.5 — 2026-09-22
+
+### 🐛 Bug fixes
+
+- [iOS] Kept the floating dev menu button clear of system bars, the front camera and the home indicator by clamping the drawn button, rather than its touch frame, to the safe area on every edge. ([#50445](https://github.com/expo/expo/pull/50445) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 58.0.4 — 2026-09-21
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 group = 'host.exp.exponent'
-version = '58.0.4'
+version = '58.0.6'
 
 def hasDevLauncher = findProject(":expo-dev-launcher") != null
 def configureInRelease = findProperty("expo.devmenu.configureInRelease") == "true"
@@ -29,7 +29,7 @@ android {
 
   defaultConfig {
     versionCode 10
-    versionName '58.0.4'
+    versionName '58.0.6'
   }
 
   buildTypes {

package/expo-dev-menu.podspec

@@ -115,6 +115,9 @@ Pod::Spec.new do |s|
     test_spec.platforms = {
       :ios => '16.4'
     }
+    test_spec.pod_target_xcconfig = {
+      'OTHER_LDFLAGS' => '$(inherited) -lc++'
+    }
   end
 
   s.test_spec 'UITests' do |test_spec|
@@ -125,9 +128,15 @@ Pod::Spec.new do |s|
     test_spec.dependency 'React'
     # ExpoModulesCore requires React-hermes or React-jsc in tests, add ExpoModulesTestCore for the underlying dependencies
     test_spec.dependency 'ExpoModulesTestCore'
+    test_spec.pod_target_xcconfig = {
+      'OTHER_LDFLAGS' => '$(inherited) -lc++'
+    }
     test_spec.platforms = {
       :ios => '16.4'
     }
+    test_spec.pod_target_xcconfig = {
+      'OTHER_LDFLAGS' => '$(inherited) -lc++'
+    }
   end
 
   s.default_subspec = ['Main']

package/ios/DevMenuManager.swift

@@ -55,6 +55,18 @@ class DevMenuCacheContainer<T> {
   }
 }
 
+final class DevMenuCallbacksRegistry {
+  private let storage = Mutex<[DevMenuManager.Callback]>([])
+
+  var callbacks: [DevMenuManager.Callback] {
+    storage.withLock { $0 }
+  }
+
+  func replace(with callbacks: [DevMenuManager.Callback]) {
+    storage.withLock { $0 = callbacks }
+  }
+}
+
 /**
  Manages the dev menu and provides most of the public API.
  */
@@ -74,10 +86,17 @@ open class DevMenuManager: NSObject {
   var canLaunchDevMenuOnStart = true
   @objc public var isReactAppRunning = false
 
+  private let appContextLock = NSLock()
+  private weak var _currentAppContext: AppContext?
+
   /**
    The AppContext for the currently running React app. Set by DevMenuModule.OnCreate.
    */
-  public private(set) weak var currentAppContext: AppContext?
+  public var currentAppContext: AppContext? {
+    appContextLock.lock()
+    defer { appContextLock.unlock() }
+    return _currentAppContext
+  }
 
   @objc public var configuration = DevMenuConfiguration()
 
@@ -179,7 +198,9 @@ open class DevMenuManager: NSObject {
 
   @objc
   public func setAppContext(_ appContext: AppContext?) {
-    currentAppContext = appContext
+    appContextLock.lock()
+    _currentAppContext = appContext
+    appContextLock.unlock()
     if appContext != nil {
       isReloading = false
       lastReloadEventAt = Date()
@@ -202,10 +223,17 @@ open class DevMenuManager: NSObject {
    */
   @objc
   public func clearAppContext(current context: AppContext?) {
-    if currentAppContext != nil && currentAppContext !== context {
+    appContextLock.lock()
+    let shouldClear = _currentAppContext == nil || _currentAppContext === context
+    if shouldClear {
+      _currentAppContext = nil
+    }
+    appContextLock.unlock()
+    guard shouldClear else {
       return
     }
-    setAppContext(nil)
+    isReactAppRunning = false
+    updateAutoLaunchObserver()
   }
 
   @objc
@@ -470,9 +498,18 @@ open class DevMenuManager: NSObject {
     callbacksSubject.eraseToAnyPublisher()
   }
 
-  public var registeredCallbacks: [Callback] = [] {
-    didSet {
-      callbacksSubject.send(registeredCallbacks)
+  private let callbacksRegistry = DevMenuCallbacksRegistry()
+
+  public var registeredCallbacks: [Callback] {
+    get {
+      callbacksRegistry.callbacks
+    }
+    set {
+      callbacksRegistry.replace(with: newValue)
+      // PassthroughSubject doesn't support concurrent sends.
+      DispatchQueue.main.async { [weak self] in
+        self?.callbacksSubject.send(newValue)
+      }
     }
   }
 

package/ios/FAB/DevMenuFABView.swift

@@ -22,6 +22,14 @@ enum FABConstants {
   )
 }
 
+struct FABPillHeightKey: PreferenceKey {
+  static let defaultValue: CGFloat = FABConstants.iconSize
+
+  static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+    value = nextValue()
+  }
+}
+
 struct FabPill: View {
   @Binding var isPressed: Bool
   @Binding var isDragging: Bool
@@ -63,6 +71,11 @@ struct FabPill: View {
           .transition(.opacity.combined(with: .scale(scale: 0.8)))
       }
     }
+    .background(
+      GeometryReader { proxy in
+        Color.clear.preference(key: FABPillHeightKey.self, value: proxy.size.height)
+      }
+    )
     .saturation(isIdle ? 0 : 1)
     .opacity(isIdle ? 0.5 : 1)
     .animation(.easeInOut(duration: 0.3), value: isIdle)
@@ -113,6 +126,18 @@ struct DevMenuFABView: View {
 
   private let fabSize = CGSize(width: 72, height: FABConstants.iconSize + 50)
 
+  /// Centred in the touch frame, so its top moves as the label appears and dismisses.
+  private var drawnFrame: CGRect {
+    let ring = FABPlacement.ringOverhang
+    let width = FABConstants.iconSize + ring * 2
+    return CGRect(
+      x: (fabSize.width - width) / 2,
+      y: (fabSize.height - pillHeight) / 2 - ring,
+      width: width,
+      height: pillHeight + ring * 2
+    )
+  }
+
   // UserDefaults keys for persisting position
   private static let positionXKey = "DevMenuFAB.positionX"
   private static let positionYKey = "DevMenuFAB.positionY"
@@ -136,6 +161,7 @@ struct DevMenuFABView: View {
   @State private var isPressed = false
   @State private var dragStartPosition: CGPoint = .zero
   @State private var didPosition = false
+  @State private var pillHeight: CGFloat = FABConstants.iconSize
 
   // Get safe area from window since .ignoresSafeArea() may zero out geometry values
   private var windowSafeArea: UIEdgeInsets {
@@ -164,6 +190,21 @@ struct DevMenuFABView: View {
 
       FabPill(isPressed: $isPressed, isDragging: $isDragging)
         .frame(width: fabSize.width, height: fabSize.height)
+        .onPreferenceChange(FABPillHeightKey.self) { height in
+          pillHeight = height
+          let ranges = placementRanges(bounds: geometry.size, safeArea: safeArea)
+          let clamped = CGPoint(
+            x: position.x.clamped(to: ranges.x),
+            y: position.y.clamped(to: ranges.y)
+          )
+          guard clamped != position else { return }
+          var transaction = Transaction()
+          transaction.disablesAnimations = true
+          withTransaction(transaction) {
+            position = clamped
+          }
+          onFrameChange(CGRect(origin: clamped, size: fabSize))
+        }
         .position(x: currentFrame.midX, y: currentFrame.midY)
         .gesture(dragGesture(bounds: geometry.size, safeArea: safeArea))
         .onAppear {
@@ -236,15 +277,10 @@ struct DevMenuFABView: View {
   private func placeInitially(bounds: CGSize, safeArea: EdgeInsets) {
     let initialPos: CGPoint
     if let storedPos = Self.loadStoredPosition() {
-      let margin = FABConstants.margin
-      let minX = margin / 2
-      let maxX = bounds.width - fabSize.width - margin / 2
-      let minY = safeArea.top + FABConstants.verticalPadding
-      let maxY = bounds.height - fabSize.height - safeArea.bottom - FABConstants.verticalPadding
-
+      let ranges = placementRanges(bounds: bounds, safeArea: safeArea)
       initialPos = CGPoint(
-        x: storedPos.x.clamped(to: minX...maxX),
-        y: storedPos.y.clamped(to: minY...maxY)
+        x: storedPos.x.clamped(to: ranges.x),
+        y: storedPos.y.clamped(to: ranges.y)
       )
     } else {
       initialPos = defaultPosition(bounds: bounds, safeArea: safeArea)
@@ -258,11 +294,27 @@ struct DevMenuFABView: View {
     }
   }
 
-  private func defaultPosition(bounds: CGSize, safeArea: EdgeInsets) -> CGPoint {
-    CGPoint(
-      x: bounds.width - fabSize.width - FABConstants.margin / 2,
-      y: safeArea.top + FABConstants.verticalPadding
+  private func placementRanges(
+    bounds: CGSize,
+    safeArea: EdgeInsets
+  ) -> (x: ClosedRange<CGFloat>, y: ClosedRange<CGFloat>) {
+    let ranges = FABPlacement.ranges(
+      bounds: bounds,
+      safeArea: FABInsets(
+        top: safeArea.top,
+        leading: safeArea.leading,
+        bottom: safeArea.bottom,
+        trailing: safeArea.trailing
+      ),
+      drawnFrame: drawnFrame,
+      inset: FABConstants.margin
     )
+    return (ranges.x, ranges.y)
+  }
+
+  private func defaultPosition(bounds: CGSize, safeArea: EdgeInsets) -> CGPoint {
+    let ranges = placementRanges(bounds: bounds, safeArea: safeArea)
+    return CGPoint(x: ranges.x.upperBound, y: ranges.y.lowerBound)
   }
 
   private func snapToEdge(
@@ -271,19 +323,13 @@ struct DevMenuFABView: View {
     bounds: CGSize,
     safeArea: EdgeInsets
   ) -> CGPoint {
-    let margin = FABConstants.margin
-    let edgeMargin = margin / 2  // Closer to screen edge when snapped
     let momentumX = velocity.x * FABConstants.momentumFactor
     let momentumY = velocity.y * FABConstants.momentumFactor
+    let ranges = placementRanges(bounds: bounds, safeArea: safeArea)
 
     let estimatedCenterX = point.x + self.fabSize.width / 2 + momentumX
-    let targetX: CGFloat = estimatedCenterX < bounds.width / 2
-      ? edgeMargin
-    : bounds.width - self.fabSize.width - edgeMargin
-
-    let minY = safeArea.top + FABConstants.verticalPadding
-    let maxY = bounds.height - self.fabSize.height - safeArea.bottom - FABConstants.verticalPadding
-    let targetY = (point.y + momentumY).clamped(to: minY...maxY)
+    let targetX = estimatedCenterX < bounds.width / 2 ? ranges.x.lowerBound : ranges.x.upperBound
+    let targetY = (point.y + momentumY).clamped(to: ranges.y)
 
     return CGPoint(x: targetX, y: targetY)
   }

package/ios/FAB/FABPlacement.swift

@@ -0,0 +1,39 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import CoreGraphics
+
+struct FABInsets {
+  let top: CGFloat
+  let leading: CGFloat
+  let bottom: CGFloat
+  let trailing: CGFloat
+}
+
+struct FABPlacementRanges {
+  let x: ClosedRange<CGFloat>
+  let y: ClosedRange<CGFloat>
+}
+
+enum FABPlacement {
+  /// The ring is stroked on a path 4pt wider than the icon, so it paints this far outside it.
+  static let ringOverhang: CGFloat = 4
+
+  /// Origins the FAB frame may take, given the painted pill in that frame's coordinate space.
+  static func ranges(
+    bounds: CGSize,
+    safeArea: FABInsets,
+    drawnFrame: CGRect,
+    inset: CGFloat
+  ) -> FABPlacementRanges {
+    // Keep `inset` from each edge, but never sit further in than the safe area already requires.
+    let minX = max(safeArea.leading, inset) - drawnFrame.minX
+    let maxX = bounds.width - max(safeArea.trailing, inset) - drawnFrame.maxX
+    let minY = max(safeArea.top, inset) - drawnFrame.minY
+    let maxY = bounds.height - max(safeArea.bottom, inset) - drawnFrame.maxY
+
+    return FABPlacementRanges(
+      x: min(minX, maxX)...max(minX, maxX),
+      y: min(minY, maxY)...max(minY, maxY)
+    )
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "58.0.4",
+  "version": "58.0.6",
   "description": "Expo/React Native module with the developer menu.",
   "keywords": [
     "dev",
@@ -40,7 +40,7 @@
     "expo": "*",
     "react-native": "*"
   },
-  "gitHead": "ebb1fd7569c9c9e172cb9abd73dfede027c1d674",
+  "gitHead": "8aeb4368d396d2d71a2fc8c652c4d1d4d53ed858",
   "scripts": {
     "build": "pnpm run build:lib && pnpm run build:plugin",
     "build:lib": "expo-build src",