Allow overriding default selected element directly

bumble-tech · Oct 6, 2023 · db1d906 · db1d906
1 parent c8cae30
commit db1d906
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.../appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/MainActivity.kt b/.../appyx-interactions/android/src/main/kotlin/com/bumble/appyx/interactions/MainActivity.kt
@@ -43,7 +43,8 @@ class MainActivity : NodeActivity() {
                         AppyxMaterial3NavNode(
                             buildContext = it,
                             navTargets = MainNavItem.values().toList(),
-                            navTargetResolver = MainNavItem.resolver
+                            navTargetResolver = MainNavItem.resolver,
+                            initialActiveElement = MainNavItem.CARDS
                         )
                     }
                 }

diff --git a/...on/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/container/MainNavNode.kt b/...on/common/src/commonMain/kotlin/com/bumble/appyx/navigation/node/container/MainNavNode.kt
@@ -10,5 +10,6 @@ class MainNavNode(
 ) : AppyxMaterial3NavNode<MainNavItem>(
     buildContext = buildContext,
     navTargets = MainNavItem.values().toList(),
-    navTargetResolver = MainNavItem.resolver
+    navTargetResolver = MainNavItem.resolver,
+    initialActiveElement = MainNavItem.SPOTLIGHT
 )
diff --git a/...material3/src/commonMain/kotlin/com/bumble/appyx/utils/material3/AppyxMaterial3NavNode.kt b/...material3/src/commonMain/kotlin/com/bumble/appyx/utils/material3/AppyxMaterial3NavNode.kt
@@ -44,6 +44,7 @@ open class AppyxMaterial3NavNode<NavTarget : Any>(
     buildContext: BuildContext,
     private val navTargets: List<NavTarget>,
     private val navTargetResolver: (NavTarget) -> AppyxNavItem,
+    private val initialActiveElement: NavTarget,
     private val animationSpec: SpringSpec<Float> = spring(
         stiffness = Spring.StiffnessHigh
     ),
@@ -56,7 +57,7 @@ open class AppyxMaterial3NavNode<NavTarget : Any>(
     private val spotlight: Spotlight<NavTarget> = Spotlight(
         model = SpotlightModel(
             items = navTargets,
-            initialActiveIndex = 0f,
+            initialActiveIndex = navTargets.indexOf(initialActiveElement).toFloat(),
             savedStateMap = buildContext.savedStateMap
         ),
         visualisation = visualisation