From c6d9cbc36996f55784fd99fd7a956c3e38fc5d23 Mon Sep 17 00:00:00 2001 From: AB1908 <14124383+AB1908@users.noreply.github.com> Date: Thu, 13 Oct 2022 15:55:29 +0530 Subject: [PATCH 1/3] fix: closing preview modal --- src/utils/ModalHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/ModalHelper.ts b/src/utils/ModalHelper.ts index 8ca3bee..9657f68 100644 --- a/src/utils/ModalHelper.ts +++ b/src/utils/ModalHelper.ts @@ -398,7 +398,7 @@ export class ModalHelper { } if (previewModalResult.code === ModalResultCode.CLOSE) { - // modal is already being closed + previewModal.close(); return undefined; } From e250a02f991ca8e8562bf34692fb1a9e529e2794 Mon Sep 17 00:00:00 2001 From: AB1908 <14124383+AB1908@users.noreply.github.com> Date: Thu, 13 Oct 2022 15:59:27 +0530 Subject: [PATCH 2/3] fix: amend close to call closeCallback instead --- src/modals/MediaDbPreviewModal.ts | 4 ++++ src/utils/ModalHelper.ts | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modals/MediaDbPreviewModal.ts b/src/modals/MediaDbPreviewModal.ts index 6e4934d..ec20a28 100644 --- a/src/modals/MediaDbPreviewModal.ts +++ b/src/modals/MediaDbPreviewModal.ts @@ -75,4 +75,8 @@ export class MediaDbPreviewModal extends Modal { onOpen(): void { this.preview(); } + + onClose(): void { + this.closeCallback(); + } } diff --git a/src/utils/ModalHelper.ts b/src/utils/ModalHelper.ts index 9657f68..7cafb68 100644 --- a/src/utils/ModalHelper.ts +++ b/src/utils/ModalHelper.ts @@ -398,7 +398,6 @@ export class ModalHelper { } if (previewModalResult.code === ModalResultCode.CLOSE) { - previewModal.close(); return undefined; } From 04db081fda5d2602f637da1e462de114551adc6d Mon Sep 17 00:00:00 2001 From: AB1908 <14124383+AB1908@users.noreply.github.com> Date: Thu, 13 Oct 2022 16:00:29 +0530 Subject: [PATCH 3/3] refactor: readd comment --- src/utils/ModalHelper.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/ModalHelper.ts b/src/utils/ModalHelper.ts index 7cafb68..8ca3bee 100644 --- a/src/utils/ModalHelper.ts +++ b/src/utils/ModalHelper.ts @@ -398,6 +398,7 @@ export class ModalHelper { } if (previewModalResult.code === ModalResultCode.CLOSE) { + // modal is already being closed return undefined; }