diff --git a/playwright/e2e/left-panel/room-list-view/room-list-header.spec.ts b/playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts similarity index 100% rename from playwright/e2e/left-panel/room-list-view/room-list-header.spec.ts rename to playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts diff --git a/playwright/e2e/left-panel/room-list-view/room-list-view.spec.ts b/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts similarity index 78% rename from playwright/e2e/left-panel/room-list-view/room-list-view.spec.ts rename to playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts index 7cd5122e8af..53795773ed6 100644 --- a/playwright/e2e/left-panel/room-list-view/room-list-view.spec.ts +++ b/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts @@ -9,7 +9,7 @@ import { type Page } from "@playwright/test"; import { test, expect } from "../../../element-web-test"; -test.describe("Search section of the room list", () => { +test.describe("Room list panel", () => { test.use({ labsFlags: ["feature_new_room_list"], }); @@ -19,7 +19,7 @@ test.describe("Search section of the room list", () => { * @param page */ function getRoomListView(page: Page) { - return page.getByTestId("room-list-view"); + return page.getByTestId("room-list-panel"); } test.beforeEach(async ({ page, app, user }) => { @@ -27,8 +27,8 @@ test.describe("Search section of the room list", () => { await app.closeNotificationToast(); }); - test("should render the room list view", { tag: "@screenshot" }, async ({ page, app, user }) => { + test("should render the room list panel", { tag: "@screenshot" }, async ({ page, app, user }) => { const roomListView = getRoomListView(page); - await expect(roomListView).toMatchScreenshot("room-list-view.png"); + await expect(roomListView).toMatchScreenshot("room-list-panel.png"); }); }); diff --git a/playwright/e2e/left-panel/room-list-view/room-list-search.spec.ts b/playwright/e2e/left-panel/room-list-panel/room-list-search.spec.ts similarity index 100% rename from playwright/e2e/left-panel/room-list-view/room-list-search.spec.ts rename to playwright/e2e/left-panel/room-list-panel/room-list-search.spec.ts diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png new file mode 100644 index 00000000000..8382d3b1844 Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png new file mode 100644 index 00000000000..6c871b6b9c7 Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-space-menu-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png similarity index 100% rename from playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-space-menu-linux.png rename to playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png diff --git a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-space-header-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png similarity index 100% rename from playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-space-header-linux.png rename to playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png new file mode 100644 index 00000000000..d03dbf992b0 Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png new file mode 100644 index 00000000000..123cf375862 Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-compose-menu-linux.png b/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-compose-menu-linux.png deleted file mode 100644 index 8f53c47d53c..00000000000 Binary files a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-compose-menu-linux.png and /dev/null differ diff --git a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-linux.png b/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-linux.png deleted file mode 100644 index 82636daa73d..00000000000 Binary files a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-linux.png and /dev/null differ diff --git a/playwright/snapshots/left-panel/room-list-view/room-list-search.spec.ts/search-section-linux.png b/playwright/snapshots/left-panel/room-list-view/room-list-search.spec.ts/search-section-linux.png deleted file mode 100644 index 6c2684e8496..00000000000 Binary files a/playwright/snapshots/left-panel/room-list-view/room-list-search.spec.ts/search-section-linux.png and /dev/null differ diff --git a/playwright/snapshots/left-panel/room-list-view/room-list-view.spec.ts/room-list-view-linux.png b/playwright/snapshots/left-panel/room-list-view/room-list-view.spec.ts/room-list-view-linux.png deleted file mode 100644 index 378d5ef9265..00000000000 Binary files a/playwright/snapshots/left-panel/room-list-view/room-list-view.spec.ts/room-list-view-linux.png and /dev/null differ diff --git a/res/css/_components.pcss b/res/css/_components.pcss index 13347e887a3..c14bb40db74 100644 --- a/res/css/_components.pcss +++ b/res/css/_components.pcss @@ -269,9 +269,9 @@ @import "./views/right_panel/_VerificationPanel.pcss"; @import "./views/right_panel/_WidgetCard.pcss"; @import "./views/room_settings/_AliasSettings.pcss"; -@import "./views/rooms/RoomListView/_RoomListHeaderView.pcss"; -@import "./views/rooms/RoomListView/_RoomListSearch.pcss"; -@import "./views/rooms/RoomListView/_RoomListView.pcss"; +@import "./views/rooms/RoomListPanel/_RoomListHeaderView.pcss"; +@import "./views/rooms/RoomListPanel/_RoomListPanel.pcss"; +@import "./views/rooms/RoomListPanel/_RoomListSearch.pcss"; @import "./views/rooms/_AppsDrawer.pcss"; @import "./views/rooms/_Autocomplete.pcss"; @import "./views/rooms/_AuxPanel.pcss"; diff --git a/res/css/views/rooms/RoomListView/_RoomListHeaderView.pcss b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss similarity index 100% rename from res/css/views/rooms/RoomListView/_RoomListHeaderView.pcss rename to res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss diff --git a/res/css/views/rooms/RoomListView/_RoomListView.pcss b/res/css/views/rooms/RoomListPanel/_RoomListPanel.pcss similarity index 94% rename from res/css/views/rooms/RoomListView/_RoomListView.pcss rename to res/css/views/rooms/RoomListPanel/_RoomListPanel.pcss index 117810e6b70..eb1f6e5fe5b 100644 --- a/res/css/views/rooms/RoomListView/_RoomListView.pcss +++ b/res/css/views/rooms/RoomListPanel/_RoomListPanel.pcss @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -.mx_RoomListView { +.mx_RoomListPanel { background-color: var(--cpd-color-bg-canvas-default); height: 100%; border-right: 1px solid var(--cpd-color-bg-subtle-primary); diff --git a/res/css/views/rooms/RoomListView/_RoomListSearch.pcss b/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss similarity index 100% rename from res/css/views/rooms/RoomListView/_RoomListSearch.pcss rename to res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx index aa4d419196d..f168c390705 100644 --- a/src/components/structures/LeftPanel.tsx +++ b/src/components/structures/LeftPanel.tsx @@ -37,7 +37,7 @@ import PosthogTrackers from "../../PosthogTrackers"; import type PageType from "../../PageTypes"; import { Landmark, LandmarkNavigation } from "../../accessibility/LandmarkNavigation"; import SettingsStore from "../../settings/SettingsStore"; -import { RoomListView } from "../views/rooms/RoomListView"; +import { RoomListPanel } from "../views/rooms/RoomListPanel"; interface IProps { isMinimized: boolean; @@ -390,7 +390,7 @@ export default class LeftPanel extends React.Component { return (
- +
); diff --git a/src/components/views/rooms/RoomListView/RoomListHeaderView.tsx b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx similarity index 100% rename from src/components/views/rooms/RoomListView/RoomListHeaderView.tsx rename to src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx diff --git a/src/components/views/rooms/RoomListView/RoomListView.tsx b/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx similarity index 79% rename from src/components/views/rooms/RoomListView/RoomListView.tsx rename to src/components/views/rooms/RoomListPanel/RoomListPanel.tsx index 2aa11269ffb..e5c1cbfa307 100644 --- a/src/components/views/rooms/RoomListView/RoomListView.tsx +++ b/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx @@ -12,7 +12,7 @@ import { UIComponent } from "../../../../settings/UIFeature"; import { RoomListSearch } from "./RoomListSearch"; import { RoomListHeaderView } from "./RoomListHeaderView"; -type RoomListViewProps = { +type RoomListPanelProps = { /** * Current active space * See {@link RoomListSearch} @@ -21,13 +21,13 @@ type RoomListViewProps = { }; /** - * A view component for the room list. + * The panel of the room list */ -export const RoomListView: React.FC = ({ activeSpace }) => { +export const RoomListPanel: React.FC = ({ activeSpace }) => { const displayRoomSearch = shouldShowComponent(UIComponent.FilterContainer); return ( -
+
{displayRoomSearch && }
diff --git a/src/components/views/rooms/RoomListView/RoomListSearch.tsx b/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx similarity index 100% rename from src/components/views/rooms/RoomListView/RoomListSearch.tsx rename to src/components/views/rooms/RoomListPanel/RoomListSearch.tsx diff --git a/src/components/views/rooms/RoomListView/index.ts b/src/components/views/rooms/RoomListPanel/index.ts similarity index 80% rename from src/components/views/rooms/RoomListView/index.ts rename to src/components/views/rooms/RoomListPanel/index.ts index 4fa7c095dfe..4356a51e262 100644 --- a/src/components/views/rooms/RoomListView/index.ts +++ b/src/components/views/rooms/RoomListPanel/index.ts @@ -5,4 +5,4 @@ * Please see LICENSE files in the repository root for full details. */ -export { RoomListView } from "./RoomListView"; +export { RoomListPanel } from "./RoomListPanel"; diff --git a/test/unit-tests/components/views/rooms/RoomListView/RoomListHeaderView-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx similarity index 99% rename from test/unit-tests/components/views/rooms/RoomListView/RoomListHeaderView-test.tsx rename to test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx index 97195556c3b..3a7e189d91f 100644 --- a/test/unit-tests/components/views/rooms/RoomListView/RoomListHeaderView-test.tsx +++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx @@ -14,7 +14,7 @@ import { type RoomListHeaderViewState, useRoomListHeaderViewModel, } from "../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel"; -import { RoomListHeaderView } from "../../../../../../src/components/views/rooms/RoomListView/RoomListHeaderView"; +import { RoomListHeaderView } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListHeaderView"; jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel", () => ({ useRoomListHeaderViewModel: jest.fn(), diff --git a/test/unit-tests/components/views/rooms/RoomListView/RoomListView-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx similarity index 88% rename from test/unit-tests/components/views/rooms/RoomListView/RoomListView-test.tsx rename to test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx index fecdabbae90..525a17e1ac8 100644 --- a/test/unit-tests/components/views/rooms/RoomListView/RoomListView-test.tsx +++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx @@ -9,7 +9,7 @@ import React from "react"; import { render, screen } from "jest-matrix-react"; import { mocked } from "jest-mock"; -import { RoomListView } from "../../../../../../src/components/views/rooms/RoomListView"; +import { RoomListPanel } from "../../../../../../src/components/views/rooms/RoomListPanel"; import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents"; import { MetaSpace } from "../../../../../../src/stores/spaces"; @@ -17,9 +17,9 @@ jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({ shouldShowComponent: jest.fn(), })); -describe("", () => { +describe("", () => { function renderComponent() { - return render(); + return render(); } beforeEach(() => { diff --git a/test/unit-tests/components/views/rooms/RoomListView/RoomListSearch-test.tsx b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx similarity index 99% rename from test/unit-tests/components/views/rooms/RoomListView/RoomListSearch-test.tsx rename to test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx index ead58cc039e..47ecc69cc34 100644 --- a/test/unit-tests/components/views/rooms/RoomListView/RoomListSearch-test.tsx +++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx @@ -10,7 +10,7 @@ import { render, screen } from "jest-matrix-react"; import { mocked } from "jest-mock"; import userEvent from "@testing-library/user-event"; -import { RoomListSearch } from "../../../../../../src/components/views/rooms/RoomListView/RoomListSearch"; +import { RoomListSearch } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListSearch"; import { MetaSpace } from "../../../../../../src/stores/spaces"; import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents"; import defaultDispatcher from "../../../../../../src/dispatcher/dispatcher"; diff --git a/test/unit-tests/components/views/rooms/RoomListView/__snapshots__/RoomListHeaderView-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap similarity index 100% rename from test/unit-tests/components/views/rooms/RoomListView/__snapshots__/RoomListHeaderView-test.tsx.snap rename to test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListHeaderView-test.tsx.snap diff --git a/test/unit-tests/components/views/rooms/RoomListView/__snapshots__/RoomListView-test.tsx.snap b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPanel-test.tsx.snap similarity index 92% rename from test/unit-tests/components/views/rooms/RoomListView/__snapshots__/RoomListView-test.tsx.snap rename to test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPanel-test.tsx.snap index 90e1454f507..d261fb95822 100644 --- a/test/unit-tests/components/views/rooms/RoomListView/__snapshots__/RoomListView-test.tsx.snap +++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListPanel-test.tsx.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[` should not render the RoomListSearch component when UIComponent.FilterContainer is at false 1`] = ` +exports[` should not render the RoomListSearch component when UIComponent.FilterContainer is at false 1`] = `
should not render the RoomListSearch component when UI `; -exports[` should render the RoomListSearch component when UIComponent.FilterContainer is at true 1`] = ` +exports[` should render the RoomListSearch component when UIComponent.FilterContainer is at true 1`] = `