mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fixed story replies modal and calling pip interactions

Browse source
This commit is contained in:
Alvaro 2022-10-17 10:58:49 -06:00 • committed by GitHub
parent 0aa9351d4f
commit bf4e697a0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 92 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/components/CallingParticipantsList.tsx
View file

@ -3,7 +3,7 @@
/* eslint-disable react/no-array-index-key */
import React from 'react';
import React, { useContext } from 'react';
import { createPortal } from 'react-dom';
import FocusTrap from 'focus-trap-react';
@ -14,6 +14,7 @@ import type { LocalizerType } from '../types/Util';
import { sortByTitle } from '../util/sortByTitle';
import type { ConversationType } from '../state/ducks/conversations';
import { isInSystemContacts } from '../util/isInSystemContacts';
import { ModalContainerContext } from './ModalHost';
type ParticipantType = ConversationType & {
hasRemoteAudio?: boolean;
@ -32,6 +33,8 @@ export const CallingParticipantsList = React.memo(
({ i18n, onClose, ourUuid, participants }: PropsType) => {
const [root, setRoot] = React.useState<HTMLElement | null>(null);
const modalContainer = useContext(ModalContainerContext) ?? document.body;
const sortedParticipants = React.useMemo<Array<ParticipantType>>(
() => sortByTitle(participants),
[participants]
@ -39,14 +42,14 @@ export const CallingParticipantsList = React.memo(
React.useEffect(() => {
const div = document.createElement('div');
document.body.appendChild(div);
modalContainer.appendChild(div);
setRoot(div);
return () => {
document.body.removeChild(div);
modalContainer.removeChild(div);
setRoot(null);
};
}, []);
}, [modalContainer]);
const handleCancel = React.useCallback(
(e: React.MouseEvent) => {