fix(ui/navigation): prevent any recomposition on fully expanded sheet state

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

Author: bmc08gt

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

@@ -139,6 +139,9 @@ class BottomSheetNavigator @InternalVoyagerApi constructor(
     private val coroutineScope: CoroutineScope
 ) : Stack<Screen> by navigator {
 
+    private var _isSheetActive by mutableStateOf(false)
+    val isSheetActive: Boolean get() = _isSheetActive
+
     val isVisible: Boolean
         get() = sheetState.isVisible
 
@@ -162,6 +165,7 @@ class BottomSheetNavigator @InternalVoyagerApi constructor(
                 replaceAll(screen)
                 // setup stack
                 sheetStacks.push(screen)
+                _isSheetActive = true
                 sheetState.show()
             } else {
                 hideAndShow(screen)
@@ -177,6 +181,7 @@ class BottomSheetNavigator @InternalVoyagerApi constructor(
                 val firstScreen = items.first()
                 val remainingScreens = items.drop(1)
                 sheetStacks.push(firstScreen to remainingScreens)
+                _isSheetActive = true
                 sheetState.show()
             } else {
                 hideAndShow(screens)
@@ -189,12 +194,14 @@ class BottomSheetNavigator @InternalVoyagerApi constructor(
             sheetStacks.pop()
             // animate sheet out
             sheetState.hide()
+            _isSheetActive = false
             // replacing w/ dummy sheet
             replaceAll(HiddenBottomSheetScreen)
             // push new stack
             sheetStacks.push(screen)
             // show new sheet
             replaceAll(screen)
+            _isSheetActive = true
             sheetState.show()
         } else {
             Timber.e("shouldn't get here; but ensuring a sheet is shown when requested.")
@@ -208,6 +215,7 @@ class BottomSheetNavigator @InternalVoyagerApi constructor(
             sheetStacks.pop()
             // animate sheet out
             sheetState.hide()
+            _isSheetActive = false
             // replacing w/ dummy sheet
             replaceAll(HiddenBottomSheetScreen)
             // push new stack
@@ -216,6 +224,7 @@ class BottomSheetNavigator @InternalVoyagerApi constructor(
             sheetStacks.push(firstScreen to remainingScreens)
             // show new sheet
             replaceAll(screens)
+            _isSheetActive = true
             sheetState.show()
         } else {
             Timber.e("shouldn't get here; but ensuring a sheet is shown when requested.")
@@ -230,11 +239,13 @@ class BottomSheetNavigator @InternalVoyagerApi constructor(
             if (isVisible) {
                 sheetStacks.pop()
                 sheetState.hide()
+                _isSheetActive = false
                 replaceAll(HiddenBottomSheetScreen)
                 showPreviousSheet()
             } else if (sheetState.targetValue == ModalBottomSheetValue.Hidden) {
                 // Swipe down - sheetState is already hidden here so `isVisible` is false
                 replaceAll(HiddenBottomSheetScreen)
+                _isSheetActive = false
             }
         }
     }

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

@@ -24,19 +24,22 @@ class CombinedNavigator(
     override var screensNavigator: Navigator? = null
     override var tabsNavigator: TabNavigator? = null
 
+    private val isSheetActive: Boolean
+        get() = sheetNavigator.isSheetActive
+
     override val lastItem: Screen?
-        get() = if (isVisible) sheetNavigator.lastItemOrNull else screensNavigator?.lastItemOrNull
+        get() = if (isSheetActive) sheetNavigator.lastItemOrNull else screensNavigator?.lastItemOrNull
+
+    override val lastEvent: StackEvent
+        get() = if (isSheetActive) sheetNavigator.lastEvent else screensNavigator?.lastEvent
+            ?: StackEvent.Idle
 
     override val lastModalItem: Screen?
         get() = sheetNavigator.lastItemOrNull
 
     override val sheetStackRoot: Screen?
         get() = sheetNavigator.sheetStacks.lastItemOrNull?.first
 
-    override val lastEvent: StackEvent
-        get() = if (isVisible) sheetNavigator.lastEvent else screensNavigator?.lastEvent
-            ?: StackEvent.Idle
-
     override val isVisible: Boolean
         get() = sheetNavigator.isVisible
 
@@ -90,7 +93,7 @@ class CombinedNavigator(
         trace(message = "navigating to ${item::class.java.simpleName}")
         launch {
             delay(delay)
-            if (isVisible) {
+            if (isSheetActive) {
                 sheetNavigator.push(item)
             } else {
                 screensNavigator?.push(item)
@@ -100,7 +103,7 @@ class CombinedNavigator(
 
     override fun push(items: List<Screen>) {
         trace(message = "navigating to ${items.joinToString { it::class.java.simpleName }}")
-        if (isVisible) {
+        if (isSheetActive) {
             sheetNavigator.push(items)
         } else {
             screensNavigator?.push(items)
@@ -126,7 +129,7 @@ class CombinedNavigator(
     }
 
     override fun isAtRoot(): Boolean {
-        return if (isVisible) {
+        return if (isSheetActive) {
             sheetNavigator.items.count() == 1
         } else {
             screensNavigator?.items?.count() == 1
@@ -135,15 +138,15 @@ class CombinedNavigator(
 
     override fun pop(): Boolean {
         trace(message = "popping from back stack")
-        return if (isVisible) {
+        return if (isSheetActive) {
             sheetNavigator.pop()
         } else {
             screensNavigator?.pop() ?: false
         }
     }
 
     override fun <T> popWithResult(result: T): Boolean {
-        return if (isVisible) {
+        return if (isSheetActive) {
             with(sheetNavigator) {
                 val prev = if (size < 2) null else items[items.size - 2] as? AppScreen
                 prev?.onResult(result)
@@ -170,15 +173,15 @@ class CombinedNavigator(
 
     override fun popAll() {
         trace(message = "popping all from back stack")
-        if (isVisible) {
+        if (isSheetActive) {
             sheetNavigator.popAll()
         } else {
             screensNavigator?.popAll()
         }
     }
 
     override fun popUntil(predicate: (Screen) -> Boolean): Boolean {
-        return if (isVisible) {
+        return if (isSheetActive) {
             sheetNavigator.popUntil(predicate)
         } else {
             screensNavigator?.popUntil(predicate) == true
@@ -191,7 +194,7 @@ class CombinedNavigator(
         screen: Screen?,
         content: @Composable () -> Unit
     ) {
-        if (isVisible) {
+        if (isSheetActive) {
             sheetNavigator.saveableState(key, screen = screen, content = content)
         } else {
             val lastScreen by remember(screen) {