vrembem 1.39.0 → 1.40.0

package/dev/scripts.modern.js

@@ -1112,7 +1112,12 @@ function hide$2(popover, obj) {
   const index = obj.collection.findIndex(item => {
     return item.target === popover.target;
   });
-  obj.collection[index].state = 'hide'; // Return the popover
+  obj.collection[index].state = 'hide'; // Clear the memory if popover trigger matches the ones saved in memory
+
+  if (popover.trigger === obj.memory.trigger) {
+    obj.memory.trigger = null;
+  } // Return the popover
+
 
   return popover;
 }
@@ -1126,7 +1131,9 @@ function hideAll(obj) {
   return obj.collection;
 }
 function hideCheck(popover, obj) {
-  // Needed to correctly check which element is currently being focused
+  // Only run hideCheck if provided popover is currently open
+  if (popover.state != 'show') return; // Needed to correctly check which element is currently being focused
+
   setTimeout(() => {
     // Check if trigger or target are being hovered
     const isHovered = popover.target.closest(':hover') === popover.target || popover.trigger.closest(':hover') === popover.trigger; // Check if trigger or target are being focused
@@ -1292,13 +1299,29 @@ function handlerClick(popover) {
   if (popover.target.classList.contains(this.settings.stateActive)) {
     hide$2(popover, this);
   } else {
+    this.memory.trigger = popover.trigger;
     show(popover, this);
     documentClick(popover, this);
   }
 }
 function handlerKeydown(event) {
-  if (event.key === 'Escape') {
-    hideAll(this);
+  switch (event.key) {
+    case 'Escape':
+      if (this.memory.trigger) {
+        this.memory.trigger.focus();
+      }
+
+      hideAll(this);
+      return;
+
+    case 'Tab':
+      this.collection.forEach(popover => {
+        hideCheck(popover, this);
+      });
+      return;
+
+    default:
+      return;
   }
 }
 function documentClick(popover, obj) {
@@ -3266,6 +3289,9 @@ class Popover {
     this.defaults = defaults;
     this.settings = _extends({}, this.defaults, options);
     this.collection = [];
+    this.memory = {
+      trigger: null
+    };
     this.__handlerKeydown = handlerKeydown.bind(this);
     if (this.settings.autoInit) this.init();
   }