Merge pull request #27 from jasonlong/advisor/009-keep-grouped-selection-visible

Keep grouped selections visible while scrolling

Author: jasonlong

Octodot/Views/NotificationListView.swift

@@ -24,8 +24,14 @@ struct NotificationListView: View {
         }
     }
 
+    enum ScrollPlacement: Equatable {
+        case minimal
+        case top
+    }
+
     struct ScrollRequest: Equatable {
         let targetID: String
+        let placement: ScrollPlacement
         let visibleIDs: [String]
     }
 
@@ -60,7 +66,12 @@ struct NotificationListView: View {
                 }
 
                 await Task.yield()
-                proxy.scrollTo(scrollRequest.targetID)
+                switch scrollRequest.placement {
+                case .minimal:
+                    proxy.scrollTo(scrollRequest.targetID)
+                case .top:
+                    proxy.scrollTo(scrollRequest.targetID, anchor: .top)
+                }
             }
         }
     }
@@ -115,15 +126,19 @@ struct NotificationListView: View {
         }
 
         let targetID: String
+        let placement: ScrollPlacement
         if groupByRepo,
            selectedIndex == 0 || notifications[selectedIndex - 1].repository != notifications[selectedIndex].repository {
             targetID = "repo:\(notifications[selectedIndex].repository)"
+            placement = .top
         } else {
             targetID = selectedNotificationID
+            placement = .minimal
         }
 
         return ScrollRequest(
             targetID: targetID,
+            placement: placement,
             visibleIDs: notifications.map(\.id)
         )
     }

OctodotTests/AppShellTests.swift

@@ -203,6 +203,7 @@ struct AppShellTests {
         )
 
         #expect(request?.targetID == "1")
+        #expect(request?.placement == .minimal)
         #expect(request?.visibleIDs == ["0", "1", "2"])
         #expect(NotificationListView.scrollRequest(
             selectedNotificationID: "999",
@@ -252,8 +253,11 @@ struct AppShellTests {
         )
 
         #expect(firstInFirstGroup?.targetID == "repo:acme/alpha")
+        #expect(firstInFirstGroup?.placement == .top)
         #expect(secondInSameGroup?.targetID == "2")
+        #expect(secondInSameGroup?.placement == .minimal)
         #expect(firstInSecondGroup?.targetID == "repo:acme/beta")
+        #expect(firstInSecondGroup?.placement == .top)
     }
 
     @Test func notificationListBuildsRepositoryHeadersOnlyAtBoundaries() {