From cae57b63b944b83b928afec79414a9704b20271c Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Mon, 29 Sep 2025 08:29:22 -0700
Subject: [PATCH 1/5] Make option disabledness look for ancestor optgroups

Now that option elements can be descendants of optgroups instead of just
children, the disabledness algorithm should look for ancestors intead of
just a parent optgroup.

Fixes https://github.com/whatwg/html/issues/11707
---
 source | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source b/source
index 877761a9424..96ab3bb9b8c 100644
--- a/source
+++ b/source
@@ -56989,9 +56989,9 @@ interface <dfn interface>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
   <p>The <dfn element-attr for="option"><code data-x="attr-option-disabled">disabled</code></dfn>
   attribute is a <span>boolean attribute</span>. An <code>option</code> element is <dfn
   data-x="concept-option-disabled">disabled</dfn> if its <code
-  data-x="attr-option-disabled">disabled</code> attribute is present or if it is a child of an
-  <code>optgroup</code> element whose <code data-x="attr-optgroup-disabled">disabled</code>
-  attribute is present.</p>
+  data-x="attr-option-disabled">disabled</code> attribute is present or if it is a
+  <span>descendant</span> of an <code>optgroup</code> element whose <code
+  data-x="attr-optgroup-disabled">disabled</code> attribute is present.</p>
   </div>
 
   <div w-nodev>

From 10b756aea8a51a6b3029d31b56025788d4d84ba8 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Tue, 30 Sep 2025 11:09:54 -0700
Subject: [PATCH 2/5] look for nearest ancestor

---
 source | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source b/source
index 96ab3bb9b8c..7127cd34d76 100644
--- a/source
+++ b/source
@@ -56989,9 +56989,9 @@ interface <dfn interface>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
   <p>The <dfn element-attr for="option"><code data-x="attr-option-disabled">disabled</code></dfn>
   attribute is a <span>boolean attribute</span>. An <code>option</code> element is <dfn
   data-x="concept-option-disabled">disabled</dfn> if its <code
-  data-x="attr-option-disabled">disabled</code> attribute is present or if it is a
-  <span>descendant</span> of an <code>optgroup</code> element whose <code
-  data-x="attr-optgroup-disabled">disabled</code> attribute is present.</p>
+  data-x="attr-option-disabled">disabled</code> attribute is present or if its nearest
+  <span>ancestor</span> <code>optgroup</code>, if present, has the <code
+  data-x="attr-optgroup-disabled">disabled</code> attribute set.</p>
   </div>
 
   <div w-nodev>

From 7ddc327ada0da99007e6aa9bab16a4c4a6b2447e Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Wed, 1 Oct 2025 13:55:06 -0700
Subject: [PATCH 3/5] use algorithm and check for select elements

---
 source | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/source b/source
index 7127cd34d76..2207c0517a3 100644
--- a/source
+++ b/source
@@ -56987,11 +56987,28 @@ interface <dfn interface>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
 
   <div algorithm>
   <p>The <dfn element-attr for="option"><code data-x="attr-option-disabled">disabled</code></dfn>
-  attribute is a <span>boolean attribute</span>. An <code>option</code> element is <dfn
-  data-x="concept-option-disabled">disabled</dfn> if its <code
-  data-x="attr-option-disabled">disabled</code> attribute is present or if its nearest
-  <span>ancestor</span> <code>optgroup</code>, if present, has the <code
-  data-x="attr-optgroup-disabled">disabled</code> attribute set.</p>
+  attribute is a <span>boolean attribute</span>. An <code>option</code> element <var>option</var> is
+  <dfn data-x="concept-option-disabled">disabled</dfn> if the following steps return true:</p>
+
+  <ol>
+   <li><p>If <var>option</var>'s <code data-x="attr-option-disabled">disabled</code> attribute is
+   present, then return true.</p></li>
+
+   <li>
+    <p>For each <var>ancestor</var> of <var>insertedOption</var>'s <span
+    data-x="ancestor">ancestors</span> in reverse <span>tree order</span>:</p>
+
+    <ol>
+     <li><p>If <var>ancestor</var> is a <code>select</code> element, then return false.</p></li>
+
+     <li><p>If <var>ancestor</var> is an <code>optgroup</code> element, then return true if
+     <var>ancestor</var>'s <code data-x="attr-optgroup-disabled">disabled</code> attribute is
+     present, otherwise return false.</p></li>
+    </ol>
+   </li>
+
+   <li><p>Return false.</p></li>
+  </ol>
   </div>
 
   <div w-nodev>

From 3b60a7a28cd6a567b3b6c30045672800c64b4635 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Wed, 1 Oct 2025 15:52:02 -0700
Subject: [PATCH 4/5] incorporate hr and option element ancestors

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

diff --git a/source b/source
index 2207c0517a3..4e56a07dffd 100644
--- a/source
+++ b/source
@@ -56999,7 +56999,8 @@ interface <dfn interface>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
     data-x="ancestor">ancestors</span> in reverse <span>tree order</span>:</p>
 
     <ol>
-     <li><p>If <var>ancestor</var> is a <code>select</code> element, then return false.</p></li>
+     <li><p>If <var>ancestor</var> is a <code>select</code>, <code>hr</code>, or <code>option</code>
+     element, then return false.</p></li>
 
      <li><p>If <var>ancestor</var> is an <code>optgroup</code> element, then return true if
      <var>ancestor</var>'s <code data-x="attr-optgroup-disabled">disabled</code> attribute is

From 39c41f5ee3cf451250710c2e991dee8e221e731f Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Tue, 7 Oct 2025 13:32:03 -0700
Subject: [PATCH 5/5] remove extra return

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

diff --git a/source b/source
index 4e56a07dffd..1b1a6daf75f 100644
--- a/source
+++ b/source
@@ -57004,7 +57004,7 @@ interface <dfn interface>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
 
      <li><p>If <var>ancestor</var> is an <code>optgroup</code> element, then return true if
      <var>ancestor</var>'s <code data-x="attr-optgroup-disabled">disabled</code> attribute is
-     present, otherwise return false.</p></li>
+     present; otherwise false.</p></li>
     </ol>
    </li>