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 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 } 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..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 @@ -112,6 +112,18 @@ public class SnapshotStateStack( lastEvent = StackEvent.Replace } + override fun replace(items: List) { + Snapshot.withMutableSnapshot { + 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) 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