From 018e2165ceab984bc82b1ff5c3a4e19acd99bbd8 Mon Sep 17 00:00:00 2001
From: LB Johnston <mail@lb.ee>
Date: Fri, 22 Sep 2023 06:38:03 +1000
Subject: [PATCH] Fix issue with closing dialog in the userbar

- Remove `data-a11y-dialog-hide` and use Stimulus data action approach
- This ensures that our code is more agnostic to the third party library and can leverage our own DialogController behaviour
- Works around ally-dialog issue https://github.com/KittyGiraudel/a11y-dialog/issues/582
- Fixes #10924
---
 .../admin/templates/wagtailadmin/shared/dialog/dialog.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/shared/dialog/dialog.html b/wagtail/admin/templates/wagtailadmin/shared/dialog/dialog.html
index d5156723ea51..44f4e3d279b8 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/dialog/dialog.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/dialog/dialog.html
@@ -12,9 +12,9 @@
         {% if theme %}data-w-dialog-theme-value="{{ theme }}"{% endif %}
         {% if data_url %}data-url="{{ data_url }}"{% endif %}
     >
-        <div data-a11y-dialog-hide class="w-dialog__overlay"></div>
+        <div class="w-dialog__overlay" data-action="click->w-dialog#hide"></div>
         <div class="w-dialog__box">
-            <button type="button" data-a11y-dialog-hide aria-label="{% trans 'Close dialog' %}" class="w-dialog__close-button">
+            <button type="button" class="w-dialog__close-button" aria-label="{% trans 'Close dialog' %}" data-action="w-dialog#hide">
                 {% icon name='cross' classname="w-dialog__close-icon" %}
             </button>