From 509fd6515604b4d0ee2336bf88b2037daea9012d Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 4 Nov 2022 17:56:37 +0000 Subject: [PATCH 1/2] Fix close button on join call modal It just errored as we didn't pass onClose through to the modal --- src/home/JoinExistingCallModal.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/home/JoinExistingCallModal.tsx b/src/home/JoinExistingCallModal.tsx index 8f4f7d7f..b04c6ae5 100644 --- a/src/home/JoinExistingCallModal.tsx +++ b/src/home/JoinExistingCallModal.tsx @@ -25,7 +25,7 @@ import styles from "./JoinExistingCallModal.module.css"; interface Props { onJoin: (e: PressEvent) => void; - onClose: (e: PressEvent) => void; + onClose: () => void; // TODO: add used parameters for [index: string]: unknown; } @@ -33,7 +33,12 @@ export function JoinExistingCallModal({ onJoin, onClose, ...rest }: Props) { const { t } = useTranslation(); return ( - +

{t("This call already exists, would you like to join?")}

From 51572b5787d36524d6e9070fd9a178b166ce0e07 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 7 Nov 2022 12:23:21 +0000 Subject: [PATCH 2/2] Make onClose required in Modal --- src/IncompatibleVersionModal.tsx | 9 ++++++++- src/Modal.tsx | 2 +- src/video-grid/VideoTileSettingsModal.tsx | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/IncompatibleVersionModal.tsx b/src/IncompatibleVersionModal.tsx index 29abfb9d..49c90443 100644 --- a/src/IncompatibleVersionModal.tsx +++ b/src/IncompatibleVersionModal.tsx @@ -24,11 +24,13 @@ import { Body } from "./typography/Typography"; interface Props { userIds: Set; room: Room; + onClose: () => void; } export const IncompatibleVersionModal: React.FC = ({ userIds, room, + onClose, ...rest }) => { const { t } = useTranslation(); @@ -38,7 +40,12 @@ export const IncompatibleVersionModal: React.FC = ({ ); return ( - + diff --git a/src/Modal.tsx b/src/Modal.tsx index 8a41fbc8..2665e116 100644 --- a/src/Modal.tsx +++ b/src/Modal.tsx @@ -43,7 +43,7 @@ export interface ModalProps extends OverlayProps, AriaDialogProps { children: ReactNode; className?: string; mobileFullScreen?: boolean; - onClose?: () => void; + onClose: () => void; } export function Modal({ diff --git a/src/video-grid/VideoTileSettingsModal.tsx b/src/video-grid/VideoTileSettingsModal.tsx index bc5dd6d0..1e8d8be2 100644 --- a/src/video-grid/VideoTileSettingsModal.tsx +++ b/src/video-grid/VideoTileSettingsModal.tsx @@ -59,9 +59,10 @@ const LocalVolume: React.FC = ({ // TODO: Extend ModalProps interface Props { feed: CallFeed; + onClose: () => void; } -export const VideoTileSettingsModal = ({ feed, ...rest }: Props) => { +export const VideoTileSettingsModal = ({ feed, onClose, ...rest }: Props) => { const { t } = useTranslation(); return ( @@ -70,6 +71,7 @@ export const VideoTileSettingsModal = ({ feed, ...rest }: Props) => { title={t("Local volume")} isDismissable mobileFullScreen + onClose={onClose} {...rest} >