From f726fa55752284b6783f7ef72802fbedb8c7ce71 Mon Sep 17 00:00:00 2001 From: William Grant Date: Wed, 22 May 2024 18:35:41 +1000 Subject: [PATCH] fix: pass through events to onClose for modals we can then use this to programmatically disable the onclose when necessary --- ts/components/SessionWrapperModal.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx index e20c249e8..f42e8e8e6 100644 --- a/ts/components/SessionWrapperModal.tsx +++ b/ts/components/SessionWrapperModal.tsx @@ -13,7 +13,7 @@ export type SessionWrapperModalType = { title?: string; showHeader?: boolean; onConfirm?: () => void; - onClose?: () => void; + onClose?: (event?: KeyboardEvent) => void; showClose?: boolean; confirmText?: string; cancelText?: string; @@ -41,8 +41,8 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => { useKey( 'Esc', - () => { - props.onClose?.(); + event => { + props.onClose?.(event); }, undefined, [props.onClose] @@ -50,8 +50,8 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => { useKey( 'Escape', - () => { - props.onClose?.(); + event => { + props.onClose?.(event); }, undefined, [props.onClose] @@ -95,7 +95,9 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => { { + props.onClose?.(); + }} padding={'5px'} margin={'0'} dataTestId="modal-close-button"