Merge pull request #111 from ryanmoelter/expose-current-navigable

Expose the current navigable in ComposeNavigator
ryanmoelter · Jan 30, 2024 · fc6587d · fc6587d
2 parents ffb7ac0 + 44d1d05
commit fc6587d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/...nx-compose/src/main/java/com/ryanmoelter/magellanx/compose/navigation/ComposeNavigator.kt b/...nx-compose/src/main/java/com/ryanmoelter/magellanx/compose/navigation/ComposeNavigator.kt
@@ -22,6 +22,7 @@ import com.ryanmoelter.magellanx.core.Displayable
 import com.ryanmoelter.magellanx.core.Navigable
 import com.ryanmoelter.magellanx.core.lifecycle.LifecycleAwareComponent
 import com.ryanmoelter.magellanx.core.lifecycle.LifecycleLimit
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 
@@ -41,11 +42,12 @@ public open class ComposeNavigator :
   /**
    * Get a snapshot of the current navigable, i.e. the last item of the current [backStack].
    */
-  private val currentNavigable
+  public val currentNavigable: Navigable<@Composable () -> Unit>?
     get() = backStack.lastOrNull()?.navigable
 
   private val currentNavigationEventFlow = backStackFlow.map { it.lastOrNull() }
-  private val currentNavigableFlow = currentNavigationEventFlow.map { it?.navigable }
+  public val currentNavigableFlow: Flow<Navigable<@Composable () -> Unit>?> =
+    currentNavigationEventFlow.map { it?.navigable }
 
   // TODO: make default transition configurable
   private val transitionFlow: MutableStateFlow<MagellanComposeTransition> =

diff --git a/magellanx-test/src/main/java/com/ryanmoelter/magellanx/test/FakeComposeNavigator.kt b/magellanx-test/src/main/java/com/ryanmoelter/magellanx/test/FakeComposeNavigator.kt
@@ -1,6 +1,5 @@
 package com.ryanmoelter.magellanx.test
 
-import androidx.compose.runtime.Composable
 import com.ryanmoelter.magellanx.compose.navigation.ComposeNavigationEvent
 import com.ryanmoelter.magellanx.compose.navigation.ComposeNavigator
 import com.ryanmoelter.magellanx.compose.navigation.Direction
@@ -15,12 +14,6 @@ import com.ryanmoelter.magellanx.core.navigation.LinearNavigator
 public class FakeComposeNavigator : ComposeNavigator() {
   public override var backStack: List<ComposeNavigationEvent> = emptyList()
 
-  /**
-   * The [Navigable] that's currently on the top of the [backStack]
-   */
-  public val currentNavigable: Navigable<@Composable () -> Unit>?
-    get() = backStack.lastOrNull()?.navigable
-
   /**
    * Clear this navigator for the next test. [destroy] will do the same thing, and it's also safe to
    * leave this object to be garbage collected instead.