From 023447e9a8331ced72b4369af1ff52f1d8e76142 Mon Sep 17 00:00:00 2001 From: Marcus Feitoza Date: Sun, 3 May 2020 17:58:27 -0300 Subject: [PATCH] fix(composedmodal): focus and event --- src/components/ComposedModal/ComposedModal.svelte | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/ComposedModal/ComposedModal.svelte b/src/components/ComposedModal/ComposedModal.svelte index df36630f..2282d40e 100644 --- a/src/components/ComposedModal/ComposedModal.svelte +++ b/src/components/ComposedModal/ComposedModal.svelte @@ -17,6 +17,8 @@ let outerModal = undefined; let innerModal = undefined; + let opened = false; + setContext('ComposedModal', { closeModal: () => { open = false; @@ -45,11 +47,15 @@ }); afterUpdate(() => { - if (open) { + if (opened) { + if (!open) { + opened = false; + dispatch('close'); + document.body.classList.add(cx('--body--with-modal-open')); + } + } else if (open) { + opened = true; dispatch('open'); - document.body.classList.add(cx('--body--with-modal-open')); - } else { - dispatch('close'); document.body.classList.remove(cx('--body--with-modal-open')); } });