Merge branch 'livekit' into toger5/track-processor-blur

This commit is contained in:
Hugh Nimmo-Smith
2025-01-08 14:08:49 +00:00
17 changed files with 163 additions and 168 deletions

View File

@@ -9,7 +9,7 @@ exports[`Can close reaction dialog 1`] = `
aria-disabled="false"
aria-expanded="true"
aria-haspopup="true"
aria-labelledby=":rav:"
aria-labelledby=":rb5:"
class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59"
data-kind="primary"
data-size="lg"

View File

@@ -25,6 +25,8 @@ import deerSoundOgg from "../sound/reactions/deer.ogg?url";
import deerSoundMp3 from "../sound/reactions/deer.mp3?url";
import rockSoundOgg from "../sound/reactions/rock.ogg?url";
import rockSoundMp3 from "../sound/reactions/rock.mp3?url";
import waveSoundOgg from "../sound/reactions/wave.ogg?url";
import waveSoundMp3 from "../sound/reactions/wave.mp3?url";
export const ElementCallReactionEventType = "io.element.call.reaction";
@@ -180,6 +182,15 @@ export const ReactionSet: ReactionOption[] = [
mp3: rockSoundMp3,
},
},
{
emoji: "👋",
name: "wave",
alias: ["hand", "waving"],
sound: {
ogg: waveSoundOgg,
mp3: waveSoundMp3,
},
},
];
export interface RaisedHandInfo {

View File

@@ -58,6 +58,7 @@ import { Link } from "../button/Link";
import { useAudioContext } from "../useAudioContext";
import { callEventAudioSounds } from "./CallEventAudioRenderer";
import { useLatest } from "../useLatest";
import { usePageTitle } from "../usePageTitle";
declare global {
interface Window {
@@ -123,6 +124,7 @@ export const GroupCallView: FC<Props> = ({
const roomAvatar = useRoomAvatar(rtcSession.room);
const { perParticipantE2EE, returnToLobby } = useUrlParams();
const e2eeSystem = useRoomEncryptionSystem(rtcSession.room.roomId);
usePageTitle(roomName);
const matrixInfo = useMemo((): MatrixInfo => {
return {

View File

@@ -45,6 +45,7 @@ import {
useTrackProcessor,
useTrackProcessorSync,
} from "../livekit/TrackProcessorContext";
import { usePageTitle } from "../usePageTitle";
interface Props {
client: MatrixClient;
@@ -72,6 +73,7 @@ export const LobbyView: FC<Props> = ({
waitingForInvite,
}) => {
const { t } = useTranslation();
usePageTitle(matrixInfo.roomName);
const onAudioPress = useCallback(
() => muteStates.audio.setEnabled?.((e) => !e),

View File

@@ -22,3 +22,4 @@ The following sound effects have been originally created by Element.
- `join_call`
- `end_call`
- `reactions/rock`
- `reactions/wave`

Binary file not shown.

Binary file not shown.

View File

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
import { useEffect } from "react";
export function usePageTitle(title: string): void {
export function usePageTitle(title?: string): void {
useEffect(() => {
const productName = import.meta.env.VITE_PRODUCT_NAME || "Element Call";
document.title = title ? `${productName} | ${title}` : productName;

View File

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
Please see LICENSE in the repository root for full details.
*/
import { renderHook } from "@testing-library/react-hooks";
import { renderHook } from "@testing-library/react";
import {
afterEach,
beforeEach,