diff --git a/core/misc/dialog/dialog.ajax.js b/core/misc/dialog/dialog.ajax.js
index dd62949273539a8f784a500488f849534d36302e..c44c031b5154d5c7a8a4781130e3f0fc715fd25e 100644
--- a/core/misc/dialog/dialog.ajax.js
+++ b/core/misc/dialog/dialog.ajax.js
@@ -3,7 +3,7 @@
* Extends the Drupal AJAX functionality to integrate the dialog API.
*/
-(function ($, Drupal) {
+(function ($, Drupal, { focusable }) {
/**
* Initialize dialogs for Ajax purposes.
*
@@ -46,6 +46,27 @@
// Overwrite the close method to remove the dialog on closing.
settings.dialog.close = function (event, ...args) {
originalClose.apply(settings.dialog, [event, ...args]);
+ // Check if the opener element is inside an AJAX container.
+ const $element = $(event.target);
+ const ajaxContainer = $element.data('uiDialog')
+ ? $element
+ .data('uiDialog')
+ .opener.closest('[data-drupal-ajax-container]')
+ : [];
+
+ // If the opener element was in an ajax container, and focus is on the
+ // body element, we can assume focus was lost. To recover, focus is moved
+ // to the first focusable element in the container.
+ if (
+ ajaxContainer.length &&
+ (document.activeElement === document.body ||
+ $(document.activeElement).not(':visible'))
+ ) {
+ const focusableChildren = focusable(ajaxContainer[0]);
+ if (focusableChildren.length > 0) {
+ focusableChildren[0].focus();
+ }
+ }
$(event.target).remove();
};
},
@@ -246,4 +267,4 @@
$(window).on('dialog:beforeclose', (e, dialog, $element) => {
$element.off('.dialog');
});
-})(jQuery, Drupal);
+})(jQuery, Drupal, window.tabbable);
diff --git a/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php b/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
index 9c02828c99479a869bd1bfb6aa093d79bceaf2e3..55f54f822d49b9927dab35affc9e24ac60fe7f44 100644
--- a/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
+++ b/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
@@ -393,8 +393,8 @@ public function testBlockContextualLinks() {
$cached_id_token = Crypt::hmacBase64($cached_id, Settings::getHashSalt() . $this->container->get('private_key')->get());
// @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
// Check existence of the contextual link placeholders.
- $this->assertSession()->responseContains('<div' . new Attribute(['data-contextual-id' => $id, 'data-contextual-token' => $id_token]) . '></div>');
- $this->assertSession()->responseContains('<div' . new Attribute(['data-contextual-id' => $cached_id, 'data-contextual-token' => $cached_id_token]) . '></div>');
+ $this->assertSession()->responseContains('<div' . new Attribute(['data-contextual-id' => $id, 'data-contextual-token' => $id_token, 'data-drupal-ajax-container' => '']) . '></div>');
+ $this->assertSession()->responseContains('<div' . new Attribute(['data-contextual-id' => $cached_id, 'data-contextual-token' => $cached_id_token, 'data-drupal-ajax-container' => '']) . '></div>');
// Get server-rendered contextual links.
// @see \Drupal\contextual\Tests\ContextualDynamicContextTest:renderContextualLinks()
diff --git a/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php b/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php
index 40b82058ea459cc29bde88bae960bc79832b51e3..b59da5b4ace02df0b63c6c83994f16fc6c5023c1 100644
--- a/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php
+++ b/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php
@@ -49,6 +49,7 @@ public static function preRenderPlaceholder(array $element) {
$attribute = new Attribute([
'data-contextual-id' => $element['#id'],
'data-contextual-token' => $token,
+ 'data-drupal-ajax-container' => '',
]);
$element['#markup'] = new FormattableMarkup('<div@attributes></div>', ['@attributes' => $attribute]);
diff --git a/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php b/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
index 8bcc8a301594c286765fd5e64098b7ec2befa893..5de661be23e4d5d617b6ea60ceb431bcc86cec21 100644
--- a/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
+++ b/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
@@ -88,6 +88,14 @@ public function testContextualLinksClick() {
$this->clickContextualLink('#block-branding', 'Test Link with Ajax');
$this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', '#drupal-modal'));
$this->assertSession()->elementContains('css', '#drupal-modal', 'Everything is contextual!');
+ $this->getSession()->getPage()->pressButton('Close');
+ $this->assertSession()->assertNoElementAfterWait('css', 'ui.dialog');
+
+ // When the dialog is closed, the opening contextual link is now inside a
+ // collapsed container, so focus should be routed to the contextual link
+ // toggle button.
+ $this->assertJsCondition('document.activeElement === document.querySelector("#block-branding button.trigger")');
+
// Check to make sure that page was not reloaded.
$this->assertSession()->pageTextContains($current_page_string);
diff --git a/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.routing.yml b/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.routing.yml
index c135824810b5f5653c5ccb0e3acd34af2d9cbc74..bbcc9c7f2d8bf132a2f0e9e3c2f4699587b409a6 100644
--- a/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.routing.yml
+++ b/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.routing.yml
@@ -29,3 +29,11 @@ dialog_renderer_test.modal_content_input:
_title: 'Thing 3'
requirements:
_access: 'TRUE'
+
+dialog_renderer_test.collapsed_opener:
+ path: '/dialog_renderer-collapsed-opener'
+ defaults:
+ _controller: '\Drupal\dialog_renderer_test\Controller\TestController::collapsedOpener'
+ _title: 'Collapsed Openers'
+ requirements:
+ _access: 'TRUE'
diff --git a/core/modules/system/tests/modules/dialog_renderer_test/src/Controller/TestController.php b/core/modules/system/tests/modules/dialog_renderer_test/src/Controller/TestController.php
index 469e35a187de48c248a0ac3f1e0516e9411b0ee8..4dae862fb95d80857b12285823448e4d9a909669 100644
--- a/core/modules/system/tests/modules/dialog_renderer_test/src/Controller/TestController.php
+++ b/core/modules/system/tests/modules/dialog_renderer_test/src/Controller/TestController.php
@@ -189,4 +189,39 @@ public function linksDisplay() {
];
}
+ /**
+ * Displays a dropbutton with a link that opens in a modal dialog.
+ *
+ * @return array
+ * Render array with links.
+ */
+ public function collapsedOpener() {
+ return [
+ '#markup' => '<h2>Honk</h2>',
+ 'dropbutton' => [
+ '#type' => 'dropbutton',
+ '#dropbutton_type' => 'small',
+ '#links' => [
+ 'front' => [
+ 'title' => 'front!',
+ 'url' => Url::fromRoute('<front>'),
+ ],
+ 'in a dropbutton' => [
+ 'title' => 'inside a dropbutton',
+ 'url' => Url::fromRoute('dialog_renderer_test.modal_content'),
+ 'attributes' => [
+ 'class' => ['use-ajax'],
+ 'data-dialog-type' => 'modal',
+ ],
+ ],
+ ],
+ ],
+ '#attached' => [
+ 'library' => [
+ 'core/drupal.ajax',
+ ],
+ ],
+ ];
+ }
+
}
diff --git a/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php b/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
index 0760f7042b6da48ab7a28c5956e4561d08aae9b5..2cec0b84e2f72476eec9fa35e74f9963e4a297ce 100644
--- a/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
+++ b/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
@@ -76,4 +76,31 @@ public function testModalRenderer() {
$this->assertJsCondition('document.activeElement === document.querySelector(".ui-dialog .form-text")');
}
+ /**
+ * Confirm focus management of a dialog openers in a dropbutton.
+ */
+ public function testOpenerInDropbutton() {
+ $assert_session = $this->assertSession();
+ $page = $this->getSession()->getPage();
+
+ $this->drupalGet('dialog_renderer-collapsed-opener');
+
+ // Open a modal using a link inside a dropbutton.
+ $page->find('css', '.dropbutton-toggle button')->click();
+ $modal_link = $assert_session->waitForElementVisible('css', '.secondary-action a');
+ $modal_link->click();
+ $assert_session->waitForElementVisible('css', '.ui-dialog');
+ $assert_session->assertVisibleInViewport('css', '.ui-dialog .ui-dialog-content');
+ $page->pressButton('Close');
+
+ // When the dialog "closes" it is still present, so wait on it switching to
+ // `display: none;`.
+ $assert_session->waitForElement('css', '.ui-dialog[style*="display: none;"]');
+
+ // Confirm that when the modal closes, focus is moved to the first visible
+ // and focusable item in the contextual link container, because the original
+ // opener is not available.
+ $this->assertJsCondition('document.activeElement === document.querySelector(".dropbutton-action a")');
+ }
+
}