feat(nav3): add NonDraggableRoute and NonDismissableRoute support for inner sheet routes

Use Material3 sheetGesturesEnabled and ModalBottomSheetProperties to
block drag gestures and scrim/back dismissal on sheets whose inner route
implements these marker interfaces. Inner route state is communicated to
the outer ModalBottomSheet via reactive CodeNavigator properties and
LocalSheetNavigator composition local.

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt

@@ -8,6 +8,9 @@ import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.NavKey
@@ -53,11 +56,14 @@ import com.flipcash.app.withdrawal.WithdrawalDestinationScreen
 import com.flipcash.app.withdrawal.WithdrawalEntryScreen
 import com.flipcash.app.withdrawal.WithdrawalFlow
 import com.getcode.navigation.AppNavHost
+import com.getcode.navigation.NonDismissableRoute
+import com.getcode.navigation.NonDraggableRoute
 import com.getcode.navigation.annotatedEntry
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.core.rememberCodeNavigator
 import com.getcode.navigation.results.NavResultStateRegistry
 import com.getcode.navigation.scenes.LocalBottomSheetDismissDispatcher
+import com.getcode.navigation.scenes.LocalSheetNavigator
 import com.getcode.navigation.scenes.ModalBottomSheetSceneStrategy
 import com.getcode.ui.components.bars.BarManager
 import dev.theolm.rinku.DeepLink
@@ -187,6 +193,24 @@ private fun SheetContent(
         }
     }
 
+    // Toggle the outer sheet's drag/dismiss behavior based on the current inner route.
+    val sheetNavigator = LocalSheetNavigator.current
+    val currentInnerRoute by remember {
+        derivedStateOf { backStack.lastOrNull() }
+    }
+    if (sheetNavigator != null) {
+        val isDragDisabled = currentInnerRoute is NonDraggableRoute
+        val isDismissDisabled = currentInnerRoute is NonDismissableRoute
+        DisposableEffect(isDragDisabled, isDismissDisabled) {
+            sheetNavigator.sheetDragDisabled = isDragDisabled
+            sheetNavigator.sheetDismissDisabled = isDismissDisabled
+            onDispose {
+                sheetNavigator.sheetDragDisabled = false
+                sheetNavigator.sheetDismissDisabled = false
+            }
+        }
+    }
+
     CompositionLocalProvider(LocalCodeNavigator provides navigator) {
         AppNavHost(
             navigator = navigator,

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt

@@ -5,6 +5,8 @@ import androidx.navigation3.runtime.NavKey
 import com.flipcash.app.core.money.RegionSelectionKind
 import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.core.tokens.TokenSwapPurpose
+import com.getcode.navigation.NonDismissableRoute
+import com.getcode.navigation.NonDraggableRoute
 import com.getcode.navigation.Sheet
 import com.getcode.opencode.internal.solana.model.SwapId
 import com.getcode.opencode.model.financial.Fiat
@@ -81,7 +83,7 @@ sealed interface AppRoute : NavKey, Parcelable {
         @Serializable data class Info(val mint: Mint, val forNeededFunds: Boolean = false, val fromDeeplink: Boolean = false): Token
         @Serializable data class Transactions(val mint: Mint): Token
         @Serializable data class SwapTransact(val purpose: TokenSwapPurpose, val forNeededFunds: Boolean = false): Token
-        @Serializable data class TxProcessing(val swapId: SwapId, val awaitExternalWallet: Boolean = false): Token
+        @Serializable data class TxProcessing(val swapId: SwapId, val awaitExternalWallet: Boolean = false): Token, NonDismissableRoute, NonDraggableRoute
         @Serializable data object SellReceipt: Token
     }
 

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenTxProcessingScreen.kt

@@ -17,7 +17,6 @@ import com.flipcash.app.tokens.ui.BuySellSwapTokenViewModel.Event
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.extensions.flowScopedViewModel
 import com.getcode.opencode.internal.solana.model.SwapId
-import com.getcode.ui.utils.DisableSheetGestures
 import com.getcode.view.LoadingSuccessState
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.firstOrNull
@@ -94,5 +93,4 @@ fun TokenTxProcessingScreen(
     }
 
     BackHandler { /* intercept */ }
-    DisableSheetGestures()
 }

ui/navigation/src/main/kotlin/com/getcode/navigation/NavMetadata.kt

@@ -11,6 +11,7 @@ import kotlin.reflect.full.isSuperclassOf
 
 enum class NavMetadataKeys(val key: String, ) {
     IsNonDismissable("non_dismissable"),
+    IsNonDraggable("non_draggable"),
     IsSheet("sheet"),
     IsSolitarySheet("sheet_solitary"),
     NavResultKey("navresult_key"),
@@ -36,6 +37,7 @@ fun KClass<*>.metadata(): Map<String, Any> {
         NavMetadataKeys.IsSheet.key to Sheet::class.java.isAssignableFrom(this.java),
         NavMetadataKeys.IsSolitarySheet.key to SolitarySheet::class.java.isAssignableFrom(this.java),
         NavMetadataKeys.IsNonDismissable.key to NonDismissableRoute::class.java.isAssignableFrom(this.java),
+        NavMetadataKeys.IsNonDraggable.key to NonDraggableRoute::class.java.isAssignableFrom(this.java),
         NavMetadataKeys.NavResultKey.key to (if (NavigationRetVal::class.isSuperclassOf(this)) {
             @Suppress("UNCHECKED_CAST")
             NavResultKey(

ui/navigation/src/main/kotlin/com/getcode/navigation/Types.kt

@@ -4,4 +4,5 @@ import androidx.navigation3.runtime.NavKey
 
 interface Sheet: NavKey
 interface NonDismissableRoute: NavKey
+interface NonDraggableRoute: NavKey
 interface SolitarySheet: NavKey

ui/navigation/src/main/kotlin/com/getcode/navigation/core/CodeNavigator.kt

@@ -63,6 +63,18 @@ data class CodeNavigator(
      * when the same route key is reused (otherwise Compose reuses the old Hidden
      * SheetState because onBack + navigateTo happen in the same snapshot).
      */
+    /**
+     * When true, the enclosing bottom sheet disables drag gestures.
+     * Inner sheet content sets this based on the current route's metadata.
+     */
+    var sheetDragDisabled by mutableStateOf(false)
+
+    /**
+     * When true, the enclosing bottom sheet blocks scrim tap and back press dismissal.
+     * Inner sheet content sets this based on the current route's metadata.
+     */
+    var sheetDismissDisabled by mutableStateOf(false)
+
     var sheetGeneration by mutableIntStateOf(0)
 
     val currentRouteKey: NavKey?
@@ -195,7 +207,7 @@ data class CodeNavigator(
     }
 
     /** Hide/dismiss a sheet (pops the current route). */
-    fun hide() = navigateBack()
+    fun hide() = popAll()
 
     /** Replace the current route with a new one. */
     fun replace(route: NavKey) = navigate(route, NavOptions(popUpTo = NavOptions.PopUpTo.PopLast))

ui/navigation/src/main/kotlin/com/getcode/navigation/scenes/ModalBottomSheetSceneStrategy.kt

@@ -9,11 +9,11 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.ModalBottomSheetProperties
 import androidx.compose.material3.SheetState
-import androidx.compose.material3.SheetValue
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.key
 import androidx.compose.runtime.rememberCoroutineScope
@@ -27,6 +27,7 @@ import androidx.navigation3.scene.Scene
 import androidx.navigation3.scene.SceneStrategy
 import androidx.navigation3.scene.SceneStrategyScope
 import com.getcode.navigation.NavMetadataKeys
+import com.getcode.navigation.core.CodeNavigator
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.results.NavResultKey
 import com.getcode.navigation.results.NavResultOrCanceled
@@ -64,7 +65,8 @@ internal class ModalBottomSheetScene<T : Any> @OptIn(ExperimentalMaterial3Api::c
         val navigator = LocalCodeNavigator.current
         key(key, navigator.sheetGeneration) {
             val isNonDismissable =
-                (metadata[NavMetadataKeys.IsNonDismissable.key] as? Boolean) ?: false
+                (metadata[NavMetadataKeys.IsNonDismissable.key] as? Boolean ?: false)
+                    || navigator.sheetDismissDisabled
 
             val handleBackResult = {
                 val navResultKey =
@@ -82,10 +84,6 @@ internal class ModalBottomSheetScene<T : Any> @OptIn(ExperimentalMaterial3Api::c
 
             var sheetState: SheetState = rememberModalBottomSheetState(
                 skipPartiallyExpanded = true,
-                confirmValueChange = { value ->
-                    // prevent dismissing via gesture if non-dismissable
-                    !(value == SheetValue.Hidden && isNonDismissable)
-                },
             )
 
             // Ensure the sheet shows when entering composition. Material3's internal
@@ -133,9 +131,15 @@ internal class ModalBottomSheetScene<T : Any> @OptIn(ExperimentalMaterial3Api::c
             // Remove grab bar for bleed to top edge of sheet
             ModalBottomSheet(
                 sheetState = sheetState,
-                onDismissRequest = { dismiss(false) },
+                onDismissRequest = { if (!isNonDismissable) dismiss(false) },
+                sheetGesturesEnabled = !navigator.sheetDragDisabled,
                 scrimColor = CodeTheme.colors.scrim,
-                properties = modalBottomSheetProperties,
+                properties = if (isNonDismissable) {
+                    ModalBottomSheetProperties(
+                        shouldDismissOnBackPress = false,
+                        shouldDismissOnClickOutside = false,
+                    )
+                } else modalBottomSheetProperties,
                 dragHandle = null,
                 contentWindowInsets = { WindowInsets() },
                 containerColor = CodeTheme.colors.surface,
@@ -154,11 +158,10 @@ internal class ModalBottomSheetScene<T : Any> @OptIn(ExperimentalMaterial3Api::c
                         .fillMaxWidth()
                         .fillMaxHeight(CodeTheme.dimens.modalHeightRatio)
                 ) {
-                    CompositionLocalProvider(LocalBottomSheetDismissDispatcher provides {
-                        dismiss(
-                            true
-                        )
-                    }) {
+                    CompositionLocalProvider(
+                        LocalBottomSheetDismissDispatcher provides { dismiss(true) },
+                        LocalSheetNavigator provides navigator,
+                    ) {
                         entry.Content()
                     }
                 }
@@ -235,3 +238,10 @@ class ModalBottomSheetSceneStrategy<T : Any>(
 }
 
 val LocalBottomSheetDismissDispatcher = staticCompositionLocalOf { {} }
+
+/**
+ * Provides the outer (root) [CodeNavigator] to inner sheet content.
+ * Used to toggle [CodeNavigator.sheetDragDisabled] from within nested navigators.
+ */
+val LocalSheetNavigator: ProvidableCompositionLocal<CodeNavigator?> =
+    staticCompositionLocalOf { null }