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

recent: Fix cursor position after muting a topic above a PM row. 

Fixes #23332

Check if col we are trying to focus exists for the row inside
`set_table_focus`.

We call `revive_current_focus` after `topics_widget` is defined
since it can be used inside it.
This commit is contained in:
Aman Agrawal 2022-11-01 08:04:33 +00:00 committed by Tim Abbott
parent 4bd46f1cb4
commit 836db701aa
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/recent_topics_ui.js
View File

@ -164,10 +164,17 @@ function set_table_focus(row, col, using_keyboard) {
return true; return true;
} }
if (col === 2 && !has_unread(row)) { const unread = has_unread(row);
if (col === 2 && !unread) {
col = 1; col = 1;
col_focus = 1; col_focus = 1;
} }
const type = get_row_type(row);
if (col === 3 && type === "private") {
col = unread ? 2 : 1;
col_focus = col;
}
const $topic_row = $topic_rows.eq(row); const $topic_row = $topic_rows.eq(row);
// We need to allow table to render first before setting focus. // We need to allow table to render first before setting focus.
setTimeout( setTimeout(
@ -193,7 +200,6 @@ function set_table_focus(row, col, using_keyboard) {
// TODO: This fake "message" object is designed to allow using the // TODO: This fake "message" object is designed to allow using the
// get_recipient_label helper inside compose_closed_ui. Surely // get_recipient_label helper inside compose_closed_ui. Surely
// there's a more readable way to write this code. // there's a more readable way to write this code.
const type = get_row_type(row);
let message; let message;
if (type === "private") { if (type === "private") {
message = { message = {
@ -770,7 +776,7 @@ export function complete_rerender() {
}, },
html_selector: get_topic_row, html_selector: get_topic_row,
$simplebar_container: $("#recent_topics_table .table_fix_head"), $simplebar_container: $("#recent_topics_table .table_fix_head"),
callback_after_render: revive_current_focus, callback_after_render: () => setTimeout(revive_current_focus, 0),
is_scroll_position_for_render, is_scroll_position_for_render,
post_scroll__pre_render_callback: set_focus_to_element_in_center, post_scroll__pre_render_callback: set_focus_to_element_in_center,
get_min_load_count, get_min_load_count,