Quote taps scroll to post on current page when possible, and cross-page jumps now are no longer overridden by unread posts destination

Author: dfsm

App/Resources/RenderView.js

@@ -1286,13 +1286,28 @@ Awful.isSpoiled = function(element) {
 
 
 /**
- Scrolls the identified post into view.
+ Scrolls the identified post into view, accounting for the navigation bar inset
+ (`topOffset`) and animating when `animated` is true. Falls back to hash navigation
+ when the element isn't in the DOM (so a late-arriving post can still resolve).
  */
-Awful.jumpToPostWithID = function(postID) {
-  // If we previously jumped to this post, we need to clear the hash in order to jump again.
-  window.location.hash = "";
+Awful.jumpToPostWithID = function(postID, animated, topOffset) {
+  var post = document.getElementById(postID);
+  if (!post) {
+    // If we previously jumped to this post, clear the hash so the same target jumps again.
+    window.location.hash = "";
+    window.location.hash = `#${postID}`;
+    return;
+  }
 
-  window.location.hash = `#${postID}`;
+  var rect = post.getBoundingClientRect();
+  var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+  var targetPosition = rect.top + scrollTop - (topOffset || 0);
+
+  if (animated) {
+    window.scrollTo({ top: targetPosition, behavior: 'smooth' });
+  } else {
+    window.scrollTo(0, targetPosition);
+  }
 };
 
 

App/View Controllers/Posts/PostsPageViewController.swift

@@ -363,7 +363,15 @@ final class PostsPageViewController: ViewController {
                     self.hiddenPosts = pendingHidden
                     self.hiddenPostsAfterLoading = nil
                 } else if self.hiddenPosts == 0, let firstUnreadPost = firstUnreadPost, firstUnreadPost > 0 {
-                    self.hiddenPosts = firstUnreadPost - 1
+                    let pendingTargetOnPage: Bool
+                    if let pendingPostID = self.jumpToPostIDAfterLoading {
+                        pendingTargetOnPage = self.posts.contains(where: { $0.postID == pendingPostID })
+                    } else {
+                        pendingTargetOnPage = false
+                    }
+                    if !pendingTargetOnPage {
+                        self.hiddenPosts = firstUnreadPost - 1
+                    }
                 }
 
                 if self.suppressNextScrollFractionPreservation {
@@ -2096,6 +2104,13 @@ extension PostsPageViewController: RenderViewDelegate {
                 if let i = posts.firstIndex(where: { $0.postID == postID }) {
                     readIgnoredPostAtIndex(i)
                 }
+            } else if case let .post(id: postID, _) = route,
+                      let i = posts.firstIndex(where: { $0.postID == postID })
+            {
+                if i < hiddenPosts {
+                    showHiddenSeenPosts()
+                }
+                postsView.renderView.jumpToPost(identifiedBy: postID, animated: true)
             } else {
                 AppDelegate.instance.open(route: route)
             }

App/Views/RenderView.swift

@@ -628,18 +628,20 @@ extension RenderView {
         return CGPoint(x: max(contentOffset.x, 0), y: max(contentOffset.y, 0))
     }
 
-    /// Scrolls so the identified post begins at the top of the viewport.
-    func jumpToPost(identifiedBy postID: String) {
+    /// Scrolls so the identified post sits below the navigation bar inset.
+    /// Set `animated` to true for a smooth scroll.
+    func jumpToPost(identifiedBy postID: String, animated: Bool = false) {
         let escapedPostID: String
         do {
             escapedPostID = try escapeForEval(postID)
         } catch {
             logger.warning("could not JSON-escape the post ID: \(error)")
             return
         }
+        let topOffset = scrollView.contentInset.top
         Task {
             do {
-                try await webView.eval("if (window.Awful) Awful.jumpToPostWithID(\(escapedPostID))")
+                try await webView.eval("if (window.Awful) Awful.jumpToPostWithID(\(escapedPostID), \(animated), \(topOffset))")
             } catch {
                 self.mentionError(error, explanation: "could not evaluate jumpToPostWithID")
             }