vrembem 1.41.0 → 1.42.0

package/dev/scripts.modern.js

@@ -1179,7 +1179,10 @@ function close(popover) {
   // Update state class
   popover.target.classList.remove(this.settings.stateActive); // Update a11y attributes
 
-  popover.trigger.setAttribute('aria-expanded', 'false'); // Disable popper event listeners
+  if (popover.trigger.hasAttribute('aria-controls')) {
+    popover.trigger.setAttribute('aria-expanded', 'false');
+  } // Disable popper event listeners
+
 
   popover.popper.setOptions({
     modifiers: [{
@@ -1385,6 +1388,9 @@ function getPopoverID(obj) {
     // If it's a popover trigger
     if (obj.hasAttribute('aria-controls')) {
       return obj.getAttribute('aria-controls');
+    } // If it's a popover tooltip trigger
+    else if (obj.hasAttribute('aria-describedby')) {
+      return obj.getAttribute('aria-describedby');
     } // If it's a popover target
     else if (obj.closest(this.settings.selectorPopover)) {
       return obj.id;
@@ -1400,7 +1406,7 @@ function getPopoverElements(query) {
   const id = getPopoverID.call(this, query);
 
   if (id) {
-    const trigger = document.querySelector(`[aria-controls="${id}"]`);
+    const trigger = document.querySelector(`[aria-controls="${id}"]`) || document.querySelector(`[aria-describedby="${id}"]`);
     const target = document.querySelector(`#${id}`);
 
     if (!trigger && !target) {
@@ -3212,7 +3218,10 @@ function open(popover) {
   // Update state class
   popover.target.classList.add(this.settings.stateActive); // Update a11y attribute
 
-  popover.trigger.setAttribute('aria-expanded', 'true'); // Update popover config
+  if (popover.trigger.hasAttribute('aria-controls')) {
+    popover.trigger.setAttribute('aria-expanded', 'true');
+  } // Update popover config
+
 
   popover.config = getConfig(popover.target, this.settings); // Enable popper event listeners and set placement/modifiers