From 128a87e7d96c34fb4a72c23623865a24ee23f9d5 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Mon, 5 Feb 2024 13:45:33 -0800
Subject: [PATCH 1/6] Close dialog elements when the open attribute is removed

Fixes https://github.com/whatwg/html/issues/5802

This patch adds attribute change steps to run the dialog closing steps
whenever the open attribute is removed in order to prevent a bad state
where the dialog is hidden but modal which renders the rest of the page
inert.
---
 source | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/source b/source
index dffcc9efcd2..c75aef9fef3 100644
--- a/source
+++ b/source
@@ -61051,9 +61051,23 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
 
   </div>
 
+  <p>The following <span data-x="concept-element-attributes-change-ext">attribute change
+  steps</span>, given <var>element</var>, <var>localName</var>, <var>oldValue</var>,
+  <var>value</var>, and <var>namespace</var> are used for <code>dialog</code> elements:</p>
+
+  <ol>
+   <li><p>If <var>namespace</var> is not null, then return.</p></li>
+
+   <li><p>If <var>localName</var> is not <code data-x="attr-dialog-open">open</code>, then
+   return.</p></li>
+
+   <li><p>If <var>value</var> is null, then <span>close the dialog</span> given
+   <var>element</var>.</p></li>
+  </ol>
+
   <div class="note" id="note-dialog-remove-open-attribute">
    <p>Removing the <code data-x="attr-dialog-open">open</code> attribute will usually hide the
-   dialog. However, doing so has a number of strange additional consequences:
+   dialog. However, doing so used to have a number of strange additional consequences:</p>
 
    <ul>
     <li><p>The <code data-x="event-close">close</code> event will not be fired.</p></li>

From 9cdcfdd5a2533e740268108b1078d37c6749a6a3 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Tue, 6 Feb 2024 13:14:46 -0800
Subject: [PATCH 2/6] add ignoreOpenAttribute parameter

---
 source | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/source b/source
index c75aef9fef3..fce4116e384 100644
--- a/source
+++ b/source
@@ -59316,7 +59316,8 @@ fur
      <li><p>Otherwise, if <var>submitter</var> has a <span data-x="concept-fe-value">value</span>,
      then set <var>result</var> to that <span data-x="concept-fe-value">value</span>.</p></li>
 
-     <li><p><span>Close the dialog</span> <var>subject</var> with <var>result</var>.</p></li>
+     <li><p><span>Close the dialog</span> given <var>subject</var>, <var>result</var>, and
+     false.</p></li>
 
      <li><p>Return.</p></li>
     </ol>
@@ -61062,7 +61063,7 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
    return.</p></li>
 
    <li><p>If <var>value</var> is null, then <span>close the dialog</span> given
-   <var>element</var>.</p></li>
+   <var>element</var>, null, and true.</p></li>
   </ol>
 
   <div class="note" id="note-dialog-remove-open-attribute">
@@ -61271,18 +61272,26 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
   <ol>
    <li><p>If <var>returnValue</var> is not given, then set it to null.</p></li>
 
-   <li><p><span>Close the dialog</span> <span>this</span> with <var>returnValue</var>.</p></li>
+   <li><p><span>Close the dialog</span> given <span>this</span>, <var>returnValue</var>, and
+   false.</p></li>
   </ol>
 
-  <p>When a <code>dialog</code> element <var>subject</var> is to be <dfn data-x="close the
-  dialog">closed</dfn>, with null or a string <var>result</var>, run these steps:</p>
+  <p>To <dfn data-x="close the dialog">close a dialog</dfn> given a <code>dialog</code> element
+  <var>subject<?var>, a string or null <var>result</var>, and a boolean
+  <var>ignoreOpenAttribute</var>:</p>
 
   <ol>
-   <li><p>If <var>subject</var> does not have an <code data-x="attr-dialog-open">open</code>
-   attribute, then return.</p></li>
+   <li>
+    <p>If <var>ignoreOpenAttribute</var> is false:</p>
 
-   <li><p>Remove <var>subject</var>'s <code data-x="attr-dialog-open">open</code>
-   attribute.</p></li>
+    <ol>
+     <li><p>If <var>subject</var> does not have an <code data-x="attr-dialog-open">open</code>
+     attribute, then return.</p></li>
+
+     <li><p>Remove <var>subject</var>'s <code data-x="attr-dialog-open">open</code>
+     attribute.</p></li>
+    </ol>
+   </li>
 
    <li><p>If the <span>is modal</span> flag of <var>subject</var> is true, then <span>request an
    element to be removed from the top layer</span> given <var>subject</var>.</p></li>

From ae5c95dab24b7c8c0b40aeb6f638e1c56374bd66 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Tue, 6 Feb 2024 13:18:56 -0800
Subject: [PATCH 3/6] delete notes

---
 source | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/source b/source
index fce4116e384..5b4a9713e10 100644
--- a/source
+++ b/source
@@ -61066,27 +61066,6 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
    <var>element</var>, null, and true.</p></li>
   </ol>
 
-  <div class="note" id="note-dialog-remove-open-attribute">
-   <p>Removing the <code data-x="attr-dialog-open">open</code> attribute will usually hide the
-   dialog. However, doing so used to have a number of strange additional consequences:</p>
-
-   <ul>
-    <li><p>The <code data-x="event-close">close</code> event will not be fired.</p></li>
-
-    <li><p>The <code data-x="dom-dialog-close">close()</code> method, and any <span data-x="close
-    request">close requests</span>, will no longer be able to close the dialog.</p></li>
-
-    <li><p>If the dialog was shown using its <code data-x="dom-dialog-showModal">showModal()</code>
-    method, the <code>Document</code> will still be <span data-x="blocked by a modal
-    dialog">blocked</span>.</p></li>
-   </ul>
-
-   <p>For these reasons, it is generally better to never remove the <code
-   data-x="attr-dialog-open">open</code> attribute manually. Instead, use the <code
-   data-x="dom-dialog-close">close()</code> method to close the dialog, or the <code
-   data-x="attr-hidden">hidden</code> attribute to hide it.</p>
-  </div>
-
   <p>The <code data-x="attr-tabindex">tabindex</code> attribute must not be specified on
   <code>dialog</code> elements.</p>
 
@@ -61355,11 +61334,7 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
     <li><p>Hiding a dialog is different from closing one. Closing a dialog gives it a return value,
     fires an event, unblocks the page for other dialogs, and so on. Whereas hiding a dialog is a
     purely visual property, and is something you can already do with the <code
-    data-x="attr-hidden">hidden</code> attribute or by removing the <code
-    data-x="attr-dialog-open">open</code> attribute. (See also the <a
-    href="#note-dialog-remove-open-attribute">note above</a> about removing the <code
-    data-x="attr-dialog-open">open</code> attribute, and how hiding the dialog in that way is
-    generally not desired.)</p></li>
+    data-x="attr-hidden">hidden</code> attribute.</p></li>
 
     <li><p>Showing a dialog is different from opening one. Opening a dialog consists of creating
     and showing that dialog (similar to how <code data-x="dom-open">window.open()</code> both

From 6f65d036a7af1bb40de0dcc2c7298aa041e0295e Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Wed, 7 Feb 2024 11:28:40 -0800
Subject: [PATCH 4/6] fix closing tag

---
 source | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source b/source
index 5b4a9713e10..40dae6dcf42 100644
--- a/source
+++ b/source
@@ -61256,7 +61256,7 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
   </ol>
 
   <p>To <dfn data-x="close the dialog">close a dialog</dfn> given a <code>dialog</code> element
-  <var>subject<?var>, a string or null <var>result</var>, and a boolean
+  <var>subject</var>, a string or null <var>result</var>, and a boolean
   <var>ignoreOpenAttribute</var>:</p>
 
   <ol>

From d84add3bdfb0a7ed0d456cf8b4ea0a8f57c4af53 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Wed, 7 Feb 2024 11:32:46 -0800
Subject: [PATCH 5/6] split into two algorithms

---
 source | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/source b/source
index 40dae6dcf42..e417e1929e2 100644
--- a/source
+++ b/source
@@ -59316,8 +59316,8 @@ fur
      <li><p>Otherwise, if <var>submitter</var> has a <span data-x="concept-fe-value">value</span>,
      then set <var>result</var> to that <span data-x="concept-fe-value">value</span>.</p></li>
 
-     <li><p><span>Close the dialog</span> given <var>subject</var>, <var>result</var>, and
-     false.</p></li>
+     <li><p><span>Close the dialog with attribute changes</span> given <var>subject</var> and
+     <var>result</var>.</p></li>
 
      <li><p>Return.</p></li>
     </ol>
@@ -61063,7 +61063,7 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
    return.</p></li>
 
    <li><p>If <var>value</var> is null, then <span>close the dialog</span> given
-   <var>element</var>, null, and true.</p></li>
+   <var>element</var> and null.</p></li>
   </ol>
 
   <p>The <code data-x="attr-tabindex">tabindex</code> attribute must not be specified on
@@ -61251,13 +61251,12 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
   <ol>
    <li><p>If <var>returnValue</var> is not given, then set it to null.</p></li>
 
-   <li><p><span>Close the dialog</span> given <span>this</span>, <var>returnValue</var>, and
-   false.</p></li>
+   <li><p><span>Close the dialog with attribute changes</span> given <span>this</span> and
+   <var>returnValue</var>.</p></li>
   </ol>
 
-  <p>To <dfn data-x="close the dialog">close a dialog</dfn> given a <code>dialog</code> element
-  <var>subject</var>, a string or null <var>result</var>, and a boolean
-  <var>ignoreOpenAttribute</var>:</p>
+  <p>To <dfn>close the dialog with attribute changes</dfn> given a <code>dialog</code> element
+  <var>subject</var> and a string or null <var>result</var>:</p>
 
   <ol>
    <li>
@@ -61272,6 +61271,13 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
     </ol>
    </li>
 
+   <li><p>Run <span>close the dialog</span> given <var>subject</var> and <var>result</var>.</p></li>
+  </ol>
+
+  <p>To <dfn>close the dialog</dfn> given a <code>dialog</code> element <var>subject</var> and a
+  string or null <var>result</var>:</p>
+
+  <ol>
    <li><p>If the <span>is modal</span> flag of <var>subject</var> is true, then <span>request an
    element to be removed from the top layer</span> given <var>subject</var>.</p></li>
 

From 42df787239c7ae5a26d4497378aa74eb3d7f27a7 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Fri, 9 Feb 2024 10:07:02 -0800
Subject: [PATCH 6/6] remove ignoreopenattribute

---
 source | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/source b/source
index e417e1929e2..031351cd938 100644
--- a/source
+++ b/source
@@ -61259,17 +61259,11 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
   <var>subject</var> and a string or null <var>result</var>:</p>
 
   <ol>
-   <li>
-    <p>If <var>ignoreOpenAttribute</var> is false:</p>
-
-    <ol>
-     <li><p>If <var>subject</var> does not have an <code data-x="attr-dialog-open">open</code>
-     attribute, then return.</p></li>
+   <li><p>If <var>subject</var> does not have an <code data-x="attr-dialog-open">open</code>
+   attribute, then return.</p></li>
 
-     <li><p>Remove <var>subject</var>'s <code data-x="attr-dialog-open">open</code>
-     attribute.</p></li>
-    </ol>
-   </li>
+   <li><p>Remove <var>subject</var>'s <code data-x="attr-dialog-open">open</code>
+   attribute.</p></li>
 
    <li><p>Run <span>close the dialog</span> given <var>subject</var> and <var>result</var>.</p></li>
   </ol>