mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-27 10:58:36 +08:00
cf8b87fd14
* Create new method for header button behaviour With the introduction of tabs, the behaviour of the header buttons is changed as follows: - Close any right panel if open - Open the correct right panel if no panel was open before The old method (and behaviour) is retained as showOrHidePhase. * Implement tabs in the right panel There are three tabs: Info, People and Threads * Remove unwanted code from RoomSummaryCard - Remove the menu item for opening the memberlist since that is now taken of by the tabs. - Remove the close button * Remove code for focusing close button from tac item See https://github.com/matrix-org/matrix-react-sdk/pull/12410 There's no longer a close button to focus so we instead focus the thread tab. This is done in RightPaneltabs.tsx so we just need to remove this code. * Introduce a room info icon to the header This was previously present in the legacy room header but not in the new header. * BaseCard changes - Adds id, ariaLabelledBy and role props to implement tab accessibility. - Adds hideHeaderButtons prop to hide header buttons (think back and close buttons). - Change confusing header rendering code: header is not rendered ONLY when no header is passed AND hideHeaderButtons is true. * Refactor repeated code into function Created a new function createSpaceScopeHeader which returns the component if the room is a space room. Previously this code was duplicated in every component that uses SpaceScopeHeader component. * Pass BaseCard attributes and use helper function Actually using the code from the last two commits * Add, update and remove tests/screenshots/snapshots * Fix distance between search bar and tabs * Update compound * Update screenshots/snapshots
59 lines
2.2 KiB
TypeScript
59 lines
2.2 KiB
TypeScript
/*
|
|
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 { MockedObject } from "jest-mock";
|
|
import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
|
|
|
|
import { Action } from "../../../../src/dispatcher/actions";
|
|
import { onView3pidInvite } from "../../../../src/stores/right-panel/action-handlers";
|
|
import RightPanelStore from "../../../../src/stores/right-panel/RightPanelStore";
|
|
import { RightPanelPhases } from "../../../../src/stores/right-panel/RightPanelStorePhases";
|
|
|
|
describe("onView3pidInvite()", () => {
|
|
let rightPanelStore!: MockedObject<RightPanelStore>;
|
|
|
|
beforeEach(() => {
|
|
rightPanelStore = {
|
|
pushCard: jest.fn(),
|
|
showOrHidePhase: jest.fn(),
|
|
} as unknown as MockedObject<RightPanelStore>;
|
|
});
|
|
|
|
it("should display room member list when payload has a falsy event", () => {
|
|
const payload = {
|
|
action: Action.View3pidInvite,
|
|
};
|
|
onView3pidInvite(payload, rightPanelStore);
|
|
|
|
expect(rightPanelStore.showOrHidePhase).toHaveBeenCalledWith(RightPanelPhases.RoomMemberList);
|
|
expect(rightPanelStore.pushCard).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("should push a 3pid member card on the right panel stack when payload has an event", () => {
|
|
const payload = {
|
|
action: Action.View3pidInvite,
|
|
event: new MatrixEvent({ type: EventType.RoomThirdPartyInvite }),
|
|
};
|
|
onView3pidInvite(payload, rightPanelStore);
|
|
|
|
expect(rightPanelStore.showOrHidePhase).not.toHaveBeenCalled();
|
|
expect(rightPanelStore.pushCard).toHaveBeenCalledWith({
|
|
phase: RightPanelPhases.Room3pidMemberInfo,
|
|
state: { memberInfoEvent: payload.event },
|
|
});
|
|
});
|
|
});
|