From 503b8c59e4f31e965cf0d46db3692f5d2decfbe3 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 13 Jun 2025 08:39:38 +0200 Subject: [PATCH] IBX-10064: Fix notification close removes focus from dropdown --- .../Resources/public/js/scripts/admin.notifications.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/admin.notifications.js b/src/bundle/Resources/public/js/scripts/admin.notifications.js index bc20a7f955..57bfc8bbf8 100644 --- a/src/bundle/Resources/public/js/scripts/admin.notifications.js +++ b/src/bundle/Resources/public/js/scripts/admin.notifications.js @@ -1,4 +1,4 @@ -(function (global, doc, ibexa) { +(function (global, doc, ibexa, bootstrap) { const notificationsContainer = doc.querySelector('.ibexa-notifications-container'); const notifications = JSON.parse(notificationsContainer.dataset.notifications); const { template } = notificationsContainer.dataset; @@ -32,7 +32,9 @@ notificationsContainer.append(notificationNode); if (timeout) { - global.setTimeout(() => notificationNode.querySelector('.ibexa-alert__close-btn').click(), timeout); + const alertBootstrapInstance = bootstrap.Alert.getOrCreateInstance(notificationNode); + + global.setTimeout(() => alertBootstrapInstance.close(), timeout); } if (typeof onShow === 'function') { @@ -45,4 +47,4 @@ }); doc.body.addEventListener('ibexa-notify', addNotification, false); -})(window, window.document, window.ibexa); +})(window, window.document, window.ibexa, window.bootstrap);