This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 830
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e675ebd
commit 7ceb9ad
Showing
12 changed files
with
531 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
Copyright 2022 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 { | ||
VoiceBroadcastHeader, | ||
VoiceBroadcastPlayback, | ||
VoiceBroadcastPlaybackControl, | ||
} from "../.."; | ||
import AccessibleButton from "../../../components/views/elements/AccessibleButton"; | ||
import { useVoiceBroadcastPlayback } from "../../hooks/useVoiceBroadcastPlayback"; | ||
import { Icon as XIcon } from "../../../../res/img/element-icons/cancel-rounded.svg"; | ||
|
||
interface VoiceBroadcastSmallPlaybackBodyProps { | ||
playback: VoiceBroadcastPlayback; | ||
} | ||
|
||
export const VoiceBroadcastSmallPlaybackBody: React.FC<VoiceBroadcastSmallPlaybackBodyProps> = ({ playback }) => { | ||
const { liveness, playbackState, room, sender, toggle } = useVoiceBroadcastPlayback(playback); | ||
return ( | ||
<div className="mx_VoiceBroadcastBody mx_VoiceBroadcastBody--pip mx_VoiceBroadcastBody--small"> | ||
<VoiceBroadcastHeader | ||
linkToRoom={true} | ||
live={liveness} | ||
liveBadgePosition="middle" | ||
microphoneLabel={sender?.name} | ||
room={room} | ||
/> | ||
<VoiceBroadcastPlaybackControl state={playbackState} onClick={toggle} /> | ||
<AccessibleButton onClick={() => playback.stop()}> | ||
<XIcon className="mx_Icon mx_Icon_8 mx_VoiceBroadcastBody__small-close" /> | ||
</AccessibleButton> | ||
</div> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
117 changes: 117 additions & 0 deletions
117
test/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody-test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
/* | ||
Copyright 2022 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 { MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix"; | ||
import { render, RenderResult } from "@testing-library/react"; | ||
import userEvent from "@testing-library/user-event"; | ||
import { mocked } from "jest-mock"; | ||
|
||
import { | ||
VoiceBroadcastInfoState, | ||
VoiceBroadcastLiveness, | ||
VoiceBroadcastPlayback, | ||
VoiceBroadcastSmallPlaybackBody, | ||
VoiceBroadcastPlaybackState, | ||
} from "../../../../src/voice-broadcast"; | ||
import { stubClient } from "../../../test-utils"; | ||
import { mkVoiceBroadcastInfoStateEvent } from "../../utils/test-utils"; | ||
|
||
// mock RoomAvatar, because it is doing too much fancy stuff | ||
jest.mock("../../../../src/components/views/avatars/RoomAvatar", () => ({ | ||
__esModule: true, | ||
default: jest.fn().mockImplementation(({ room }) => { | ||
return <div data-testid="room-avatar">room avatar: {room.name}</div>; | ||
}), | ||
})); | ||
|
||
describe("<VoiceBroadcastSmallPlaybackBody />", () => { | ||
const userId = "@user:example.com"; | ||
const roomId = "!room:example.com"; | ||
let client: MatrixClient; | ||
let infoEvent: MatrixEvent; | ||
let playback: VoiceBroadcastPlayback; | ||
let renderResult: RenderResult; | ||
|
||
beforeAll(() => { | ||
client = stubClient(); | ||
mocked(client.relations).mockClear(); | ||
mocked(client.relations).mockResolvedValue({ events: [] }); | ||
|
||
infoEvent = mkVoiceBroadcastInfoStateEvent( | ||
roomId, | ||
VoiceBroadcastInfoState.Stopped, | ||
userId, | ||
client.getDeviceId(), | ||
); | ||
}); | ||
|
||
beforeEach(() => { | ||
playback = new VoiceBroadcastPlayback(infoEvent, client); | ||
jest.spyOn(playback, "toggle").mockImplementation(() => Promise.resolve()); | ||
jest.spyOn(playback, "getLiveness"); | ||
jest.spyOn(playback, "getState"); | ||
}); | ||
|
||
describe("when rendering a playing broadcast", () => { | ||
beforeEach(() => { | ||
mocked(playback.getState).mockReturnValue(VoiceBroadcastPlaybackState.Playing); | ||
mocked(playback.getLiveness).mockReturnValue("not-live"); | ||
renderResult = render(<VoiceBroadcastSmallPlaybackBody playback={playback} />); | ||
}); | ||
|
||
it("should render as expected", () => { | ||
expect(renderResult.container).toMatchSnapshot(); | ||
}); | ||
}); | ||
|
||
describe(`when rendering a stopped broadcast`, () => { | ||
beforeEach(() => { | ||
mocked(playback.getState).mockReturnValue(VoiceBroadcastPlaybackState.Stopped); | ||
mocked(playback.getLiveness).mockReturnValue("not-live"); | ||
renderResult = render(<VoiceBroadcastSmallPlaybackBody playback={playback} />); | ||
}); | ||
|
||
it("should render as expected", () => { | ||
expect(renderResult.container).toMatchSnapshot(); | ||
}); | ||
|
||
describe("and clicking the play button", () => { | ||
beforeEach(async () => { | ||
await userEvent.click(renderResult.getByLabelText("play voice broadcast")); | ||
}); | ||
|
||
it("should toggle the playback", () => { | ||
expect(playback.toggle).toHaveBeenCalled(); | ||
}); | ||
}); | ||
}); | ||
|
||
describe.each([ | ||
[VoiceBroadcastPlaybackState.Paused, "not-live"], | ||
[VoiceBroadcastPlaybackState.Playing, "live"], | ||
])("when rendering a %s/%s broadcast", (state: VoiceBroadcastPlaybackState, liveness: VoiceBroadcastLiveness) => { | ||
beforeEach(() => { | ||
mocked(playback.getState).mockReturnValue(state); | ||
mocked(playback.getLiveness).mockReturnValue(liveness); | ||
renderResult = render(<VoiceBroadcastSmallPlaybackBody playback={playback} />); | ||
}); | ||
|
||
it("should render as expected", () => { | ||
expect(renderResult.container).toMatchSnapshot(); | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.