Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: alters chat icon behavior on drawer and mobile (#19192) 

Refines the behavior of clicking the chat icon in mobile and when in drawer mode as follows: If chat is open, clicking the icon takes you to the index.
This commit is contained in:
Joffrey JAFFEUX 2022-11-25 15:12:32 +01:00 committed by GitHub
parent 90411540c7
commit 9ade68233c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/chat/assets/javascripts/discourse/widgets/chat-header-icon.js
View File

@ -64,13 +64,21 @@ export default createWidget("header-chat-link", {
},
click() {
if (this.chatStateManager.isFullPageActive && !this.site.mobileView) {
if (this.chatStateManager.isFullPageActive && this.site.desktopView) {
return;
}
return this.router.transitionTo(
this.chatStateManager.lastKnownChatURL || "chat"
);
if (this.chatStateManager.isFullPageActive && this.site.mobileView) {
return this.router.transitionTo("chat");
}
if (this.chatStateManager.isDrawerActive) {
return this.router.transitionTo("chat");
} else {
return this.router.transitionTo(
this.chatStateManager.lastKnownChatURL || "chat"
);
}
},
chatRerenderHeader() {

32
plugins/chat/spec/system/navigation_spec.rb
View File

@ -17,6 +17,38 @@ RSpec.describe "Navigation", type: :system, js: true do
sign_in(user)
end
context "when clicking chat icon and drawer is viewing channel" do
it "navigates to index" do
chat_page.open_from_header
chat_drawer_page.open_channel(category_channel_2)
chat_page.open_from_header
expect(page).to have_content(I18n.t("js.chat.direct_messages.title"))
end
end
context "when clicking chat icon on mobile and is viewing channel" do
it "navigates to index" do
visit("/chat?mobile_view=1")
chat_page.visit_channel(category_channel_2)
chat_page.open_from_header
expect(page).to have_current_path(chat_path)
end
end
context "when clicking chat icon on desktop and is viewing channel" do
it "stays on channel page" do
visit("/chat")
chat_page.visit_channel(category_channel_2)
chat_page.open_from_header
expect(page).to have_current_path(
chat.channel_path(category_channel_2.id, category_channel_2.slug),
)
end
end
context "when visiting /chat" do
it "opens full page" do
chat_page.open