Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

narrow: Fix browser back not navigation to previous selected message. 

Reproducer:
* Go to a stream narrow.
* Scroll up to select a previous message.
* Click on a different stream in the left sidebar.
* Click browser back button, you land at first unread message instead
  of your selected message.

Fixed by updating the hash before we render the new message list.
This commit is contained in:
Aman Agrawal 2024-05-09 05:55:11 +00:00 committed by Tim Abbott
parent 4619a1e028
commit d4ea7e251b
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/src/narrow.js
View File

@ -466,12 +466,25 @@ export function activate(raw_terms, opts) {
} }
assert(msg_list !== undefined); assert(msg_list !== undefined);
// Put the narrow terms in the URL fragment/hash.
//
// opts.change_hash will be false when the URL fragment was
// the source of this narrow, and the fragment was not a link to
// a specific target message ID that has been moved.
//
// This needs to be called at the same time as updating the
// current message list so that we don't need to think about
// bugs related to the URL fragment/hash being desynced from
// mesasge_lists.current.
if (opts.change_hash) {
save_narrow(terms, opts.trigger);
}
// Show the new set of messages. It is important to set message_lists.current to // Show the new set of messages. It is important to set message_lists.current to
// the view right as it's being shown, because we rely on message_lists.current // the view right as it's being shown, because we rely on message_lists.current
// being shown for deciding when to condense messages. // being shown for deciding when to condense messages.
// From here on down, any calls to the narrow_state API will // From here on down, any calls to the narrow_state API will
// reflect the requested narrow. // reflect the requested narrow.
message_lists.update_current_message_list(msg_list); message_lists.update_current_message_list(msg_list);
let select_immediately; let select_immediately;
@ -574,14 +587,6 @@ export function activate(raw_terms, opts) {
}); });
} }
// Put the narrow terms in the URL fragment.
// Disabled when the URL fragment was the source
// of this narrow, but not if the fragment had
// a target message ID that has been moved.
if (opts.change_hash) {
save_narrow(terms, opts.trigger);
}
handle_post_view_change(msg_list); handle_post_view_change(msg_list);
unread_ui.update_unread_banner(); unread_ui.update_unread_banner();

4
web/tests/narrow_activate.test.js
View File

@ -224,11 +224,11 @@ run_test("basics", ({override}) => {
[message_feed_top_notices, "hide_top_of_narrow_notices"], [message_feed_top_notices, "hide_top_of_narrow_notices"],
[message_feed_loading, "hide_indicators"], [message_feed_loading, "hide_indicators"],
[compose_banner, "clear_message_sent_banners"], [compose_banner, "clear_message_sent_banners"],
[message_viewport, "stop_auto_scrolling"],
[browser_history, "set_hash"],
[compose_actions, "on_narrow"], [compose_actions, "on_narrow"],
[unread_ops, "process_visible"], [unread_ops, "process_visible"],
[narrow_history, "save_narrow_state_and_flush"], [narrow_history, "save_narrow_state_and_flush"],
[message_viewport, "stop_auto_scrolling"],
[browser_history, "set_hash"],
[typing_events, "render_notifications_for_narrow"], [typing_events, "render_notifications_for_narrow"],
[compose_closed_ui, "update_buttons_for_stream_views"], [compose_closed_ui, "update_buttons_for_stream_views"],
[compose_closed_ui, "update_reply_recipient_label"], [compose_closed_ui, "update_reply_recipient_label"],