imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle ManagedHybrid widgets in useRoomCall and mark them in the widget state event

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2023-09-11 11:39:30 +01:00
parent 5a2595a093
commit 569832bc24
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
4 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/hooks/room/useRoomCall.ts
View file

@ -31,6 +31,7 @@ import { placeCall } from "../../utils/room/placeCall";
import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore";
import { useRoomState } from "../useRoomState";
import { _t } from "../../languageHandler";
import { isManagedHybridWidget } from "../../widgets/ManagedHybrid";
export type PlatformCallType = "element_call" | "jitsi_or_element_call" | "legacy_or_jitsi";
@ -69,6 +70,8 @@ export const useRoomCall = (
const widgets = useWidgets(room);
const jitsiWidget = useMemo(() => widgets.find((widget) => WidgetType.JITSI.matches(widget.type)), [widgets]);
const hasJitsiWidget = !!jitsiWidget;
const managedHybridWidget = useMemo(() => widgets.find(isManagedHybridWidget), [widgets]);
const hasManagedHybridWidget = !!managedHybridWidget;
const groupCall = useCall(room.roomId);
const hasGroupCall = groupCall !== null;
@ -105,7 +108,7 @@ export const useRoomCall = (
useElementCallExclusively,
mayEditWidgets,
]);
const widget = callType === "element_call" ? groupCall?.widget : jitsiWidget;
const widget = callType === "element_call" ? groupCall?.widget : jitsiWidget ?? managedHybridWidget;
const [canPinWidget, setCanPinWidget] = useState(false);
const [widgetPinned, setWidgetPinned] = useState(false);
@ -122,7 +125,7 @@ export const useRoomCall = (
}, [room, jitsiWidget, groupCall, updateWidgetState]);
const state = useMemo((): State => {
if (hasGroupCall || hasJitsiWidget) {
if (hasGroupCall || hasJitsiWidget || hasManagedHybridWidget) {
return promptPinWidget ? State.Unpinned : State.Ongoing;
}
if (hasLegacyCall) {
@ -142,6 +145,7 @@ export const useRoomCall = (
hasGroupCall,
hasJitsiWidget,
hasLegacyCall,
hasManagedHybridWidget,
mayCreateElementCalls,
mayEditWidgets,
memberCount,