0d6a550c33
* Improve accessibility and testability of Tooltip Adding a role to Tooltip was motivated by React Testing Library's reliance on accessibility-related attributes to locate elements. * Make the ReadyWatchingStore constructor safer The ReadyWatchingStore constructor previously had a chance to immediately call onReady, which was dangerous because it was potentially calling the derived class's onReady at a point when the derived class hadn't even finished construction yet. In normal usage, I guess this never was a problem, but it was causing some of the tests I was writing to crash. This is solved by separating out the onReady call into a start method. * Rename 1:1 call components to 'LegacyCall' to reflect the fact that they're slated for removal, and to not clash with the new Call code. * Refactor VideoChannelStore into Call and CallStore Call is an abstract class that currently only has a Jitsi implementation, but this will make it easy to later add an Element Call implementation. * Remove WidgetReady, ClientReady, and ForceHangupCall hacks These are no longer used by the new Jitsi call implementation, and can be removed. * yarn i18n * Delete call map entries instead of inserting nulls * Allow multiple active calls and consolidate call listeners * Fix a race condition when creating a video room * Un-hardcode the media device fallback labels * Apply misc code review fixes * yarn i18n * Disconnect from calls more politely on logout * Fix some strict mode errors * Fix another updateRoom race condition
59 lines
2.1 KiB
TypeScript
59 lines
2.1 KiB
TypeScript
/*
|
|
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, { FC, useContext, useEffect } from "react";
|
|
|
|
import type { Room } from "matrix-js-sdk/src/models/room";
|
|
import type { Call } from "../../models/Call";
|
|
import { useCall, useConnectionState } from "../../hooks/useCall";
|
|
import { isConnected } from "../../models/Call";
|
|
import MatrixClientContext from "../../contexts/MatrixClientContext";
|
|
import AppTile from "../views/elements/AppTile";
|
|
import { CallLobby } from "../views/voip/CallLobby";
|
|
|
|
interface Props {
|
|
room: Room;
|
|
resizing: boolean;
|
|
}
|
|
|
|
const LoadedVideoRoomView: FC<Props & { call: Call }> = ({ room, resizing, call }) => {
|
|
const cli = useContext(MatrixClientContext);
|
|
const connected = isConnected(useConnectionState(call));
|
|
|
|
// We'll take this opportunity to tidy up our room state
|
|
useEffect(() => { call?.clean(); }, [call]);
|
|
|
|
if (!call) return null;
|
|
|
|
return <div className="mx_VideoRoomView">
|
|
{ connected ? null : <CallLobby room={room} call={call} /> }
|
|
{ /* We render the widget even if we're disconnected, so it stays loaded */ }
|
|
<AppTile
|
|
app={call.widget}
|
|
room={room}
|
|
userId={cli.credentials.userId}
|
|
creatorUserId={call.widget.creatorUserId}
|
|
waitForIframeLoad={call.widget.waitForIframeLoad}
|
|
showMenubar={false}
|
|
pointerEvents={resizing ? "none" : undefined}
|
|
/>
|
|
</div>;
|
|
};
|
|
|
|
export const VideoRoomView: FC<Props> = ({ room, resizing }) => {
|
|
const call = useCall(room.roomId);
|
|
return call ? <LoadedVideoRoomView room={room} resizing={resizing} call={call} /> : null;
|
|
};
|