Skip to content

clearAll uses the initialIndex to reset #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinBlock-GC merged 1 commit into from
Apr 10, 2026
Merged

clearAll uses the initialIndex to reset #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraryVersion.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ view_version=1.2.0
material_version=1.0.4
functions_version=1.0.0
savedstate_version=1.0.1
navigation_version=1.2.3
navigation_version=1.2.4
recyclerview_version=1.2.0
viewpager2_version=1.0.0
communications_version=1.0.0
Expand Down
10 changes: 10 additions & 0 deletions navigation/src/androidTest/java/com/tunjid/androidx/navigation/MultiStackNavigatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,16 @@ class MultiStackNavigatorTest {
assertSame(ROOT_TAG_0, multiStackNavigator.current?.tag)
}

@Test
fun clearAllShowsInitialIndex() = runBlocking {
val multiStackNavigator = multiStackNavigator(MultiStackNavigator.BackStackType.UniqueEntries, initialIndex = 1)
multiStackNavigator.performConsecutively(this) {
push(NavigationTestFragment.newInstance(TAG_A))
clearAll()
assertSame(ROOT_TAG_1, multiStackNavigator.current?.tag)
}
}

private fun MultiStackNavigator.assertNavigatorIndices(vararg tags: String?) {
tags.forEachIndexed { index, tag -> assertEquals(tag, navigatorAt(index)?.current?.tag) }
}
Expand Down
2 changes: 1 addition & 1 deletion navigation/src/main/java/com/tunjid/androidx/navigation/MultiStackNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ fun FragmentActivity.multiStackNavigationController(
class MultiStackNavigator(
stackCount: Int,
stateContainer: LifecycleSavedStateContainer,
private val initialIndex: Int,
internal val initialIndex: Int,
private val fragmentManager: FragmentManager,
@IdRes override val containerId: Int,
backStackType: BackStackType = BackStackType.UniqueEntries,
Expand Down
2 changes: 1 addition & 1 deletion navigation/src/main/java/com/tunjid/androidx/navigation/SuspendingMultiStackNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SuspendingMultiStackNavigator internal constructor(
mainThreadSuspendCancellableCoroutine<Unit> { continuation ->
navigator.reset(commitNow = false) { continuation.resumeIfActive(Unit) }
}
navigator.stackFragments[0].waitForChild()
navigator.stackFragments[navigator.initialIndex].waitForChild()
}

private suspend fun StackFragment.waitForChild(): Fragment {
Expand Down
Loading