vrembem 3.0.1 → 3.0.4

package/dev/scripts.umd.js

@@ -2542,7 +2542,7 @@
       // Check if trigger or element are being hovered.
       var isHovered = popover.el.closest(':hover') === popover.el || popover.trigger.closest(':hover') === popover.trigger; // Check if trigger or element are being focused.
 
-      var isFocused = document.activeElement.closest("#" + popover.id + ", [aria-controls=\"" + popover.id + "\"]"); // Close if the trigger and element are not currently hovered or focused.
+      var 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();
@@ -2587,21 +2587,21 @@
   function handleDocumentClick(popover) {
     var root = this;
     document.addEventListener('click', function _f(event) {
-      // Check if a popover was clicked.
-      var result = event.target.closest("#" + popover.id + ", [aria-controls=\"" + popover.id + "\"]");
+      // Check if a popover or its trigger was clicked.
+      var 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);
-        }
       }
     });
   }