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

recent_topics: Don't revive focus when RT is not in focus. 

When there is any overlay or popover open or user is focused on
any other input, we don't revive focus within recent topics.

Fixes #17875
This commit is contained in:
Aman Agrawal 2021-03-30 08:38:06 +00:00 committed by Tim Abbott
parent 134db206a9
commit e8b7ad886d
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend_tests/node_tests/hotkey.js
View File

@ -94,6 +94,7 @@ mock_esm("../../static/js/hotspots", {
mock_esm("../../static/js/recent_topics", { mock_esm("../../static/js/recent_topics", {
is_visible: () => false, is_visible: () => false,
is_in_focus: () => false,
}); });
message_lists.current = { message_lists.current = {

9
static/js/hotkey.js
View File

@ -530,14 +530,7 @@ export function process_hotkey(e, hotkey) {
case "tab": case "tab":
case "shift_tab": case "shift_tab":
case "open_recent_topics": case "open_recent_topics":
if ( if (recent_topics.is_in_focus()) {
hashchange.in_recent_topics_hash() &&
!popovers.any_active() &&
!overlays.is_active() &&
!$("#searchbox_form #search_query").is(":focus") &&
!$(".user-list-filter").is(":focus") &&
!$(".stream-list-filter").is(":focus")
) {
return recent_topics.change_focused_element($(e.target), event_name); return recent_topics.change_focused_element($(e.target), event_name);
} }
} }

19
static/js/recent_topics.js
View File

@ -7,6 +7,7 @@ import render_recent_topics_body from "../templates/recent_topics_table.hbs";
import * as compose_actions from "./compose_actions"; import * as compose_actions from "./compose_actions";
import * as drafts from "./drafts"; import * as drafts from "./drafts";
import * as hash_util from "./hash_util"; import * as hash_util from "./hash_util";
import * as hashchange from "./hashchange";
import * as ListWidget from "./list_widget"; import * as ListWidget from "./list_widget";
import {localstorage} from "./localstorage"; import {localstorage} from "./localstorage";
import * as message_store from "./message_store"; import * as message_store from "./message_store";
@ -16,8 +17,10 @@ import * as muting from "./muting";
import * as narrow from "./narrow"; import * as narrow from "./narrow";
import * as narrow_state from "./narrow_state"; import * as narrow_state from "./narrow_state";
import * as navigate from "./navigate"; import * as navigate from "./navigate";
import * as overlays from "./overlays";
import * as panels from "./panels"; import * as panels from "./panels";
import * as people from "./people"; import * as people from "./people";
import * as popovers from "./popovers";
import * as recent_senders from "./recent_senders"; import * as recent_senders from "./recent_senders";
import * as stream_data from "./stream_data"; import * as stream_data from "./stream_data";
import * as stream_list from "./stream_list"; import * as stream_list from "./stream_list";
@ -66,6 +69,17 @@ const ls = localstorage();
let filters = new Set(); let filters = new Set();
export function is_in_focus() {
// Check if user is focused on
// recent topics.
return (
hashchange.in_recent_topics_hash() &&
!popovers.any_active() &&
!overlays.is_active() &&
!$(".home-page-input").is(":focus")
);
}
export function clear_for_tests() { export function clear_for_tests() {
filters.clear(); filters.clear();
topics.clear(); topics.clear();
@ -109,8 +123,9 @@ function revive_current_focus() {
// to the focused element, this function attempts to revive the // to the focused element, this function attempts to revive the
// link and focus to the element prior to the rerender. // link and focus to the element prior to the rerender.
// Don't change focus if user is trying to type anywhere. // We try to avoid setting focus when user
if ($(".home-page-input").is(":focus")) { // is not focused on recent topics.
if (!is_in_focus()) {
return false; return false;
} }