From e749b017c925c0f77ca532487f1f8c21bfbc1ba9 Mon Sep 17 00:00:00 2001 From: Florian Duros Date: Thu, 27 Feb 2025 14:34:54 +0100 Subject: [PATCH] refactor: rename `mx_RoomList` as `mx_LegacyRoomList` (#29362) --- playwright/e2e/crypto/crypto.spec.ts | 2 +- playwright/e2e/invite/invite-dialog.spec.ts | 2 +- res/css/_components.pcss | 2 +- .../{_RoomList.pcss => _LegacyRoomList.pcss} | 18 ++++++++--------- src/components/structures/SpaceRoomView.tsx | 8 ++++---- src/components/views/rooms/LegacyRoomList.tsx | 20 +++++++++---------- 6 files changed, 26 insertions(+), 26 deletions(-) rename res/css/views/rooms/{_RoomList.pcss => _LegacyRoomList.pcss} (71%) diff --git a/playwright/e2e/crypto/crypto.spec.ts b/playwright/e2e/crypto/crypto.spec.ts index ace1b74c74..2d294ff7c2 100644 --- a/playwright/e2e/crypto/crypto.spec.ts +++ b/playwright/e2e/crypto/crypto.spec.ts @@ -28,7 +28,7 @@ const checkDMRoom = async (page: Page) => { }; const startDMWithBob = async (page: Page, bob: Bot) => { - await page.locator(".mx_RoomList").getByRole("button", { name: "Start chat" }).click(); + await page.locator(".mx_LegacyRoomList").getByRole("button", { name: "Start chat" }).click(); await page.getByTestId("invite-dialog-input").fill(bob.credentials.userId); await page.locator(".mx_InviteDialog_tile_nameStack_name").getByText("Bob").click(); await expect( diff --git a/playwright/e2e/invite/invite-dialog.spec.ts b/playwright/e2e/invite/invite-dialog.spec.ts index 73238f8c3d..8d64e6e047 100644 --- a/playwright/e2e/invite/invite-dialog.spec.ts +++ b/playwright/e2e/invite/invite-dialog.spec.ts @@ -77,7 +77,7 @@ test.describe("Invite dialog", function () { "should support inviting a user to Direct Messages", { tag: "@screenshot" }, async ({ page, app, user, bot }) => { - await page.locator(".mx_RoomList").getByRole("button", { name: "Start chat" }).click(); + await page.locator(".mx_LegacyRoomList").getByRole("button", { name: "Start chat" }).click(); const other = page.locator(".mx_InviteDialog_other"); // Assert that the header is rendered diff --git a/res/css/_components.pcss b/res/css/_components.pcss index c14bb40db7..9012960195 100644 --- a/res/css/_components.pcss +++ b/res/css/_components.pcss @@ -289,6 +289,7 @@ @import "./views/rooms/_IRCLayout.pcss"; @import "./views/rooms/_InvitedIconView.pcss"; @import "./views/rooms/_JumpToBottomButton.pcss"; +@import "./views/rooms/_LegacyRoomList.pcss"; @import "./views/rooms/_LegacyRoomListHeader.pcss"; @import "./views/rooms/_LinkPreviewGroup.pcss"; @import "./views/rooms/_LinkPreviewWidget.pcss"; @@ -313,7 +314,6 @@ @import "./views/rooms/_RoomHeader.pcss"; @import "./views/rooms/_RoomInfoLine.pcss"; @import "./views/rooms/_RoomKnocksBar.pcss"; -@import "./views/rooms/_RoomList.pcss"; @import "./views/rooms/_RoomPreviewBar.pcss"; @import "./views/rooms/_RoomPreviewCard.pcss"; @import "./views/rooms/_RoomSearchAuxPanel.pcss"; diff --git a/res/css/views/rooms/_RoomList.pcss b/res/css/views/rooms/_LegacyRoomList.pcss similarity index 71% rename from res/css/views/rooms/_RoomList.pcss rename to res/css/views/rooms/_LegacyRoomList.pcss index 74e2e86ed1..acf162b7a2 100644 --- a/res/css/views/rooms/_RoomList.pcss +++ b/res/css/views/rooms/_LegacyRoomList.pcss @@ -6,31 +6,31 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -.mx_RoomList { +.mx_LegacyRoomList { padding-right: 7px; /* width of the scrollbar, to line things up */ } -.mx_RoomList_iconPlus::before { +.mx_LegacyRoomList_iconPlus::before { mask-image: url("$(res)/img/element-icons/roomlist/plus-circle.svg"); } -.mx_RoomList_iconNewRoom::before { +.mx_LegacyRoomList_iconNewRoom::before { mask-image: url("$(res)/img/element-icons/roomlist/hash-plus.svg"); } -.mx_RoomList_iconNewVideoRoom::before { +.mx_LegacyRoomList_iconNewVideoRoom::before { mask-image: url("$(res)/img/element-icons/roomlist/hash-video.svg"); } -.mx_RoomList_iconAddExistingRoom::before { +.mx_LegacyRoomList_iconAddExistingRoom::before { mask-image: url("$(res)/img/element-icons/roomlist/hash.svg"); } -.mx_RoomList_iconExplore::before { +.mx_LegacyRoomList_iconExplore::before { mask-image: url("$(res)/img/element-icons/roomlist/hash-search.svg"); } -.mx_RoomList_iconDialpad::before { +.mx_LegacyRoomList_iconDialpad::before { mask-image: url("$(res)/img/element-icons/roomlist/dialpad.svg"); } -.mx_RoomList_iconStartChat::before { +.mx_LegacyRoomList_iconStartChat::before { mask-image: url("@vector-im/compound-design-tokens/icons/user-add-solid.svg"); } -.mx_RoomList_iconInvite::before { +.mx_LegacyRoomList_iconInvite::before { mask-image: url("$(res)/img/element-icons/room/share.svg"); } diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 170cb4615d..bb4fe19520 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -117,7 +117,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => { <> => { e.preventDefault(); e.stopPropagation(); @@ -132,7 +132,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => { {videoRoomsEnabled && ( => { e.preventDefault(); e.stopPropagation(); @@ -157,7 +157,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => { )} { e.preventDefault(); e.stopPropagation(); @@ -168,7 +168,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => { {canCreateSpace && ( { e.preventDefault(); e.stopPropagation(); diff --git a/src/components/views/rooms/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx index 2894255c04..a940484b16 100644 --- a/src/components/views/rooms/LegacyRoomList.tsx +++ b/src/components/views/rooms/LegacyRoomList.tsx @@ -142,7 +142,7 @@ const DmAuxButton: React.FC = ({ tabIndex, dispatcher = default {showCreateRooms && ( { e.preventDefault(); e.stopPropagation(); @@ -158,7 +158,7 @@ const DmAuxButton: React.FC = ({ tabIndex, dispatcher = default {showInviteUsers && ( { e.preventDefault(); e.stopPropagation(); @@ -230,7 +230,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { { e.preventDefault(); e.stopPropagation(); @@ -247,7 +247,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { <> { e.preventDefault(); e.stopPropagation(); @@ -261,7 +261,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { {videoRoomsEnabled && ( { e.preventDefault(); e.stopPropagation(); @@ -279,7 +279,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { )} { e.preventDefault(); e.stopPropagation(); @@ -300,7 +300,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { <> { e.preventDefault(); e.stopPropagation(); @@ -312,7 +312,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { {videoRoomsEnabled && ( { e.preventDefault(); e.stopPropagation(); @@ -333,7 +333,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { {showExploreRooms ? ( { e.preventDefault(); e.stopPropagation(); @@ -678,7 +678,7 @@ export default class LegacyRoomList extends React.PureComponent } onKeyDownHandler(ev); }} - className="mx_RoomList" + className="mx_LegacyRoomList" role="tree" aria-label={_t("common|rooms")} ref={this.treeRef}