这是indexloc提供的服务，不要输入任何密码
Skip to content

Simplify code in threePaneEntry #25

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
merged 1 commit into from
Feb 13, 2025
Merged

Simplify code in threePaneEntry #25

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
9 changes: 0 additions & 9 deletions library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/PaneScope.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ package com.tunjid.treenav.compose

import androidx.compose.animation.AnimatedContentScope
import androidx.compose.animation.AnimatedVisibilityScope
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
import androidx.compose.runtime.Stable
import androidx.compose.runtime.State
import androidx.compose.runtime.getValue
Expand All @@ -45,13 +43,6 @@ interface PaneScope<Pane, Destination : Node> : AnimatedVisibilityScope {
*/
val isActive: Boolean

/**
* Describes how a destination transitions after an adaptive change
*/
data class Transitions(
val enter: EnterTransition,
val exit: ExitTransition,
)
}

/**
Expand Down
48 changes: 17 additions & 31 deletions library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/ThreePane.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,42 +108,33 @@ fun <R : Node> threePaneEntry(
paneTransform = paneMapping,
renderTransform = { destination, original ->
val state = paneState
val modifier = when (state.pane) {
val shouldAnimate = when (state.pane) {
ThreePane.Primary,
ThreePane.Secondary,
-> when {
ThreePane.PrimaryToSecondary in state.adaptations
|| ThreePane.SecondaryToPrimary in state.adaptations
-> Modifier

else -> Modifier
.animateEnterExit(
enter = enterTransition(),
exit = exitTransition()
)
ThreePane.PrimaryToSecondary in state.adaptations -> false
ThreePane.SecondaryToPrimary in state.adaptations -> false
else -> true
}

ThreePane.TransientPrimary -> when {
ThreePane.PrimaryToTransient in state.adaptations -> Modifier

else -> Modifier
.animateEnterExit(
enter = enterTransition(),
exit = exitTransition()
)
ThreePane.PrimaryToTransient in state.adaptations -> false
else -> true
}

else -> Modifier
.animateEnterExit(
enter = enterTransition(),
exit = exitTransition()
)
else -> true
}
Box(
modifier = modifier
) {
original(destination)
}
modifier =
if (shouldAnimate) Modifier.animateEnterExit(
enter = enterTransition(),
exit = exitTransition()
)
else Modifier,
content = {
original(destination)
}
)

},
content = render
Expand All @@ -160,8 +151,3 @@ private val DefaultFadeIn = fadeIn(
private val DefaultFadeOut = fadeOut(
animationSpec = RouteTransitionAnimationSpec,
)

private val NoTransition = PaneScope.Transitions(
enter = EnterTransition.None,
exit = ExitTransition.None,
)