vrembem 1.40.3 → 1.41.0

package/dev/scripts.esm.js

@@ -381,6 +381,30 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+function _inheritsLoose(subClass, superClass) {
+  subClass.prototype = Object.create(superClass.prototype);
+  subClass.prototype.constructor = subClass;
+
+  _setPrototypeOf(subClass, superClass);
+}
+
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+
+  return _setPrototypeOf(o, p);
+}
+
+function _assertThisInitialized(self) {
+  if (self === void 0) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return self;
+}
+
 var defaults$3 = {
   autoInit: false,
   stateAttr: 'aria-checked',
@@ -1273,20 +1297,77 @@ var Modal = /*#__PURE__*/function () {
   return Modal;
 }();
 
+var Collection = /*#__PURE__*/function () {
+  function Collection() {
+    this.collection = [];
+  }
+
+  var _proto = Collection.prototype;
+
+  _proto.register = function register(item) {
+    this.deregister(item);
+    this.collection.push(item);
+    return this.collection;
+  };
+
+  _proto.deregister = function deregister(ref) {
+    var index = this.collection.findIndex(function (entry) {
+      return entry === ref;
+    });
+
+    if (index >= 0) {
+      var entry = this.collection[index];
+      Object.getOwnPropertyNames(entry).forEach(function (prop) {
+        delete entry[prop];
+      });
+      this.collection.splice(index, 1);
+    }
+
+    return this.collection;
+  };
+
+  _proto.registerCollection = function registerCollection(items) {
+    var _this = this;
+
+    items.forEach(function (item) {
+      _this.register(item);
+    });
+    return this.collection;
+  };
+
+  _proto.deregisterCollection = function deregisterCollection() {
+    while (this.collection.length > 0) {
+      this.deregister(this.collection[0]);
+    }
+
+    return this.collection;
+  };
+
+  _proto.get = function get(query, key) {
+    if (key === void 0) {
+      key = 'id';
+    }
+
+    var result = this.collection.find(function (item) {
+      return item[key] === query;
+    });
+    return result || null;
+  };
+
+  return Collection;
+}();
+
 var defaults = {
   autoInit: false,
-  // Data attributes
-  dataPopover: 'popover',
-  dataTrigger: 'popover-trigger',
-  dataArrow: 'popover-arrow',
-  dataEventType: 'popover-event',
-  dataPlacement: 'popover-placement',
+  // Selectors
+  selectorPopover: '.popover',
+  selectorArrow: '.popover__arrow',
   // State classes
   stateActive: 'is-active',
   // Feature toggles
-  eventType: 'click',
   eventListeners: true,
-  placement: 'bottom-start'
+  eventType: 'click',
+  placement: 'bottom'
 };
 
 function close(popover) {
@@ -1300,12 +1381,9 @@ function close(popover) {
       name: 'eventListeners',
       enabled: false
     }]
-  }); // Update collection status with new state
+  }); // Update popover state
 
-  var index = this.collection.findIndex(function (item) {
-    return item.target === popover.target;
-  });
-  this.collection[index].state = 'closed'; // Clear the memory if popover trigger matches the ones saved in memory
+  popover.state = 'closed'; // Clear memory if popover trigger matches the one saved in memory
 
   if (popover.trigger === this.memory.trigger) {
     this.memory.trigger = null;
@@ -1315,19 +1393,15 @@ function close(popover) {
   return popover;
 }
 function closeAll() {
-  var _this = this;
-
   this.collection.forEach(function (popover) {
     if (popover.state === 'opened') {
-      _this.close(popover);
+      popover.close();
     }
   }); // Return the collection
 
   return this.collection;
 }
 function closeCheck(popover) {
-  var _this2 = this;
-
   // Only run closeCheck if provided popover is currently open
   if (popover.state != 'opened') return; // Needed to correctly check which element is currently being focused
 
@@ -1335,10 +1409,10 @@ function closeCheck(popover) {
     // Check if trigger or target are being hovered
     var isHovered = popover.target.closest(':hover') === popover.target || popover.trigger.closest(':hover') === popover.trigger; // Check if trigger or target are being focused
 
-    var isFocused = document.activeElement.closest("[data-" + _this2.settings.dataPopover + "]") === popover.target || document.activeElement.closest("[data-" + _this2.settings.dataTrigger + "]") === popover.trigger; // Close if the trigger and target are not currently hovered or focused
+    var isFocused = document.activeElement.closest("#" + popover.id + ", [aria-controls=\"" + popover.id + "\"]"); // Close if the trigger and target are not currently hovered or focused
 
     if (!isHovered && !isFocused) {
-      _this2.close(popover);
+      popover.close();
     } // Return the popover
 
 
@@ -1348,10 +1422,10 @@ function closeCheck(popover) {
 
 function handlerClick(popover) {
   if (popover.target.classList.contains(this.settings.stateActive)) {
-    this.close(popover);
+    popover.close();
   } else {
     this.memory.trigger = popover.trigger;
-    this.open(popover);
+    popover.open();
     documentClick.call(this, popover);
   }
 }
@@ -1364,7 +1438,7 @@ function handlerKeydown(event) {
         this.memory.trigger.focus();
       }
 
-      this.closeAll();
+      closeAll.call(this);
       return;
 
     case 'Tab':
@@ -1378,19 +1452,21 @@ function handlerKeydown(event) {
   }
 }
 function documentClick(popover) {
-  var obj = this;
+  var root = this;
   document.addEventListener('click', function _f(event) {
-    var result = event.target.closest("[data-" + obj.settings.dataPopover + "], [data-" + obj.settings.dataTrigger + "]");
-    var match = result === popover.target || result === popover.trigger;
+    // Check if a popover was clicked
+    var result = event.target.closest("#" + popover.id + ", [aria-controls=\"" + popover.id + "\"]");
 
-    if (!match) {
-      if (popover.target.classList.contains(obj.settings.stateActive)) {
-        obj.close(popover);
+    if (!result) {
+      // If it doesn't match and popover is open, close it and remove event listener
+      if (popover.target && popover.target.classList.contains(root.settings.stateActive)) {
+        popover.close();
       }
 
       this.removeEventListener('click', _f);
     } else {
-      if (!popover.target.classList.contains(obj.settings.stateActive)) {
+      // If it does match and popover isn't currently active, remove event listener
+      if (popover.target && !popover.target.classList.contains(root.settings.stateActive)) {
         this.removeEventListener('click', _f);
       }
     }
@@ -1407,30 +1483,23 @@ function getConfig(el, settings) {
     'offset': 0,
     'overflow-padding': 0,
     'flip-padding': 0,
-    'arrow-element': "[data-" + settings.dataArrow + "]",
+    'arrow-element': settings.selectorArrow,
     'arrow-padding': 0
   }; // Loop through config obj
 
   for (var prop in config) {
     // Get the CSS variable property values
     var prefix = getComputedStyle(document.body).getPropertyValue('--vrembem-variable-prefix');
-    var val = styles.getPropertyValue("--" + prefix + "popover-" + prop).trim(); // If a value was found, replace the default in config obj
+    var value = styles.getPropertyValue("--" + prefix + "popover-" + prop).trim(); // If a value was found, replace the default in config obj
 
-    if (val) {
-      config[prop] = val;
+    if (value) {
+      config[prop] = value;
     }
   } // Return the config obj
 
 
   return config;
 }
-function getData(el, attr, fallback) {
-  if (fallback === void 0) {
-    fallback = false;
-  }
-
-  return el.hasAttribute("data-" + attr) ? el.getAttribute("data-" + attr) : fallback;
-}
 function getPadding(value) {
   var padding; // Split the value by spaces if it's a string
 
@@ -1504,47 +1573,53 @@ function getModifiers(options) {
     }
   }];
 }
-function getPopover(trigger, settings) {
-  // Get the value of the popover trigger attribute
-  var id = trigger.getAttribute("data-" + settings.dataTrigger).trim();
+function getPopoverID(obj) {
+  // If it's a string
+  if (typeof obj === 'string') {
+    return obj;
+  } // If it's an HTML element
+  else if (typeof obj.hasAttribute === 'function') {
+    // If it's a popover trigger
+    if (obj.hasAttribute('aria-controls')) {
+      return obj.getAttribute('aria-controls');
+    } // If it's a popover target
+    else if (obj.closest(this.settings.selectorPopover)) {
+      return obj.id;
+    } // Return false if no id was found
+    else return false;
+  } // If it has an ID property
+  else if (obj.id) {
+    return obj.id;
+  } // Return false if no id was found
+  else return false;
+}
+function getPopoverElements(query) {
+  var id = getPopoverID.call(this, query);
 
   if (id) {
-    // If trigger attribute value exists, return the querySelector element using
-    // the provided popover trigger attribute's value
-    return document.querySelector("[data-" + settings.dataPopover + "=\"" + id + "\"]");
-  } else {
-    // If trigger attribute value doesn't exist, check if 
-    // - There is a nextElementSibling relative to the trigger
-    // - And it has the popover data attribute.
-    return trigger.nextElementSibling && trigger.nextElementSibling.hasAttribute("data-" + settings.dataPopover) ? // Return the element or false if the two checks fail
-    trigger.nextElementSibling : false;
-  }
-}
-
-function open(popover) {
-  // Update state class
-  popover.target.classList.add(this.settings.stateActive); // Update a11y attributes
-
-  popover.trigger.setAttribute('aria-expanded', 'true'); // Update popover config
-
-  popover.config = getConfig(popover.target, this.settings); // Enable popper event listeners and set placement/modifiers
-
-  popover.popper.setOptions({
-    placement: getData(popover.target, this.settings.dataPlacement, popover.config['placement']),
-    modifiers: [{
-      name: 'eventListeners',
-      enabled: true
-    }].concat(getModifiers(popover.config))
-  }); // Update popover's position
+    var trigger = document.querySelector("[aria-controls=\"" + id + "\"]");
+    var target = document.querySelector("#" + id);
 
-  popover.popper.update(); // Update collection status with new state
-
-  var index = this.collection.findIndex(function (item) {
-    return item.target === popover.target;
-  });
-  this.collection[index].state = 'opened'; // Return the popover
+    if (!trigger && !target) {
+      console.error('No popover elements found using the provided ID:', id);
+    } else if (!trigger) {
+      console.error('No popover trigger associated with the provided popover:', target);
+    } else if (!target) {
+      console.error('No popover associated with the provided popover trigger:', trigger);
+    }
 
-  return popover;
+    if (!trigger || !target) {
+      return false;
+    } else {
+      return {
+        trigger: trigger,
+        target: target
+      };
+    }
+  } else {
+    console.error('Could not resolve the popover ID:', query);
+    return false;
+  }
 }
 
 var top = 'top';
@@ -3330,72 +3405,95 @@ var createPopper = /*#__PURE__*/popperGenerator({
   defaultModifiers: defaultModifiers
 }); // eslint-disable-next-line import/no-unused-modules
 
-function register(trigger, target) {
-  // If no target is passed
-  if (!target) {
-    // Try and get the target
-    target = getPopover(trigger, this.settings); // If still no target is returned, log an error and return false
+function open(popover) {
+  // Update state class
+  popover.target.classList.add(this.settings.stateActive); // Update a11y attribute
 
-    if (!target) {
-      console.error('No popover associated with the provided trigger:', trigger);
-      return false;
-    }
-  } // Check if this item has already been registered in the collection
+  popover.trigger.setAttribute('aria-expanded', 'true'); // Update popover config
 
+  popover.config = getConfig(popover.target, this.settings); // Enable popper event listeners and set placement/modifiers
 
-  var index = this.collection.findIndex(function (item) {
-    return item.trigger === trigger && item.target === target;
-  }); // Initiate popover variable
+  popover.popper.setOptions({
+    placement: popover.config['placement'],
+    modifiers: [{
+      name: 'eventListeners',
+      enabled: true
+    }].concat(getModifiers(popover.config))
+  }); // Update popover position
 
-  var popover; // Check if it already exists in collection
+  popover.popper.update(); // Update popover state
 
-  if (index >= 0) {
-    // Set popover as item from collection
-    popover = this.collection[index];
-  } else {
-    // Create popper instance
-    var popperInstance = createPopper(trigger, target); // Build popover object and push to collection array
+  popover.state = 'opened'; // Return the popover
 
-    popover = {
-      state: 'closed',
-      trigger: trigger,
-      target: target,
-      popper: popperInstance,
-      config: getConfig(target, this.settings)
-    }; // Add item to collection
+  return popover;
+}
+
+function register(trigger, target) {
+  // Deregister popover if it already exists in the collection
+  this.deregister(target.id); // Create popper instance
+
+  var popperInstance = createPopper(trigger, target); // Save root this for use inside object & create methods API
+
+  var root = this;
+  var methods = {
+    open: function open$1() {
+      open.call(root, this);
+    },
+    close: function close$1() {
+      close.call(root, this);
+    },
+    deregister: function deregister() {
+      _deregister.call(root, this);
+    }
+  }; // Build popover object and push to collection array
 
-    this.collection.push(popover);
-  } // Setup event listeners
+  var popover = _extends({
+    id: target.id,
+    state: 'closed',
+    trigger: trigger,
+    target: target,
+    popper: popperInstance,
+    config: getConfig(target, this.settings)
+  }, methods); // Setup event listeners
 
 
   registerEventListeners.call(this, popover); // Set initial state of popover
 
   if (popover.target.classList.contains(this.settings.stateActive)) {
-    this.open(popover);
+    popover.open();
     documentClick.call(this, popover);
   } else {
-    this.close(popover);
-  } // Return the popover object
+    popover.close();
+  } // Add item to collection
+
 
+  this.collection.push(popover); // Return the popover object
 
   return popover;
 }
-function deregister(popover) {
+
+function _deregister(popover) {
   // Check if this item has been registered in the collection
-  var index = this.collection.findIndex(function (item) {
-    return item.trigger === popover.trigger && item.target === popover.target;
-  }); // If the item exists in the collection
+  var index = this.collection.findIndex(function (entry) {
+    return entry.id === popover.id;
+  }); // If the entry exists in the collection
 
   if (index >= 0) {
-    // Close the popover
-    if (popover.state === 'opened') {
-      this.close(popover);
+    // Get the collection entry
+    var entry = this.collection[index]; // Close the collection entry if it's open
+
+    if (entry.state === 'opened') {
+      entry.close();
     } // Clean up the popper instance
 
 
-    popover.popper.destroy(); // Remove event listeners
+    entry.popper.destroy(); // Remove event listeners
+
+    deregisterEventListeners(entry); // Delete properties from collection entry
 
-    deregisterEventListeners(popover); // Remove item from collection
+    Object.getOwnPropertyNames(entry).forEach(function (prop) {
+      delete entry[prop];
+    }); // Remove entry from collection
 
     this.collection.splice(index, 1);
   } // Return the new collection
@@ -3407,7 +3505,7 @@ function registerEventListeners(popover) {
   // If event listeners aren't already setup
   if (!popover.__eventListeners) {
     // Add event listeners based on event type
-    var eventType = getData(popover.target, this.settings.dataEventType, popover.config['event']);
+    var eventType = popover.config['event'];
 
     if (eventType === 'hover') {
       // Setup event listeners object for hover
@@ -3468,38 +3566,23 @@ function deregisterEventListeners(popover) {
 
   return popover;
 }
-function registerCollection() {
-  var _this = this;
 
-  // Get all the triggers
-  var triggers = document.querySelectorAll("[data-" + this.settings.dataTrigger + "]");
-  triggers.forEach(function (trigger) {
-    // Register the popover and save to collection array
-    _this.register(trigger, false);
-  }); // Return the popover collection
-
-  return this.collection;
-}
-function deregisterCollection() {
-  // Loop through all items within the collection and pass them to deregister()
-  while (this.collection.length > 0) {
-    this.deregister(this.collection[0]);
-  } // Return the popover collection
+var Popover = /*#__PURE__*/function (_Collection) {
+  _inheritsLoose(Popover, _Collection);
 
+  function Popover(options) {
+    var _this;
 
-  return this.collection;
-}
+    _this = _Collection.call(this) || this;
+    _this.defaults = defaults;
+    _this.settings = _extends({}, _this.defaults, options); // this.collection = [];
 
-var Popover = /*#__PURE__*/function () {
-  function Popover(options) {
-    this.defaults = defaults;
-    this.settings = _extends({}, this.defaults, options);
-    this.collection = [];
-    this.memory = {
+    _this.memory = {
       trigger: null
     };
-    this.__handlerKeydown = handlerKeydown.bind(this);
-    if (this.settings.autoInit) this.init();
+    _this.__handlerKeydown = handlerKeydown.bind(_assertThisInitialized(_this));
+    if (_this.settings.autoInit) _this.init();
+    return _this;
   }
 
   var _proto = Popover.prototype;
@@ -3510,9 +3593,11 @@ var Popover = /*#__PURE__*/function () {
     }
 
     // Update settings with passed options
-    if (options) this.settings = _extends({}, this.settings, options); // Build the collections array with popover instances
+    if (options) this.settings = _extends({}, this.settings, options); // Get all the popovers
+
+    var popovers = document.querySelectorAll(this.settings.selectorPopover); // Build the collections array with popover instances
 
-    this.registerCollection(); // If eventListeners is enabled
+    this.registerCollection(popovers); // If eventListeners is enabled
 
     if (this.settings.eventListeners) {
       // Pass false to initEventListeners() since registerCollection()
@@ -3537,7 +3622,7 @@ var Popover = /*#__PURE__*/function () {
   ;
 
   _proto.initEventListeners = function initEventListeners(processCollection) {
-    var _this = this;
+    var _this2 = this;
 
     if (processCollection === void 0) {
       processCollection = true;
@@ -3546,7 +3631,7 @@ var Popover = /*#__PURE__*/function () {
     if (processCollection) {
       // Loop through collection and setup event listeners
       this.collection.forEach(function (popover) {
-        registerEventListeners.call(_this, popover);
+        registerEventListeners.call(_this2, popover);
       });
     } // Add keydown global event listener
 
@@ -3574,44 +3659,40 @@ var Popover = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.register = function register$1(trigger, target) {
-    if (target === void 0) {
-      target = false;
-    }
-
-    return register.call(this, trigger, target);
-  };
-
-  _proto.deregister = function deregister$1(popover) {
-    return deregister.call(this, popover);
-  };
-
-  _proto.registerCollection = function registerCollection$1() {
-    return registerCollection.call(this);
+  _proto.register = function register$1(query) {
+    var els = getPopoverElements.call(this, query);
+    if (!els) return false;
+    return register.call(this, els.trigger, els.target);
   };
 
-  _proto.deregisterCollection = function deregisterCollection$1() {
-    return deregisterCollection.call(this);
+  _proto.deregister = function deregister(query) {
+    var popover = this.get(getPopoverID(query));
+    if (!popover) return false;
+    return _deregister.call(this, popover);
   }
   /**
    * Change state functionality
    */
   ;
 
-  _proto.open = function open$1(popover) {
-    return open.call(this, popover);
-  };
-
-  _proto.close = function close$1(popover) {
-    return close.call(this, popover);
+  _proto.open = function open(id) {
+    var popover = this.get(id);
+    if (!popover) return false;
+    return popover.open();
   };
 
-  _proto.closeAll = function closeAll$1() {
-    return closeAll.call(this);
+  _proto.close = function close(id) {
+    if (id) {
+      var popover = this.get(id);
+      if (!popover) return false;
+      return popover.close();
+    } else {
+      return closeAll.call(this);
+    }
   };
 
   return Popover;
-}();
+}(Collection);
 
 export { Checkbox, Drawer, Modal, Popover, index as core };
 //# sourceMappingURL=scripts.esm.js.map