- Add scroll to top as auxiliary action to ExpandedPost/FeedView/User…

…View.
mlemgroup · Oct 7, 2023 · db5834e · db5834e
1 parent e339faa
commit db5834e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/Mlem/Views/Shared/Posts/Expanded Post.swift b/Mlem/Views/Shared/Posts/Expanded Post.swift
@@ -72,11 +72,13 @@ struct ExpandedPost: View {
     @State var commentSortingType: CommentSortType = .appStorageValue()
     @State private var postLayoutMode: LargePost.LayoutMode = .maximize
 
+    @State private var scrollToTopAppeared = false
+    @Namespace var scrollToTop
+
     var body: some View {
         contentView
             .environmentObject(commentTracker)
             .navigationBarTitle(post.community.name, displayMode: .inline)
-            .hoistNavigation(dismiss: dismiss)
             .toolbar {
                 ToolbarItemGroup(placement: .navigationBarTrailing) { toolbarMenu }
             }
@@ -100,6 +102,9 @@ struct ExpandedPost: View {
         GeometryReader { proxy in
             ScrollViewReader { (scrollProxy: ScrollViewProxy) in
                 ScrollView {
+                    ScrollToView(appeared: $scrollToTopAppeared)
+                        .id(scrollToTop)
+
                     VStack(spacing: 0) {
                         postView
                             .id(0)
@@ -136,6 +141,19 @@ struct ExpandedPost: View {
                 .onPreferenceChange(AnchorsKey.self) { anchors in
                     topVisibleCommentId = topCommentRow(of: anchors, in: proxy)
                 }
+                .hoistNavigation(
+                    dismiss: dismiss,
+                    auxiliaryAction: {
+                        if scrollToTopAppeared {
+                            return false
+                        } else {
+                            withAnimation {
+                                scrollProxy.scrollTo(scrollToTop)
+                            }
+                            return true
+                        }
+                    }
+                )
             }
         }
         .overlay {

diff --git a/Mlem/Views/Tabs/Feeds/Feed View.swift b/Mlem/Views/Tabs/Feeds/Feed View.swift
@@ -152,8 +152,15 @@ struct FeedView: View {
                             return true
                         }
                     } else {
-                        print("exhausted auxiliary actions, perform dismiss action instead...")
-                        return false
+                        if scrollToTopAppeared {
+                            print("exhausted auxiliary actions, perform dismiss action instead...")
+                            return false
+                        } else {
+                            withAnimation {
+                                scrollViewProxy?.scrollTo(scrollToTop, anchor: .top)
+                            }
+                            return true
+                        }
                     }
                 }
             )

diff --git a/Mlem/Views/Tabs/Profile/User View.swift b/Mlem/Views/Tabs/Profile/User View.swift
@@ -77,7 +77,14 @@ struct UserView: View {
                             }
                             return true
                         } else {
-                            return false
+                            if scrollToTopAppeared {
+                                return false
+                            } else {
+                                withAnimation {
+                                    scrollViewProxy?.scrollTo(scrollToTop)
+                                }
+                                return true
+                            }
                         }
                     }
                 )