Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close the dialog element when the open attribute is removed #44408

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Close the dialog element when the open attribute is removed #44408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions html/semantics/interactive-elements/the-dialog-element/dialog-close-via-attribute.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<link rel=author href="mailto:[email protected]">
<link rel=help href="https://github.com/whatwg/html/issues/5802">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>

<button>button</button>
<dialog>hello world</dialog>

<script>
const dialog = document.querySelector('dialog');
const button = document.querySelector('button');

promise_test(async t => {
dialog.showModal();

let closeFired = false;
let cancelFired = false;
dialog.addEventListener('close', () => closeFired = true);
dialog.addEventListener('cancel', () => cancelFired = true);

dialog.removeAttribute('open');
await new Promise(resolve => t.step_timeout(resolve, 0));
await new Promise(requestAnimationFrame);

assert_false(dialog.matches(':modal'),
'The dialog should not match :modal after closing.');
assert_false(cancelFired,
'The cancel event should not fire when removing the open attribute.');
assert_true(closeFired,
'The close event should be fired when removing the open attribute.');

let buttonFiredClick = false;
button.addEventListener('click', () => buttonFiredClick = true);
await test_driver.click(button);
assert_true(buttonFiredClick,
'The page should not be inert or blocked after removing the open attribute.');
}, 'Removing the open attribute from an open modal dialog should run the closing algorithm.');

promise_test(async t => {
dialog.show();

let closeFired = false;
let cancelFired = false;
dialog.addEventListener('close', () => closeFired = true);
dialog.addEventListener('cancel', () => cancelFired = true);

dialog.removeAttribute('open');
await new Promise(resolve => t.step_timeout(resolve, 0));
await new Promise(requestAnimationFrame);

assert_false(cancelFired,
'The cancel event should not fire when removing the open attribute.');
assert_true(closeFired,
'The close event should be fired when removing the open attribute.');
}, 'Removing the open attribute from an open non-modal dialog should fire a close event.');
</script>
4 changes: 2 additions & 2 deletions html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,11 @@
assert_equals(topElement(), d11);

// Removing the open attribute and running through the showModal() algorithm
// again should not promote d10 to the top.
// again should promote d10 to the top.
d10.removeAttribute("open");
assert_equals(topElement(), d11);
d10.showModal();
assert_equals(topElement(), d11);
assert_equals(topElement(), d10);

// Closing d11 with close() should cause d10 to be the topmost element.
d11.close();
Expand Down