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

Commit 6bd2075

Browse files
committed
Update compound and use subtleBackground
Signed-off-by: Michael Telatynski <[email protected]>
1 parent 7cc5fff commit 6bd2075

File tree

15 files changed

+33
-17
lines changed

15 files changed

+33
-17
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@sentry/browser": "^8.0.0",
8282
"@testing-library/react-hooks": "^8.0.1",
8383
"@vector-im/compound-design-tokens": "^1.2.0",
84-
"@vector-im/compound-web": "^5.2.3",
84+
"@vector-im/compound-web": "^5.4.0",
8585
"@zxcvbn-ts/core": "^3.0.4",
8686
"@zxcvbn-ts/language-common": "^3.0.4",
8787
"@zxcvbn-ts/language-en": "^3.0.2",

playwright/e2e/crypto/crypto.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ test.describe("Cryptography", function () {
227227
await verify(page, bob);
228228

229229
// Assert that verified icon is rendered
230-
await page.getByRole("button", { name: "Room members" }).click();
230+
await page.getByTestId("base-card-back-button").click();
231231
await page.locator(".mx_RightPanelTabs").getByText("Info").click();
232232
await expect(page.locator('.mx_RoomSummaryCard_badges [data-kind="success"]')).toContainText("Encrypted");
233233

playwright/e2e/crypto/event-shields.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ test.describe("Cryptography", function () {
132132
// wait for the logout to propagate. Workaround for https://github.com/vector-im/element-web/issues/26263 by repeatedly closing and reopening Bob's user info.
133133
async function awaitOneDevice(iterations = 1) {
134134
const rightPanel = page.locator(".mx_RightPanel");
135-
await rightPanel.getByRole("button", { name: "Room members" }).click();
135+
await rightPanel.getByTestId("base-card-back-button").click();
136136
await rightPanel.getByText("Bob").click();
137137
const sessionCountText = await rightPanel
138138
.locator(".mx_UserInfo_devices")

playwright/e2e/read-receipts/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ class Helpers {
538538
const threadPanel = this.page.locator(".mx_ThreadPanel");
539539
await expect(threadPanel).toBeVisible();
540540
await threadPanel.evaluate(($panel) => {
541-
const $button = $panel.querySelector<HTMLElement>('.mx_BaseCard_back[aria-label="Threads"]');
541+
const $button = $panel.querySelector<HTMLElement>('[data-testid="base-card-back-button"]');
542542
// If the Threads back button is present then click it - the
543543
// threads button can open either threads list or thread panel
544544
if ($button) {

playwright/e2e/right-panel/right-panel.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ test.describe("RightPanel", () => {
106106
await expect(page.locator(".mx_FilePanel")).toBeVisible();
107107
await expect(page.locator(".mx_FilePanel_empty")).toBeVisible();
108108

109-
await page.getByRole("button", { name: "Room information" }).click();
109+
await page.getByTestId("base-card-back-button").click();
110110
await checkRoomSummaryCard(page, ROOM_NAME);
111111
});
112112

@@ -120,7 +120,7 @@ test.describe("RightPanel", () => {
120120
await expect(page.locator(".mx_UserInfo")).toBeVisible();
121121
await expect(page.locator(".mx_UserInfo_profile").getByText(NAME)).toBeVisible();
122122

123-
await page.getByRole("button", { name: "Room members" }).click();
123+
await page.getByTestId("base-card-back-button").click();
124124
await expect(page.locator(".mx_MemberList")).toBeVisible();
125125

126126
await page.locator(".mx_RightPanelTabs").getByText("Info").click();
@@ -145,7 +145,7 @@ test.describe("RightPanel", () => {
145145
await expect(page.locator(".mx_UserInfo_profile").getByText(NAME)).toBeVisible();
146146
await expect(page.locator(".mx_SpaceScopeHeader").getByText(SPACE_NAME)).toBeVisible();
147147

148-
await page.getByRole("button", { name: "Back" }).click();
148+
await page.getByTestId("base-card-back-button").click();
149149
await expect(page.locator(".mx_MemberList")).toBeVisible();
150150
});
151151
});

playwright/e2e/threads/threads.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ test.describe("Threads", () => {
433433
await textbox.press("Enter");
434434
await expect(locator.locator(".mx_EventTile_last").getByText("Hello Mr. User")).toBeAttached();
435435
// Close thread
436-
await locator.getByRole("button", { name: "Close" }).click();
436+
await locator.getByTestId("base-card-close-button").click();
437437

438438
// Open existing thread
439439
locator = page
@@ -486,7 +486,7 @@ test.describe("Threads", () => {
486486
await textbox.press("Enter");
487487
await expect(threadPanel.locator(".mx_EventTile_last").getByText(threadMessage)).toBeVisible();
488488
// Close thread
489-
await threadPanel.getByRole("button", { name: "Close" }).click();
489+
await threadPanel.getByTestId("base-card-close-button").click();
490490
};
491491

492492
await sendMessage("Hello Mr. Bot");
Loading
Loading
Loading
Loading
Loading

src/components/views/right_panel/BaseCard.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,13 @@ const BaseCard: React.FC<IProps> = forwardRef<HTMLDivElement, IProps>(
9191
};
9292
const label = backLabelForPhase(prevCard.phase) ?? _t("action|back");
9393
backButton = (
94-
<IconButton size="28px" data-testid="base-card-back-button" onClick={onBackClick} tooltip={label}>
94+
<IconButton
95+
size="28px"
96+
data-testid="base-card-back-button"
97+
onClick={onBackClick}
98+
tooltip={label}
99+
subtleBackground
100+
>
95101
<ChevronLeftIcon />
96102
</IconButton>
97103
);
@@ -106,6 +112,7 @@ const BaseCard: React.FC<IProps> = forwardRef<HTMLDivElement, IProps>(
106112
onClick={onClose}
107113
ref={closeButtonRef}
108114
tooltip={closeLabel ?? _t("action|close")}
115+
subtleBackground
109116
>
110117
<CloseIcon />
111118
</IconButton>

test/components/views/elements/__snapshots__/AppTile-test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
3030
/>
3131
</div>
3232
<button
33-
class="_icon-button_rijzz_17"
33+
class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
3434
data-testid="base-card-close-button"
3535
role="button"
3636
style="--cpd-icon-button-size: 28px;"

test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
8383
Profile
8484
</p>
8585
<button
86-
class="_icon-button_rijzz_17"
86+
class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
8787
data-testid="base-card-close-button"
8888
role="button"
8989
style="--cpd-icon-button-size: 28px;"
@@ -247,7 +247,7 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
247247
Profile
248248
</p>
249249
<button
250-
class="_icon-button_rijzz_17"
250+
class="_icon-button_bh2qc_17 _subtle-bg_bh2qc_38"
251251
data-testid="base-card-close-button"
252252
role="button"
253253
style="--cpd-icon-button-size: 28px;"

yarn.lock

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,6 +2107,14 @@
21072107
dependencies:
21082108
"@radix-ui/react-slot" "1.1.0"
21092109

2110+
"@radix-ui/react-progress@^1.0.3":
2111+
version "1.1.0"
2112+
resolved "https://registry.yarnpkg.com/@radix-ui/react-progress/-/react-progress-1.1.0.tgz#28c267885ec154fc557ec7a66cb462787312f7e2"
2113+
integrity sha512-aSzvnYpP725CROcxAOEBVZZSIQVQdHgBr2QQFKySsaD14u8dNT0batuXI+AAGDdAHfXH8rbnHmjYFqVJ21KkRg==
2114+
dependencies:
2115+
"@radix-ui/react-context" "1.1.0"
2116+
"@radix-ui/react-primitive" "2.0.0"
2117+
21102118
"@radix-ui/[email protected]":
21112119
version "1.1.0"
21122120
resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.0.tgz#b30c59daf7e714c748805bfe11c76f96caaac35e"
@@ -2957,16 +2965,17 @@
29572965
dependencies:
29582966
svg2vectordrawable "^2.9.1"
29592967

2960-
"@vector-im/compound-web@^5.2.3":
2961-
version "5.2.3"
2962-
resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-5.2.3.tgz#feab8ae7623cfaa243b9be69325e1696bfa1a09c"
2963-
integrity sha512-KU5vAgNIFBzRHfCRK5dGAhxjrfkrUXeOYzDUNc2QjEnqGaUR3RM4c53sw0Ga1oHbOeAWoUGId+ptH3ewPdUTAQ==
2968+
"@vector-im/compound-web@^5.4.0":
2969+
version "5.4.0"
2970+
resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-5.4.0.tgz#b95262197199c11931a8c6f5269514eb9461f187"
2971+
integrity sha512-+EPbr8HzlGEWSePEcPs2iQEBnjXvHGWK177SKF8IO2C7Z2Ygddxa2VTQ7oqtrUfgT+NB5IBTLyXV4Nx7FLgmMA==
29642972
dependencies:
29652973
"@floating-ui/react" "^0.26.9"
29662974
"@floating-ui/react-dom" "^2.0.8"
29672975
"@radix-ui/react-context-menu" "^2.1.5"
29682976
"@radix-ui/react-dropdown-menu" "^2.0.6"
29692977
"@radix-ui/react-form" "^0.0.3"
2978+
"@radix-ui/react-progress" "^1.0.3"
29702979
"@radix-ui/react-separator" "^1.0.3"
29712980
"@radix-ui/react-slot" "^1.0.2"
29722981
"@radix-ui/react-tooltip" "^1.0.6"

0 commit comments

Comments
 (0)