vrembem 3.0.2 → 3.0.5

package/dev/scripts.modern.js

@@ -1899,7 +1899,7 @@ function closeCheck(popover) {
     // Check if trigger or element are being hovered.
     const isHovered = popover.el.closest(':hover') === popover.el || popover.trigger.closest(':hover') === popover.trigger; // Check if trigger or element are being focused.
 
-    const isFocused = document.activeElement.closest(`#${popover.id}, [aria-controls="${popover.id}"]`); // Close if the trigger and element are not currently hovered or focused.
+    const isFocused = document.activeElement.closest(`#${popover.id}, [aria-controls="${popover.id}"], [aria-describedby="${popover.id}"]`); // Close if the trigger and element are not currently hovered or focused.
 
     if (!isHovered && !isFocused) {
       popover.close();
@@ -1942,21 +1942,21 @@ function handleKeydown(event) {
 function handleDocumentClick(popover) {
   const root = this;
   document.addEventListener('click', function _f(event) {
-    // Check if a popover was clicked.
-    const result = event.target.closest(`#${popover.id}, [aria-controls="${popover.id}"]`);
+    // Check if a popover or its trigger was clicked.
+    const wasClicked = event.target.closest(`#${popover.id}, [aria-controls="${popover.id}"], [aria-describedby="${popover.id}"]`); // If popover or popover trigger was clicked...
 
-    if (!result) {
-      // If it doesn't match and popover is open, close it and remove event listener.
+    if (wasClicked) {
+      // If popover element exists and is not active...
+      if (popover.el && !popover.el.classList.contains(root.settings.stateActive)) {
+        this.removeEventListener('click', _f);
+      }
+    } else {
+      // If popover element exists and is active...
       if (popover.el && popover.el.classList.contains(root.settings.stateActive)) {
         popover.close();
       }
 
       this.removeEventListener('click', _f);
-    } else {
-      // If it does match and popover isn't currently active, remove event listener.
-      if (popover.el && !popover.el.classList.contains(root.settings.stateActive)) {
-        this.removeEventListener('click', _f);
-      }
     }
   });
 }