vrembem 1.40.1 → 1.41.0

package/dev/scripts.js

@@ -34,10 +34,9 @@ var setTabindex = function setTabindex(selector) {
 };
 
 /**
- * Adds a class or classes to an element or NodeList
- * ---
- * @param {Node || NodeList} el - Element(s) to add class(es) to
- * @param {String || Array} cl - Class(es) to add
+ * Adds a class or classes to a Node or NodeList.
+ * @param {Node || NodeList} el - Element(s) to add class(es) to.
+ * @param  {String || Array} cl - Class(es) to add.
  */
 var addClass = function addClass(el) {
   var _arguments = arguments;
@@ -50,10 +49,9 @@ var addClass = function addClass(el) {
 };
 
 /**
- * Takes a hyphen cased string and converts it to camel case
- * ---
- * @param {String } str - the string to convert to camel case
- * @returns {Boolean} - returns a camel cased string
+ * Takes a hyphen cased string and converts it to camel case.
+ * @param {String } str - the string to convert to camel case.
+ * @returns {Boolean} - returns a camel cased string.
  */
 var camelCase = function camelCase(str) {
   return str.replace(/-([a-z])/g, function (g) {
@@ -179,27 +177,25 @@ var FocusTrap = /*#__PURE__*/function () {
 }();
 
 /**
- * Get an element(s) from a selector or return value if not a string
- * ---
- * @param {String} selector - Selector to query
- * @param {Boolean} single - Whether to return a single or all matches
+ * Get an element(s) from a selector or return value if not a string.
+ * @param {String} selector - Selector to query.
+ * @param {Boolean} single - Whether to return a single or all matches.
  */
 var getElement = function getElement(selector, single) {
   if (single === void 0) {
     single = 0;
   }
 
-  if (typeof selector != 'string') return selector;
+  if (typeof selector !== 'string') return selector;
   return single ? document.querySelector(selector) : document.querySelectorAll(selector);
 };
 
 /**
- * Checks an element or NodeList whether they contain a class or classes
+ * Checks an element or NodeList whether they contain a class or classes.
  * Ref: https://davidwalsh.name/nodelist-array
- * ---
- * @param {Node} el - Element(s) to check class(es) on
- * @param {String || Array} c - Class(es) to check
- * @returns {Boolean} - Returns true if class exists, otherwise false
+ * @param {Node} el - Element(s) to check class(es) on.
+ * @param {String || Array} c - Class(es) to check.
+ * @returns {Boolean} - Returns true if class exists, otherwise false.
  */
 var hasClass = function hasClass(el) {
   el = el.forEach ? el : [el];
@@ -212,10 +208,9 @@ var hasClass = function hasClass(el) {
 };
 
 /**
- * Takes a camel cased string and converts it to hyphen case
- * ---
- * @param {String } str - the string to convert to hyphen case
- * @returns {Boolean} - returns a hyphen cased string
+ * Takes a camel cased string and converts it to hyphen case.
+ * @param {String } str - the string to convert to hyphen case.
+ * @returns {Boolean} - returns a hyphen cased string.
  */
 var hyphenCase = function hyphenCase(str) {
   return str.replace(/([a-z][A-Z])/g, function (g) {
@@ -224,11 +219,10 @@ var hyphenCase = function hyphenCase(str) {
 };
 
 /**
- * Moves element(s) in the DOM based on a reference and move type
- * ---
- * @param {String} target - The element(s) to move
- * @param {String} type - Move type can be 'after', 'before', 'append' or 'prepend'
- * @param {String} reference - The reference element the move is relative to
+ * Moves element(s) in the DOM based on a reference and move type.
+ * @param {String} target - The element(s) to move.
+ * @param {String} type - Move type can be 'after', 'before', 'append' or 'prepend'.
+ * @param {String} reference - The reference element the move is relative to.
  */
 
 function moveElement(target, type, reference) {
@@ -283,10 +277,9 @@ function moveElement(target, type, reference) {
 }
 
 /**
- * Remove a class or classes from an element or NodeList
- * ---
- * @param {Node || NodeList} el - Element(s) to remove class(es) from
- * @param {String || Array} cl - Class(es) to remove
+ * Remove a class or classes from an element or NodeList.
+ * @param {Node || NodeList} el - Element(s) to remove class(es) from.
+ * @param {String || Array} cl - Class(es) to remove.
  */
 var removeClass = function removeClass(el) {
   var _arguments = arguments;
@@ -299,10 +292,9 @@ var removeClass = function removeClass(el) {
 };
 
 /**
- * Toggle a class or classes on an element or NodeList
- * ---
- * @param {Node || NodeList} el - Element(s) to toggle class(es) on
- * @param {String || Array} cl - Class(es) to toggle
+ * Toggle a class or classes on an element or NodeList.
+ * @param {Node || NodeList} el - Element(s) to toggle class(es) on.
+ * @param {String || Array} cl - Class(es) to toggle.
  */
 var toggleClass = function toggleClass(el) {
   var _arguments = arguments;
@@ -389,13 +381,39 @@ 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',
+  stateValue: 'mixed'
+};
+
 var Checkbox = /*#__PURE__*/function () {
   function Checkbox(options) {
-    this.defaults = {
-      autoInit: false,
-      stateAttr: 'aria-checked',
-      stateValue: 'mixed'
-    };
+    this.defaults = defaults$3;
     this.settings = _extends({}, this.defaults, options);
     this.__handlerClick = this.handlerClick.bind(this);
     if (this.settings.autoInit) this.init();
@@ -495,55 +513,6 @@ var defaults$2 = {
   transition: true
 };
 
-var switchToDefault = function switchToDefault(drawerKey, obj) {
-  try {
-    // Initial guards
-    var drawer = obj.getDrawer(drawerKey);
-    if (!drawer) return Promise.resolve(obj.drawerNotFound(drawerKey));
-    if (!hasClass(drawer, obj.settings.classModal)) return Promise.resolve(); // Tear down modal state
-
-    setInert(false, obj.settings.selectorInert);
-    setOverflowHidden(false, obj.settings.selectorOverflow);
-    removeClass(drawer, obj.settings.classModal);
-    obj.focusTrap.destroy(); // Restore drawers saved state
-
-    drawerKey = drawer.getAttribute("data-" + obj.settings.dataDrawer);
-    var drawerState = obj.state[drawerKey];
-
-    if (drawerState == obj.settings.stateOpened) {
-      addClass(drawer, obj.settings.stateOpened);
-      removeClass(drawer, obj.settings.stateClosed);
-    } // Dispatch custom event
-
-
-    drawer.dispatchEvent(new CustomEvent(obj.settings.customEventPrefix + 'toDefault', {
-      bubbles: true
-    }));
-    return Promise.resolve(drawer);
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-var switchToModal = function switchToModal(drawerKey, obj) {
-  try {
-    // Initial guards
-    var drawer = obj.getDrawer(drawerKey);
-    if (!drawer) return Promise.resolve(obj.drawerNotFound(drawerKey));
-    if (hasClass(drawer, obj.settings.classModal)) return Promise.resolve(); // Enable modal state
-
-    addClass(drawer, obj.settings.classModal);
-    addClass(drawer, obj.settings.stateClosed);
-    removeClass(drawer, obj.settings.stateOpened); // Dispatch custom event
-
-    drawer.dispatchEvent(new CustomEvent(obj.settings.customEventPrefix + 'toModal', {
-      bubbles: true
-    }));
-    return Promise.resolve(drawer);
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-
 var Breakpoint = /*#__PURE__*/function () {
   function Breakpoint(parent) {
     this.mediaQueryLists = [];
@@ -559,16 +528,23 @@ var Breakpoint = /*#__PURE__*/function () {
 
     var drawers = document.querySelectorAll("[data-" + this.parent.settings.dataBreakpoint + "]");
     drawers.forEach(function (drawer) {
+      // Setup mediaQueryList object
       var id = drawer.getAttribute("data-" + _this.parent.settings.dataDrawer);
       var key = drawer.getAttribute("data-" + _this.parent.settings.dataBreakpoint);
 
       var bp = _this.getBreakpoint(key);
 
-      var mql = window.matchMedia('(min-width:' + bp + ')');
+      var mql = window.matchMedia('(min-width:' + bp + ')'); // Run match check
 
-      _this.match(mql, drawer);
+      _this.match(mql, drawer); // Conditionally use addListner() for IE11 support
+
+
+      if (typeof mql.addEventListener === 'function') {
+        mql.addEventListener('change', _this.__check);
+      } else {
+        mql.addListener(_this.__check);
+      } // Push to mediaQueryLists array along with drawer ID
 
-      mql.addEventListener('change', _this.__check);
 
       _this.mediaQueryLists.push({
         'mql': mql,
@@ -613,9 +589,9 @@ var Breakpoint = /*#__PURE__*/function () {
 
   _proto.match = function match(mql, drawer) {
     if (mql.matches) {
-      switchToDefault(drawer, this.parent);
+      this.parent.switchToDefault(drawer);
     } else {
-      switchToModal(drawer, this.parent);
+      this.parent.switchToModal(drawer);
     }
   };
 
@@ -641,6 +617,52 @@ var Breakpoint = /*#__PURE__*/function () {
   return Breakpoint;
 }();
 
+function getDrawer(drawerKey) {
+  if (typeof drawerKey !== 'string') return drawerKey;
+  return document.querySelector("[data-" + this.settings.dataDrawer + "=\"" + drawerKey + "\"]");
+}
+function drawerNotFound(key) {
+  return Promise.reject(new Error("Did not find drawer with key: \"" + key + "\""));
+}
+
+var close$2 = function close(drawerKey) {
+  try {
+    var _this2 = this;
+
+    var drawer = _this2.getDrawer(drawerKey);
+
+    if (!drawer) return Promise.resolve(drawerNotFound(drawerKey));
+
+    if (hasClass(drawer, _this2.settings.stateOpened)) {
+      _this2.working = true;
+
+      if (hasClass(drawer, _this2.settings.classModal)) {
+        setInert(false, _this2.settings.selectorInert);
+        setOverflowHidden(false, _this2.settings.selectorOverflow);
+      }
+
+      return Promise.resolve(closeTransition(drawer, _this2.settings)).then(function () {
+        _this2.stateSave(drawer);
+
+        focusTrigger(_this2);
+
+        _this2.focusTrap.destroy();
+
+        drawer.dispatchEvent(new CustomEvent(_this2.settings.customEventPrefix + 'closed', {
+          detail: _this2,
+          bubbles: true
+        }));
+        _this2.working = false;
+        return drawer;
+      });
+    } else {
+      return Promise.resolve(drawer);
+    }
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 function handlerClick$2(event) {
   // Working catch
   if (this.working) return; // Toggle data trigger
@@ -704,6 +726,48 @@ function handlerKeydown$2(event) {
   }
 }
 
+var open$2 = function open(drawerKey) {
+  try {
+    var _this2 = this;
+
+    var drawer = _this2.getDrawer(drawerKey);
+
+    if (!drawer) return Promise.resolve(drawerNotFound(drawerKey));
+
+    if (!hasClass(drawer, _this2.settings.stateOpened)) {
+      _this2.working = true;
+      var isModal = hasClass(drawer, _this2.settings.classModal);
+
+      if (isModal) {
+        setOverflowHidden(true, _this2.settings.selectorOverflow);
+      }
+
+      return Promise.resolve(openTransition(drawer, _this2.settings)).then(function () {
+        _this2.stateSave(drawer);
+
+        if (isModal) {
+          _this2.focusTrap.init(drawer);
+
+          setInert(true, _this2.settings.selectorInert);
+        }
+
+        focusTarget(drawer, _this2.settings);
+        drawer.dispatchEvent(new CustomEvent(_this2.settings.customEventPrefix + 'opened', {
+          detail: _this2,
+          bubbles: true
+        }));
+        _this2.working = false;
+        return drawer;
+      });
+    } else {
+      focusTarget(drawer, _this2.settings);
+      return Promise.resolve(drawer);
+    }
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 function stateSet(settings) {
   // If save state is disabled
   if (!settings.stateSave) return stateClear(settings); // If there isn't an existing state to set
@@ -748,6 +812,82 @@ function stateClear(settings) {
   return {};
 }
 
+var switchToDefault = function switchToDefault(drawerKey) {
+  try {
+    var _this4 = this;
+
+    // Initial guards
+    var drawer = _this4.getDrawer(drawerKey);
+
+    if (!drawer) return Promise.resolve(drawerNotFound(drawerKey));
+    if (!hasClass(drawer, _this4.settings.classModal)) return Promise.resolve(); // Tear down modal state
+
+    setInert(false, _this4.settings.selectorInert);
+    setOverflowHidden(false, _this4.settings.selectorOverflow);
+    removeClass(drawer, _this4.settings.classModal);
+
+    _this4.focusTrap.destroy(); // Restore drawers saved state
+
+
+    drawerKey = drawer.getAttribute("data-" + _this4.settings.dataDrawer);
+    var drawerState = _this4.state[drawerKey];
+
+    if (drawerState == _this4.settings.stateOpened) {
+      addClass(drawer, _this4.settings.stateOpened);
+      removeClass(drawer, _this4.settings.stateClosed);
+    } // Dispatch custom event
+
+
+    drawer.dispatchEvent(new CustomEvent(_this4.settings.customEventPrefix + 'toDefault', {
+      bubbles: true
+    }));
+    return Promise.resolve(drawer);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var switchToModal = function switchToModal(drawerKey) {
+  try {
+    var _this2 = this;
+
+    // Initial guards
+    var drawer = _this2.getDrawer(drawerKey);
+
+    if (!drawer) return Promise.resolve(drawerNotFound(drawerKey));
+    if (hasClass(drawer, _this2.settings.classModal)) return Promise.resolve(); // Enable modal state
+
+    addClass(drawer, _this2.settings.classModal);
+    addClass(drawer, _this2.settings.stateClosed);
+    removeClass(drawer, _this2.settings.stateOpened); // Dispatch custom event
+
+    drawer.dispatchEvent(new CustomEvent(_this2.settings.customEventPrefix + 'toModal', {
+      bubbles: true
+    }));
+    return Promise.resolve(drawer);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
+var toggle = function toggle(drawerKey) {
+  try {
+    var _this2 = this;
+
+    var drawer = _this2.getDrawer(drawerKey);
+
+    if (!drawer) return Promise.resolve(drawerNotFound(drawerKey));
+    var isClosed = !hasClass(drawer, _this2.settings.stateOpened);
+
+    if (isClosed) {
+      return Promise.resolve(_this2.open(drawer));
+    } else {
+      return Promise.resolve(_this2.close(drawer));
+    }
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 var Drawer = /*#__PURE__*/function () {
   function Drawer(options) {
     this.defaults = defaults$2;
@@ -814,19 +954,12 @@ var Drawer = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.getDrawer = function getDrawer(drawerKey) {
-    if (typeof drawerKey !== 'string') return drawerKey;
-    return document.querySelector("[data-" + this.settings.dataDrawer + "=\"" + drawerKey + "\"]");
-  };
-
-  _proto.drawerNotFound = function drawerNotFound(key) {
-    return Promise.reject(new Error("Did not find drawer with key: \"" + key + "\""));
+  _proto.getDrawer = function getDrawer$1(drawerKey) {
+    return getDrawer.call(this, drawerKey);
   };
 
   _proto.setTabindex = function setTabindex$1() {
-    var selectorTabindex = "\n      [data-" + this.settings.dataDrawer + "]\n      [data-" + this.settings.dataDialog + "]\n    ";
-
-    setTabindex(selectorTabindex);
+    return setTabindex("\n      [data-" + this.settings.dataDrawer + "]\n      [data-" + this.settings.dataDialog + "]\n    ");
   }
   /**
    * Save state functionality
@@ -854,114 +987,27 @@ var Drawer = /*#__PURE__*/function () {
   ;
 
   _proto.switchToDefault = function switchToDefault$1(drawerKey) {
-    return switchToDefault(drawerKey, this);
+    return switchToDefault.call(this, drawerKey);
   };
 
   _proto.switchToModal = function switchToModal$1(drawerKey) {
-    return switchToModal(drawerKey, this);
+    return switchToModal.call(this, drawerKey);
   }
   /**
    * Change state functionality
    */
   ;
 
-  _proto.toggle = function toggle(drawerKey) {
-    try {
-      var _this2 = this;
-
-      var drawer = _this2.getDrawer(drawerKey);
-
-      if (!drawer) return Promise.resolve(_this2.drawerNotFound(drawerKey));
-      var isClosed = !hasClass(drawer, _this2.settings.stateOpened);
-
-      if (isClosed) {
-        return Promise.resolve(_this2.open(drawer));
-      } else {
-        return Promise.resolve(_this2.close(drawer));
-      }
-    } catch (e) {
-      return Promise.reject(e);
-    }
+  _proto.toggle = function toggle$1(drawerKey) {
+    return toggle.call(this, drawerKey);
   };
 
   _proto.open = function open(drawerKey) {
-    try {
-      var _this4 = this;
-
-      var drawer = _this4.getDrawer(drawerKey);
-
-      if (!drawer) return Promise.resolve(_this4.drawerNotFound(drawerKey));
-
-      if (!hasClass(drawer, _this4.settings.stateOpened)) {
-        _this4.working = true;
-        var isModal = hasClass(drawer, _this4.settings.classModal);
-
-        if (isModal) {
-          setOverflowHidden(true, _this4.settings.selectorOverflow);
-        }
-
-        return Promise.resolve(openTransition(drawer, _this4.settings)).then(function () {
-          _this4.stateSave(drawer);
-
-          if (isModal) {
-            _this4.focusTrap.init(drawer);
-
-            setInert(true, _this4.settings.selectorInert);
-          }
-
-          focusTarget(drawer, _this4.settings);
-          drawer.dispatchEvent(new CustomEvent(_this4.settings.customEventPrefix + 'opened', {
-            detail: _this4,
-            bubbles: true
-          }));
-          _this4.working = false;
-          return drawer;
-        });
-      } else {
-        focusTarget(drawer, _this4.settings);
-        return Promise.resolve(drawer);
-      }
-    } catch (e) {
-      return Promise.reject(e);
-    }
+    return open$2.call(this, drawerKey);
   };
 
   _proto.close = function close(drawerKey) {
-    try {
-      var _this6 = this;
-
-      var drawer = _this6.getDrawer(drawerKey);
-
-      if (!drawer) return Promise.resolve(_this6.drawerNotFound(drawerKey));
-
-      if (hasClass(drawer, _this6.settings.stateOpened)) {
-        _this6.working = true;
-
-        if (hasClass(drawer, _this6.settings.classModal)) {
-          setInert(false, _this6.settings.selectorInert);
-          setOverflowHidden(false, _this6.settings.selectorOverflow);
-        }
-
-        return Promise.resolve(closeTransition(drawer, _this6.settings)).then(function () {
-          _this6.stateSave(drawer);
-
-          focusTrigger(_this6);
-
-          _this6.focusTrap.destroy();
-
-          drawer.dispatchEvent(new CustomEvent(_this6.settings.customEventPrefix + 'closed', {
-            detail: _this6,
-            bubbles: true
-          }));
-          _this6.working = false;
-          return drawer;
-        });
-      } else {
-        return Promise.resolve(drawer);
-      }
-    } catch (e) {
-      return Promise.reject(e);
-    }
+    return close$2.call(this, drawerKey);
   };
 
   return Drawer;
@@ -995,6 +1041,40 @@ var defaults$1 = {
   transition: true
 };
 
+var close$1 = function close(returnFocus) {
+  if (returnFocus === void 0) {
+    returnFocus = true;
+  }
+
+  try {
+    var _this2 = this;
+
+    var modal = document.querySelector("[data-" + _this2.settings.dataModal + "]." + _this2.settings.stateOpened);
+
+    if (modal) {
+      _this2.working = true;
+      setInert(false, _this2.settings.selectorInert);
+      setOverflowHidden(false, _this2.settings.selectorOverflow);
+      return Promise.resolve(closeTransition(modal, _this2.settings)).then(function () {
+        if (returnFocus) focusTrigger(_this2);
+
+        _this2.focusTrap.destroy();
+
+        modal.dispatchEvent(new CustomEvent(_this2.settings.customEventPrefix + 'closed', {
+          detail: _this2,
+          bubbles: true
+        }));
+        _this2.working = false;
+        return modal;
+      });
+    } else {
+      return Promise.resolve(modal);
+    }
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 var handlerClick$1 = function handlerClick(event) {
   try {
     var _temp3 = function _temp3(_result) {
@@ -1056,21 +1136,76 @@ function handlerKeydown$1(event) {
   }
 }
 
-function setInitialState(obj) {
-  var modals = document.querySelectorAll("[data-" + obj.settings.dataModal + "]");
+function getModal(modalKey) {
+  if (typeof modalKey !== 'string') return modalKey;
+  return document.querySelector("[data-" + this.settings.dataModal + "=\"" + modalKey + "\"]");
+}
+function modalNotFound(key) {
+  return Promise.reject(new Error("Did not find modal with key: \"" + key + "\""));
+}
+function moveModals(type, ref) {
+  if (type === void 0) {
+    type = this.settings.moveModals.type;
+  }
+
+  if (ref === void 0) {
+    ref = this.settings.moveModals.ref;
+  }
+
+  var modals = document.querySelectorAll("[data-" + this.settings.dataModal + "]");
+  if (modals.length) moveElement(modals, type, ref);
+}
+
+function setInitialState() {
+  var _this = this;
+
+  var modals = document.querySelectorAll("[data-" + this.settings.dataModal + "]");
   modals.forEach(function (el) {
-    if (el.classList.contains(obj.settings.stateOpened)) {
-      setInert(false, obj.settings.selectorInert);
-      setOverflowHidden(false, obj.settings.selectorOverflow);
-      focusTrigger(obj);
-      obj.focusTrap.destroy();
-    }
+    // Remove opened state setup
+    if (el.classList.contains(_this.settings.stateOpened)) {
+      setInert(false, _this.settings.selectorInert);
+      setOverflowHidden(false, _this.settings.selectorOverflow);
+      focusTrigger(_this);
 
-    removeClass(el, obj.settings.stateOpened, obj.settings.stateOpening, obj.settings.stateClosing);
-    addClass(el, obj.settings.stateClosed);
+      _this.focusTrap.destroy();
+    } // Remove all state classes and add the default state (closed)
+
+
+    removeClass(el, _this.settings.stateOpened, _this.settings.stateOpening, _this.settings.stateClosing);
+    addClass(el, _this.settings.stateClosed);
   });
 }
 
+var open$1 = function open(modalKey) {
+  try {
+    var _this2 = this;
+
+    var modal = getModal.call(_this2, modalKey);
+    if (!modal) return Promise.resolve(modalNotFound(modalKey));
+
+    if (hasClass(modal, _this2.settings.stateClosed)) {
+      _this2.working = true;
+      setOverflowHidden(true, _this2.settings.selectorOverflow);
+      return Promise.resolve(openTransition(modal, _this2.settings)).then(function () {
+        _this2.focusTrap.init(modal);
+
+        focusTarget(modal, _this2.settings);
+        setInert(true, _this2.settings.selectorInert);
+        modal.dispatchEvent(new CustomEvent(_this2.settings.customEventPrefix + 'opened', {
+          detail: _this2,
+          bubbles: true
+        }));
+        _this2.working = false;
+        return modal;
+      });
+    } else {
+      return Promise.resolve(modal);
+    }
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 var Modal = /*#__PURE__*/function () {
   function Modal(options) {
     this.defaults = defaults$1;
@@ -1092,13 +1227,12 @@ var Modal = /*#__PURE__*/function () {
 
     if (options) this.settings = _extends({}, this.settings, options);
     this.moveModals();
+    this.setInitialState();
 
     if (this.settings.setTabindex) {
       this.setTabindex();
     }
 
-    this.setInitialState();
-
     if (this.settings.eventListeners) {
       this.initEventListeners();
     }
@@ -1132,36 +1266,20 @@ var Modal = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.getModal = function getModal(modalKey) {
-    if (typeof modalKey !== 'string') return modalKey;
-    return document.querySelector("[data-" + this.settings.dataModal + "=\"" + modalKey + "\"]");
-  };
-
-  _proto.modalNotFound = function modalNotFound(key) {
-    return Promise.reject(new Error("Did not find modal with key: \"" + key + "\""));
+  _proto.getModal = function getModal$1(modalKey) {
+    return getModal.call(this, modalKey);
   };
 
   _proto.setTabindex = function setTabindex$1() {
-    var selectorTabindex = "\n      [data-" + this.settings.dataModal + "]\n      [data-" + this.settings.dataDialog + "]\n    ";
-
-    setTabindex(selectorTabindex);
+    return setTabindex("\n      [data-" + this.settings.dataModal + "]\n      [data-" + this.settings.dataDialog + "]\n    ");
   };
 
   _proto.setInitialState = function setInitialState$1() {
-    setInitialState(this);
+    return setInitialState.call(this);
   };
 
-  _proto.moveModals = function moveModals(type, ref) {
-    if (type === void 0) {
-      type = this.settings.moveModals.type;
-    }
-
-    if (ref === void 0) {
-      ref = this.settings.moveModals.ref;
-    }
-
-    var modals = document.querySelectorAll("[data-" + this.settings.dataModal + "]");
-    if (modals.length) moveElement(modals, type, ref);
+  _proto.moveModals = function moveModals$1(type, ref) {
+    return moveModals.call(this, type, ref);
   }
   /**
    * Change state functionality
@@ -1169,92 +1287,92 @@ var Modal = /*#__PURE__*/function () {
   ;
 
   _proto.open = function open(modalKey) {
-    try {
-      var _this2 = this;
+    return open$1.call(this, modalKey);
+  };
 
-      var modal = _this2.getModal(modalKey);
+  _proto.close = function close(returnFocus) {
+    return close$1.call(this, returnFocus);
+  };
 
-      if (!modal) return Promise.resolve(_this2.modalNotFound(modalKey));
+  return Modal;
+}();
 
-      if (hasClass(modal, _this2.settings.stateClosed)) {
-        _this2.working = true;
-        setOverflowHidden(true, _this2.settings.selectorOverflow);
-        return Promise.resolve(openTransition(modal, _this2.settings)).then(function () {
-          _this2.focusTrap.init(modal);
+var Collection = /*#__PURE__*/function () {
+  function Collection() {
+    this.collection = [];
+  }
 
-          focusTarget(modal, _this2.settings);
-          setInert(true, _this2.settings.selectorInert);
-          modal.dispatchEvent(new CustomEvent(_this2.settings.customEventPrefix + 'opened', {
-            detail: _this2,
-            bubbles: true
-          }));
-          _this2.working = false;
-          return modal;
-        });
-      } else {
-        return Promise.resolve(modal);
-      }
-    } catch (e) {
-      return Promise.reject(e);
-    }
+  var _proto = Collection.prototype;
+
+  _proto.register = function register(item) {
+    this.deregister(item);
+    this.collection.push(item);
+    return this.collection;
   };
 
-  _proto.close = function close(returnFocus) {
-    if (returnFocus === void 0) {
-      returnFocus = true;
+  _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);
     }
 
-    try {
-      var _this4 = this;
+    return this.collection;
+  };
 
-      var modal = document.querySelector("[data-" + _this4.settings.dataModal + "]." + _this4.settings.stateOpened);
+  _proto.registerCollection = function registerCollection(items) {
+    var _this = this;
 
-      if (modal) {
-        _this4.working = true;
-        setInert(false, _this4.settings.selectorInert);
-        setOverflowHidden(false, _this4.settings.selectorOverflow);
-        return Promise.resolve(closeTransition(modal, _this4.settings)).then(function () {
-          if (returnFocus) focusTrigger(_this4);
+    items.forEach(function (item) {
+      _this.register(item);
+    });
+    return this.collection;
+  };
 
-          _this4.focusTrap.destroy();
+  _proto.deregisterCollection = function deregisterCollection() {
+    while (this.collection.length > 0) {
+      this.deregister(this.collection[0]);
+    }
 
-          modal.dispatchEvent(new CustomEvent(_this4.settings.customEventPrefix + 'closed', {
-            detail: _this4,
-            bubbles: true
-          }));
-          _this4.working = false;
-          return modal;
-        });
-      } else {
-        return Promise.resolve(modal);
-      }
-    } catch (e) {
-      return Promise.reject(e);
+    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 Modal;
+  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 hide$2(popover, obj) {
+function close(popover) {
   // Update state class
-  popover.target.classList.remove(obj.settings.stateActive); // Update a11y attributes
+  popover.target.classList.remove(this.settings.stateActive); // Update a11y attributes
 
   popover.trigger.setAttribute('aria-expanded', 'false'); // Disable popper event listeners
 
@@ -1263,41 +1381,38 @@ function hide$2(popover, obj) {
       name: 'eventListeners',
       enabled: false
     }]
-  }); // Update collection status with new state
+  }); // Update popover state
 
-  var index = obj.collection.findIndex(function (item) {
-    return item.target === popover.target;
-  });
-  obj.collection[index].state = 'hide'; // 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 === obj.memory.trigger) {
-    obj.memory.trigger = null;
+  if (popover.trigger === this.memory.trigger) {
+    this.memory.trigger = null;
   } // Return the popover
 
 
   return popover;
 }
-function hideAll(obj) {
-  obj.collection.forEach(function (popover) {
-    if (popover.state === 'show') {
-      hide$2(popover, obj);
+function closeAll() {
+  this.collection.forEach(function (popover) {
+    if (popover.state === 'opened') {
+      popover.close();
     }
   }); // Return the collection
 
-  return obj.collection;
+  return this.collection;
 }
-function hideCheck(popover, obj) {
-  // Only run hideCheck if provided popover is currently open
-  if (popover.state != 'show') return; // Needed to correctly check which element is currently being focused
+function closeCheck(popover) {
+  // Only run closeCheck if provided popover is currently open
+  if (popover.state != 'opened') return; // Needed to correctly check which element is currently being focused
 
   setTimeout(function () {
     // 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-" + obj.settings.dataPopover + "]") === popover.target || document.activeElement.closest("[data-" + obj.settings.dataTrigger + "]") === popover.trigger; // Hide 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) {
-      hide$2(popover, obj);
+      popover.close();
     } // Return the popover
 
 
@@ -1305,6 +1420,59 @@ function hideCheck(popover, obj) {
   }, 1);
 }
 
+function handlerClick(popover) {
+  if (popover.target.classList.contains(this.settings.stateActive)) {
+    popover.close();
+  } else {
+    this.memory.trigger = popover.trigger;
+    popover.open();
+    documentClick.call(this, popover);
+  }
+}
+function handlerKeydown(event) {
+  var _this = this;
+
+  switch (event.key) {
+    case 'Escape':
+      if (this.memory.trigger) {
+        this.memory.trigger.focus();
+      }
+
+      closeAll.call(this);
+      return;
+
+    case 'Tab':
+      this.collection.forEach(function (popover) {
+        closeCheck.call(_this, popover);
+      });
+      return;
+
+    default:
+      return;
+  }
+}
+function documentClick(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 + "\"]");
+
+    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 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);
+      }
+    }
+  });
+}
+
 function getConfig(el, settings) {
   // Get the computed styles of the popover
   var styles = getComputedStyle(el); // Setup the config obj with default values
@@ -1315,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
 
@@ -1412,97 +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 show(popover, obj) {
-  // Update state class
-  popover.target.classList.add(obj.settings.stateActive); // Update a11y attributes
+    var trigger = document.querySelector("[aria-controls=\"" + id + "\"]");
+    var target = document.querySelector("#" + id);
 
-  popover.trigger.setAttribute('aria-expanded', 'true'); // Update popover config
-
-  popover.config = getConfig(popover.target, obj.settings); // Enable popper event listeners and set placement/modifiers
-
-  popover.popper.setOptions({
-    placement: getData(popover.target, obj.settings.dataPlacement, popover.config['placement']),
-    modifiers: [{
-      name: 'eventListeners',
-      enabled: true
-    }].concat(getModifiers(popover.config))
-  }); // Update popover's position
-
-  popover.popper.update(); // Update collection status with new state
-
-  var index = obj.collection.findIndex(function (item) {
-    return item.target === popover.target;
-  });
-  obj.collection[index].state = 'show'; // Return the popover
-
-  return popover;
-}
-
-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) {
-  var _this = this;
-
-  switch (event.key) {
-    case 'Escape':
-      if (this.memory.trigger) {
-        this.memory.trigger.focus();
-      }
-
-      hideAll(this);
-      return;
-
-    case 'Tab':
-      this.collection.forEach(function (popover) {
-        hideCheck(popover, _this);
-      });
-      return;
-
-    default:
-      return;
-  }
-}
-function documentClick(popover, obj) {
-  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;
-
-    if (!match) {
-      if (popover.target.classList.contains(obj.settings.stateActive)) {
-        hide$2(popover, obj);
-      }
+    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);
+    }
 
-      this.removeEventListener('click', _f);
+    if (!trigger || !target) {
+      return false;
     } else {
-      if (!popover.target.classList.contains(obj.settings.stateActive)) {
-        this.removeEventListener('click', _f);
-      }
+      return {
+        trigger: trigger,
+        target: target
+      };
     }
-  });
+  } else {
+    console.error('Could not resolve the popover ID:', query);
+    return false;
+  }
 }
 
 var top = 'top';
@@ -3288,95 +3405,118 @@ var createPopper = /*#__PURE__*/popperGenerator({
   defaultModifiers: defaultModifiers
 }); // eslint-disable-next-line import/no-unused-modules
 
-function register(trigger, target, obj) {
-  // If no target is passed
-  if (!target) {
-    // Try and get the target
-    target = getPopover(trigger, obj.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 = obj.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 = obj.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
+
+  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
 
-    popover = {
-      state: 'hide',
-      trigger: trigger,
-      target: target,
-      popper: popperInstance,
-      config: getConfig(target, obj.settings)
-    }; // Add item to collection
+  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
 
-    obj.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(popover, obj); // Set initial state of popover
+  registerEventListeners.call(this, popover); // Set initial state of popover
 
-  if (popover.target.classList.contains(obj.settings.stateActive)) {
-    show(popover, obj);
-    documentClick(popover, obj);
+  if (popover.target.classList.contains(this.settings.stateActive)) {
+    popover.open();
+    documentClick.call(this, popover);
   } else {
-    hide$2(popover, obj);
-  } // Return the popover object
+    popover.close();
+  } // Add item to collection
+
 
+  this.collection.push(popover); // Return the popover object
 
   return popover;
 }
-function deregister(popover, obj) {
+
+function _deregister(popover) {
   // Check if this item has been registered in the collection
-  var index = obj.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) {
-    // Hide the popover
-    if (popover.state === 'show') {
-      hide$2(popover, obj);
+    // 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(popover); // Remove item from collection
+    deregisterEventListeners(entry); // Delete properties from collection entry
 
-    obj.collection.splice(index, 1);
+    Object.getOwnPropertyNames(entry).forEach(function (prop) {
+      delete entry[prop];
+    }); // Remove entry from collection
+
+    this.collection.splice(index, 1);
   } // Return the new collection
 
 
-  return obj.collection;
+  return this.collection;
 }
-function registerEventListeners(popover, obj) {
+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, obj.settings.dataEventType, popover.config['event']);
+    var eventType = popover.config['event'];
 
     if (eventType === 'hover') {
       // Setup event listeners object for hover
       popover.__eventListeners = [{
         el: ['trigger'],
         type: ['mouseenter', 'focus'],
-        listener: show.bind(null, popover, obj)
+        listener: open.bind(this, popover)
       }, {
         el: ['trigger', 'target'],
         type: ['mouseleave', 'focusout'],
-        listener: hideCheck.bind(null, popover, obj)
+        listener: closeCheck.bind(this, popover)
       }]; // Loop through listeners and apply to appropriate elements
 
       popover.__eventListeners.forEach(function (evObj) {
@@ -3391,7 +3531,7 @@ function registerEventListeners(popover, obj) {
       popover.__eventListeners = [{
         el: ['trigger'],
         type: ['click'],
-        listener: handlerClick.bind(obj, popover)
+        listener: handlerClick.bind(this, popover)
       }]; // Loop through listeners and apply to appropriate elements
 
       popover.__eventListeners.forEach(function (evObj) {
@@ -3426,36 +3566,23 @@ function deregisterEventListeners(popover) {
 
   return popover;
 }
-function registerCollection(obj) {
-  // Get all the triggers
-  var triggers = document.querySelectorAll("[data-" + obj.settings.dataTrigger + "]");
-  triggers.forEach(function (trigger) {
-    // Register the popover and save to collection array
-    register(trigger, false, obj);
-  }); // Return the popover collection
 
-  return obj.collection;
-}
-function deregisterCollection(obj) {
-  // Loop through all items within the collection and pass them to deregister()
-  while (obj.collection.length > 0) {
-    deregister(obj.collection[0], obj);
-  } // Return the popover collection
+var Popover = /*#__PURE__*/function (_Collection) {
+  _inheritsLoose(Popover, _Collection);
 
+  function Popover(options) {
+    var _this;
 
-  return obj.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;
@@ -3466,10 +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
 
-    registerCollection(this); // If eventListeners is enabled
+    var popovers = document.querySelectorAll(this.settings.selectorPopover); // Build the collections array with popover instances
 
+    this.registerCollection(popovers); // If eventListeners is enabled
 
     if (this.settings.eventListeners) {
       // Pass false to initEventListeners() since registerCollection()
@@ -3480,8 +3608,7 @@ var Popover = /*#__PURE__*/function () {
 
   _proto.destroy = function destroy() {
     // Deregister all popovers from collection
-    deregisterCollection(this); // If eventListeners is enabled
-
+    this.deregisterCollection(); // If eventListeners is enabled
 
     if (this.settings.eventListeners) {
       // Pass false to destroyEventListeners() since deregisterCollection()
@@ -3495,7 +3622,7 @@ var Popover = /*#__PURE__*/function () {
   ;
 
   _proto.initEventListeners = function initEventListeners(processCollection) {
-    var _this = this;
+    var _this2 = this;
 
     if (processCollection === void 0) {
       processCollection = true;
@@ -3504,7 +3631,7 @@ var Popover = /*#__PURE__*/function () {
     if (processCollection) {
       // Loop through collection and setup event listeners
       this.collection.forEach(function (popover) {
-        registerEventListeners(popover, _this);
+        registerEventListeners.call(_this2, popover);
       });
     } // Add keydown global event listener
 
@@ -3532,44 +3659,40 @@ var Popover = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.register = function register$1(trigger, target) {
-    if (target === void 0) {
-      target = false;
-    }
-
-    return register(trigger, target, this);
-  };
-
-  _proto.deregister = function deregister$1(popover) {
-    return deregister(popover, this);
-  };
-
-  _proto.registerCollection = function registerCollection$1() {
-    return registerCollection(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(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.show = function show$1(popover) {
-    return show(popover, this);
-  };
-
-  _proto.hide = function hide(popover) {
-    return hide$2(popover, this);
+  _proto.open = function open(id) {
+    var popover = this.get(id);
+    if (!popover) return false;
+    return popover.open();
   };
 
-  _proto.hideAll = function hideAll$1() {
-    return hideAll(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);
 
 exports.Checkbox = Checkbox;
 exports.Drawer = Drawer;