Revert "Revert "fix(notification): on:close should be cancellable (#1379)" (#1381)" (#1382)

This reverts commit 052acfc2ce.
This commit is contained in:
metonym 2022-06-29 11:11:33 -07:00 committed by GitHub
commit aee7f3ba76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions

View file

@ -40,8 +40,14 @@
let timeoutId = undefined; let timeoutId = undefined;
function close(closeFromTimeout) { function close(closeFromTimeout) {
const shouldContinue = dispatch(
"close",
{ timeout: closeFromTimeout === true },
{ cancelable: true }
);
if (shouldContinue) {
open = false; open = false;
dispatch("close", { timeout: closeFromTimeout === true }); }
} }
onMount(() => { onMount(() => {

View file

@ -43,8 +43,14 @@
let timeoutId = undefined; let timeoutId = undefined;
function close(closeFromTimeout) { function close(closeFromTimeout) {
const shouldContinue = dispatch(
"close",
{ timeout: closeFromTimeout === true },
{ cancelable: true }
);
if (shouldContinue) {
open = false; open = false;
dispatch("close", { timeout: closeFromTimeout === true }); }
} }
onMount(() => { onMount(() => {