Create new RoomHeader component

res/css/_components.pcss

@@ -292,6 +292,7 @@
 @import "./views/rooms/_ReplyTile.pcss";
 @import "./views/rooms/_RoomBreadcrumbs.pcss";
 @import "./views/rooms/_RoomCallBanner.pcss";
+@import "./views/rooms/_RoomHeader.pcss";
 @import "./views/rooms/_RoomInfoLine.pcss";
 @import "./views/rooms/_RoomList.pcss";
 @import "./views/rooms/_RoomListHeader.pcss";

res/css/views/rooms/_RoomHeader.pcss

@@ -0,0 +1,53 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+:root {
+    --RoomHeader-indicator-dot-size: 8px;
+    --RoomHeader-indicator-dot-offset: -3px;
+    --RoomHeader-indicator-pulseColor: $alert;
+}
+
+.mx_LegacyRoomHeader {
+    flex: 0 0 50px;
+    border-bottom: 1px solid $primary-hairline-color;
+    background-color: $background;
+}
+
+.mx_LegacyRoomHeader_wrapper {
+    height: 44px;
+    display: flex;
+    align-items: center;
+    min-width: 0;
+    margin: 0 20px 0 16px;
+    padding-top: 6px;
+    border-bottom: 1px solid $separator;
+}
+
+.mx_LegacyRoomHeader_name {
+    flex: 0 1 auto;
+    overflow: hidden;
+    color: $primary-content;
+    font: var(--cpd-font-heading-sm-semibold);
+    font-weight: var(--cpd-font-weight-semibold);
+    min-height: 24px;
+    align-items: center;
+    border-radius: 6px;
+    margin: 0 3px;
+    padding: 1px 4px;
+    display: flex;
+    user-select: none;
+    cursor: pointer;
+}

src/components/structures/RoomView.tsx

@@ -296,6 +296,9 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
     return (
         <div className="mx_RoomView mx_RoomView--local">
             <ErrorBoundary>
+                {SettingsStore.getValue("feature_new_room_decoration_ui") ? (
+                    <RoomHeader room={context.room} />
+                ) : (
                     <LegacyRoomHeader
                         room={context.room}
                         searchInfo={undefined}
@@ -312,6 +315,7 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
                         viewingCall={false}
                         activeCall={null}
                     />
+                )}
                 <main className="mx_RoomView_body" ref={props.roomView}>
                     <FileDropTarget parent={props.roomView.current} onFileDrop={props.onFileDrop} />
                     <div className="mx_RoomView_timeline">
@@ -346,6 +350,9 @@ function LocalRoomCreateLoader(props: ILocalRoomCreateLoaderProps): ReactElement
     return (
         <div className="mx_RoomView mx_RoomView--local">
             <ErrorBoundary>
+                {SettingsStore.getValue("feature_new_room_decoration_ui") ? (
+                    <RoomHeader room={context.room} />
+                ) : (
                     <LegacyRoomHeader
                         room={context.room}
                         searchInfo={undefined}
@@ -362,6 +369,7 @@ function LocalRoomCreateLoader(props: ILocalRoomCreateLoaderProps): ReactElement
                         viewingCall={false}
                         activeCall={null}
                     />
+                )}
                 <div className="mx_RoomView_body">
                     <LargeLoader text={text} />
                 </div>
@@ -2461,6 +2469,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         <EffectsOverlay roomWidth={this.roomView.current.offsetWidth} />
                     )}
                     <ErrorBoundary>
+                        {SettingsStore.getValue("feature_new_room_decoration_ui") ? (
+                            <RoomHeader room={this.state.room} />
+                        ) : (
                             <LegacyRoomHeader
                                 room={this.state.room}
                                 searchInfo={this.state.search}
@@ -2478,6 +2489,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                                 viewingCall={viewingCall}
                                 activeCall={this.state.activeCall}
                             />
+                        )}
                         <MainSplit
                             panel={rightPanel}
                             resizeNotifier={this.props.resizeNotifier}

src/components/structures/WaitingForThirdPartyRoomView.tsx

@@ -50,6 +50,9 @@ export const WaitingForThirdPartyRoomView: React.FC<Props> = ({ roomView, resize
     return (
         <div className="mx_RoomView mx_RoomView--local">
             <ErrorBoundary>
+                {SettingsStore.getValue("feature_new_room_decoration_ui") ? (
+                    <RoomHeader room={context.room} />
+                ) : (
                     <LegacyRoomHeader
                         room={context.room}
                         inRoom={true}
@@ -65,6 +68,7 @@ export const WaitingForThirdPartyRoomView: React.FC<Props> = ({ roomView, resize
                         viewingCall={false}
                         activeCall={null}
                     />
+                )}
                 <main className="mx_RoomView_body" ref={roomView}>
                     <div className="mx_RoomView_timeline">
                         <ScrollPanel className="mx_RoomView_messagePanel" resizeNotifier={resizeNotifier}>

src/components/views/rooms/LegacyRoomHeader.tsx

@@ -29,7 +29,7 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import { UserTab } from "../dialogs/UserTab";
 import SettingsStore from "../../../settings/SettingsStore";
-import RoomHeaderButtons from "../right_panel/RoomHeaderButtons";
+import RoomHeaderButtons from "../right_panel/LegacyRoomHeaderButtons";
 import E2EIcon from "./E2EIcon";
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";

src/components/views/rooms/RoomHeader.tsx

@@ -0,0 +1,54 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+
+import type { Room } from "matrix-js-sdk/src/models/room";
+import { _t } from "../../../languageHandler";
+import RoomName from "../elements/RoomName";
+import { IOOBData } from "../../../stores/ThreepidInviteStore";
+
+export default function RoomHeader({ room, oobData }: { room?: Room; oobData?: IOOBData }): JSX.Element {
+    let oobName = _t("Join Room");
+    if (oobData && oobData.name) {
+        oobName = oobData.name;
+    }
+
+    return (
+        <header className="mx_LegacyRoomHeader light-panel">
+            <div className="mx_LegacyRoomHeader_wrapper">
+                {room && (
+                    <RoomName room={room}>
+                        {(name) => {
+                            const roomName = name || oobName;
+                            return (
+                                <div
+                                    className="mx_LegacyRoomHeader_name"
+                                    dir="auto"
+                                    title={roomName}
+                                    role="heading"
+                                    aria-level={1}
+                                >
+                                    {roomName}
+                                </div>
+                            );
+                        }}
+                    </RoomName>
+                )}
+            </div>
+        </header>
+    );
+}

src/settings/Settings.tsx

@@ -566,6 +566,14 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         labsGroup: LabGroup.Rooms,
         supportedLevels: LEVELS_FEATURE,
     },
+    "feature_new_room_decoration_ui": {
+        isFeature: true,
+        labsGroup: LabGroup.Rooms,
+        displayName: _td("Under active development, new room header & details interface"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+        controller: new ReloadOnChangeController(),
+    },
     "useCompactLayout": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("Use a more compact 'Modern' layout"),

test/components/views/rooms/RoomHeader-test.tsx

@@ -0,0 +1,46 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { Mocked } from "jest-mock";
+import { render } from "@testing-library/react";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { stubClient } from "../../../test-utils";
+import RoomHeader from "../../../../src/components/views/rooms/RoomHeader";
+import type { MatrixClient } from "matrix-js-sdk/src/client";
+
+describe("Roomeader", () => {
+    let client: Mocked<MatrixClient>;
+    let room: Room;
+
+    const ROOM_ID = "!1:example.org";
+
+    beforeEach(async () => {
+        stubClient();
+        room = new Room(ROOM_ID, client, "@alice:example.org");
+    });
+
+    it("renders with no props", () => {
+        const { asFragment } = render(<RoomHeader />);
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("renders the room header", () => {
+        const { container } = render(<RoomHeader room={room} />);
+        expect(container).toHaveTextContent(ROOM_ID);
+    });
+});

test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap

@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Roomeader renders with no props 1`] = `
+<DocumentFragment>
+  <header
+    class="mx_LegacyRoomHeader light-panel"
+  >
+    <div
+      class="mx_LegacyRoomHeader_wrapper"
+    />
+  </header>
+</DocumentFragment>
+`;