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

popovers: Fix popovers force closing on topic visibility change. 

When a topic is muted, it is removed from the view in some cases.
This can lead to the popover being force closed since the popover is
anchored to the reference element.

We add a delay to all the methods that contribute to hiding the topic,
on mute, to allow the relevant animations to be completed before the
topic is hidden from view and the popover is closed.
This commit is contained in:
Sayam Samal 2024-06-04 01:26:33 +05:30 committed by Tim Abbott
parent 56be95a1c8
commit 94627196df
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/popover_menus.ts
View File

@ -97,6 +97,14 @@ export function get_topic_menu_popover(): tippy.Instance | null {
return popover_instances.topics_menu;
}
export function is_topic_menu_popover_displayed(): boolean | undefined {
return popover_instances.topics_menu?.state.isVisible;
}
export function is_visibility_policy_popover_displayed(): boolean | undefined {
return popover_instances.change_visibility_policy?.state.isVisible;
}
export function get_scheduled_messages_popover(): tippy.Instance | null {
return popover_instances.send_later;
}

25
web/src/user_topics_ui.ts
View File

@ -1,7 +1,9 @@
import $ from "jquery";
import * as inbox_util from "./inbox_util";
import * as message_lists from "./message_lists";
import type {Message} from "./message_store";
import * as narrow_state from "./narrow_state";
import * as overlays from "./overlays";
import * as popover_menus from "./popover_menus";
import * as recent_view_ui from "./recent_view_ui";
@ -12,11 +14,29 @@ import * as unread_ui from "./unread_ui";
import * as user_topics from "./user_topics";
import type {ServerUserTopic} from "./user_topics";
function should_add_topic_update_delay(visibility_policy: number): boolean | undefined {
// If topic visibility related popovers are active, add a delay to all methods that
// hide the topic on mute. This allows the switching animations to complete before the
// popover is force closed due to the reference element being removed from view.
const is_topic_muted = visibility_policy === user_topics.all_visibility_policies.MUTED;
const is_relevant_popover_open =
popover_menus.is_topic_menu_popover_displayed() ??
popover_menus.is_visibility_policy_popover_displayed();
// Don't add delay if the user is in inbox view or topics narrow, since
// the popover's reference element is always visible in these cases.
const is_inbox_view = inbox_util.is_visible();
const is_topic_narrow = narrow_state.narrowed_by_topic_reply();
return is_topic_muted && is_relevant_popover_open && !is_inbox_view && !is_topic_narrow;
}
export function handle_topic_updates(user_topic_event: ServerUserTopic): void {
// Update the UI after changes in topic visibility policies.
user_topics.set_user_topic(user_topic_event);
popover_menus.get_topic_menu_popover()?.hide();
setTimeout(
() => {
stream_list.update_streams_sidebar();
unread_ui.update_unread_counts();
message_lists.current?.update_muting_and_rerender();
@ -24,6 +44,9 @@ export function handle_topic_updates(user_topic_event: ServerUserTopic): void {
user_topic_event.stream_id,
user_topic_event.topic_name,
);
},
should_add_topic_update_delay(user_topic_event.visibility_policy) ? 500 : 0,
);
if (overlays.settings_open() && settings_user_topics.loaded) {
const stream_id = user_topic_event.stream_id;