1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-07 21:23:00 +03:00

Fix thread summary layout for narrow right panel timeline (#7838)

This commit is contained in:
J. Ryan Stinnett
2022-02-23 14:03:46 +00:00
committed by GitHub
parent 5e76d988ca
commit d8ac7cf202
15 changed files with 248 additions and 68 deletions

View File

@@ -38,11 +38,11 @@ describe("MessageComposerButtons", () => {
const buttons = wrapAndRender(
<MessageComposerButtons
isMenuOpen={false}
narrowMode={false}
showLocationButton={true}
showStickersButton={true}
toggleButtonMenu={() => {}}
/>,
false,
);
expect(buttonLabels(buttons)).toEqual([
@@ -56,11 +56,11 @@ describe("MessageComposerButtons", () => {
const buttons = wrapAndRender(
<MessageComposerButtons
isMenuOpen={true}
narrowMode={false}
showLocationButton={true}
showStickersButton={true}
toggleButtonMenu={() => {}}
/>,
false,
);
expect(buttonLabels(buttons)).toEqual([
@@ -80,11 +80,11 @@ describe("MessageComposerButtons", () => {
const buttons = wrapAndRender(
<MessageComposerButtons
isMenuOpen={false}
narrowMode={true}
showLocationButton={true}
showStickersButton={true}
toggleButtonMenu={() => {}}
/>,
true,
);
expect(buttonLabels(buttons)).toEqual([
@@ -97,11 +97,11 @@ describe("MessageComposerButtons", () => {
const buttons = wrapAndRender(
<MessageComposerButtons
isMenuOpen={true}
narrowMode={true}
showLocationButton={true}
showStickersButton={true}
toggleButtonMenu={() => {}}
/>,
true,
);
expect(buttonLabels(buttons)).toEqual([
@@ -117,7 +117,7 @@ describe("MessageComposerButtons", () => {
});
});
function wrapAndRender(component: React.ReactElement): ReactWrapper {
function wrapAndRender(component: React.ReactElement, narrow: boolean): ReactWrapper {
const mockClient = MatrixClientPeg.matrixClient = createTestClient();
const roomId = "myroomid";
const mockRoom: any = {
@@ -128,7 +128,7 @@ function wrapAndRender(component: React.ReactElement): ReactWrapper {
return new RoomMember(roomId, userId);
},
};
const roomState = createRoomState(mockRoom);
const roomState = createRoomState(mockRoom, narrow);
return mount(
<MatrixClientContext.Provider value={mockClient}>
@@ -139,7 +139,7 @@ function wrapAndRender(component: React.ReactElement): ReactWrapper {
);
}
function createRoomState(room: Room): IRoomState {
function createRoomState(room: Room, narrow: boolean): IRoomState {
return {
room: room,
roomId: room.roomId,
@@ -176,6 +176,7 @@ function createRoomState(room: Room): IRoomState {
matrixClientIsReady: false,
timelineRenderingType: TimelineRenderingType.Room,
liveTimeline: undefined,
narrow,
};
}