From b28a9f99dde07d508d1aab499959886ee0f60496 Mon Sep 17 00:00:00 2001
From: Mason Freed <masonf@chromium.org>
Date: Fri, 15 Nov 2024 17:50:44 -0800
Subject: [PATCH 1/4] Fix corner case invoker issue with popover nested inside
 invoker

In this situation:

```
<button popovertarget=foo>Activate
  <div popover id=foo>Clicking me shouldn't close me</div>
</button>
```

clicking the button properly activates the popover, however, clicking on the popover itself after that should **not** close the popover. It currently does because the popover click bubbles to the `<button>` and activates the invoker, which toggles the popover closed.

This patch fixes that case.
---
 source | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/source b/source
index 667b17a3a94..5d548bfad02 100644
--- a/source
+++ b/source
@@ -48192,8 +48192,9 @@ interface <dfn interface>HTMLInputElement</dfn> : <span>HTMLElement</span> {
    <li><p>Run <var>element</var>'s <dfn>input activation behavior</dfn>, if any, and do nothing
    otherwise.</p></li>
 
-   <li><p>Run the <span>popover target attribute activation behavior</span> on
-   <var>element</var>.</p></li>
+   <li><p>Run the <span>popover target attribute activation behavior</span> given
+   <var>element</var> and <var>event</var>'s
+   <span data-x="concept-event-target">target</span>.</p></li>
   </ol>
 
   <p class="note">Recall that an element's <span>activation behavior</span> runs for both
@@ -53491,7 +53492,8 @@ interface <dfn interface>HTMLButtonElement</dfn> : <span>HTMLElement</span> {
    </li>
 
    <li><p>Run the <span>popover target attribute activation behavior</span> given
-   <var>element</var>.</p></li>
+   <var>element</var> and <var>event</var>'s
+   <span data-x="concept-event-target">target</span>.</p></li>
   </ol>
 
   </div>
@@ -86359,13 +86361,16 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
   attribute, <span>limited to only known values</span>.</p>
 
   <p>To run the <dfn>popover target attribute activation behavior</dfn> given a <code>Node</code>
-  <var>node</var>:</p>
+  <var>node</var> and an <code>EventTarget</code> <var>eventTarget</var>:</p>
 
   <ol>
    <li><p>Let <var>popover</var> be <var>node</var>'s <span>popover target element</span>.</p></li>
 
    <li><p>If <var>popover</var> is null, then return.</p></li>
 
+   <li><p>If <var>eventTarget</var> is a <span>shadow-including inclusive descendant</span> of
+   <var>popover</var>, then return.</p></li>
+
    <li><p>If <var>node</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
    attribute is in the <span data-x="attr-popovertargetaction-show">show</span> state and
    <var>popover</var>'s <span>popover visibility state</span> is <span

From 81b5b7f564d3510b63f6c4797b5602ba701a1e07 Mon Sep 17 00:00:00 2001
From: Mason Freed <masonf@chromium.org>
Date: Sun, 17 Nov 2024 09:43:27 -0800
Subject: [PATCH 2/4] Fix nesting problem

---
 source | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/source b/source
index 5d548bfad02..58f6c227aaf 100644
--- a/source
+++ b/source
@@ -86361,22 +86361,23 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
   attribute, <span>limited to only known values</span>.</p>
 
   <p>To run the <dfn>popover target attribute activation behavior</dfn> given a <code>Node</code>
-  <var>node</var> and an <code>EventTarget</code> <var>eventTarget</var>:</p>
+  <var>invoker</var> and an <code>EventTarget</code> <var>eventTarget</var>:</p>
 
   <ol>
-   <li><p>Let <var>popover</var> be <var>node</var>'s <span>popover target element</span>.</p></li>
+   <li><p>Let <var>popover</var> be <var>invoker</var>'s <span>popover target element</span>.</p></li>
 
    <li><p>If <var>popover</var> is null, then return.</p></li>
 
    <li><p>If <var>eventTarget</var> is a <span>shadow-including inclusive descendant</span> of
-   <var>popover</var>, then return.</p></li>
+   <var>popover</var>, and <var>popover</var> is a <span>shadow-including inclusive descendant</span>
+   of <var>invoker</var>, then return.</p></li>
 
-   <li><p>If <var>node</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
+   <li><p>If <var>invoker</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
    attribute is in the <span data-x="attr-popovertargetaction-show">show</span> state and
    <var>popover</var>'s <span>popover visibility state</span> is <span
    data-x="popover-showing-state">showing</span>, then return.</p></li>
 
-   <li><p>If <var>node</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
+   <li><p>If <var>invoker</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
    attribute is in the <span data-x="attr-popovertargetaction-hide">hide</span> state and
    <var>popover</var>'s <span>popover visibility state</span> is <span
    data-x="popover-hidden-state">hidden</span>, then return.</p></li>
@@ -86388,23 +86389,23 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
    <li><p>Otherwise, if <var>popover</var>'s <span>popover visibility state</span> is <span
    data-x="popover-hidden-state">hidden</span> and the result of running <span>check popover
    validity</span> given <var>popover</var>, false, false, and null is true, then run <span>show
-   popover</span> given <var>popover</var>, false, and <var>node</var>.</p></li>
+   popover</span> given <var>popover</var>, false, and <var>invoker</var>.</p></li>
   </ol>
 
-  <p>To get the <dfn>popover target element</dfn> given a <code>Node</code> <var>node</var>, perform
+  <p>To get the <dfn>popover target element</dfn> given a <code>Node</code> <var>invoker</var>, perform
   the following steps. They return an <span data-x="HTML elements">HTML element</span> or null.</p>
 
   <ol>
-   <li><p>If <var>node</var> is not a <span data-x="concept-button">button</span>, then return
+   <li><p>If <var>invoker</var> is not a <span data-x="concept-button">button</span>, then return
    null.</p></li>
 
-   <li><p>If <var>node</var> is <span data-x="concept-fe-disabled">disabled</span>, then return
+   <li><p>If <var>invoker</var> is <span data-x="concept-fe-disabled">disabled</span>, then return
    null.</p></li>
 
-   <li><p>If <var>node</var> has a <span>form owner</span> and <var>node</var> is a <span
+   <li><p>If <var>invoker</var> has a <span>form owner</span> and <var>invoker</var> is a <span
    data-x="concept-submit-button">submit button</span>, then return null.</p></li>
 
-   <li><p>Let <var>popoverElement</var> be the result of running <var>node</var>'s <span data-x="get
+   <li><p>Let <var>popoverElement</var> be the result of running <var>invoker</var>'s <span data-x="get
    the attr-associated element">get the <code data-x="">popovertarget</code>-associated
    element</span>.</p></li>
 

From 3f5cffee6c28b204cb43efe1e604bcde8acd1582 Mon Sep 17 00:00:00 2001
From: Mason Freed <masonf@chromium.org>
Date: Mon, 18 Nov 2024 10:31:44 -0800
Subject: [PATCH 3/4] Address comments

---
 source | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/source b/source
index 58f6c227aaf..fe3fb4c688a 100644
--- a/source
+++ b/source
@@ -48192,9 +48192,8 @@ interface <dfn interface>HTMLInputElement</dfn> : <span>HTMLElement</span> {
    <li><p>Run <var>element</var>'s <dfn>input activation behavior</dfn>, if any, and do nothing
    otherwise.</p></li>
 
-   <li><p>Run the <span>popover target attribute activation behavior</span> given
-   <var>element</var> and <var>event</var>'s
-   <span data-x="concept-event-target">target</span>.</p></li>
+   <li><p>Run the <span>popover target attribute activation behavior</span> given <var>element</var>
+   and <var>event</var>'s <span data-x="concept-event-target">target</span>.</p></li>
   </ol>
 
   <p class="note">Recall that an element's <span>activation behavior</span> runs for both
@@ -53491,9 +53490,8 @@ interface <dfn interface>HTMLButtonElement</dfn> : <span>HTMLElement</span> {
     </dl>
    </li>
 
-   <li><p>Run the <span>popover target attribute activation behavior</span> given
-   <var>element</var> and <var>event</var>'s
-   <span data-x="concept-event-target">target</span>.</p></li>
+   <li><p>Run the <span>popover target attribute activation behavior</span> given <var>element</var>
+   and <var>event</var>'s <span data-x="concept-event-target">target</span>.</p></li>
   </ol>
 
   </div>
@@ -86361,23 +86359,24 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
   attribute, <span>limited to only known values</span>.</p>
 
   <p>To run the <dfn>popover target attribute activation behavior</dfn> given a <code>Node</code>
-  <var>invoker</var> and an <code>EventTarget</code> <var>eventTarget</var>:</p>
+  <var>node</var> and an <code>EventTarget</code> <var>eventTarget</var>:</p>
 
   <ol>
-   <li><p>Let <var>popover</var> be <var>invoker</var>'s <span>popover target element</span>.</p></li>
+   <li><p>Let <var>popover</var> be <var>node</var>'s <span>popover target element</span>.</p></li>
 
    <li><p>If <var>popover</var> is null, then return.</p></li>
 
    <li><p>If <var>eventTarget</var> is a <span>shadow-including inclusive descendant</span> of
-   <var>popover</var>, and <var>popover</var> is a <span>shadow-including inclusive descendant</span>
-   of <var>invoker</var>, then return.</p></li>
+   <var>popover</var> and <var>popover</var> is a
+   <span data-x="shadow-including descendant">shadow-including descendant</span> of <var>node</var>,
+   then return.</p></li>
 
-   <li><p>If <var>invoker</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
+   <li><p>If <var>node</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
    attribute is in the <span data-x="attr-popovertargetaction-show">show</span> state and
    <var>popover</var>'s <span>popover visibility state</span> is <span
    data-x="popover-showing-state">showing</span>, then return.</p></li>
 
-   <li><p>If <var>invoker</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
+   <li><p>If <var>node</var>'s <code data-x="attr-popovertargetaction">popovertargetaction</code>
    attribute is in the <span data-x="attr-popovertargetaction-hide">hide</span> state and
    <var>popover</var>'s <span>popover visibility state</span> is <span
    data-x="popover-hidden-state">hidden</span>, then return.</p></li>
@@ -86389,23 +86388,23 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
    <li><p>Otherwise, if <var>popover</var>'s <span>popover visibility state</span> is <span
    data-x="popover-hidden-state">hidden</span> and the result of running <span>check popover
    validity</span> given <var>popover</var>, false, false, and null is true, then run <span>show
-   popover</span> given <var>popover</var>, false, and <var>invoker</var>.</p></li>
+   popover</span> given <var>popover</var>, false, and <var>node</var>.</p></li>
   </ol>
 
-  <p>To get the <dfn>popover target element</dfn> given a <code>Node</code> <var>invoker</var>, perform
+  <p>To get the <dfn>popover target element</dfn> given a <code>Node</code> <var>node</var>, perform
   the following steps. They return an <span data-x="HTML elements">HTML element</span> or null.</p>
 
   <ol>
-   <li><p>If <var>invoker</var> is not a <span data-x="concept-button">button</span>, then return
+   <li><p>If <var>node</var> is not a <span data-x="concept-button">button</span>, then return
    null.</p></li>
 
-   <li><p>If <var>invoker</var> is <span data-x="concept-fe-disabled">disabled</span>, then return
+   <li><p>If <var>node</var> is <span data-x="concept-fe-disabled">disabled</span>, then return
    null.</p></li>
 
-   <li><p>If <var>invoker</var> has a <span>form owner</span> and <var>invoker</var> is a <span
+   <li><p>If <var>node</var> has a <span>form owner</span> and <var>node</var> is a <span
    data-x="concept-submit-button">submit button</span>, then return null.</p></li>
 
-   <li><p>Let <var>popoverElement</var> be the result of running <var>invoker</var>'s <span data-x="get
+   <li><p>Let <var>popoverElement</var> be the result of running <var>node</var>'s <span data-x="get
    the attr-associated element">get the <code data-x="">popovertarget</code>-associated
    element</span>.</p></li>
 

From 4e759968ba93713cdbb3a95a2cd90bc7242dfc05 Mon Sep 17 00:00:00 2001
From: Mason Freed <masonf@chromium.org>
Date: Thu, 21 Nov 2024 09:24:01 -0800
Subject: [PATCH 4/4] EventTarget->Node

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

diff --git a/source b/source
index fe3fb4c688a..0621799164d 100644
--- a/source
+++ b/source
@@ -86359,7 +86359,7 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
   attribute, <span>limited to only known values</span>.</p>
 
   <p>To run the <dfn>popover target attribute activation behavior</dfn> given a <code>Node</code>
-  <var>node</var> and an <code>EventTarget</code> <var>eventTarget</var>:</p>
+  <var>node</var> and a <code>Node</code> <var>eventTarget</var>:</p>
 
   <ol>
    <li><p>Let <var>popover</var> be <var>node</var>'s <span>popover target element</span>.</p></li>