expo-dev-menu 58.0.9 → 58.0.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 58.0.10
+
+### Patch Changes
+
+- [iOS] Disable the vertical bar while the dev menu is open so the sheet fills the full width on iPhone Duo. ([#50900](https://github.com/expo/expo/pull/50900) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 58.0.9
 
 ### Patch 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.9'
+version = '58.0.10'
 
 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.9'
+    versionName '58.0.10'
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devmenu/compose/ripple/Ripple.kt

@@ -69,7 +69,11 @@ internal class CommonRippleNode(
   override fun addRipple(interaction: PressInteraction.Press, size: Size, targetRadius: Float) {
     // Finish existing ripples
     ripples.forEach { _, ripple -> ripple.finish() }
-    val origin = if (bounded) interaction.pressPosition else null
+    val origin = if (bounded) {
+      interaction.pressPosition
+    } else {
+      null
+    }
     val rippleAnimation =
       RippleAnimation(origin = origin, radius = targetRadius, bounded = bounded)
     ripples[interaction] = rippleAnimation
@@ -186,7 +190,9 @@ internal class AndroidRippleNode(
   }
 
   private fun getOrCreateRippleContainer(): RippleContainer {
-    if (rippleContainer != null) return rippleContainer!!
+    if (rippleContainer != null) {
+      return rippleContainer!!
+    }
     val view = findNearestViewGroup(currentValueOf(LocalView))
     rippleContainer = createAndAttachRippleContainerIfNeeded(view)
     return rippleContainer!!

package/android/src/debug/java/expo/modules/devmenu/compose/ripple/RippleAlpha.kt

@@ -26,13 +26,25 @@ public class RippleAlpha(
   public val pressedAlpha: Float
 ) {
   override fun equals(other: Any?): Boolean {
-    if (this === other) return true
-    if (other !is RippleAlpha) return false
+    if (this === other) {
+      return true
+    }
+    if (other !is RippleAlpha) {
+      return false
+    }
 
-    if (draggedAlpha != other.draggedAlpha) return false
-    if (focusedAlpha != other.focusedAlpha) return false
-    if (hoveredAlpha != other.hoveredAlpha) return false
-    if (pressedAlpha != other.pressedAlpha) return false
+    if (draggedAlpha != other.draggedAlpha) {
+      return false
+    }
+    if (focusedAlpha != other.focusedAlpha) {
+      return false
+    }
+    if (hoveredAlpha != other.hoveredAlpha) {
+      return false
+    }
+    if (pressedAlpha != other.pressedAlpha) {
+      return false
+    }
 
     return true
   }

package/android/src/debug/java/expo/modules/devmenu/compose/ripple/RippleFactory.kt

@@ -77,7 +77,11 @@ fun ripple(
   color: Color = Color.Unspecified
 ): IndicationNodeFactory {
   return if (radius == Dp.Unspecified && color == Color.Unspecified) {
-    if (bounded) return DefaultBoundedRipple else DefaultUnboundedRipple
+    if (bounded) {
+      return DefaultBoundedRipple
+    } else {
+      DefaultUnboundedRipple
+    }
   } else {
     RippleNodeFactory(bounded, radius, color)
   }
@@ -207,11 +211,19 @@ class RippleConfiguration(
   val rippleAlpha: RippleAlpha? = null
 ) {
   override fun equals(other: Any?): Boolean {
-    if (this === other) return true
-    if (other !is RippleConfiguration) return false
+    if (this === other) {
+      return true
+    }
+    if (other !is RippleConfiguration) {
+      return false
+    }
 
-    if (color != other.color) return false
-    if (rippleAlpha != other.rippleAlpha) return false
+    if (color != other.color) {
+      return false
+    }
+    if (rippleAlpha != other.rippleAlpha) {
+      return false
+    }
 
     return true
   }
@@ -249,12 +261,22 @@ private constructor(
   }
 
   override fun equals(other: Any?): Boolean {
-    if (this === other) return true
-    if (other !is RippleNodeFactory) return false
+    if (this === other) {
+      return true
+    }
+    if (other !is RippleNodeFactory) {
+      return false
+    }
 
-    if (bounded != other.bounded) return false
-    if (radius != other.radius) return false
-    if (colorProducer != other.colorProducer) return false
+    if (bounded != other.bounded) {
+      return false
+    }
+    if (radius != other.radius) {
+      return false
+    }
+    if (colorProducer != other.colorProducer) {
+      return false
+    }
     return color == other.color
   }
 
@@ -294,7 +316,9 @@ private class DelegatingThemeAwareRippleNode(
       if (configuration == null) {
         removeRipple()
       } else {
-        if (rippleNode == null) attachNewRipple()
+        if (rippleNode == null) {
+          attachNewRipple()
+        }
       }
     }
   }

package/android/src/debug/java/expo/modules/devmenu/compose/ripple/RippleHostView.kt

@@ -227,7 +227,11 @@ internal class RippleHostView(context: Context) : View(context) {
       }
       postDelayed(resetRippleRunnable, ResetRippleDelayDuration)
     } else {
-      val state = if (pressed) PressedState else RestingState
+      val state = if (pressed) {
+        PressedState
+      } else {
+        RestingState
+      }
       ripple?.state = state
     }
     lastRippleStateChangeTimeMillis = currentTime
@@ -276,7 +280,11 @@ private class UnprojectedRipple(private val bounded: Boolean) :
     // The color of the mask here doesn't matter - we just need a mask to draw the bounded
     // ripple
     // against
-    /* mask */ if (bounded) ColorDrawable(android.graphics.Color.WHITE) else null
+    /* mask */ if (bounded) {
+      ColorDrawable(android.graphics.Color.WHITE)
+    } else {
+      null
+    }
   ) {
   /**
    * Store the ripple color so we can compare it later, as there is no way to get the currently

package/android/src/debug/java/expo/modules/devmenu/fab/FabState.kt

@@ -41,8 +41,16 @@ class FabState(
 
   fun savePosition(offset: Offset) {
     // Store position as 0–1 ratios within the safe area so it survives screen size changes
-    val normalizedX = if (fabAreaBounds.x > 0f) offset.x / fabAreaBounds.x else 0f
-    val normalizedY = if (fabAreaBounds.y > 0f) offset.y / fabAreaBounds.y else 0f
+    val normalizedX = if (fabAreaBounds.x > 0f) {
+      offset.x / fabAreaBounds.x
+    } else {
+      0f
+    }
+    val normalizedY = if (fabAreaBounds.y > 0f) {
+      offset.y / fabAreaBounds.y
+    } else {
+      0f
+    }
 
     prefs.edit {
       putFloat(FAB_POSITION_X, normalizedX)

package/android/src/debug/java/expo/modules/devmenu/fab/FloatingActionButtonContent.kt

@@ -42,17 +42,29 @@ fun FloatingActionButtonContent(
   showLabel: Boolean = true
 ) {
   val scale by animateFloatAsState(
-    targetValue = if (isPressed && !isDragging) 0.9f else 1f,
+    targetValue = if (isPressed && !isDragging) {
+      0.9f
+    } else {
+      1f
+    },
     label = "pressScale"
   )
 
   val idleAlpha by animateFloatAsState(
-    targetValue = if (isIdle) 0.5f else 1f,
+    targetValue = if (isIdle) {
+      0.5f
+    } else {
+      1f
+    },
     label = "idleAlpha"
   )
 
   val idleSaturation by animateFloatAsState(
-    targetValue = if (isIdle) 0f else 1f,
+    targetValue = if (isIdle) {
+      0f
+    } else {
+      1f
+    },
     label = "idleSaturation"
   )
 

package/android/src/debug/java/expo/modules/devmenu/fab/MovableFloatingActionButton.kt

@@ -109,7 +109,11 @@ fun MovableFloatingActionButton(
       if (state.isOpen) {
         fab.restingOffset = fab.animatedOffset.value
         val isOnLeftSide = fab.animatedOffset.value.x < fab.fabAreaBounds.x / 2f
-        val offScreenX = if (isOnLeftSide) -totalFabSizePx.x else constraints.maxWidth.toFloat()
+        val offScreenX = if (isOnLeftSide) {
+          -totalFabSizePx.x
+        } else {
+          constraints.maxWidth.toFloat()
+        }
         fab.animatedOffset.animateTo(
           targetValue = Offset(offScreenX, fab.animatedOffset.value.y),
           animationSpec = tween(durationMillis = 500)

package/android/src/debug/java/expo/modules/devmenu/launch/ExpoLauncherUrl.kt

@@ -8,7 +8,11 @@ import android.net.Uri
  * Keep in sync with `packages/expo-dev-menu/ios/Launch/ExpoLauncherURL.swift`.
  */
 class ExpoLauncherUrl(val url: Uri) {
-  private val paramNames: Set<String> = if (url.isHierarchical) url.queryParameterNames else emptySet()
+  private val paramNames: Set<String> = if (url.isHierarchical) {
+    url.queryParameterNames
+  } else {
+    emptySet()
+  }
   private val hasReservedParams = paramNames.any { it.startsWith(RESERVED_PREFIX) }
 
   val isLegacyHost = url.host == LEGACY_HOST
@@ -47,7 +51,9 @@ class ExpoLauncherUrl(val url: Uri) {
 
   /** `__expo_<name>`, or the [legacy] param next to the legacy host. */
   private fun param(name: String, legacy: String? = null): String? {
-    if (!url.isHierarchical) return null
+    if (!url.isHierarchical) {
+      return null
+    }
     return url.getQueryParameter(RESERVED_PREFIX + name)
       ?: legacy?.takeIf { isLegacyHost }?.let(url::getQueryParameter)
   }

package/ios/DevMenuViewController.swift

@@ -42,6 +42,13 @@ class DevMenuViewController: UIViewController {
   }
 #endif
 
+#if canImport(SwiftUICore, _version: 8.0.85) && os(iOS)
+  @available(iOS 27.1, *)
+  override var preferredVerticalBarBehavior: UIVerticalBarBehavior {
+    return .disabled
+  }
+#endif
+
   private func setupSwiftUIView() {
     let rootView = DevMenuRootView()
     let hostingController = UIHostingController(rootView: rootView)

package/ios/SwiftUI/HeaderView.swift

@@ -63,7 +63,8 @@ struct HeaderView: View {
     .task {
       await loadIcon(from: viewModel.appInfo?.appIcon)
     }
-    .padding()
+    .padding([.horizontal, .bottom])
+    .padding(.top, 24)
   }
 
   private func loadIcon(from path: String?) async {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "58.0.9",
+  "version": "58.0.10",
   "description": "Expo/React Native module with the developer menu.",
   "keywords": [
     "dev",
@@ -28,11 +28,11 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.7.4",
-    "@testing-library/react-native": "^13.3.0",
+    "@testing-library/react-native": "^14.0.1",
     "@types/jest": "^29.2.1",
     "@types/node": "^22.14.0",
-    "babel-preset-expo": "58.0.6",
-    "expo-module-scripts": "56.0.4",
+    "babel-preset-expo": "58.0.8",
+    "expo-module-scripts": "56.0.5",
     "react": "19.3.0",
     "react-native": "0.88.0-rc.3"
   },