From 3270e876d7d5e6117efc5213466d279b529f9e55 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Tue, 16 Dec 2025 12:46:42 +0000 Subject: [PATCH] More cleanup --- playwright/e2e/audio-player/audio-player.spec.ts | 2 +- playwright/e2e/right-panel/file-panel.spec.ts | 2 +- playwright/e2e/timeline/timeline.spec.ts | 2 +- res/css/structures/_RoomView.pcss | 4 ---- src/components/structures/RoomView.tsx | 9 +-------- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/playwright/e2e/audio-player/audio-player.spec.ts b/playwright/e2e/audio-player/audio-player.spec.ts index 282440f74e..44da5e301d 100644 --- a/playwright/e2e/audio-player/audio-player.spec.ts +++ b/playwright/e2e/audio-player/audio-player.spec.ts @@ -35,7 +35,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => { await page.locator(".mx_Dialog").getByRole("button", { name: "Upload" }).click(); // Wait until the file is sent - await expect(page.locator(".mx_RoomView_statusArea_expanded")).not.toBeVisible(); + await expect(page.locator(".mx_RoomView_statusArea")).not.toBeVisible(); await expect(page.locator(".mx_EventTile.mx_EventTile_last .mx_EventTile_receiptSent")).toBeVisible(); // wait for the tile to finish loading await expect( diff --git a/playwright/e2e/right-panel/file-panel.spec.ts b/playwright/e2e/right-panel/file-panel.spec.ts index 5549b2d315..f7b6e05aa3 100644 --- a/playwright/e2e/right-panel/file-panel.spec.ts +++ b/playwright/e2e/right-panel/file-panel.spec.ts @@ -22,7 +22,7 @@ async function uploadFile(page: Page, file: string) { await page.locator(".mx_Dialog").getByRole("button", { name: "Upload" }).click(); // Wait until the file is sent - await expect(page.locator(".mx_RoomView_statusArea_expanded")).not.toBeVisible(); + await expect(page.locator(".mx_RoomView_statusArea")).not.toBeVisible(); await expect(page.locator(".mx_EventTile.mx_EventTile_last .mx_EventTile_receiptSent")).toBeVisible(); } diff --git a/playwright/e2e/timeline/timeline.spec.ts b/playwright/e2e/timeline/timeline.spec.ts index 806e7e9038..a0cce2a178 100644 --- a/playwright/e2e/timeline/timeline.spec.ts +++ b/playwright/e2e/timeline/timeline.spec.ts @@ -771,7 +771,7 @@ test.describe("Timeline", () => { await page.locator(".mx_Dialog").getByRole("button", { name: "Upload" }).click(); // Wait until the file is sent - await expect(page.locator(".mx_RoomView_statusArea_expanded")).not.toBeVisible(); + await expect(page.locator(".mx_RoomView_statusArea")).not.toBeVisible(); await expect(page.locator(".mx_EventTile.mx_EventTile_last .mx_EventTile_receiptSent")).toBeVisible(); // Assert that the file size is displayed in kibibytes (1024 bytes), not kilobytes (1000 bytes) diff --git a/res/css/structures/_RoomView.pcss b/res/css/structures/_RoomView.pcss index 03f95020da..e135e52f0d 100644 --- a/res/css/structures/_RoomView.pcss +++ b/res/css/structures/_RoomView.pcss @@ -99,15 +99,11 @@ Please see LICENSE files in the repository root for full details. width: 100%; flex: 0 0 auto; - max-height: 0px; background-color: $background; z-index: 1000; overflow: hidden; transition: all 0.2s ease-out; -} - -.mx_RoomView_statusArea_expanded { max-height: 100px; } diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 3a49f0749a..6c6c6720df 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -243,7 +243,6 @@ export interface IRoomState { // 'scroll to bottom' knob, among a couple of other things. atEndOfLiveTimeline?: boolean; showTopUnreadMessagesBar: boolean; - statusBarVisible: boolean; // We load this later by asking the js-sdk to suggest a version for us. // This object is the result of Room#getRecommendedVersion() @@ -462,7 +461,6 @@ export class RoomView extends React.Component { showRightPanel: false, joining: false, showTopUnreadMessagesBar: false, - statusBarVisible: false, canReact: false, canSendMessages: false, resizing: false, @@ -2366,7 +2364,6 @@ export class RoomView extends React.Component { } let statusBar: JSX.Element | undefined; - const isStatusAreaExpanded = true; if (ContentMessages.sharedInstance().getCurrentUploads().length > 0) { statusBar = ; @@ -2374,14 +2371,10 @@ export class RoomView extends React.Component { statusBar = ; } - const statusBarAreaClass = classNames("mx_RoomView_statusArea", { - mx_RoomView_statusArea_expanded: isStatusAreaExpanded, - }); - // if statusBar does not exist then statusBarArea is blank and takes up unnecessary space on the screen // show statusBarArea only if statusBar is present const statusBarArea = statusBar && ( -
+
{statusBar}