Fix timeline not programmatically selected in drawer

rros · Feb 12, 2024 · 5c2c26d · 5c2c26d
1 parent 08d8b6f
commit 5c2c26d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/iosApp/Source/App/CompactView.swift b/iosApp/Source/App/CompactView.swift
@@ -46,8 +46,12 @@ struct CompactView: View {
             .navigationDestination(for: CompactViewRoute.self) { route in
                 switch route {
                 case .feed:
-                    HomeScreen(toggleListScroll: $scrollUpTrigger, homeViewModel: homeViewModel)
-                        .environmentObject(indexHolder)
+                    HomeScreen(
+                        toggleListScroll: $scrollUpTrigger,
+                        selectedDrawerItem: $selectedDrawerItem,
+                        homeViewModel: homeViewModel
+                    )
+                    .environmentObject(indexHolder)
                 }
             }
         }

diff --git a/iosApp/Source/App/RegularView.swift b/iosApp/Source/App/RegularView.swift
@@ -45,8 +45,12 @@ struct RegularView: View {
             .navigationBarTitleDisplayMode(.inline)
         } detail: {
             NavigationStack {
-                HomeScreen(toggleListScroll: $scrollUpTrigger, homeViewModel: homeViewModel)
-                    .environmentObject(indexHolder)
+                HomeScreen(
+                    toggleListScroll: $scrollUpTrigger,
+                    selectedDrawerItem: $selectedDrawerItem,
+                    homeViewModel: homeViewModel
+                )
+                .environmentObject(indexHolder)
             }
             .navigationBarTitleDisplayMode(.inline)
         }

diff --git a/iosApp/Source/Home/HomeScreen.swift b/iosApp/Source/Home/HomeScreen.swift
@@ -49,6 +49,8 @@ struct HomeScreen: View {
     @Binding
     var toggleListScroll: Bool
 
+    @Binding var selectedDrawerItem: DrawerItem?
+
     let homeViewModel: HomeViewModel
 
     var body: some View {
@@ -94,6 +96,7 @@ struct HomeScreen: View {
             },
             onBackToTimelineClick: {
                 homeViewModel.onFeedFilterSelected(selectedFeedFilter: FeedFilter.Timeline())
+                selectedDrawerItem = DrawerItem.Timeline()
             }
         )
         .task {