Merge pull request #3979 from element-hq/settings-footer-glitch

Stop the settings button from appearing while footer is fading out

src/room/InCallView.test.tsx

@@ -14,7 +14,12 @@ import {
   type MockedFunction,
   vi,
 } from "vitest";
-import { render, type RenderResult } from "@testing-library/react";
+import {
+  getByRole,
+  render,
+  screen,
+  type RenderResult,
+} from "@testing-library/react";
 import { type LocalParticipant } from "livekit-client";
 import { BehaviorSubject, of } from "rxjs";
 import { BrowserRouter, MemoryRouter } from "react-router-dom";
@@ -189,57 +194,35 @@ describe("InCallView", () => {
       expect(container).toMatchSnapshot();
     });
   });
+
   describe("settings button with AppBar header", () => {
-    it("mobile landscape, is accessible when showHeader is false", () => {
+    it("mobile portrait, is visible in the header", () => {
-      // windowSize with height <= 600 results in "flat" windowMode,
+      createInCallView({
-      // which means showHeader$ emits false.
-      const { getAllByRole } = createInCallView({
         initialRoute: "/?header=app_bar",
         withAppBar: true,
         callViewModelOptions: {
-          // Set windowMode$ to "flat" (height <= 600)
+          // Narrow like a mobile phone in portrait orientation
-          windowSize$: constant({ width: 1000, height: 500 }),
+          windowSize$: constant({ width: 400, height: 700 }),
         },
       });
-      // When showHeader is false, hideSettingsButton is false,
+
-      // so the settings button is visible in the footer.
+      getByRole(screen.getByRole("banner"), "button", { name: "Settings" });
-      const settingsBtn = getAllByRole("button", { name: "Settings" });
-      // here we check for two settings buttons because there are two buttons in the bottom bar. One for the
-      // the narrow layout and another one for the wide layout.
-      // Their visibility uses @media css queries, which cannot be tested in JSDOM,
-      // but we can at least check that both buttons are rendered and have the correct classes.
-      expect(settingsBtn.length).toBe(2);
-      expect(settingsBtn[0]).toHaveAttribute(
-        "data-testid",
-        "settings-bottom-left",
-      );
-      expect(settingsBtn[0]).toBeVisible();
     });
 
-    it("mobile portrait, is accessible when showHeader is true", () => {
+    it("mobile landscape, is not visible anywhere", () => {
-      // windowSize with height > 600 and width > 600 results in "normal" windowMode,
+      const { queryByRole } = createInCallView({
-      // which means showHeader$ emits true.
-      const { getAllByRole } = createInCallView({
         initialRoute: "/?header=app_bar",
         withAppBar: true,
         callViewModelOptions: {
-          // Set windowMode$ to "normal" (height >= 600)
+          // Flat like a mobile phone in landscape orientation
-          windowSize$: constant({ width: 1000, height: 800 }),
+          windowSize$: constant({ width: 700, height: 400 }),
         },
       });
-      // When showHeader is true and headerStyle is AppBar,
-      // hideSettingsButton is true in the footer, but the settings
-      // button is rendered in the AppBar via useAppBarSecondaryButton.
-      const settingsBtns = getAllByRole("button", { name: "Settings" });
 
-      expect(settingsBtns.length).toBe(1);
+      expect(queryByRole("button", { name: "Settings" })).toBe(null);
-      expect(settingsBtns[0]).toHaveAttribute(
-        "data-testid",
-        "settings-app-bar",
-      );
-      expect(settingsBtns[0]).toBeVisible();
     });
   });
+
   describe("audioOutputSwitcher", () => {
     it("is visible and can be clicked", async () => {
       const user = userEvent.setup();

src/room/InCallView.tsx

@@ -570,8 +570,6 @@ export const InCallView: FC<InCallViewProps> = ({
     matrixRoom.roomId,
   );
 
-  const settingsButtonInAppBar =
-    headerStyle === HeaderStyle.AppBar && showHeader;
   useAppBarSecondaryButton(
     <SettingsIconButton
       key="settings"
@@ -603,7 +601,9 @@ export const InCallView: FC<InCallViewProps> = ({
       audioOutputSwitcher={audioOutputSwitcher ?? undefined}
       // Only pass the openSettings function if the settings button is not in the app bar.
       // If there is no fn the button will be hidden in the footer.
-      openSettings={settingsButtonInAppBar ? undefined : openSettings}
+      openSettings={
+        headerStyle === HeaderStyle.AppBar ? undefined : openSettings
+      }
       hangup={vm.hangup}
       //Debug props
       debugTileLayout={debugTileLayout}