Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix: Right panel keeps showing chat when unmaximizing widget. #11697

Merged
merged 6 commits into from
Oct 23, 2023
Merged

Fix: Right panel keeps showing chat when unmaximizing widget. #11697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ab382b
Right panel chat closes when unmaximising widget
Oct 2, 2023
d9fb5f3
Basic right panel tests added
manancodes Oct 5, 2023
51fcd9f
Accessible selectors used for new tests
manancodes Oct 13, 2023
c845d3d
Merge branch 'develop' into manancodes/Widget_unmaximised_behaviour
florianduros Oct 16, 2023
551e217
Test added to check if chat exists in right panel
manancodes Oct 21, 2023
5e182ff
Merge branch 'develop' into manancodes/Widget_unmaximised_behaviour
manancodes Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions cypress/e2e/widgets/layout.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,20 @@ describe("Widget Layout", () => {

cy.get('iframe[title="widget"]').invoke("height").should("be.greaterThan", 400);
});
it("open right panel with chat when maximizing widget", () => {
cy.get('iframe[title="widget"]').invoke("height").should("be.lessThan", 250);
cy.findByRole("button", { name: "Maximise" }).click();
cy.get(".mx_RightPanel").within(() => {
cy.get(".mx_BaseCard_header").should("contain", "Chat");
});
});
it("close right panel with chat when unmaximizing widget", () => {
cy.get('iframe[title="widget"]').invoke("height").should("be.lessThan", 250);
cy.findByRole("button", { name: "Maximise" }).click();
cy.get(".mx_RightPanel").within(() => {
cy.get(".mx_BaseCard_header").should("contain", "Chat");
});
cy.findByRole("button", { name: "Un-maximise" }).click();
cy.get(".mx_RightPanel").should("not.exist");
});
});
3 changes: 3 additions & 0 deletions src/components/structures/RoomView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
if (this.context.widgetLayoutStore.hasMaximisedWidget(this.state.room)) {
// Show chat in right panel when a widget is maximised
this.context.rightPanelStore.setCard({ phase: RightPanelPhases.Timeline });
} else {
// Close the chat in right panel when the widget is unmaximised
this.context.rightPanelStore.togglePanel(null);
}
this.checkWidgets(this.state.room);
};
Expand Down