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

Commit

Permalink
Fix TAC button alignment when expanded (#12238)
Browse files Browse the repository at this point in the history
  • Loading branch information
florianduros authored and andybalaam committed Feb 9, 2024
1 parent c5456d7 commit 7119165
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 3 deletions.
14 changes: 14 additions & 0 deletions playwright/e2e/spaces/threads-activity-centre/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,20 @@ export class Helpers {
await this.receiveMessages(room2, ["Msg2", msg.threadedOff("Msg2", "Resp2")]);
await this.receiveMessages(room1, ["Msg3", msg.threadedOff("Msg3", "Resp3")]);
}

/**
* Get the space panel
*/
getSpacePanel() {
return this.page.getByRole("navigation", { name: "Spaces" });
}

/**
* Expand the space panel
*/
expandSpacePanel() {
return this.page.getByRole("button", { name: "Expand" }).click();
}
}

export { expect };
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ test.describe("Threads Activity Centre", () => {
labsFlags: ["threadsActivityCentre"],
});

test("should have the button correctly aligned and displayed in the space panel when expanded", async ({
util,
}) => {
// Open the space panel
await util.expandSpacePanel();
// The buttons in the space panel should be aligned when expanded
await expect(util.getSpacePanel()).toMatchScreenshot("tac-button-expanded.png");
});

test("should not show indicator when there is no thread", async ({ roomAlpha: room1, util }) => {
// No indicator should be shown
await util.assertNoTacIndicator();
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions res/css/structures/_ThreadsActivityCentre.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
.mx_ThreadsActivityCentreButton {
color: $secondary-content;
height: 32px;
width: 32px;
min-width: 32px;
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -28,11 +28,11 @@

&.expanded {
/* align with settings icon */
margin-left: 20px;
margin-left: 25px;

& > .mx_ThreadsActivityCentreButton_IndicatorIcon {
/* align with settings label */
margin-right: 12px;
margin-right: 14px;
}
}

Expand Down

0 comments on commit 7119165

Please sign in to comment.