From 49ce4b74f8d45540c6e531d69b7378290b15d1c0 Mon Sep 17 00:00:00 2001 From: Tang <1024830255@qq.com> Date: Sun, 8 Mar 2026 15:54:40 +0800 Subject: [PATCH 1/5] Added `replace(items: List)` to the Stack interface and its implementation. --- .../adriel/voyager/core/stack/SnapshotStateStack.kt | 10 ++++++++++ .../kotlin/cafe/adriel/voyager/core/stack/Stack.kt | 2 ++ 2 files changed, 12 insertions(+) diff --git a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt index d28020d1..ff94dd89 100644 --- a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt +++ b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt @@ -112,6 +112,16 @@ public class SnapshotStateStack( lastEvent = StackEvent.Replace } + override fun replace(items: List) { + if (stateStack.isEmpty()) { + push(items) + } else { + stateStack.removeLastElement() + stateStack += items + } + lastEvent = StackEvent.Replace + } + public override infix fun replaceAll(item: Item) { Snapshot.withMutableSnapshot { stateStack.clear() diff --git a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/Stack.kt b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/Stack.kt index bf65e8fd..7c43ec03 100644 --- a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/Stack.kt +++ b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/Stack.kt @@ -30,6 +30,8 @@ public interface Stack { public infix fun replace(item: Item) + public infix fun replace(items: List) + public infix fun replaceAll(item: Item) public infix fun replaceAll(items: List) From e0190983c25fca0071a6b7842167b49affab44dc Mon Sep 17 00:00:00 2001 From: Tang <1024830255@qq.com> Date: Sun, 8 Mar 2026 16:01:47 +0800 Subject: [PATCH 2/5] Execute apiDump to generate the .api file. --- voyager-core/api/android/voyager-core.api | 2 ++ voyager-core/api/desktop/voyager-core.api | 2 ++ 2 files changed, 4 insertions(+) diff --git a/voyager-core/api/android/voyager-core.api b/voyager-core/api/android/voyager-core.api index 6fd8e538..c53c360c 100644 --- a/voyager-core/api/android/voyager-core.api +++ b/voyager-core/api/android/voyager-core.api @@ -219,6 +219,7 @@ public final class cafe/adriel/voyager/core/stack/SnapshotStateStack : cafe/adri public fun push (Ljava/lang/Object;)V public fun push (Ljava/util/List;)V public fun replace (Ljava/lang/Object;)V + public fun replace (Ljava/util/List;)V public fun replaceAll (Ljava/lang/Object;)V public fun replaceAll (Ljava/util/List;)V } @@ -248,6 +249,7 @@ public abstract interface class cafe/adriel/voyager/core/stack/Stack { public abstract fun push (Ljava/lang/Object;)V public abstract fun push (Ljava/util/List;)V public abstract fun replace (Ljava/lang/Object;)V + public abstract fun replace (Ljava/util/List;)V public abstract fun replaceAll (Ljava/lang/Object;)V public abstract fun replaceAll (Ljava/util/List;)V } diff --git a/voyager-core/api/desktop/voyager-core.api b/voyager-core/api/desktop/voyager-core.api index 8cff349a..e9c5eb3b 100644 --- a/voyager-core/api/desktop/voyager-core.api +++ b/voyager-core/api/desktop/voyager-core.api @@ -202,6 +202,7 @@ public final class cafe/adriel/voyager/core/stack/SnapshotStateStack : cafe/adri public fun push (Ljava/lang/Object;)V public fun push (Ljava/util/List;)V public fun replace (Ljava/lang/Object;)V + public fun replace (Ljava/util/List;)V public fun replaceAll (Ljava/lang/Object;)V public fun replaceAll (Ljava/util/List;)V } @@ -231,6 +232,7 @@ public abstract interface class cafe/adriel/voyager/core/stack/Stack { public abstract fun push (Ljava/lang/Object;)V public abstract fun push (Ljava/util/List;)V public abstract fun replace (Ljava/lang/Object;)V + public abstract fun replace (Ljava/util/List;)V public abstract fun replaceAll (Ljava/lang/Object;)V public abstract fun replaceAll (Ljava/util/List;)V } From 3564a95e6e2d8d600a7619f14e24bf79c7c0bd08 Mon Sep 17 00:00:00 2001 From: Tang <1024830255@qq.com> Date: Sat, 21 Mar 2026 18:04:55 +0800 Subject: [PATCH 3/5] Fix `replace(items: List)`, surround remove and add in a `Snapshot.withMutableSnapshot`. --- .../voyager/core/stack/SnapshotStateStack.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt index ff94dd89..7a238bc9 100644 --- a/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt +++ b/voyager-core/src/commonMain/kotlin/cafe/adriel/voyager/core/stack/SnapshotStateStack.kt @@ -113,13 +113,15 @@ public class SnapshotStateStack( } override fun replace(items: List) { - if (stateStack.isEmpty()) { - push(items) - } else { - stateStack.removeLastElement() - stateStack += items + Snapshot.withMutableSnapshot { + if (stateStack.isEmpty()) { + push(items) + } else { + stateStack.removeLastElement() + stateStack += items + } + lastEvent = StackEvent.Replace } - lastEvent = StackEvent.Replace } public override infix fun replaceAll(item: Item) { From 338df7c7bd6f8d1cf04b93ea88662c47d66060d5 Mon Sep 17 00:00:00 2001 From: Tang <1024830255@qq.com> Date: Sun, 22 Mar 2026 14:20:35 +0800 Subject: [PATCH 4/5] Execute apiDump to generate the .api file. --- .../api/android/voyager-bottom-sheet-navigator.api | 1 + .../api/desktop/voyager-bottom-sheet-navigator.api | 1 + 2 files changed, 2 insertions(+) diff --git a/voyager-bottom-sheet-navigator/api/android/voyager-bottom-sheet-navigator.api b/voyager-bottom-sheet-navigator/api/android/voyager-bottom-sheet-navigator.api index b2dac70e..fd36f368 100644 --- a/voyager-bottom-sheet-navigator/api/android/voyager-bottom-sheet-navigator.api +++ b/voyager-bottom-sheet-navigator/api/android/voyager-bottom-sheet-navigator.api @@ -21,6 +21,7 @@ public final class cafe/adriel/voyager/navigator/bottomSheet/BottomSheetNavigato public fun push (Ljava/util/List;)V public fun replace (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replace (Ljava/lang/Object;)V + public fun replace (Ljava/util/List;)V public fun replaceAll (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replaceAll (Ljava/lang/Object;)V public fun replaceAll (Ljava/util/List;)V diff --git a/voyager-bottom-sheet-navigator/api/desktop/voyager-bottom-sheet-navigator.api b/voyager-bottom-sheet-navigator/api/desktop/voyager-bottom-sheet-navigator.api index 7d89fa57..a6ea2139 100644 --- a/voyager-bottom-sheet-navigator/api/desktop/voyager-bottom-sheet-navigator.api +++ b/voyager-bottom-sheet-navigator/api/desktop/voyager-bottom-sheet-navigator.api @@ -21,6 +21,7 @@ public final class cafe/adriel/voyager/navigator/bottomSheet/BottomSheetNavigato public fun push (Ljava/util/List;)V public fun replace (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replace (Ljava/lang/Object;)V + public fun replace (Ljava/util/List;)V public fun replaceAll (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replaceAll (Ljava/lang/Object;)V public fun replaceAll (Ljava/util/List;)V From f410b93d4e4643463597cf5826c7b27bb8250094 Mon Sep 17 00:00:00 2001 From: Tang <1024830255@qq.com> Date: Sat, 13 Jun 2026 18:03:50 +0800 Subject: [PATCH 5/5] Execute apiDump to generate the .api file. ./gradlew :voyager-navigator:androidApiDump ./gradlew :voyager-navigator:desktopApiDump --- voyager-navigator/api/android/voyager-navigator.api | 1 + voyager-navigator/api/desktop/voyager-navigator.api | 1 + 2 files changed, 2 insertions(+) diff --git a/voyager-navigator/api/android/voyager-navigator.api b/voyager-navigator/api/android/voyager-navigator.api index 92749417..edaac059 100644 --- a/voyager-navigator/api/android/voyager-navigator.api +++ b/voyager-navigator/api/android/voyager-navigator.api @@ -31,6 +31,7 @@ public final class cafe/adriel/voyager/navigator/Navigator : cafe/adriel/voyager public fun push (Ljava/util/List;)V public fun replace (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replace (Ljava/lang/Object;)V + public fun replace (Ljava/util/List;)V public fun replaceAll (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replaceAll (Ljava/lang/Object;)V public fun replaceAll (Ljava/util/List;)V diff --git a/voyager-navigator/api/desktop/voyager-navigator.api b/voyager-navigator/api/desktop/voyager-navigator.api index 0079b3d9..cfce7ea2 100644 --- a/voyager-navigator/api/desktop/voyager-navigator.api +++ b/voyager-navigator/api/desktop/voyager-navigator.api @@ -31,6 +31,7 @@ public final class cafe/adriel/voyager/navigator/Navigator : cafe/adriel/voyager public fun push (Ljava/util/List;)V public fun replace (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replace (Ljava/lang/Object;)V + public fun replace (Ljava/util/List;)V public fun replaceAll (Lcafe/adriel/voyager/core/screen/Screen;)V public synthetic fun replaceAll (Ljava/lang/Object;)V public fun replaceAll (Ljava/util/List;)V