expo-dev-menu 56.0.5 → 56.0.7

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 56.0.7 — 2026-05-13
+
+### 🐛 Bug fixes
+
+- Fix FAB safe-area bounds ([#45647](https://github.com/expo/expo/pull/45647) by [@Wenszel](https://github.com/Wenszel))
+
+## 56.0.6 — 2026-05-11
+
+_This version does not introduce any user-facing changes._
+
 ## 56.0.5 — 2026-05-08
 
 ### 💡 Others

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 = '56.0.5'
+version = '56.0.7'
 
 def hasDevLauncher = findProject(":expo-dev-launcher") != null
 def configureInRelease = findProperty("expo.devmenu.configureInRelease") == "true"
@@ -29,7 +29,7 @@ android {
 
   defaultConfig {
     versionCode 10
-    versionName '56.0.5'
+    versionName '56.0.7'
   }
 
   buildTypes {

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

@@ -4,8 +4,6 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.VectorConverter
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -15,7 +13,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
 import androidx.core.content.edit
 import kotlinx.coroutines.delay
 
@@ -25,17 +22,9 @@ private const val FAB_POSITION_X = "fabPositionX"
 private const val FAB_POSITION_Y = "fabPositionY"
 private const val FAB_POSITION_UNSET = -1f
 
-data class FabBounds(
-  val screen: Offset,
-  val safe: Offset,
-  val safeMinY: Float,
-  val drag: Offset,
-  val halfFab: Offset
-)
-
 class FabState(
   initialOffset: Offset,
-  val bounds: FabBounds,
+  var fabAreaBounds: Offset,
   val prefs: SharedPreferences
 ) {
   val animatedOffset = Animatable(initialOffset, Offset.VectorConverter)
@@ -51,12 +40,9 @@ class FabState(
   }
 
   fun savePosition(offset: Offset) {
-    val safeWidth = bounds.safe.x
-    val safeHeight = bounds.safe.y - bounds.safeMinY
-
     // Store position as 0–1 ratios within the safe area so it survives screen size changes
-    val normalizedX = if (safeWidth > 0f) offset.x / safeWidth else 0f
-    val normalizedY = if (safeHeight > 0f) (offset.y - bounds.safeMinY) / safeHeight 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)
@@ -66,40 +52,27 @@ class FabState(
 }
 
 @Composable
-fun rememberFabState(screenBounds: Offset, totalFabSizePx: Offset): FabState {
-  val density = LocalDensity.current
-  val systemBarInsets = WindowInsets.systemBars
-  val safeInsetTop = with(density) { systemBarInsets.getTop(this).toFloat() }
-  val safeInsetBottom = with(density) { systemBarInsets.getBottom(this).toFloat() }
-  val halfFab = Offset(totalFabSizePx.x / 2f, totalFabSizePx.y / 2f)
-
-  val fabBounds = FabBounds(
-    screen = screenBounds,
-    safe = Offset(screenBounds.x, screenBounds.y - safeInsetBottom),
-    safeMinY = safeInsetTop,
-    drag = Offset(screenBounds.x + halfFab.x, screenBounds.y + halfFab.y),
-    halfFab = halfFab
-  )
-
+fun rememberFabState(fabAreaBounds: Offset): FabState {
   val context = LocalContext.current
   val prefs = remember { context.getSharedPreferences(FAB_PREFS, Context.MODE_PRIVATE) }
 
-  val initialOffset = remember(fabBounds.safe, fabBounds.safeMinY) {
+  val initialOffset = remember {
     val savedX = prefs.getFloat(FAB_POSITION_X, FAB_POSITION_UNSET)
     val savedY = prefs.getFloat(FAB_POSITION_Y, FAB_POSITION_UNSET)
-    val safeMaxX = maxOf(0f, fabBounds.safe.x)
-    val safeMaxY = maxOf(fabBounds.safeMinY, fabBounds.safe.y)
     if (savedX != FAB_POSITION_UNSET && savedY != FAB_POSITION_UNSET) {
       Offset(
-        x = (savedX * safeMaxX).coerceIn(0f, safeMaxX),
-        y = (savedY * (safeMaxY - fabBounds.safeMinY) + fabBounds.safeMinY).coerceIn(fabBounds.safeMinY, safeMaxY)
+        x = (savedX * fabAreaBounds.x).coerceIn(0f, fabAreaBounds.x),
+        y = (savedY * fabAreaBounds.y).coerceIn(0f, fabAreaBounds.y)
       )
     } else {
-      Offset(fabBounds.safe.x, fabBounds.safeMinY)
+      Offset(fabAreaBounds.x, 0f)
     }
   }
 
-  val state = remember { FabState(initialOffset, fabBounds, prefs) }
+  val state = remember { FabState(initialOffset, fabAreaBounds, prefs) }
+  // We can't simply update the entire state when the bounds change,
+  // because it would result in resetting the interaction state (isPressed, isDragging).
+  state.fabAreaBounds = fabAreaBounds
 
   LaunchedEffect(state.lastInteractionTime) {
     state.isIdle = false

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

@@ -5,6 +5,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.unit.IntOffset
 import expo.modules.devmenu.fab.ExpoVelocityTracker.PointF
 import kotlin.math.roundToInt
@@ -49,6 +50,15 @@ internal fun Offset.coerceIn(minX: Float = 0f, maxX: Float, minY: Float = 0f, ma
   )
 }
 
+internal fun Offset.coerceIn(rect: Rect): Offset {
+  return this.coerceIn(
+    minX = rect.left,
+    maxX = rect.right,
+    minY = rect.top,
+    maxY = rect.bottom
+  )
+}
+
 @Composable
 internal fun <T> rememberPrevious(current: T): T? {
   val previousRef = remember { mutableStateOf<T?>(null) }

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

@@ -14,12 +14,14 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.input.pointer.positionChange
 import androidx.compose.ui.platform.LocalDensity
@@ -48,7 +50,11 @@ fun MovableFloatingActionButton(
   margin: Dp = Margin,
   onPress: () -> Unit = {}
 ) {
-  BoxWithConstraints(modifier = modifier.fillMaxSize()) {
+  BoxWithConstraints(
+    modifier = modifier
+      .safeDrawingPadding()
+      .fillMaxSize()
+  ) {
     val totalFabSize = DpSize(fabSize.width + margin * 2, fabSize.height + margin * 2)
     val totalFabSizePx = with(LocalDensity.current) {
       Offset(totalFabSize.width.toPx(), totalFabSize.height.toPx())
@@ -58,7 +64,16 @@ fun MovableFloatingActionButton(
       y = constraints.maxHeight - totalFabSizePx.y
     )
 
-    val fab = rememberFabState(bounds, totalFabSizePx)
+    val halfFab = Offset(totalFabSizePx.x / 2f, totalFabSizePx.y / 2f)
+    val dragBounds = Rect(
+      left = -halfFab.x,
+      top = -halfFab.y,
+      right = bounds.x + halfFab.x,
+      bottom = bounds.y + halfFab.y
+    )
+
+    val fab = rememberFabState(bounds)
+
     val isFabDisplayable = state.showFab &&
       !state.isInPictureInPictureMode &&
       bounds.x >= 0f &&
@@ -70,7 +85,7 @@ fun MovableFloatingActionButton(
     LaunchedEffect(state.isOpen) {
       if (state.isOpen) {
         fab.restingOffset = fab.animatedOffset.value
-        val isOnLeftSide = fab.animatedOffset.value.x < fab.bounds.safe.x / 2f
+        val isOnLeftSide = fab.animatedOffset.value.x < fab.fabAreaBounds.x / 2f
         val offScreenX = if (isOnLeftSide) -totalFabSizePx.x else constraints.maxWidth.toFloat()
         fab.animatedOffset.animateTo(
           targetValue = Offset(offScreenX, fab.animatedOffset.value.y),
@@ -97,14 +112,13 @@ fun MovableFloatingActionButton(
       previousBounds?.let {
         val oldX = fab.animatedOffset.value.x
         val oldY = fab.animatedOffset.value.y
-        val newX = (oldX / previousBounds.x) * fab.bounds.safe.x
-        val newY = (oldY / previousBounds.y) * fab.bounds.safe.y
+        val newX = (oldX / previousBounds.x) * fab.fabAreaBounds.x
+        val newY = (oldY / previousBounds.y) * fab.fabAreaBounds.y
         val newTarget = calculateTargetPosition(
           currentPosition = Offset(newX, newY),
           velocity = ExpoVelocityTracker.PointF(0f, 0f),
-          bounds = fab.bounds.safe,
-          totalFabWidth = totalFabSizePx.x,
-          minY = fab.bounds.safeMinY
+          bounds = fab.fabAreaBounds,
+          totalFabWidth = totalFabSizePx.x
         )
 
         fab.animatedOffset.snapTo(newTarget)
@@ -140,7 +154,7 @@ fun MovableFloatingActionButton(
 
                   drag(pointerId) { change ->
                     dragOffset = (dragOffset + change.positionChange())
-                      .coerceIn(minX = -fab.bounds.halfFab.x, maxX = fab.bounds.drag.x, minY = -fab.bounds.halfFab.y, maxY = fab.bounds.drag.y)
+                      .coerceIn(dragBounds)
                     dragDistance += change.positionChange().getDistance()
                     velocityTracker.registerPosition(dragOffset.x, dragOffset.y)
 
@@ -187,7 +201,12 @@ private fun CoroutineScope.handleRelease(
   totalFabSizePx: Offset
 ) {
   val velocity = velocityTracker.calculateVelocity()
-  val newOffset = calculateTargetPosition(fab.animatedOffset.value, velocity, fab.bounds.safe, totalFabSizePx.x, fab.bounds.safeMinY)
+  val newOffset = calculateTargetPosition(
+    currentPosition = fab.animatedOffset.value,
+    velocity = velocity,
+    bounds = fab.fabAreaBounds,
+    totalFabWidth = totalFabSizePx.x
+  )
 
   velocityTracker.clear()
   launch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "56.0.5",
+  "version": "56.0.7",
   "description": "Expo/React Native module with the developer menu.",
   "main": "build/DevMenu.js",
   "types": "build/DevMenu.d.ts",
@@ -32,15 +32,15 @@
     "@types/node": "^22.14.0",
     "react": "19.2.3",
     "react-native": "0.85.3",
-    "expo": "56.0.0-preview.7",
-    "babel-preset-expo": "56.0.5",
-    "expo-module-scripts": "56.0.2"
+    "babel-preset-expo": "56.0.7",
+    "expo-module-scripts": "56.0.2",
+    "expo": "56.0.0-preview.10"
   },
   "peerDependencies": {
     "expo": "*",
     "react-native": "*"
   },
-  "gitHead": "a30353e69ca0d72b9fac5830abc631feda1ba3ae",
+  "gitHead": "40f0a6f6711d93762e0506b37e6e077e4bd9a541",
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",