Skip to content

Use NavStack and NavStackList in NavigableCircuitContent #2461

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
stagg merged 1 commit into from
Jan 8, 2026
Merged

Use NavStack and NavStackList in NavigableCircuitContent #2461

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 backstack/api/android/backstack.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public final class com/slack/circuit/backstack/BackStackKt {
}

public abstract interface class com/slack/circuit/backstack/NavDecoration {
public abstract fun DecoratedContent (Ljava/util/List;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public abstract fun DecoratedContent (Lcom/slack/circuit/runtime/navigation/NavStackList;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
}

public final class com/slack/circuit/backstack/SaveableBackStack : com/slack/circuit/backstack/BackStack {
Expand Down
2 changes: 1 addition & 1 deletion backstack/api/backstack.klib.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ abstract interface <#A: com.slack.circuit.backstack/BackStack.Record> com.slack.
}

abstract interface com.slack.circuit.backstack/NavDecoration { // com.slack.circuit.backstack/NavDecoration|null[0]
abstract fun <#A1: com.slack.circuit.runtime.navigation/NavArgument> DecoratedContent(kotlin.collections/List<#A1>, androidx.compose.ui/Modifier, kotlin/Function3<#A1, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // com.slack.circuit.backstack/NavDecoration.DecoratedContent|DecoratedContent(kotlin.collections.List<0:0>;androidx.compose.ui.Modifier;kotlin.Function3<0:0,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){0§<com.slack.circuit.runtime.navigation.NavArgument>}[0]
abstract fun <#A1: com.slack.circuit.runtime.navigation/NavArgument> DecoratedContent(com.slack.circuit.runtime.navigation/NavStackList<#A1>, androidx.compose.ui/Modifier, kotlin/Function3<#A1, androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int) // com.slack.circuit.backstack/NavDecoration.DecoratedContent|DecoratedContent(com.slack.circuit.runtime.navigation.NavStackList<0:0>;androidx.compose.ui.Modifier;kotlin.Function3<0:0,androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int){0§<com.slack.circuit.runtime.navigation.NavArgument>}[0]
}

final class com.slack.circuit.backstack/SaveableBackStack : com.slack.circuit.backstack/BackStack<com.slack.circuit.backstack/SaveableBackStack.Record> { // com.slack.circuit.backstack/SaveableBackStack|null[0]
Expand Down
2 changes: 1 addition & 1 deletion backstack/api/jvm/backstack.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public final class com/slack/circuit/backstack/BackStackKt {
}

public abstract interface class com/slack/circuit/backstack/NavDecoration {
public abstract fun DecoratedContent (Ljava/util/List;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public abstract fun DecoratedContent (Lcom/slack/circuit/runtime/navigation/NavStackList;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
}

public final class com/slack/circuit/backstack/SaveableBackStack : com/slack/circuit/backstack/BackStack {
Expand Down
3 changes: 2 additions & 1 deletion backstack/src/commonMain/kotlin/com/slack/circuit/backstack/Navigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
import androidx.compose.ui.Modifier
import com.slack.circuit.runtime.navigation.NavArgument
import com.slack.circuit.runtime.navigation.NavStackList
import com.slack.circuit.runtime.screen.Screen
import kotlin.DeprecationLevel.WARNING

Expand All @@ -27,7 +28,7 @@ import kotlin.DeprecationLevel.WARNING
public interface NavDecoration {
@Composable
public fun <T : NavArgument> DecoratedContent(
args: List<T>,
args: NavStackList<T>,
modifier: Modifier,
content: @Composable (T) -> Unit,
)
Expand Down
37 changes: 19 additions & 18 deletions circuit-foundation/api/android/circuit-foundation.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,9 @@ public final class com/slack/circuit/foundation/NavEventKt {

public final class com/slack/circuit/foundation/NavigableCircuitContentKt {
public static final fun NavigableCircuitContent (Lcom/slack/circuit/runtime/Navigator;Lcom/slack/circuit/backstack/BackStack;Landroidx/compose/ui/Modifier;Lcom/slack/circuit/foundation/Circuit;Ljava/util/Map;Lcom/slack/circuit/backstack/NavDecoration;Lcom/slack/circuit/foundation/animation/AnimatedNavDecorator$Factory;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V
public static final fun NavigableCircuitContent (Lcom/slack/circuit/runtime/Navigator;Lcom/slack/circuit/runtime/navigation/NavStack;Landroidx/compose/ui/Modifier;Lcom/slack/circuit/foundation/Circuit;Ljava/util/Map;Lcom/slack/circuit/backstack/NavDecoration;Lcom/slack/circuit/foundation/animation/AnimatedNavDecorator$Factory;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V
public static final fun getLocalAnsweringResultHandler ()Landroidx/compose/runtime/ProvidableCompositionLocal;
public static final fun getLocalBackStack ()Landroidx/compose/runtime/ProvidableCompositionLocal;
public static final fun getLocalNavStack ()Landroidx/compose/runtime/ProvidableCompositionLocal;
}

public final class com/slack/circuit/foundation/NavigatorDefaults {
Expand All @@ -194,21 +195,20 @@ public final class com/slack/circuit/foundation/NavigatorDefaults$DefaultDecorat
public fun <init> ()V
public fun Decoration (Landroidx/compose/animation/AnimatedContentScope;Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public synthetic fun Decoration (Landroidx/compose/animation/AnimatedContentScope;Lcom/slack/circuit/foundation/animation/AnimatedNavState;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public fun targetState (Ljava/util/List;)Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;
public synthetic fun targetState (Ljava/util/List;)Lcom/slack/circuit/foundation/animation/AnimatedNavState;
public fun targetState (Lcom/slack/circuit/runtime/navigation/NavStackList;)Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;
public synthetic fun targetState (Lcom/slack/circuit/runtime/navigation/NavStackList;)Lcom/slack/circuit/foundation/animation/AnimatedNavState;
public fun transitionSpec (Landroidx/compose/animation/AnimatedContentTransitionScope;Lcom/slack/circuit/foundation/animation/AnimatedNavEvent;)Landroidx/compose/animation/ContentTransform;
public fun updateTransition (Ljava/util/List;Landroidx/compose/runtime/Composer;I)Landroidx/compose/animation/core/Transition;
public fun updateTransition (Lcom/slack/circuit/runtime/navigation/NavStackList;Landroidx/compose/runtime/Composer;I)Landroidx/compose/animation/core/Transition;
}

public final class com/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState : com/slack/circuit/foundation/animation/AnimatedNavState {
public static final field $stable I
public fun <init> (Ljava/util/List;)V
public final fun component1 ()Ljava/util/List;
public final fun copy (Ljava/util/List;)Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;
public static synthetic fun copy$default (Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;Ljava/util/List;ILjava/lang/Object;)Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;
public fun <init> (Lcom/slack/circuit/runtime/navigation/NavStackList;)V
public final fun component1 ()Lcom/slack/circuit/runtime/navigation/NavStackList;
public final fun copy (Lcom/slack/circuit/runtime/navigation/NavStackList;)Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;
public static synthetic fun copy$default (Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;Lcom/slack/circuit/runtime/navigation/NavStackList;ILjava/lang/Object;)Lcom/slack/circuit/foundation/NavigatorDefaults$DefaultDecorator$DefaultAnimatedState;
public fun equals (Ljava/lang/Object;)Z
public final fun getArgs ()Ljava/util/List;
public fun getBackStack ()Ljava/util/List;
public fun getNavStack ()Lcom/slack/circuit/runtime/navigation/NavStackList;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}
Expand All @@ -222,7 +222,7 @@ public final class com/slack/circuit/foundation/NavigatorDefaults$DefaultDecorat
public final class com/slack/circuit/foundation/NavigatorDefaults$EmptyDecoration : com/slack/circuit/backstack/NavDecoration {
public static final field $stable I
public static final field INSTANCE Lcom/slack/circuit/foundation/NavigatorDefaults$EmptyDecoration;
public fun DecoratedContent (Ljava/util/List;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public fun DecoratedContent (Lcom/slack/circuit/runtime/navigation/NavStackList;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
}

public final class com/slack/circuit/foundation/NavigatorImplKt {
Expand All @@ -235,6 +235,7 @@ public final class com/slack/circuit/foundation/NavigatorImplKt {

public final class com/slack/circuit/foundation/Navigator_androidKt {
public static final fun rememberCircuitNavigator (Lcom/slack/circuit/backstack/BackStack;ZLandroidx/compose/runtime/Composer;II)Lcom/slack/circuit/runtime/Navigator;
public static final fun rememberCircuitNavigator (Lcom/slack/circuit/runtime/navigation/NavStack;ZLandroidx/compose/runtime/Composer;II)Lcom/slack/circuit/runtime/Navigator;
}

public abstract interface class com/slack/circuit/foundation/NonPausablePresenter : com/slack/circuit/runtime/presenter/Presenter {
Expand All @@ -256,21 +257,23 @@ public final class com/slack/circuit/foundation/RecordLifecycleKt {
public final class com/slack/circuit/foundation/animation/AnimatedNavDecoration : com/slack/circuit/backstack/NavDecoration {
public static final field $stable I
public fun <init> (Ljava/util/Map;Lcom/slack/circuit/foundation/animation/AnimatedNavDecorator$Factory;)V
public fun DecoratedContent (Ljava/util/List;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public fun DecoratedContent (Lcom/slack/circuit/runtime/navigation/NavStackList;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
}

public abstract interface class com/slack/circuit/foundation/animation/AnimatedNavDecorator {
public abstract fun Decoration (Landroidx/compose/animation/AnimatedContentScope;Lcom/slack/circuit/foundation/animation/AnimatedNavState;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public abstract fun targetState (Ljava/util/List;)Lcom/slack/circuit/foundation/animation/AnimatedNavState;
public abstract fun targetState (Lcom/slack/circuit/runtime/navigation/NavStackList;)Lcom/slack/circuit/foundation/animation/AnimatedNavState;
public abstract fun transitionSpec (Landroidx/compose/animation/AnimatedContentTransitionScope;Lcom/slack/circuit/foundation/animation/AnimatedNavEvent;)Landroidx/compose/animation/ContentTransform;
public abstract fun updateTransition (Ljava/util/List;Landroidx/compose/runtime/Composer;I)Landroidx/compose/animation/core/Transition;
public abstract fun updateTransition (Lcom/slack/circuit/runtime/navigation/NavStackList;Landroidx/compose/runtime/Composer;I)Landroidx/compose/animation/core/Transition;
}

public abstract interface class com/slack/circuit/foundation/animation/AnimatedNavDecorator$Factory {
public abstract fun create ()Lcom/slack/circuit/foundation/animation/AnimatedNavDecorator;
}

public final class com/slack/circuit/foundation/animation/AnimatedNavEvent : java/lang/Enum {
public static final field Backward Lcom/slack/circuit/foundation/animation/AnimatedNavEvent;
public static final field Forward Lcom/slack/circuit/foundation/animation/AnimatedNavEvent;
public static final field GoTo Lcom/slack/circuit/foundation/animation/AnimatedNavEvent;
public static final field Pop Lcom/slack/circuit/foundation/animation/AnimatedNavEvent;
public static final field RootReset Lcom/slack/circuit/foundation/animation/AnimatedNavEvent;
Expand All @@ -280,10 +283,8 @@ public final class com/slack/circuit/foundation/animation/AnimatedNavEvent : jav
}

public abstract interface class com/slack/circuit/foundation/animation/AnimatedNavState {
public abstract fun getBackStack ()Ljava/util/List;
public fun getBackStackDepth ()I
public fun getRoot ()Lcom/slack/circuit/runtime/navigation/NavArgument;
public fun getTop ()Lcom/slack/circuit/runtime/navigation/NavArgument;
public fun getActive ()Lcom/slack/circuit/runtime/screen/Screen;
public abstract fun getNavStack ()Lcom/slack/circuit/runtime/navigation/NavStackList;
}

public final class com/slack/circuit/foundation/animation/PartialContentTransform {
Expand Down
Loading